diff --git a/.image_optim.yml b/.image_optim.yml
deleted file mode 100644
index 746b85dc3b..0000000000
--- a/.image_optim.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-skip_missing_workers: true
-allow_lossy: false
-# PNG
-advpng: false
-optipng:
-  level: 2
-pngcrush: false
-pngout: false
-pngquant: false
-# JPG
-jpegrecompress: false
-timeout: 15
diff --git a/.rubocop.yml b/.rubocop.yml
index 792d6e22e1..cd2bcd9762 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,14 +1,108 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+  DisabledByDefault: true
+  Exclude:
+    - 'bundle/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
 
-Metrics/LineLength:
-  Max: 120
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
 
-Metrics/MethodLength:
+# Do not use braces for hash literals when they are the last argument of a
+# method call.
+Style/BracesAroundHashParameters:
+  Enabled: true
+
+# Align `when` with `case`.
+Layout/CaseIndentation:
+  Enabled: true
+
+# Align comments with method definitions.
+Layout/CommentIndentation:
+  Enabled: true
+
+# No extra empty lines.
+Layout/EmptyLines:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Two spaces, no tabs (for indentation).
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
+  Enabled: true
+
+Layout/SpaceAroundKeyword:
+  Enabled: true
+
+Layout/SpaceAroundOperators:
+  Enabled: true
+
+Layout/SpaceBeforeFirstArg:
+    Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
+# Use `foo { bar }` not `foo {bar}`.
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+
+# Use `{ a: 1 }` not `{a:1}`.
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+
+Layout/SpaceInsideParens:
+  Enabled: true
+
+# Detect hard tabs, no hard tabs.
+Layout/Tab:
+  Enabled: true
+
+# Blank lines should not have any spaces.
+Layout/TrailingBlankLines:
+  Enabled: true
+
+# No trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Lint/BlockAlignment:
+  Enabled: true
+
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Lint/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/AlignHash:
+  Enabled: true
+
+Bundler/OrderedGems:
   Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: False
diff --git a/.travis.yml b/.travis.yml
index 5eaaec0902..dc66517428 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,7 @@ env:
     - RUBY_GC_MALLOC_LIMIT=50000000
   matrix:
     - "RAILS_MASTER=0 QUNIT_RUN=0"
-    - "RAILS_MASTER=1 QUNIT_RUN=0"
     - "RAILS_MASTER=0 QUNIT_RUN=1"
-    - "RAILS_MASTER=1 QUNIT_RUN=1"
 
 addons:
   postgresql: 9.5
@@ -20,9 +18,6 @@ addons:
     - jhead
 
 matrix:
-  allow_failures:
-    - env: "RAILS_MASTER=1 QUNIT_RUN=0"
-    - env: "RAILS_MASTER=1 QUNIT_RUN=1"
   fast_finish: true
 
 rvm:
@@ -41,7 +36,7 @@ cache:
     - vendor/bundle
 
 before_install:
-  - gem install bundler
+  - gem install bundler rubocop
   - git clone --depth=1 https://github.com/discourse/discourse-backup-uploads-to-s3.git plugins/discourse-backup-uploads-to-s3
   - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert
   - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday
@@ -53,6 +48,7 @@ before_install:
   - eslint --ext .es6 test/javascripts
   - eslint --ext .es6 plugins/**/assets/javascripts
   - eslint test/javascripts
+  - rubocop --parallel
 
 before_script:
   - bundle exec rake db:create db:migrate
@@ -62,4 +58,4 @@ install:
   - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi"
 
 script:
-  - bash -c "if [ '$QUNIT_RUN' == '0' ]; then bundle exec rspec && bundle exec rake plugin:spec; else bundle exec rake qunit:test['200000']; fi"
+  - bash -c "if [ '$QUNIT_RUN' == '0' ]; then bundle exec rspec && bundle exec rake plugin:spec; else LOAD_PLUGINS=1 bundle exec rake qunit:test['300000']; fi"
diff --git a/Gemfile b/Gemfile
index 03dbe0a17b..ba6165e350 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,7 @@ gem 'aws-sdk', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
-gem 'email_reply_trimmer', '0.1.6'
+gem 'email_reply_trimmer', '0.1.7'
 
 # TODO Use official image_optim gem once https://github.com/toy/image_optim/pull/149
 # is merged.
@@ -122,7 +122,6 @@ group :test do
   gem 'webmock', require: false
   gem 'fakeweb', '~> 1.3.0', require: false
   gem 'minitest', require: false
-  gem 'timecop'
   # TODO: Remove once we upgrade to Rails 5.
   gem 'test_after_commit'
 end
@@ -152,6 +151,7 @@ group :development do
   gem 'binding_of_caller'
   gem 'annotate'
   gem 'foreman', require: false
+  gem 'rubocop', require: false
 end
 
 # this is an optional gem, it provides a high performance replacement
@@ -184,13 +184,12 @@ gem 'simple-rss', require: false
 gem 'stackprof', require: false, platform: :mri
 gem 'memory_profiler', require: false, platform: :mri
 
-gem 'rmmseg-cpp', require: false
+gem 'cppjieba_rb', require: false
 
 gem 'logster'
 
 gem 'sassc', require: false
 
-
 if ENV["IMPORT"] == "1"
   gem 'mysql2'
   gem 'redcarpet'
diff --git a/Gemfile.lock b/Gemfile.lock
index c84ad60a34..b15fe8ddc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
       globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -71,6 +71,7 @@ GEM
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
+    cppjieba_rb (0.3.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
@@ -84,7 +85,7 @@ GEM
       image_size (~> 1.5)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    email_reply_trimmer (0.1.6)
+    email_reply_trimmer (0.1.7)
     ember-data-source (2.2.1)
       ember-source (>= 1.8, < 3.0)
     ember-handlebars-template (0.7.5)
@@ -127,7 +128,7 @@ GEM
     hiredis (0.6.1)
     htmlentities (4.3.4)
     http_accept_language (2.0.5)
-    i18n (0.8.4)
+    i18n (0.8.6)
     image_size (1.5.0)
     in_threads (1.4.0)
     jmespath (1.3.1)
@@ -137,7 +138,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jwt (1.5.6)
     kgio (2.11.0)
-    libv8 (5.3.332.38.5)
+    libv8 (5.9.211.38.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -153,12 +154,14 @@ GEM
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99.3)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_mime (0.1.3)
     mini_portile2 (2.2.0)
-    mini_racer (0.1.9)
-      libv8 (~> 5.3)
-    minitest (5.10.2)
+    mini_racer (0.1.11)
+      libv8 (~> 5.7)
+    minitest (5.10.3)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     mock_redis (0.17.3)
@@ -211,7 +214,7 @@ GEM
     omniauth-twitter (1.3.0)
       omniauth-oauth (~> 1.1)
       rack
-    onebox (1.8.14)
+    onebox (1.8.16)
       fast_blank (>= 1.0.0)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
@@ -222,7 +225,11 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
+    parallel (1.11.2)
+    parser (2.4.0.0)
+      ast (~> 2.2)
     pg (0.20.0)
+    powerpack (0.1.1)
     progress (3.3.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -245,16 +252,16 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
+      railties (= 4.2.9)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -266,11 +273,13 @@ GEM
       loofah (~> 2.0)
     rails_multisite (1.0.6)
       rails (> 4.2, < 5)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.2)
+      rake
     raindrops (0.18.0)
     rake (12.0.0)
     rake-compiler (1.0.4)
@@ -286,7 +295,6 @@ GEM
     redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
     rinku (2.0.2)
-    rmmseg-cpp (0.2.9)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -312,10 +320,18 @@ GEM
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
     rtlit (0.0.5)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ll (2.1.2)
       ansi
       ast
     ruby-openid (2.7.0)
+    ruby-progressbar (1.8.1)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
@@ -363,7 +379,6 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.7)
-    timecop (0.8.1)
     trollop (2.1.2)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -372,6 +387,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
+    unicode-display_width (1.3.0)
     unicorn (5.3.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -395,9 +411,10 @@ DEPENDENCIES
   bullet
   byebug
   certified
+  cppjieba_rb
   discourse-qunit-rails
   discourse_image_optim
-  email_reply_trimmer (= 0.1.6)
+  email_reply_trimmer (= 0.1.7)
   ember-handlebars-template (= 0.7.5)
   ember-rails (= 0.18.5)
   ember-source
@@ -459,11 +476,11 @@ DEPENDENCIES
   redis
   redis-namespace
   rinku
-  rmmseg-cpp
   rspec
   rspec-html-matchers
   rspec-rails
   rtlit
+  rubocop
   ruby-readability
   sanitize
   sassc
@@ -476,11 +493,10 @@ DEPENDENCIES
   test_after_commit
   thor
   tilt
-  timecop
   uglifier
   unf
   unicorn
   webmock
 
 BUNDLED WITH
-   1.15.1
+   1.15.3
diff --git a/Rakefile b/Rakefile
index 179ba560eb..7a7f9ee44b 100755
--- a/Rakefile
+++ b/Rakefile
@@ -9,4 +9,3 @@ Discourse::Application.load_tasks
 # this prevents crashes when migrating a database in production in certain
 # PostgreSQL configuations when trying to create structure.sql
 Rake::Task["db:structure:dump"].clear if Rails.env.production?
-
diff --git a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6 b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
index e4d19613b5..8d43474a9d 100644
--- a/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
+++ b/app/assets/javascripts/admin/components/admin-directory-toggle.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js.es6 b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
new file mode 100644
index 0000000000..3c78becb49
--- /dev/null
+++ b/app/assets/javascripts/admin/components/admin-watched-word.js.es6
@@ -0,0 +1,19 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import { bufferedRender } from 'discourse-common/lib/buffered-render';
+
+export default Ember.Component.extend(bufferedRender({
+  classNames: ['watched-word'],
+
+  buildBuffer(buffer) {
+    buffer.push(iconHTML('times'));
+    buffer.push(' ' + this.get('word.word'));
+  },
+
+  click() {
+    this.get('word').destroy().then(() => {
+      this.sendAction('action', this.get('word'));
+    }).catch(e => {
+      bootbox.alert(I18n.t("generic_error_with_reason", {error: `http: ${e.status} - ${e.body}`}));
+    });;
+  }
+}));
diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6 b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
index d176b5a40a..c5f1a4a244 100644
--- a/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
+++ b/app/assets/javascripts/admin/components/admin-web-hook-status.js.es6
@@ -1,5 +1,5 @@
 import computed from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6
index 73a46eded3..36f420d100 100644
--- a/app/assets/javascripts/admin/components/resumable-upload.js.es6
+++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 /*global Resumable:true */
@@ -40,7 +41,7 @@ export default Ember.Component.extend(bufferedRender({
 
   buildBuffer(buffer) {
     const icon = this.get("isUploading") ? "times" : "upload";
-    buffer.push(`<i class="fa fa-${icon}"></i>`);
+    buffer.push(iconHTML(icon));
     buffer.push("<span class='ru-label'>" + this.get("text") + "</span>");
     buffer.push("<span class='ru-progress' style='width:" + this.get("progress") + "%'></span>");
   },
diff --git a/app/assets/javascripts/admin/components/watched-word-form.js.es6 b/app/assets/javascripts/admin/components/watched-word-form.js.es6
new file mode 100644
index 0000000000..95f859abf4
--- /dev/null
+++ b/app/assets/javascripts/admin/components/watched-word-form.js.es6
@@ -0,0 +1,49 @@
+import WatchedWord from 'admin/models/watched-word';
+import { on, observes } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  classNames: ['watched-word-form'],
+  formSubmitted: false,
+  actionKey: null,
+  showSuccessMessage: false,
+
+  @observes('word')
+  removeSuccessMessage() {
+    if (this.get('showSuccessMessage') && !Ember.isEmpty(this.get('word'))) {
+      this.set('showSuccessMessage', false);
+    }
+  },
+
+  actions: {
+    submit() {
+      if (!this.get('formSubmitted')) {
+        this.set('formSubmitted', true);
+
+        const watchedWord = WatchedWord.create({ word: this.get('word'), action: this.get('actionKey') });
+
+        watchedWord.save().then(result => {
+          this.setProperties({ word: '', formSubmitted: false, showSuccessMessage: true });
+          this.sendAction('action', WatchedWord.create(result));
+          Ember.run.schedule('afterRender', () => this.$('.watched-word-input').focus());
+        }).catch(e => {
+          this.set('formSubmitted', false);
+          const msg = (e.responseJSON && e.responseJSON.errors) ?
+                      I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')}) :
+                      I18n.t("generic_error");
+          bootbox.alert(msg, () => this.$('.watched-word-input').focus());
+        });
+      }
+    }
+  },
+
+  @on("didInsertElement")
+  _init() {
+    Ember.run.schedule('afterRender', () => {
+      this.$('.watched-word-input').keydown(e => {
+        if (e.keyCode === 13) {
+          this.send('submit');
+        }
+      });
+    });
+  }
+});
diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js.es6 b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
new file mode 100644
index 0000000000..8d9e6ba0a9
--- /dev/null
+++ b/app/assets/javascripts/admin/components/watched-word-uploader.js.es6
@@ -0,0 +1,25 @@
+import computed from "ember-addons/ember-computed-decorators";
+import UploadMixin from "discourse/mixins/upload";
+
+export default Em.Component.extend(UploadMixin, {
+  type: 'csv',
+  classNames: 'watched-words-uploader',
+  uploadUrl: '/admin/logs/watched_words/upload',
+  addDisabled: Em.computed.alias("uploading"),
+
+  validateUploadedFilesOptions() {
+    return { csvOnly: true };
+  },
+
+  @computed('actionKey')
+  data(actionKey) {
+    return { action_key: actionKey };
+  },
+
+  uploadDone() {
+    if (this) {
+      bootbox.alert(I18n.t("admin.watched_words.form.upload_successful"));
+      this.sendAction("done");
+    }
+  }
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-group.js.es6 b/app/assets/javascripts/admin/controllers/admin-group.js.es6
index 52dbc07791..cab20f908f 100644
--- a/app/assets/javascripts/admin/controllers/admin-group.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-group.js.es6
@@ -31,10 +31,10 @@ export default Ember.Controller.extend({
     ];
   }.property(),
 
-  @computed('model.visibility_level', 'model.public')
-  disableMembershipRequestSetting(visibility_level, publicGroup) {
+  @computed('model.visibility_level', 'model.public_admission')
+  disableMembershipRequestSetting(visibility_level, publicAdmission) {
     visibility_level = parseInt(visibility_level);
-    return (visibility_level !== 0) || publicGroup;
+    return (visibility_level !== 0) || publicAdmission;
   },
 
   @computed('model.visibility_level', 'model.allow_membership_requests')
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
new file mode 100644
index 0000000000..bd11f15fcf
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words-action.js.es6
@@ -0,0 +1,65 @@
+import computed from 'ember-addons/ember-computed-decorators';
+import WatchedWord from 'admin/models/watched-word';
+
+export default Ember.Controller.extend({
+  actionNameKey: null,
+  adminWatchedWords: Ember.inject.controller(),
+  showWordsList: Ember.computed.or('adminWatchedWords.filtered', 'adminWatchedWords.showWords'),
+
+  findAction(actionName) {
+    return (this.get('adminWatchedWords.model') || []).findBy('nameKey', actionName);
+  },
+
+  @computed('adminWatchedWords.model', 'actionNameKey')
+  filteredContent() {
+    if (!this.get('actionNameKey')) { return []; }
+
+    const a = this.findAction(this.get('actionNameKey'));
+    return a ? a.words : [];
+  },
+
+  @computed('actionNameKey')
+  actionDescription(actionNameKey) {
+    return I18n.t('admin.watched_words.action_descriptions.' + actionNameKey);
+  },
+
+  actions: {
+    recordAdded(arg) {
+      const a = this.findAction(this.get('actionNameKey'));
+      if (a) {
+        a.words.unshiftObject(arg);
+        a.incrementProperty('count');
+        Em.run.schedule('afterRender', () => {
+          // remove from other actions lists
+          let match = null;
+          this.get('adminWatchedWords.model').forEach(action => {
+            if (match) return;
+
+            if (action.nameKey !== this.get('actionNameKey')) {
+              match = action.words.findBy('id', arg.id);
+              if (match) {
+                action.words.removeObject(match);
+                action.decrementProperty('count');
+              }
+            }
+          });
+        });
+      }
+    },
+
+    recordRemoved(arg) {
+      const a = this.findAction(this.get('actionNameKey'));
+      if (a) {
+        a.words.removeObject(arg);
+        a.decrementProperty('count');
+      }
+    },
+
+    uploadComplete() {
+      WatchedWord.findAll().then(data => {
+        this.set('adminWatchedWords.model', data);
+      });
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6 b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
new file mode 100644
index 0000000000..07d53fd230
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/admin-watched-words.js.es6
@@ -0,0 +1,51 @@
+import debounce from 'discourse/lib/debounce';
+
+export default Ember.Controller.extend({
+  filter: null,
+  filtered: false,
+  showWords: false,
+  disableShowWords: Ember.computed.alias('filtered'),
+
+  filterContentNow() {
+
+    if (!!Ember.isEmpty(this.get('allWatchedWords'))) return;
+
+    let filter;
+    if (this.get('filter')) {
+      filter = this.get('filter').toLowerCase();
+    }
+
+    if (filter === undefined || filter.length < 1) {
+      this.set('model', this.get('allWatchedWords'));
+      return;
+    }
+
+    const matchesByAction = [];
+
+    this.get('allWatchedWords').forEach(wordsForAction => {
+      const wordRecords = wordsForAction.words.filter(wordRecord => {
+        return (wordRecord.word.indexOf(filter) > -1);
+      });
+      matchesByAction.pushObject( Ember.Object.create({
+        nameKey: wordsForAction.nameKey,
+        name: wordsForAction.name,
+        words: wordRecords,
+        count: wordRecords.length
+      }) );
+    });
+
+    this.set('model', matchesByAction);
+  },
+
+  filterContent: debounce(function() {
+    this.filterContentNow();
+    this.set('filtered', !Ember.isEmpty(this.get('filter')));
+  }, 250).observes('filter'),
+
+  actions: {
+    clearFilter() {
+      this.setProperties({ filter: '' });
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/admin/helpers/check-icon.js.es6 b/app/assets/javascripts/admin/helpers/check-icon.js.es6
new file mode 100644
index 0000000000..0a68c0be0b
--- /dev/null
+++ b/app/assets/javascripts/admin/helpers/check-icon.js.es6
@@ -0,0 +1,7 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { renderIcon } from 'discourse-common/lib/icon-library';
+
+registerUnbound('check-icon', function(value) {
+  let icon = value ? "check" : "times";
+  return new Handlebars.SafeString(renderIcon('string', icon));
+});
diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6
index 0720976e69..662f0b046c 100644
--- a/app/assets/javascripts/admin/models/admin-user.js.es6
+++ b/app/assets/javascripts/admin/models/admin-user.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { ajax } from 'discourse/lib/ajax';
 import computed from 'ember-addons/ember-computed-decorators';
 import { propertyNotEqual } from 'discourse/lib/computed';
@@ -108,7 +109,7 @@ const AdminUser = Discourse.User.extend({
             "class": "cancel-inline",
             "link":  true
           }, {
-            "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("admin.user.delete_all_posts"),
+            "label": `${iconHTML('exclamation-triangle')} ` + I18n.t("admin.user.delete_all_posts"),
             "class": "btn btn-danger",
             "callback": function() {
               ajax("/admin/users/" + user.get('id') + "/delete_all_posts", {
@@ -337,7 +338,7 @@ const AdminUser = Discourse.User.extend({
       "class": "cancel",
       "link":  true
     }, {
-      "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.block_accept'),
+      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.block_accept'),
       "class": "btn btn-danger",
       "callback": function() { performBlock(); }
     }];
@@ -386,7 +387,7 @@ const AdminUser = Discourse.User.extend({
       "class": "cancel",
       "link":  true
     }, {
-      "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.anonymize_yes'),
+      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.anonymize_yes'),
       "class": "btn btn-danger",
       "callback": function() { performAnonymize(); }
     }];
@@ -450,7 +451,7 @@ const AdminUser = Discourse.User.extend({
       "class": "btn",
       "link":  true
     }, {
-      "label": '<i class="fa fa-exclamation-triangle"></i>' + I18n.t('admin.user.delete_and_block'),
+      "label": `${iconHTML('exclamation-triangle')} ` + I18n.t('admin.user.delete_and_block'),
       "class": "btn btn-danger",
       "callback": function(){ performDestroy(true); }
     }, {
@@ -479,7 +480,7 @@ const AdminUser = Discourse.User.extend({
         "class": "cancel-inline",
         "link":  true
       }, {
-        "label": '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("flagging.yes_delete_spammer"),
+        "label": `${iconHTML('exclamation-triangle')} ` + I18n.t("flagging.yes_delete_spammer"),
         "class": "btn btn-danger",
         "callback": function() {
           return ajax("/admin/users/" + user.get('id') + '.json', {
diff --git a/app/assets/javascripts/admin/models/flagged-post.js.es6 b/app/assets/javascripts/admin/models/flagged-post.js.es6
index c7a654608f..7a627f1569 100644
--- a/app/assets/javascripts/admin/models/flagged-post.js.es6
+++ b/app/assets/javascripts/admin/models/flagged-post.js.es6
@@ -2,7 +2,7 @@ import { ajax } from 'discourse/lib/ajax';
 import AdminUser from 'admin/models/admin-user';
 import Topic from 'discourse/models/topic';
 import Post from 'discourse/models/post';
-
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 const FlaggedPost = Post.extend({
 
@@ -35,13 +35,14 @@ const FlaggedPost = Post.extend({
 
   dispositionIcon: function (disposition) {
     if (!disposition) { return null; }
-    var icon, title = I18n.t('admin.flags.dispositions.' + disposition);
+    let icon;
+    let title = 'admin.flags.dispositions.' + disposition;
     switch (disposition) {
-      case "deferred": { icon = "fa-external-link"; break; }
-      case "agreed": { icon = "fa-thumbs-o-up"; break; }
-      case "disagreed": { icon = "fa-thumbs-o-down"; break; }
+      case "deferred": { icon = "external-link"; break; }
+      case "agreed": { icon = "thumbs-o-up"; break; }
+      case "disagreed": { icon = "thumbs-o-down"; break; }
     }
-    return "<i class='fa " + icon + "' title='" + title + "'></i>";
+    return iconHTML(icon, { title });
   },
 
   wasEdited: function () {
diff --git a/app/assets/javascripts/admin/models/watched-word.js.es6 b/app/assets/javascripts/admin/models/watched-word.js.es6
new file mode 100644
index 0000000000..c0418aef97
--- /dev/null
+++ b/app/assets/javascripts/admin/models/watched-word.js.es6
@@ -0,0 +1,37 @@
+import { ajax } from 'discourse/lib/ajax';
+
+const WatchedWord = Discourse.Model.extend({
+  save() {
+    return ajax("/admin/logs/watched_words" + (this.id ? '/' + this.id : '') + ".json", {
+      type: this.id ? 'PUT' : 'POST',
+      data: {word: this.get('word'), action_key: this.get('action')},
+      dataType: 'json'
+    });
+  },
+
+  destroy() {
+    return ajax("/admin/logs/watched_words/" + this.get('id') + ".json", {type: 'DELETE'});
+  }
+});
+
+WatchedWord.reopenClass({
+  findAll() {
+    return ajax("/admin/logs/watched_words").then(function (list) {
+      const actions = {};
+      list.words.forEach(s => {
+        if (!actions[s.action]) { actions[s.action] = []; }
+        actions[s.action].pushObject(WatchedWord.create(s));
+      });
+
+      list.actions.forEach(a => {
+        if (!actions[a]) { actions[a] = []; }
+      });
+
+      return Object.keys(actions).map(function(n) {
+        return Ember.Object.create({nameKey: n, name: I18n.t('admin.watched_words.actions.' + n), words: actions[n], count: actions[n].length});
+      });
+    });
+  }
+});
+
+export default WatchedWord;
diff --git a/app/assets/javascripts/admin/models/web-hook.js.es6 b/app/assets/javascripts/admin/models/web-hook.js.es6
index 325d931045..27d72878b0 100644
--- a/app/assets/javascripts/admin/models/web-hook.js.es6
+++ b/app/assets/javascripts/admin/models/web-hook.js.es6
@@ -37,7 +37,7 @@ export default RestModel.extend({
   },
 
   groupFinder(term) {
-    return Group.findAll({search: term, ignore_automatic: false});
+    return Group.findAll({ term: term, ignore_automatic: false });
   },
 
   @computed('wildcard_web_hook', 'web_hook_event_types.[]')
@@ -82,4 +82,3 @@ export default RestModel.extend({
     return this.createProperties();
   }
 });
-
diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js.es6 b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
index dd87207156..34e55914ad 100644
--- a/app/assets/javascripts/admin/routes/admin-route-map.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-route-map.js.es6
@@ -62,6 +62,10 @@ export default function() {
       this.route('screenedEmails', { path: '/screened_emails' });
       this.route('screenedIpAddresses', { path: '/screened_ip_addresses' });
       this.route('screenedUrls', { path: '/screened_urls' });
+      this.route('adminWatchedWords', { path: '/watched_words', resetNamespace: true}, function() {
+        this.route('index', { path: '/' } );
+        this.route('action', { path: '/action/:action_id' } );
+      });
     });
 
     this.route('adminGroups', { path: '/groups', resetNamespace: true }, function() {
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
new file mode 100644
index 0000000000..123884d6fc
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-action.js.es6
@@ -0,0 +1,11 @@
+export default Discourse.Route.extend({
+  model(params) {
+    this.controllerFor('adminWatchedWordsAction').set('actionNameKey', params.action_id);
+    let filteredContent = this.controllerFor('adminWatchedWordsAction').get('filteredContent');
+    return Ember.Object.create({
+      nameKey: params.action_id,
+      name: I18n.t('admin.watched_words.actions.' + params.action_id),
+      words: filteredContent
+    });
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
new file mode 100644
index 0000000000..0103744b52
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-watched-words-index.js.es6
@@ -0,0 +1,5 @@
+export default Discourse.Route.extend({
+  beforeModel() {
+    this.replaceWith('adminWatchedWords.action', this.modelFor('adminWatchedWords')[0].nameKey);
+  }
+});
diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js.es6 b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
new file mode 100644
index 0000000000..77f9082b57
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-watched-words.js.es6
@@ -0,0 +1,15 @@
+import WatchedWord from 'admin/models/watched-word';
+
+export default Discourse.Route.extend({
+  queryParams: {
+    filter: { replace: true }
+  },
+
+  model() {
+    return WatchedWord.findAll();
+  },
+
+  afterModel(watchedWordsList) {
+    this.controllerFor('adminWatchedWords').set('allWatchedWords', watchedWordsList);
+  }
+});
diff --git a/app/assets/javascripts/admin/templates/api-keys.hbs b/app/assets/javascripts/admin/templates/api-keys.hbs
index 60449052bb..b25eebd69a 100644
--- a/app/assets/javascripts/admin/templates/api-keys.hbs
+++ b/app/assets/javascripts/admin/templates/api-keys.hbs
@@ -29,5 +29,5 @@
 {{/if}}
 
 {{#unless hasMasterKey}}
-  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n 'admin.api.generate_master'}}</button>
+<button class='btn' {{action "generateMasterKey"}}>{{d-icon "key"}}</button>
 {{/unless}}
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index c94f59fe10..674eae8de2 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -3,7 +3,7 @@
 
   <div>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
+      {{d-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
   </div>
 {{/d-section}}
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index e0ae7001df..e40e6bfec0 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -38,7 +38,7 @@
                   content=badgeGroupings
                   optionValuePath="content.id"
                   optionLabelPath="content.displayName"}}
-      &nbsp;<button {{action "editGroupings"}} class='btn'>{{fa-icon 'pencil'}}</button>
+      &nbsp;<button {{action "editGroupings"}} class='btn'>{{d-icon 'pencil'}}</button>
     </div>
 
 
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index 3ca7f91294..aeeaac9c9e 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -15,7 +15,7 @@
       {{/each}}
     </ul>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
+      {{d-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
     <br>
     <br>
diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
index 304570c0a5..82fbf0d799 100644
--- a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs
@@ -1,6 +1,6 @@
 <td class="title">
   {{#if report.icon}}
-    {{fa-icon report.icon}}
+    {{d-icon report.icon}}
   {{/if}}
   <a href="{{report.reportUrl}}">{{report.title}}</a>
 </td>
@@ -8,15 +8,15 @@
 <td class="value">{{number report.todayCount}}</td>
 
 <td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>
-  {{number report.yesterdayCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
+  {{number report.yesterdayCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
 </td>
 
 <td class="value {{report.sevenDayTrend}}" title={{report.sevenDayCountTitle}}>
-  {{number report.lastSevenDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
+  {{number report.lastSevenDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
 </td>
 
 <td class="value {{report.thirtyDayTrend}}" title={{report.thirtyDayCountTitle}}>
-  {{number report.lastThirtyDaysCount}} {{fa-icon "caret-up" class="up"}} {{fa-icon "caret-down" class="down"}}
+  {{number report.lastThirtyDaysCount}} {{d-icon "caret-up" class="up"}} {{d-icon "caret-down" class="down"}}
 </td>
 
 <td class="value">{{number report.total}}</td>
diff --git a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
index 92451dbbf9..88d59816fe 100644
--- a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
+++ b/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs
@@ -1,4 +1,4 @@
 <div class="validation-error {{unless message 'hidden'}}">
-  {{fa-icon "times"}}
+  {{d-icon "times"}}
   {{message}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
index 71d7216f27..77e254b42f 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/string.hbs
@@ -1,3 +1,8 @@
-{{text-field value=value classNames="input-setting-string"}}
+{{#if setting.textarea}}
+  {{textarea value=value classNames="input-setting-textarea"}}
+{{else}}
+  {{text-field value=value classNames="input-setting-string"}}
+{{/if}}
+
 {{setting-validation-message message=validationMessage}}
 <div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
new file mode 100644
index 0000000000..64fbcb6570
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/watched-word-form.hbs
@@ -0,0 +1,7 @@
+<b>{{i18n 'admin.watched_words.form.label'}}</b>
+{{text-field value=word disabled=formSubmitted class="watched-word-input" autocorrect="off" autocapitalize="off"}}
+{{d-button action="submit" disabled=formSubmitted label="admin.watched_words.form.add"}}
+
+{{#if showSuccessMessage}}
+  <span class="success-message">{{i18n 'admin.watched_words.form.success'}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
new file mode 100644
index 0000000000..caa74a8615
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs
@@ -0,0 +1,7 @@
+<label class="btn {{if addDisabled 'disabled'}}">
+  {{d-icon "upload"}}
+  {{i18n 'admin.watched_words.form.upload'}}
+  <input disabled={{addDisabled}} type="file" accept="text/plain,text/csv" style="visibility: hidden; position: absolute;" />
+</label>
+<br/>
+<span class="instructions">One word per line</span>
diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
index 6b3c8a3e91..e688e13316 100644
--- a/app/assets/javascripts/admin/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors-show.hbs
@@ -5,13 +5,13 @@
       {{#unless model.theme_id}}
       <button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'admin.customize.save'}}</button>
       {{/unless}}
-      <button {{action "copy" model}} class='btn'><i class="fa fa-copy"></i> {{i18n 'admin.customize.copy'}}</button>
-      <button {{action "copyToClipboard" model}} class='btn'><i class="fa fa-clipboard"></i> {{i18n 'admin.customize.copy_to_clipboard'}}</button>
+      <button {{action "copy" model}} class='btn'>{{d-icon "copy"}} {{i18n 'admin.customize.copy'}}</button>
+      <button {{action "copyToClipboard" model}} class='btn'>{{d-icon "clipboard"}} {{i18n 'admin.customize.copy_to_clipboard'}}</button>
       {{#if model.theme_id}}
       {{i18n "admin.customize.theme_owner"}}
       {{#link-to "adminCustomizeThemes.show" model.theme_id}}{{model.theme_name}}{{/link-to}}
       {{else}}
-      <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n 'admin.customize.delete'}}</button>
+      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'admin.customize.delete'}}</button>
       {{/if}}
       <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
     </div>
diff --git a/app/assets/javascripts/admin/templates/customize-colors.hbs b/app/assets/javascripts/admin/templates/customize-colors.hbs
index 1ed39b8fcf..920f6f1954 100644
--- a/app/assets/javascripts/admin/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize-colors.hbs
@@ -4,12 +4,12 @@
     {{#each model as |scheme|}}
       {{#unless scheme.is_base}}
       <li>
-        {{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{fa-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
+        {{#link-to 'adminCustomize.colors.show' scheme replace=true}}{{d-icon 'paint-brush'}}{{scheme.description}}{{/link-to}}
       </li>
       {{/unless}}
     {{/each}}
   </ul>
-  <button {{action "newColorScheme"}} class='btn'>{{fa-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
+  <button {{action "newColorScheme"}} class='btn'>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
 </div>
 
 {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
index fafce666a6..83eebb83d0 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-edit.hbs
@@ -19,7 +19,7 @@
         <li>
           {{#link-to 'adminCustomizeThemes.edit' model.id 'desktop' fieldName replace=true title=field.title}}
             {{i18n 'admin.customize.theme.desktop'}}
-            {{fa-icon 'desktop'}}
+            {{d-icon 'desktop'}}
           {{/link-to}}
         </li>
         {{/if}}
@@ -27,7 +27,7 @@
         <li class='mobile'>
           {{#link-to 'adminCustomizeThemes.edit' model.id 'mobile' fieldName replace=true title=field.title}}
             {{i18n 'admin.customize.theme.mobile'}}
-            {{fa-icon 'mobile'}}
+            {{d-icon 'mobile'}}
           {{/link-to}}
         </li>
         {{/if}}
@@ -46,14 +46,14 @@
         {{#each fields as |field|}}
           <li>
             {{#link-to 'adminCustomizeThemes.edit' model.id currentTargetName field.name replace=true title=field.title}}
-              {{#if field.icon}}{{fa-icon field.icon}} {{/if}}
+              {{#if field.icon}}{{d-icon field.icon}} {{/if}}
               {{i18n field.key}}
             {{/link-to}}
           </li>
         {{/each}}
         <li class='toggle-maximize'>
           <a {{action "toggleMaximize"}}>
-            <i class="fa fa-{{maximizeIcon}}"></i>
+            {{d-icon maximizeIcon}}
           </a>
         </li>
       </ul>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 6e89af4767..638d7f24d4 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -5,7 +5,7 @@
       {{d-button action="finishedEditingName" class="btn-primary btn-small submit-edit" icon="check"}}
       {{d-button action="cancelEditingName" class="btn-small cancel-edit" icon="times"}}
     {{else}}
-      {{model.name}} <a {{action "startEditingName"}}>{{fa-icon "pencil"}}</a>
+      {{model.name}} <a {{action "startEditingName"}}>{{d-icon "pencil"}}</a>
     {{/if}}
   </h2>
 
@@ -15,7 +15,7 @@
   </p>
   {{#if model.remote_theme.license_url}}
   <p>
-    <a href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}} {{fa-icon "copyright"}}</a>
+    <a href="{{model.remote_theme.license_url}}">{{i18n "admin.customize.theme.license"}} {{d-icon "copyright"}}</a>
   </p>
   {{/if}}
   {{/if}}
@@ -133,8 +133,8 @@
     {{/if}}
   {{/if}}
 
-  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{fa-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
-  <a class="btn export" target="_blank" href={{downloadUrl}}>{{fa-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
+  <a href='{{previewUrl}}' title="{{i18n 'admin.customize.explain_preview'}}" target='_blank' class='btn'>{{d-icon 'desktop'}}{{i18n 'admin.customize.theme.preview'}}</a>
+  <a class="btn export" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n 'admin.export_json.button_text'}}</a>
 
   {{d-button action="destroy" label="admin.customize.delete" icon="trash" class="btn-danger"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/templates/customize-themes.hbs
index 43129006a5..c9474917ef 100644
--- a/app/assets/javascripts/admin/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes.hbs
@@ -7,10 +7,10 @@
         {{#link-to 'adminCustomizeThemes.show' theme replace=true}}
           {{theme.name}}
           {{#if theme.user_selectable}}
-            {{fa-icon "user"}}
+            {{d-icon "user"}}
           {{/if}}
           {{#if theme.default}}
-            {{fa-icon "asterisk"}}
+            {{d-icon "asterisk"}}
           {{/if}}
         {{/link-to}}
       </li>
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index c6c4487009..b8c0297d48 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -29,15 +29,15 @@
     <div class="dashboard-stats totals">
       <table>
         <tr>
-          <td class="title">{{fa-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
+          <td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.admins'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
-          <td class="title">{{fa-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
+          <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.suspended'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
         </tr>
         <tr>
-          <td class="title">{{fa-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
+          <td class="title">{{d-icon "shield"}} {{i18n 'admin.dashboard.moderators'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
-          <td class="title">{{fa-icon "ban"}} {{i18n 'admin.dashboard.blocked'}}</td>
+          <td class="title">{{d-icon "ban"}} {{i18n 'admin.dashboard.blocked'}}</td>
           <td class="value">{{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}</td>
         </tr>
       </table>
@@ -87,7 +87,7 @@
       <table class="table table-condensed table-hover">
         <thead>
           <tr>
-            <th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}">{{fa-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}}</th>
+            <th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}">{{d-icon "envelope"}} {{i18n 'admin.dashboard.private_messages_short'}}</th>
             <th>{{i18n 'admin.dashboard.reports.today'}}</th>
             <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
             <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
@@ -176,7 +176,7 @@
   <div class="dashboard-right">
     {{#if foundProblems}}
       <div class="dashboard-stats detected-problems">
-        <div class="look-here">{{fa-icon "exclamation-triangle"}}</div>
+        <div class="look-here">{{d-icon "exclamation-triangle"}}</div>
         <div class="problem-messages">
           {{#conditional-loading-spinner condition=loadingProblems}}
             <p>
diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/templates/email-sent.hbs
index 847076f098..9dd7996ff5 100644
--- a/app/assets/javascripts/admin/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/templates/email-sent.hbs
@@ -30,7 +30,7 @@
           {{/if}}
         </td>
         <td>
-          {{#if l.bounced}}{{fa-icon "repeat" title="admin.email.bounced"}}{{/if}}
+          {{#if l.bounced}}{{d-icon "repeat" title="admin.email.bounced"}}{{/if}}
           <a href='mailto:{{unbound l.to_address}}'>{{l.to_address}}</a>
         </td>
         <td>{{l.email_type}}</td>
diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/templates/emojis.hbs
index 6f35c097a9..675e8249be 100644
--- a/app/assets/javascripts/admin/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/templates/emojis.hbs
@@ -20,7 +20,7 @@
             <tr>
               <th><img class="emoji emoji-custom" src="{{unbound e.url}}" title="{{unbound e.name}}"></th>
               <th>:{{e.name}}:</th>
-              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{fa-icon 'trash-o'}} </button></th>
+              <th><button {{action "destroy" e}} class='btn btn-danger no-text pull-right'>{{d-icon 'trash-o'}} </button></th>
             </tr>
           {{/each}}
         </tbody>
diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs
index 8796f31ff3..0c26c8254b 100644
--- a/app/assets/javascripts/admin/templates/flags-list.hbs
+++ b/app/assets/javascripts/admin/templates/flags-list.hbs
@@ -19,7 +19,9 @@
                   {{#if flaggedPost.postAuthorFlagged}}
                     {{#if flaggedPost.user}}
                       {{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="large"}}{{/link-to}}
-                      {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n 'admin.flags.was_edited'}}"></i>{{/if}}
+                      {{#if flaggedPost.wasEdited}}
+                        {{d-icon "pencil" title="admin.flags.was_edited"}}
+                      {{/if}}
                     {{/if}}
                   {{/if}}
                   {{#if adminActiveFlagsView}}
@@ -31,7 +33,7 @@
                 <div class="topic-excerpt">
                   <h3>
                     {{#if flaggedPost.topic.isPrivateMessage}}
-                      <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
+                      <span class="private-message-glyph">{{d-icon "envelope"}}</span>
                     {{/if}}
                     {{topic-status topic=flaggedPost.topic}}
                     <a href='{{unbound flaggedPost.url}}'>{{{unbound flaggedPost.topic.fancyTitle}}}</a>
@@ -90,7 +92,7 @@
                           {{format-age flagger.disposedAt}}
                           {{{flagger.dispositionIcon}}}
                           {{#if flagger.tookAction}}
-                            <i class='fa fa-gavel' title='{{i18n 'admin.flags.took_action'}}'></i>
+                            {{d-icon "gavel" title="admin.flags.took_action"}}
                           {{/if}}
                         </td>
                       </tr>
@@ -129,7 +131,8 @@
                       </p>
                     {{/if}}
                     <a href="{{unbound c.permalink}}">
-                      <button class='btn btn-reply'><i class="fa fa-reply"></i>&nbsp;{{i18n 'admin.flags.reply_message'}}</button>
+                      <button class='btn btn-reply'>{{d-icon "reply"}}&nbsp;{{i18n 'admin.flags.reply_message'}}</button>
+
                     </a>
                   {{/if}}
                 </div>
@@ -141,14 +144,14 @@
             <tr>
               <td colspan="3" class="action">
                 {{#if adminActiveFlagsView}}
-                  <button title='{{i18n 'admin.flags.agree_title'}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree'}}&hellip;</button>
+                <button title='{{i18n 'admin.flags.agree_title'}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}>{{d-icon "thumbs-o-up"}}{{i18n 'admin.flags.agree'}}&hellip;</button>
                   {{#if flaggedPost.postHidden}}
-                    <button title='{{i18n 'admin.flags.disagree_flag_unhide_post_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag_unhide_post'}}</button>
+                  <button title='{{i18n 'admin.flags.disagree_flag_unhide_post_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}>{{d-icon "thumbs-o-down"}}{{i18n 'admin.flags.disagree_flag_unhide_post'}}</button>
                   {{else}}
-                    <button title='{{i18n 'admin.flags.disagree_flag_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag'}}</button>
+                  <button title='{{i18n 'admin.flags.disagree_flag_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}>{{d-icon "thumbs-o-down"}}{{i18n 'admin.flags.disagree_flag'}}</button>
                   {{/if}}
-                  <button title='{{i18n 'admin.flags.defer_flag_title'}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n 'admin.flags.defer_flag'}}</button>
-                  <button title='{{i18n 'admin.flags.delete_title'}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n 'admin.flags.delete'}}&hellip;</button>
+                  <button title='{{i18n 'admin.flags.defer_flag_title'}}' class='btn' {{action "deferFlags" flaggedPost}}>{{d-icon "external-link"}}{{i18n 'admin.flags.defer_flag'}}</button>
+                  <button title='{{i18n 'admin.flags.delete_title'}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}>{{d-icon "trash-o"}}{{i18n 'admin.flags.delete'}}&hellip;</button>
                 {{/if}}
               </td>
             </tr>
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index d1e8f3df18..1dd0a55cd1 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -9,19 +9,18 @@
     {{/if}}
   </div>
 
-  {{#if model.id}}
-    {{#unless model.automatic}}
-      <div>
-        <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
-        {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
-      </div>
+  {{#unless model.automatic}}
+    <div>
+      <label for='full_name'>{{i18n 'groups.edit.full_name'}}</label>
+      {{input type='text' name='full_name' value=model.full_name class='group-edit-full-name'}}
+    </div>
 
-      <div>
-        <label for="bio">{{i18n 'groups.bio'}}</label>
-        {{d-editor value=model.bio_raw}}
-      </div>
+    <div>
+      <label for="bio">{{i18n 'groups.bio'}}</label>
+      {{d-editor value=model.bio_raw}}
+    </div>
 
-      {{#if model.hasOwners}}
+    {{#if model.hasOwners}}
       <div>
         <label for='owner-list'>{{i18n 'admin.groups.group_owners'}}</label>
         <div class="ac-wrap clearfix" id='owner-list'>
@@ -30,31 +29,55 @@
           {{/each}}
         </div>
       </div>
-      {{/if}}
-      <div>
-        <label for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
-        {{user-selector usernames=model.ownerUsernames placeholderKey="admin.groups.selector_placeholder" id="owner-selector"}}
-        {{d-button action="addOwners" class="add" icon="plus" label="admin.groups.add"}}
-      </div>
-    {{/unless}}
+    {{/if}}
+
     <div>
-      {{group-members-input model=model}}
+      <label for="owner-selector">{{i18n 'admin.groups.add_owners'}}</label>
+
+      {{user-selector usernames=model.ownerUsernames
+          placeholderKey="admin.groups.selector_placeholder"
+          id="owner-selector"}}
+
+      {{#if model.id}}
+        {{d-button
+            action="addOwners"
+            class="add"
+            icon="plus"
+            label="admin.groups.add"}}
+      {{/if}}
     </div>
-  {{/if}}
+  {{/unless}}
+
+  <div>
+    {{group-members-input model=model addButton=model.id}}
+  </div>
 
   <div>
     <label for="visiblity">{{i18n 'groups.visibility_levels.title'}}</label>
-    {{combo-box name="alias" valueAttribute="value" value=model.visibility_level content=visibilityLevelOptions}}
+    {{combo-box name="alias"
+        valueAttribute="value"
+        value=model.visibility_level
+        content=visibilityLevelOptions
+        castInteger=true}}
   </div>
 
   {{#unless model.automatic}}
     <div>
       <label>
         {{input type="checkbox"
-            checked=model.public
+            checked=model.public_admission
             disabled=disablePublicSetting}}
 
-        {{i18n 'groups.public'}}
+        {{i18n 'groups.public_admission'}}
+      </label>
+    </div>
+
+    <div>
+      <label>
+        {{input type='checkbox'
+            checked=model.public_exit}}
+
+        {{i18n 'groups.public_exit'}}
       </label>
     </div>
 
@@ -123,7 +146,7 @@
   <div class='buttons'>
     <button {{action "save"}} disabled={{disableSave}} class='btn btn-primary'>{{i18n 'admin.customize.save'}}</button>
     {{#unless model.automatic}}
-      <button {{action "destroy"}} class='btn btn-danger'>{{fa-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
+      <button {{action "destroy"}} class='btn btn-danger'>{{d-icon "trash-o"}}{{i18n 'admin.customize.delete'}}</button>
     {{/unless}}
 
     <span class="saving {{unless savingStatus 'hidden'}}">{{savingStatus}}</span>
diff --git a/app/assets/javascripts/admin/templates/groups-type-index.hbs b/app/assets/javascripts/admin/templates/groups-type-index.hbs
index 88d870c1f6..196ded96d2 100644
--- a/app/assets/javascripts/admin/templates/groups-type-index.hbs
+++ b/app/assets/javascripts/admin/templates/groups-type-index.hbs
@@ -3,7 +3,7 @@
 
   <div>
     {{#link-to 'adminGroup' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
+      {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
     {{/link-to}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/groups-type.hbs b/app/assets/javascripts/admin/templates/groups-type.hbs
index b4d2a0acf3..a1fa829897 100644
--- a/app/assets/javascripts/admin/templates/groups-type.hbs
+++ b/app/assets/javascripts/admin/templates/groups-type.hbs
@@ -18,7 +18,7 @@
           {{d-button action="refreshAutoGroups" icon="refresh" label="admin.groups.refresh" disabled=refreshingAutoGroups}}
         {{else}}
           {{#link-to 'adminGroup' 'new' class="btn"}}
-            {{fa-icon "plus"}} {{i18n 'admin.groups.new'}}
+            {{d-icon "plus"}} {{i18n 'admin.groups.new'}}
           {{/link-to}}
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index 5c412949fa..d72e5a9262 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -3,6 +3,7 @@
   {{nav-item route='adminLogs.screenedEmails' label='admin.logs.screened_emails.title'}}
   {{nav-item route='adminLogs.screenedIpAddresses' label='admin.logs.screened_ips.title'}}
   {{nav-item route='adminLogs.screenedUrls' label='admin.logs.screened_urls.title'}}
+  {{nav-item route='adminWatchedWords' label='admin.watched_words.title'}}
   {{#if currentUser.admin}}
     {{nav-item path='/logs' label='admin.logs.logster.title'}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
index 685d8455c3..f99ff865e1 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-emails.hbs
@@ -1,6 +1,6 @@
 <p>
   {{i18n 'admin.logs.screened_emails.description'}}
-  <button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+  <button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
 </p>
 <br>
 
diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
index ca6c216f50..00e67a9aa5 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs
@@ -41,9 +41,9 @@
           </div>
           <div class="col action">
             {{#if item.isBlocked}}
-              {{fa-icon "ban"}}
+              {{d-icon "ban"}}
             {{else}}
-              {{fa-icon "check"}}
+              {{d-icon "check"}}
             {{/if}}
             {{item.actionName}}
           </div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
index 40aaceba70..7b1048f1b4 100644
--- a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened-urls.hbs
@@ -1,6 +1,6 @@
 <p>
   {{i18n 'admin.logs.screened_urls.description'}}
-  <button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+  <button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{d-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
 </p>
 <br>
 
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index f469ec266e..50f02f9f5b 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -7,25 +7,25 @@
     {{#if actionFilter}}
       <a {{action "clearFilter" "actionFilter"}} class="filter">
         <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
     {{#if filters.acting_user}}
       <a {{action "clearFilter" "acting_user"}} class="filter">
         <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
     {{#if filters.target_user}}
       <a {{action "clearFilter" "target_user"}} class="filter">
         <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
     {{#if filters.subject}}
       <a {{action "clearFilter" "subject"}} class="filter">
         <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
-        {{fa-icon "times-circle"}}
+        {{d-icon "times-circle"}}
       </a>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
index 6f845b22c8..63ce16601b 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs
@@ -1,13 +1,13 @@
 {{#d-modal-body title="admin.flags.agree_flag_modal_title"}}
   {{#if model.user_deleted}}
-    <button title="{{i18n 'admin.flags.agree_flag_restore_post_title'}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
+  <button title={{i18n 'admin.flags.agree_flag_restore_post_title'}} {{action "agreeFlagRestorePost"}} class="btn">{{d-icon "thumbs-o-up"}}{{d-icon "eye"}}{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
   {{else}}
     {{#unless model.postHidden}}
-      <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
+    <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn">{{d-icon "thumbs-o-up"}}{{d-icon "eye-slash"}}{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
     {{/unless}}
   {{/if}}
-  <button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
+  <button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn">{{d-icon "thumbs-o-up"}}{{i18n 'admin.flags.agree_flag'}}</button>
   {{#if model.canDeleteAsSpammer}}
-    <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger">{{d-icon "exclamation-triangle"}}{{i18n 'admin.flags.delete_spammer'}}</button>
   {{/if}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
index c22bd9d99d..70b0c1c3fc 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs
@@ -24,7 +24,7 @@
 
     {{#if count_warning}}
       <div class="count-warning">
-        <p class="heading"><i class="fa fa-warning"></i> {{i18n 'admin.badges.preview.bad_count_warning.header'}}</p>
+        <p class="heading">{{d-icon "warning"}} {{i18n 'admin.badges.preview.bad_count_warning.header'}}</p>
         <p class="body">{{i18n 'admin.badges.preview.bad_count_warning.text'}}</p>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
index 5286bbf0b0..d58a63c134 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
@@ -7,6 +7,6 @@
                    valueAttribute="base_scheme_id"}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action "selectBase"}}>{{fa-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
+    <button class='btn btn-primary' {{action "selectBase"}}>{{d-icon 'plus'}}{{i18n 'admin.customize.new'}}</button>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
index c2abeae36d..89cf7452a4 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-delete-flag.hbs
@@ -1,7 +1,7 @@
 {{#d-modal-body title="admin.flags.delete_flag_modal_title"}}
-  <button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
-  <button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
+<button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn">{{d-icon "trash-o"}}{{d-icon "external-link"}}{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
+<button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn">{{d-icon "trash-o"}}{{d-icon "thumbs-o-up"}}{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
   {{#if model.canDeleteAsSpammer}}
-    <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" model.user}} class="btn btn-danger">{{d-icon "exclamation-triangle"}}{{i18n 'admin.flags.delete_spammer'}}</button>
   {{/if}}
 {{/d-modal-body}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
index 80eb0844b3..f37c1f414d 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs
@@ -5,15 +5,15 @@
       <li>
         {{#if wc.editing}}
           {{input value=wc.name}}
-          <button {{action "save" wc}} class="btn no-text">{{fa-icon 'check'}}</button>
+          <button {{action "save" wc}} class="btn no-text">{{d-icon 'check'}}</button>
         {{else}}
           {{wc.displayName}}
         {{/if}}
         <div class='actions'>
-          <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{fa-icon 'pencil'}}</button>
-          <button {{action "up" wc}} class="btn no-text">{{fa-icon 'toggle-up'}}</button>
-          <button {{action "down" wc}} class="btn no-text">{{fa-icon 'toggle-down'}}</button>
-          <button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{fa-icon 'times'}}</button>
+          <button {{action "edit" wc}} class="btn no-text" disabled={{wc.system}}>{{d-icon 'pencil'}}</button>
+          <button {{action "up" wc}} class="btn no-text">{{d-icon 'toggle-up'}}</button>
+          <button {{action "down" wc}} class="btn no-text">{{d-icon 'toggle-down'}}</button>
+          <button {{action "delete" wc}} class="btn no-text btn-danger" disabled={{wc.system}}>{{d-icon 'times'}}</button>
         </div>
       </li>
     {{/each}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
index 9d9326ad3e..afb7525fb5 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -11,6 +11,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-danger' {{action "suspend"}} disabled={{submitDisabled}}><i class='fa fa-ban'></i>{{i18n 'admin.user.suspend'}}</button>
+  <button class='btn btn-danger' {{action "suspend"}} disabled={{submitDisabled}}>{{d-icon "ban"}}{{i18n 'admin.user.suspend'}}</button>
   <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/templates/site-text-edit.hbs
index 5e02eb0731..4e134433d8 100644
--- a/app/assets/javascripts/admin/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/templates/site-text-edit.hbs
@@ -13,7 +13,7 @@
   {{/save-controls}}
 
   {{#link-to 'adminSiteText.index' class="go-back"}}
-    {{fa-icon 'arrow-left'}}
+    {{d-icon 'arrow-left'}}
     {{i18n 'admin.site_text.go_back'}}
   {{/link-to}}
 
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 393695e842..9977aca39d 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -1,7 +1,7 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class='nav nav-pills'>
-      <li>{{#link-to 'adminUser' user}}<i class="fa fa-caret-left"></i> &nbsp;{{user.username}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUser' user}}{{d-icon "caret-left"}} &nbsp;{{user.username}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index f6a7a2d75e..7a016f150f 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -3,7 +3,7 @@
   <div class='user-controls'>
     {{#if model.canViewProfile}}
       {{#link-to 'user' model class="btn"}}
-        {{fa-icon "user"}}
+        {{d-icon "user"}}
         {{i18n 'admin.user.show_public_profile'}}
       {{/link-to}}
     {{/if}}
@@ -151,7 +151,7 @@
         {{i18n 'badges.badge_count' count=model.badge_count}}
       </div>
       <div class='controls'>
-        {{#link-to 'adminUser.badges' model class="btn"}}{{fa-icon "certificate"}}{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
+        {{#link-to 'adminUser.badges' model class="btn"}}{{d-icon "certificate"}}{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
       </div>
     </div>
   {{/if}}
@@ -281,9 +281,11 @@
     <div class="controls">
       {{#if model.canLockTrustLevel}}
         {{#if model.trust_level_locked}}
-          <i title='{{i18n 'admin.user.trust_level_locked_tip'}}' class='fa fa-lock'></i> {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
+          {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
+          {{d-button action="lockTrustLevel" actionParam=false label="admin.user.unlock_trust_level"}}
         {{else}}
-          <i title='{{i18n 'admin.user.trust_level_unlocked_tip'}}' class='fa fa-unlock'></i> {{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
+          {{d-icon "unlock" title="admin.user.trust_level_unlocked_tip"}}
+          {{d-button action="lockTrustLevel" actionParam=true label="admin.user.lock_trust_level"}}
         {{/if}}
       {{/if}}
       {{#if model.tl3Requirements}}
@@ -487,7 +489,7 @@
     <div class="clearfix"></div>
     <br/>
     <div class="pull-right">
-      {{fa-icon "exclamation-triangle"}} {{model.deleteExplanation}}
+      {{d-icon "exclamation-triangle"}} {{model.deleteExplanation}}
     </div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
index e0536ddd08..1561a95670 100644
--- a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
@@ -1,7 +1,7 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminUser' model}}<i class="fa fa-caret-left"></i> &nbsp;{{model.username}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUser' model}}{{d-icon "caret-left"}} &nbsp;{{model.username}}{{/link-to}}</li>
       <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
     </ul>
   </div>
@@ -24,7 +24,7 @@
     <tbody>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.visits'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.days_visited 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.days_visited}}</td>
         <td>
           {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n 'admin.user.tl3_requirements.days'}})
         </td>
@@ -32,67 +32,67 @@
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.topics_replied_to'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.topics_replied_to 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.topics_replied_to}}</td>
         <td>{{model.tl3Requirements.num_topics_replied_to}}</td>
         <td>{{model.tl3Requirements.min_topics_replied_to}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.topics_viewed'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.topics_viewed 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.topics_viewed}}</td>
         <td>{{model.tl3Requirements.topics_viewed}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.topics_viewed_all_time 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.topics_viewed_all_time}}</td>
         <td>{{model.tl3Requirements.min_topics_viewed_all_time}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.posts_read'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.posts_read 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.posts_read}}</td>
         <td>{{model.tl3Requirements.posts_read}}</td>
         <td>{{model.tl3Requirements.min_posts_read}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.posts_read_all_time'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.posts_read_all_time 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.posts_read_all_time}}</td>
         <td>{{model.tl3Requirements.min_posts_read_all_time}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.flagged_posts'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.flagged_posts 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.flagged_posts}}</td>
         <td>{{model.tl3Requirements.num_flagged_posts}}</td>
         <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_posts}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.flagged_by_users'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.flagged_by_users 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.flagged_by_users}}</td>
         <td>{{model.tl3Requirements.num_flagged_by_users}}</td>
         <td>{{i18n 'max_of_count' count=model.tl3Requirements.max_flagged_by_users}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_given'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_given 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_given}}</td>
         <td>{{model.tl3Requirements.num_likes_given}}</td>
         <td>{{model.tl3Requirements.min_likes_given}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_received'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_received 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_received}}</td>
         <td>{{model.tl3Requirements.num_likes_received}}</td>
         <td>{{model.tl3Requirements.min_likes_received}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_received_days'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_received_days 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_received_days}}</td>
         <td>{{model.tl3Requirements.num_likes_received_days}}</td>
         <td>{{model.tl3Requirements.min_likes_received_days}}</td>
       </tr>
       <tr>
         <th>{{i18n 'admin.user.tl3_requirements.likes_received_users'}}</th>
-        <td><i class="fa {{if model.tl3Requirements.met.likes_received_users 'fa-check' 'fa-times'}}"></i></td>
+        <td>{{check-icon model.tl3Requirements.met.likes_received_users}}</td>
         <td>{{model.tl3Requirements.num_likes_received_users}}</td>
         <td>{{model.tl3Requirements.min_likes_received_users}}</td>
       </tr>
@@ -105,16 +105,16 @@
       {{#if model.tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if model.tl3Requirements.on_grace_period}}
-          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
+          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
         {{else}} {{! not on grace period }}
-          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
                                       {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
         {{/if}}
       {{else}} {{! requirements not lost - remains tl3 }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
+          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
         {{else}} {{! tl not locked }}
-          <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
+          {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
           {{#if model.tl3Requirements.on_grace_period}}
             {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
           {{/if}}
@@ -123,13 +123,13 @@
     {{else}} {{! is not tl3 }}
       {{#if model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
-        <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
+        {{d-icon "check"}} {{i18n 'admin.user.tl3_requirements.qualifies'}}
                                     {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
       {{else}} {{! requirements not met - remains regular }}
         {{#if model.tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
+          {{d-icon "lock"}} {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
         {{else}}
-          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+          {{d-icon "times"}} {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
         {{/if}}
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index cc0c5ce09e..9bb578af7d 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -92,10 +92,10 @@
             {{/if}}
             <td>
               {{#if user.admin}}
-                {{fa-icon "shield" title="admin.title" }}
+                {{d-icon "shield" title="admin.title" }}
               {{/if}}
               {{#if user.moderator}}
-                {{fa-icon "shield" title="admin.moderator" }}
+                {{d-icon "shield" title="admin.moderator" }}
               {{/if}}
             </td>
           </tr>
diff --git a/app/assets/javascripts/admin/templates/version-checks.hbs b/app/assets/javascripts/admin/templates/version-checks.hbs
index 25c560ad6a..4f39265026 100644
--- a/app/assets/javascripts/admin/templates/version-checks.hbs
+++ b/app/assets/javascripts/admin/templates/version-checks.hbs
@@ -18,7 +18,7 @@
       {{#if versionCheck.noCheckPerformed}}
         <td class="version-number">&mdash;</td>
         <td class="face">
-          <span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
+          <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
         </td>
         <td class="version-notes">
           <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
@@ -28,9 +28,9 @@
           <td class="version-number">{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</td>
           <td class="face">
             {{#if versionCheck.version_check_pending}}
-              <span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
+              <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
             {{else}}
-              <span class="icon critical-updates-available">{{fa-icon "frown-o"}}</span>
+              <span class="icon critical-updates-available">{{d-icon "frown-o"}}</span>
             {{/if}}
           </td>
           <td class="version-notes">
@@ -46,13 +46,13 @@
           <td class="version-number">{{dash-if-empty versionCheck.latest_version}}</td>
           <td class="face">
             {{#if versionCheck.upToDate }}
-            <span class='icon up-to-date'>{{fa-icon "smile-o"}}</span>
+            <span class='icon up-to-date'>{{d-icon "smile-o"}}</span>
             {{else}}
               <span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
                 {{#if versionCheck.behindByOneVersion}}
-                  {{fa-icon "meh-o"}}
+                  {{d-icon "meh-o"}}
                 {{else}}
-                  {{fa-icon "frown-o"}}
+                  {{d-icon "frown-o"}}
                 {{/if}}
               </span>
             {{/if}}
diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/templates/watched-words-action.hbs
new file mode 100644
index 0000000000..3a7351d9ed
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/watched-words-action.hbs
@@ -0,0 +1,18 @@
+<h2>{{model.name}}</h2>
+
+<p class="about">{{actionDescription}}</p>
+
+{{watched-word-form actionKey=actionNameKey action="recordAdded"}}
+
+{{watched-word-uploader uploading=uploading actionKey=actionNameKey done="uploadComplete"}}
+
+<div class='clearfix'></div>
+<div class="watched-words-list">
+  {{#if showWordsList}}
+    {{#each filteredContent as |word| }}
+      <div class="watched-word-box">{{admin-watched-word word=word action="recordRemoved"}}</div>
+    {{/each}}
+  {{else}}
+    {{i18n 'admin.watched_words.word_count' count=model.words.length}}
+  {{/if}}
+</div>
diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/templates/watched-words.hbs
new file mode 100644
index 0000000000..501e4af97b
--- /dev/null
+++ b/app/assets/javascripts/admin/templates/watched-words.hbs
@@ -0,0 +1,31 @@
+<div class='admin-controls'>
+  <div class='search controls'>
+    <label class="show-words-checkbox">
+      {{input type="checkbox" checked=showWords disabled=disableShowWords}}
+      {{i18n 'admin.watched_words.show_words'}}
+    </label>
+  </div>
+  <div class='controls'>
+    {{text-field value=filter placeholderKey="admin.watched_words.search" class="no-blur"}}
+    {{d-button action="clearFilter" label="admin.watched_words.clear_filter"}}
+  </div>
+</div>
+
+<div class="admin-nav pull-left">
+  <ul class="nav nav-stacked">
+    {{#each model as |action|}}
+      {{#link-to 'adminWatchedWords.action' action.nameKey tagName='li' class=action.nameKey}}
+        {{#link-to 'adminWatchedWords.action' action.nameKey}}
+          {{action.name}}
+          {{#if action.count}}<span class="count">({{action.count}})</span>{{/if}}
+        {{/link-to}}
+      {{/link-to}}
+    {{/each}}
+  </ul>
+</div>
+
+<div class="admin-detail pull-left mobile-closed watched-words-detail">
+  {{outlet}}
+</div>
+
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
index f3b8825e5b..e0d0609871 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs
@@ -1,10 +1,10 @@
 <div class="web-hook-direction">
   {{#link-to 'adminWebHooks' tagName='button' classNames='btn'}}
-    {{fa-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
+    {{d-icon 'list'}} {{i18n 'admin.web_hooks.events.go_list'}}
   {{/link-to}}
   {{d-button icon="send" label="admin.web_hooks.events.ping" action="ping" disabled=pingDisabled}}
   {{#link-to 'adminWebHooks.show' model.extras.web_hook_id tagName='button' classNames='btn'}}
-    {{fa-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
+    {{d-icon 'edit'}} {{i18n 'admin.web_hooks.events.go_details'}}
   {{/link-to}}
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index c7a8e03088..8530de5f12 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -1,5 +1,5 @@
 {{#link-to 'adminWebHooks' class="go-back"}}
-  {{fa-icon 'arrow-left'}}
+  {{d-icon 'arrow-left'}}
   {{i18n 'admin.web_hooks.go_back'}}
 {{/link-to}}
 
@@ -49,12 +49,12 @@
 
     <div class='filters'>
       <div>
-        <label>{{fa-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
+        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.categories_filter'}}</label>
         {{category-selector categories=model.categories blacklist=model.categories}}
         <div class="instructions">{{i18n 'admin.web_hooks.categories_filter_instructions'}}</div>
       </div>
       <div>
-        <label>{{fa-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
+        <label>{{d-icon 'circle' class='tracking'}}{{i18n 'admin.web_hooks.groups_filter'}}</label>
         {{group-selector groupNames=model.groupsFilterInName groupFinder=model.groupFinder}}
         <div class="instructions">{{i18n 'admin.web_hooks.groups_filter_instructions'}}</div>
       </div>
diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/templates/web-hooks.hbs
index 082cf170b4..81d4b86e4d 100644
--- a/app/assets/javascripts/admin/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks.hbs
@@ -1,6 +1,6 @@
 <div class='pull-right'>
   {{#link-to 'adminWebHooks.show' 'new' tagName='button' classNames='btn'}}
-    {{fa-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
+    {{d-icon 'plus'}} {{i18n 'admin.web_hooks.new'}}
   {{/link-to}}
 </div>
 <div class='clearfix'></div>
@@ -24,7 +24,7 @@
             <td>{{#link-to 'adminWebHooks.show' webHook}}{{webHook.payload_url}}{{/link-to}}</td>
             <td class='description'>{{webHook.description}}</td>
             <td class='controls'>
-              {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{fa-icon 'edit'}}{{/link-to}}
+              {{#link-to 'adminWebHooks.show' webHook tagName='button' classNames='btn btn-default no-text'}}{{d-icon 'edit'}}{{/link-to}}
               {{d-button class="destroy btn-danger" action='destroy' actionParam=webHook icon="remove"}}
             </td>
           </tr>
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 632ad9d8f9..61c5442a93 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -69,8 +69,6 @@
 //= require ./discourse/components/notifications-button
 //= require ./discourse/lib/link-mentions
 //= require ./discourse/components/site-header
-//= require ./discourse/lib/emoji/groups
-//= require ./discourse/lib/emoji/toolbar
 //= require ./discourse/components/d-editor
 //= require ./discourse/lib/screen-track
 //= require ./discourse/routes/discourse
diff --git a/app/assets/javascripts/discourse-common/components/combo-box.js.es6 b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
index e5828e8fc7..0d8cd538b8 100644
--- a/app/assets/javascripts/discourse-common/components/combo-box.js.es6
+++ b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
@@ -1,5 +1,6 @@
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import { on, observes } from 'ember-addons/ember-computed-decorators';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 export default Ember.Component.extend(bufferedRender({
   tagName: 'select',
@@ -97,7 +98,7 @@ export default Ember.Component.extend(bufferedRender({
       this.selectionTemplate = (item) => {
         let name = Em.get(item, 'text');
         name = Handlebars.escapeExpression(name);
-        return `<i class='fa fa-${this.get("selectionIcon")}'></i>${name}`;
+        return iconHTML(this.get('selectionIcon')) + name;
       };
     }
 
diff --git a/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
new file mode 100644
index 0000000000..b85b9ebf26
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/helpers/d-icon.js.es6
@@ -0,0 +1,6 @@
+import { registerUnbound } from 'discourse-common/lib/helpers';
+import { renderIcon } from 'discourse-common/lib/icon-library';
+
+registerUnbound('d-icon', function(id, params) {
+  return new Handlebars.SafeString(renderIcon('string', id, params));
+});
diff --git a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6 b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
index 3c1f8b9b5a..bd736c8482 100644
--- a/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
+++ b/app/assets/javascripts/discourse-common/helpers/fa-icon.js.es6
@@ -1,25 +1,12 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
+import { renderIcon } from 'discourse-common/lib/icon-library';
+import deprecated from 'discourse-common/lib/deprecated';
 
-export function iconClasses(icon, params) {
-  let classes = "fa fa-" + icon;
-  if (params.modifier) { classes += " fa-" + params.modifier; }
-  if (params['class']) { classes += ' ' + params['class']; }
-  return classes;
-}
-
-export function iconHTML(icon, params) {
-  params = params || {};
-
-  var html = "<i class='" + iconClasses(icon, params) + "'";
-  if (params.title) { html += ` title='${I18n.t(params.title)}'`; }
-  if (params.label) { html += " aria-hidden='true'"; }
-  html += "></i>";
-  if (params.label) {
-    html += "<span class='sr-only'>" + I18n.t(params.label) + "</span>";
-  }
-  return html;
+export function iconHTML(id, params) {
+  return renderIcon('string', id, params);
 }
 
 registerUnbound('fa-icon', function(icon, params) {
+  deprecated("Use `{{d-icon}}` instead of `{{fa-icon}}");
   return new Handlebars.SafeString(iconHTML(icon, params));
 });
diff --git a/app/assets/javascripts/discourse-common/lib/icon-library.js.es6 b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
new file mode 100644
index 0000000000..60fe773995
--- /dev/null
+++ b/app/assets/javascripts/discourse-common/lib/icon-library.js.es6
@@ -0,0 +1,71 @@
+import { h } from 'virtual-dom';
+let _renderers = [];
+
+export function renderIcon(renderType, id, params) {
+  for (let i=0; i<_renderers.length; i++) {
+    let renderer = _renderers[i];
+    let rendererForType = renderer[renderType];
+
+    if (rendererForType) {
+      let result = rendererForType(id, params || {});
+      if (result) {
+        return result;
+      }
+    }
+  }
+}
+
+export function iconHTML(id, params) {
+  return renderIcon('string', id, params);
+}
+
+export function iconNode(id, params) {
+  return renderIcon('node', id, params);
+}
+
+export function registerIconRenderer(renderer) {
+  _renderers.unshift(renderer);
+}
+
+// Support for font awesome icons
+function faClasses(id, params) {
+  let classNames = `fa fa-${id} d-icon d-icon-${id}`;
+  if (params) {
+    if (params.modifier) { classNames += " fa-" + params.modifier; }
+    if (params['class']) { classNames += ' ' + params['class']; }
+  }
+  return classNames;
+}
+
+// default resolver is font awesome
+registerIconRenderer({
+  name: 'font-awesome',
+
+  string(id, params) {
+    let tagName = params.tagName || 'i';
+    let html = `<${tagName} class='${faClasses(id, params)}'`;
+    if (params.title) { html += ` title='${I18n.t(params.title)}'`; }
+    if (params.label) { html += " aria-hidden='true'"; }
+    html += `></${tagName}>`;
+    if (params.label) {
+      html += "<span class='sr-only'>" + I18n.t(params.label) + "</span>";
+    }
+    return html;
+  },
+
+  node(id, params) {
+    let tagName = params.tagName || 'i';
+
+    const properties = {
+      className: faClasses(id, params),
+      attributes: { "aria-hidden": true }
+    };
+
+    if (params.title) { properties.attributes.title = params.title; }
+    if (params.label) {
+      return h(tagName, properties, h('span.sr-only', I18n.t(params.label)));
+    } else {
+      return h(tagName, properties);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6 b/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
index 60978f3959..0ad58a506c 100644
--- a/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/auto-update-input-selector.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { default as computed, observes } from "ember-addons/ember-computed-decorators";
 import Combobox from 'discourse-common/components/combo-box';
 import { CLOSE_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
@@ -111,9 +112,7 @@ export default Combobox.extend({
     let icons;
 
     if (icon) {
-      icons = icon.split(',').map(i => {
-        return `<i class='fa fa-${i}'/>`;
-      }).join(" ");
+      icons = icon.split(',').map(i => iconHTML(i)).join(" ");
     }
 
     if (time) {
diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
index 8dbb4d3423..6a6c1a3353 100644
--- a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import DropdownButton from 'discourse/components/dropdown-button';
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -15,14 +15,14 @@ export default DropdownButton.extend({
       { id: 'create',
         title: I18n.t('category.create'),
         description: I18n.t('category.create_long'),
-        styleClasses: 'fa fa-plus' }
+        icon: 'plus' }
     ];
     if (includeReorder) {
       items.push({
         id: 'reorder',
         title: I18n.t('categories.reorder.title'),
         description: I18n.t('categories.reorder.title_long'),
-        styleClasses: 'fa fa-random'
+        icon: 'random'
       });
     }
     return items;
diff --git a/app/assets/javascripts/discourse/components/category-drop.js.es6 b/app/assets/javascripts/discourse/components/category-drop.js.es6
index e9f05c33fe..0f51ca5751 100644
--- a/app/assets/javascripts/discourse/components/category-drop.js.es6
+++ b/app/assets/javascripts/discourse/components/category-drop.js.es6
@@ -1,4 +1,6 @@
 import { setting } from 'discourse/lib/computed';
+import computed from 'ember-addons/ember-computed-decorators';
+
 var get = Ember.get;
 
 export default Ember.Component.extend({
@@ -8,10 +10,10 @@ export default Ember.Component.extend({
 
   tagName: 'li',
 
-  iconClass: function() {
-    if (this.get('expanded')) { return "fa fa-caret-down"; }
-    return "fa fa-caret-right";
-  }.property('expanded'),
+  @computed('expanded')
+  expandIcon(expanded) {
+    return expanded ? 'caret-down' : 'caret-right';
+  },
 
   allCategoriesUrl: function() {
     if (this.get('subCategory')) {
@@ -33,7 +35,7 @@ export default Ember.Component.extend({
   }.property('category'),
 
   dropdownButtonClass: function() {
-    var result = 'badge-category category-dropdown-button';
+    let result = 'dropdown-header category-dropdown-button';
     if (Em.isNone(this.get('category'))) {
       result += ' home';
     }
@@ -57,21 +59,35 @@ export default Ember.Component.extend({
   }.property('category'),
 
   badgeStyle: function() {
-    var category = this.get('category');
+    let category = this.get('category');
+
+    const categoryStyle = this.siteSettings.category_style;
+    if (categoryStyle === 'bullet') {
+      return;
+    }
 
     if (category) {
-      var color = get(category, 'color'),
-          textColor = get(category, 'text_color');
+      let color = get(category, 'color');
+      let textColor = get(category, 'text_color');
 
       if (color || textColor) {
-        var style = "";
-        if (color) { style += "background-color: #" + color + "; border-color: #" + color + ";"; }
-        if (textColor) { style += "color: #" + textColor + "; "; }
+        let style = "";
+        if (color) { 
+          if (categoryStyle === "bar") {
+            style += `border-color: #${color};`;
+          } else if (categoryStyle === "box") {
+            style += `background-color: #${color};`;
+            if (textColor) { style += "color: #" + textColor + "; "; }
+          }
+        }
+
         return style.htmlSafe();
       }
     }
 
-    return "background-color: #eee; color: #333".htmlSafe();
+    if (categoryStyle === 'box') {
+      return "background-color: #eee; color: #333".htmlSafe();
+    }
   }.property('category'),
 
   clickEventName: function() {
diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index fe2ab5aae8..8f2528cdd3 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -1,10 +1,11 @@
 import userSearch from 'discourse/lib/user-search';
-import { default as computed, on } from 'ember-addons/ember-computed-decorators';
+import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
 import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions';
 import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags';
 import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag';
 import Composer from 'discourse/models/composer';
 import { load } from 'pretty-text/oneboxer';
+import { applyInlineOneboxes } from 'pretty-text/inline-oneboxer';
 import { ajax } from 'discourse/lib/ajax';
 import InputValidation from 'discourse/models/input-validation';
 import { findRawTemplate } from 'discourse/lib/raw-templates';
@@ -30,6 +31,14 @@ export default Ember.Component.extend({
   _setupPreview() {
     const val = (this.site.mobileView ? false : (this.keyValueStore.get('composer.showPreview') || 'true'));
     this.set('showPreview', val === 'true');
+
+    this.appEvents.on('composer:show-preview', () => {
+      this.set('showPreview', true);
+    });
+
+    this.appEvents.on('composer:hide-preview', () => {
+      this.set('showPreview', false);
+    });
   },
 
   @computed('site.mobileView', 'showPreview')
@@ -42,9 +51,16 @@ export default Ember.Component.extend({
     return showPreview ? I18n.t('composer.hide_preview') : I18n.t('composer.show_preview');
   },
 
+  @observes('showPreview')
+  showPreviewChanged() {
+      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
+  },
+
   @computed
   markdownOptions() {
     return {
+      previewing: true,
+
       lookupAvatarByPostNumber: (postNumber, topicId) => {
         const topic = this.get('topic');
         if (!topic) { return; }
@@ -158,6 +174,10 @@ export default Ember.Component.extend({
     });
   },
 
+  _loadInlineOneboxes(inline) {
+    applyInlineOneboxes(inline, ajax);
+  },
+
   _loadOneboxes($oneboxes) {
     const post = this.get('composer.post');
     let refresh = false;
@@ -445,6 +465,8 @@ export default Ember.Component.extend({
   @on('willDestroyElement')
   _composerClosed() {
     this.appEvents.trigger('composer:will-close');
+    this.appEvents.off('composer:show-preview');
+    this.appEvents.off('composer:hide-preview');
     Ember.run.next(() => {
       $('#main-outlet').css('padding-bottom', 0);
       // need to wait a bit for the "slide down" transition of the composer
@@ -486,7 +508,6 @@ export default Ember.Component.extend({
 
     togglePreview() {
       this.toggleProperty('showPreview');
-      this.keyValueStore.set({ key: 'composer.showPreview', value: this.get('showPreview') });
     },
 
     extraButtons(toolbar) {
@@ -558,6 +579,18 @@ export default Ember.Component.extend({
         Ember.run.debounce(this, this._loadOneboxes, $oneboxes, 450);
       }
 
+      let inline = {};
+      $('a.inline-onebox-loading', $preview).each(function(index, link) {
+        let $link = $(link);
+        $link.removeClass('inline-onebox-loading');
+        let text = $link.text();
+        inline[text] = inline[text] || [];
+        inline[text].push($link);
+      });
+      if (Object.keys(inline).length > 0) {
+        Ember.run.debounce(this, this._loadInlineOneboxes, inline, 450);
+      }
+
       this.trigger('previewRefreshed', $preview);
       this.sendAction('afterRefresh', $preview);
     },
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index 2e37da138e..8841500af8 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -2,6 +2,7 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import InputValidation from 'discourse/models/input-validation';
 import { load, lookupCache } from 'pretty-text/oneboxer';
 import { ajax } from 'discourse/lib/ajax';
+import afterTransition from 'discourse/lib/after-transition';
 
 export default Ember.Component.extend({
   classNames: ['title-input'],
@@ -10,7 +11,11 @@ export default Ember.Component.extend({
   didInsertElement() {
     this._super();
     if (this.get('focusTarget') === 'title') {
-      this.$('input').putCursorAtEnd();
+      const $input = this.$("input");
+
+      afterTransition(this.$().closest("#reply-control"), () => {
+        $input.putCursorAtEnd();
+      });
     }
   },
 
diff --git a/app/assets/javascripts/discourse/components/composer-toggles.js.es6 b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
new file mode 100644
index 0000000000..cd5369638c
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/composer-toggles.js.es6
@@ -0,0 +1,14 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('composeState')
+  toggleIcon(composeState) {
+    if (composeState === "draft" || composeState === "saving") {
+      return "times";
+    }
+    return "chevron-down";
+  }
+});
+
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 289d5ee4f1..f0638423d0 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -1,6 +1,5 @@
 /*global Mousetrap:true */
 import { default as computed, on, observes } from 'ember-addons/ember-computed-decorators';
-import { showSelector } from "discourse/lib/emoji/toolbar";
 import Category from 'discourse/models/category';
 import { categoryHashtagTriggerRule } from 'discourse/lib/category-hashtags';
 import { TAG_HASHTAG_POSTFIX } from 'discourse/lib/tag-hashtags';
@@ -78,7 +77,11 @@ class Toolbar {
       group: 'insertions',
       icon: 'quote-right',
       shortcut: 'Shift+9',
-      perform: e => e.applyList('> ', 'blockquote_text')
+      perform: e => e.applyList(
+        '> ',
+        'blockquote_text',
+        { applyEmptyLines: true, multiline: true }
+      )
     });
 
     this.addButton({id: 'code', group: 'insertions', shortcut: 'Shift+C', action: 'formatCode'});
@@ -198,6 +201,7 @@ export default Ember.Component.extend({
   linkText: '',
   lastSel: null,
   _mouseTrap: null,
+  emojiPickerIsActive: false,
 
   @computed('placeholder')
   placeholderTranslated(placeholder) {
@@ -328,7 +332,6 @@ export default Ember.Component.extend({
   _applyEmojiAutocomplete($editorInput) {
     if (!this.siteSettings.enable_emoji) { return; }
 
-    const register = this.register;
     const self = this;
 
     $editorInput.autocomplete({
@@ -346,20 +349,8 @@ export default Ember.Component.extend({
         if (v.code) {
           return `${v.code}:`;
         } else {
-          showSelector({
-            appendTo: self.$(),
-            register,
-            onSelect: title => {
-              // Remove the previously type characters when a new emoji is selected from the selector.
-              let selected = self._getSelected();
-              let newPre = selected.pre.replace(/:[^:]+$/, ":");
-              let numOfRemovedChars = selected.pre.length - newPre.length;
-              selected.pre = newPre;
-              selected.start -= numOfRemovedChars;
-              selected.end -= numOfRemovedChars;
-              self._addText(selected, `${title}:`);
-            }
-          });
+          $editorInput.autocomplete({cancel: true});
+          self.set('emojiPickerIsActive', true);
           return "";
         }
       },
@@ -453,11 +444,15 @@ export default Ember.Component.extend({
   },
 
   // perform the same operation over many lines of text
-  _getMultilineContents(lines, head, hval, hlen, tail, tlen) {
+  _getMultilineContents(lines, head, hval, hlen, tail, tlen, opts) {
     let operation = OP.NONE;
 
+    const applyEmptyLines = opts && opts.applyEmptyLines;
+
     return lines.map(l => {
-      if (l.length === 0) { return l; }
+      if (!applyEmptyLines && l.length === 0) {
+        return l;
+      }
 
       if (operation !== OP.ADDED &&
           (l.slice(0, hlen) === hval && tlen === 0 || l.slice(-tlen) === tail)) {
@@ -513,8 +508,15 @@ export default Ember.Component.extend({
         this.set('value', `${pre.slice(0, -hlen)}${sel.value}${post.slice(tlen)}`);
         this._selectText(sel.start - hlen, sel.value.length);
       } else {
-        const contents = this._getMultilineContents(lines, head, hval, hlen, tail, tlen);
-
+        const contents = this._getMultilineContents(
+          lines,
+          head,
+          hval,
+          hlen,
+          tail,
+          tlen,
+          opts
+        );
         this.set('value', `${pre}${contents}${post}`);
         if (lines.length === 1 && tlen > 0) {
           this._selectText(sel.start + hlen, sel.value.length);
@@ -525,9 +527,9 @@ export default Ember.Component.extend({
     }
   },
 
-  _applyList(sel, head, exampleKey) {
+  _applyList(sel, head, exampleKey, opts) {
     if (sel.value.indexOf("\n") !== -1) {
-      this._applySurround(sel, head, '', exampleKey);
+      this._applySurround(sel, head, '', exampleKey, opts);
     } else {
 
       const [hval, hlen] = getHead(head);
@@ -587,9 +589,10 @@ export default Ember.Component.extend({
 
     if (post.length > 0) {
       post = post.replace(/^\n*/, "\n\n");
+    } else {
+      post = "\n";
     }
 
-
     const value = pre + text + post;
     const $textarea = this.$('textarea.d-editor-input');
 
@@ -614,13 +617,28 @@ export default Ember.Component.extend({
   },
 
   actions: {
+    emojiSelected(code) {
+      let selected = this._getSelected();
+      const captures = selected.pre.match(/\B:(\w*)$/);
+
+      if(_.isEmpty(captures)) {
+        this._addText(selected, `:${code}:`);
+      } else {
+        let numOfRemovedChars = selected.pre.length - captures[1].length;
+        selected.pre = selected.pre.slice(0, selected.pre.length - captures[1].length);
+        selected.start -= numOfRemovedChars;
+        selected.end -= numOfRemovedChars;
+        this._addText(selected, `${code}:`);
+      }
+    },
+
     toolbarButton(button) {
       const selected = this._getSelected(button.trimLeading);
       const toolbarEvent = {
         selected,
         selectText: (from, length) => this._selectText(from, length),
         applySurround: (head, tail, exampleKey, opts) => this._applySurround(selected, head, tail, exampleKey, opts),
-        applyList: (head, exampleKey) => this._applyList(selected, head, exampleKey),
+        applyList: (head, exampleKey, opts) => this._applyList(selected, head, exampleKey, opts),
         addText: text => this._addText(selected, text),
         replaceText: text => this._addText({pre: '', post: ''}, text),
         getText: () => this.get('value'),
@@ -692,11 +710,7 @@ export default Ember.Component.extend({
     },
 
     emoji() {
-      showSelector({
-        appendTo: this.$(),
-        register: this.register,
-        onSelect: title => this._addText(this._getSelected(), `:${title}:`)
-      });
+      this.set('emojiPickerIsActive', !this.get('emojiPickerIsActive'));
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index 475c79d049..1e1a40cdc3 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -2,7 +2,7 @@ import { on } from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   elementId: 'discourse-modal',
-  classNameBindings: [':modal', ':hidden', 'modalClass'],
+  classNameBindings: [':modal', 'modalClass'],
   attributeBindings: ['data-keyboard'],
 
   // We handle ESC ourselves
@@ -17,6 +17,7 @@ export default Ember.Component.extend({
     });
 
     this.appEvents.on('modal:body-shown', data => {
+      this.$().removeClass('hidden');
       if (data.title) {
         this.set('title', I18n.t(data.title));
       } else if (data.rawTitle) {
diff --git a/app/assets/javascripts/discourse/components/directory-toggle.js.es6 b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
index 3f55ec0543..8da529957a 100644
--- a/app/assets/javascripts/discourse/components/directory-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/directory-toggle.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/discourse/components/dropdown-button.js.es6 b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
index 032c80e2af..bffeaa6cdc 100644
--- a/app/assets/javascripts/discourse/components/dropdown-button.js.es6
+++ b/app/assets/javascripts/discourse/components/dropdown-button.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
@@ -29,7 +30,7 @@ export default Ember.Component.extend(bufferedRender({
       buffer.push("<h4 class='title'>" + title + "</h4>");
     }
 
-    buffer.push(`<button class='btn standard dropdown-toggle ${this.get('buttonExtraClasses')}' data-toggle='dropdown'>${this.get('text')}</button>`);
+    buffer.push(`<button class='btn standard dropdown-toggle ${this.get('buttonExtraClasses') || ''}' data-toggle='dropdown'>${this.get('text')}</button>`);
     buffer.push("<ul class='dropdown-menu'>");
 
     const contents = this.get('dropDownContent');
@@ -40,7 +41,15 @@ export default Ember.Component.extend(bufferedRender({
               className = (self.get('activeItem') === id ? 'disabled': '');
 
         buffer.push("<li data-id=\"" + id + "\" class=\"" + className + "\"><a href>");
-        buffer.push("<span class='icon " + row.styleClasses + "'></span>");
+
+        if (row.icon) {
+          let iconClass = 'icon';
+          if (row.iconClass) {
+            iconClass += ` ${row.iconClass}`;
+          }
+          buffer.push(iconHTML(row.icon, { tagName: 'span', class: iconClass }));
+        }
+
         buffer.push("<div><span class='title'>" + row.title + "</span>");
         buffer.push("<span>" + row.description + "</span></div>");
         buffer.push("</a></li>");
diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
new file mode 100644
index 0000000000..08d5441758
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -0,0 +1,543 @@
+import { observes } from "ember-addons/ember-computed-decorators";
+import { findRawTemplate } from "discourse/lib/raw-templates";
+import { emojiUrlFor } from "discourse/lib/text";
+import KeyValueStore from "discourse/lib/key-value-store";
+import { emojis } from "pretty-text/emoji/data";
+import { extendedEmojiList, isSkinTonableEmoji } from "pretty-text/emoji";
+
+const keyValueStore = new KeyValueStore("discourse_emojis_");
+const EMOJI_USAGE = "emojiUsage";
+const EMOJI_SELECTED_DIVERSITY = "emojiSelectedDiversity";
+const PER_ROW = 11;
+const customEmojis = _.map(_.keys(extendedEmojiList()), code => {
+  return { code, src: emojiUrlFor(code) };
+});
+
+export function resetCache() {
+  keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
+  keyValueStore.setObject({ key: EMOJI_SELECTED_DIVERSITY, value: 1 });
+}
+
+let $picker, $filter, $results, $list, scrollPosition, $visibleSections, _checkTimeout;
+
+export default Ember.Component.extend({
+  willDestroyElement() {
+    this._super();
+
+    this._unbindEvents();
+    this.appEvents.off("emoji-picker:close");
+  },
+
+  didInsertElement() {
+    this._super();
+
+    this.appEvents.on("emoji-picker:close", () => this.set("active", false));
+
+    $picker = this.$(".emoji-picker");
+
+    if (!keyValueStore.getObject(EMOJI_USAGE)) {
+      keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
+    } else if(_.isPlainObject(keyValueStore.getObject(EMOJI_USAGE))) {
+      // handle legacy format
+      keyValueStore.setObject({ key: EMOJI_USAGE, value: _.keys(keyValueStore.getObject(EMOJI_USAGE)) });
+    }
+
+    scrollPosition = 0;
+  },
+
+  didUpdateAttrs() {
+    this._super();
+
+    if (this.get("active")) {
+      this.show();
+    } else {
+      this.close();
+    }
+  },
+
+  @observes("filter")
+  filterChanged() {
+    $filter.find(".clear-filter").toggle(!_.isEmpty(this.get("filter")));
+    Ember.run.debounce(this, this._filterEmojisList, 250);
+  },
+
+  @observes("selectedDiversity")
+  selectedDiversityChanged() {
+    keyValueStore.setObject({key: EMOJI_SELECTED_DIVERSITY, value: this.get("selectedDiversity")});
+
+    $.each($list.find(".emoji[data-loaded='1'].diversity"), (_, button) => {
+      $(button).css("background-image", "").removeAttr("data-loaded");
+    });
+
+    if(this.get("filter") !== "") {
+      $.each($results.find(".emoji.diversity"), (_, button) => this._setButtonBackground(button, true) );
+    }
+
+    this._updateSelectedDiversity();
+  },
+
+  @observes("recentEmojis")
+  recentEmojisChanged() {
+    const previousScrollTop = scrollPosition;
+    const $recentSection = $list.find(".section[data-section='recent']");
+    const $recentSectionGroup = $recentSection.find(".section-group");
+    const $recentCategory = $picker.find(".category-icon button[data-section='recent']").parent();
+    let persistScrollPosition = !$recentCategory.is(":visible") ? true : false;
+
+    // we set height to 0 to avoid it being taken into account for scroll position
+    if(_.isEmpty(this.get("recentEmojis"))) {
+      $recentCategory.hide();
+      $recentSection.css("height", 0).hide();
+    } else {
+      $recentCategory.show();
+      $recentSection.css("height", "auto").show();
+    }
+
+    const recentEmojis = _.map(this.get("recentEmojis"), code => {
+      return { code, src: emojiUrlFor(code) };
+    });
+    const template = findRawTemplate("emoji-picker-recent")({recentEmojis});
+    $recentSectionGroup.html(template);
+
+    if(persistScrollPosition) {
+      $list.scrollTop(previousScrollTop + $recentSection.outerHeight());
+    }
+
+    this._bindHover($recentSectionGroup);
+  },
+
+  close() {
+    $picker
+      .css({width: "", left: "", bottom: "", display: "none"})
+      .empty();
+
+    this.$().find(".emoji-picker-modal").remove();
+
+    this._unbindEvents();
+
+    clearTimeout(_checkTimeout);
+  },
+
+  show() {
+    const template = findRawTemplate("emoji-picker")({customEmojis});
+    $picker.html(template);
+    this.$().append("<div class='emoji-picker-modal'></div>");
+
+    $filter = $picker.find(".filter");
+    $results = $picker.find(".results");
+    $list = $picker.find(".list");
+
+    this.set("selectedDiversity", keyValueStore.getObject(EMOJI_SELECTED_DIVERSITY) || 1);
+    this.set("recentEmojis", keyValueStore.getObject(EMOJI_USAGE) || []);
+
+    this._bindEvents();
+
+    Ember.run.scheduleOnce("afterRender", this, function() {
+      this._sectionLoadingCheck();
+      this._loadCategoriesEmojis();
+      this._positionPicker();
+      this._scrollTo();
+      this._updateSelectedDiversity();
+    });
+  },
+
+  _updateSelectedDiversity() {
+    const $diversityPicker = $picker.find(".diversity-picker");
+
+    $diversityPicker.find(".diversity-scale").removeClass("selected");
+    $diversityPicker
+      .find(`.diversity-scale[data-level="${this.get("selectedDiversity")}"]`)
+      .addClass("selected");
+  },
+
+  _sectionLoadingCheck() {
+    _checkTimeout = setTimeout(() => { this._sectionLoadingCheck(); }, 500);
+    Ember.run.throttle(this, this._checkVisibleSection, 100);
+  },
+
+  _loadCategoriesEmojis() {
+    $.each($picker.find(".categories-column button.emoji"), (_, button) => {
+      const $button = $(button);
+      const code = this._codeWithDiversity($button.data("tabicon"), false);
+      $button.css("background-image", `url("${emojiUrlFor(code)}")`);
+    });
+  },
+
+  _bindEvents() {
+    this._bindDiversityClick();
+    this._bindSectionsScroll();
+    this._bindEmojiClick($list.find(".section-group"));
+    this._bindClearRecentEmojisGroup();
+    this._bindResizing();
+    this._bindCategoryClick();
+    this._bindModalClick();
+    this._bindFilterInput();
+
+    if(!this.site.isMobileDevice) {
+      this._bindHover();
+    }
+  },
+
+  _bindModalClick() {
+    this.$(".emoji-picker-modal")
+        .on("click", () => this.set("active", false));
+
+    this.$(document).on("click.emoji-picker", (event) => {
+      const onPicker = $(event.target).parents(".emoji-picker").length === 1;
+      const onGrippie = event.target.className.indexOf("grippie") > -1;
+      if(!onPicker && !onGrippie) {
+        this.set("active", false);
+        return false;
+      }
+    });
+  },
+
+  _unbindEvents() {
+    this.$(window).off("resize");
+    this.$(".emoji-picker-modal").off("click");
+    Ember.$("#reply-control").off("div-resizing");
+    this.$(document).off("click.emoji-picker");
+  },
+
+  _filterEmojisList() {
+    if (this.get("filter") === "") {
+      $filter.find("input[name='filter']").val("");
+      $results.empty().hide();
+      $list.show();
+    } else {
+      const lowerCaseFilter = this.get("filter").toLowerCase();
+      const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
+      const filteredCodes = _.filter(filterableEmojis, code => {
+        return code.indexOf(lowerCaseFilter) > -1;
+      }).slice(0, 30);
+      $results.empty().html(
+        _.map(filteredCodes, (code) => {
+          const hasDiversity = isSkinTonableEmoji(code);
+          const diversity = hasDiversity ? "diversity" : "";
+          const scaledCode = this._codeWithDiversity(code, hasDiversity);
+          return `<button style="background-image: url('${emojiUrlFor(scaledCode)}')" type="button" class="emoji ${diversity}" tabindex="-1" title="${code}"></button>`;
+        })
+      ).show();
+      this._bindHover($results);
+      this._bindEmojiClick($results);
+      $list.hide();
+    }
+  },
+
+  _bindFilterInput() {
+    const $input = $filter.find("input");
+
+    $input.on("input", (event) => {
+      this.set("filter", event.currentTarget.value);
+    });
+
+    $filter.find(".clear-filter").on("click", () => {
+      $input.val("").focus();
+      this.set("filter", "");
+      return false;
+    });
+  },
+
+  _bindCategoryClick() {
+    $picker.find(".category-icon").on("click", "button.emoji", (event) => {
+      this.set("filter", "");
+      $results.empty();
+      $list.show();
+
+      const section = $(event.currentTarget).data("section");
+      const $section = $list.find(`.section[data-section="${section}"]`);
+      const scrollTop = $list.scrollTop() + ($section.offset().top - $list.offset().top);
+      this._scrollTo(scrollTop);
+      return false;
+    });
+  },
+
+  _bindHover($hoverables) {
+    const replaceInfoContent = (html) => $picker.find(".footer .info").html(html || "");
+
+    ($hoverables || $list.find(".section-group")).on({
+      mouseover: (event) => {
+        const code = this._codeForEmojiButton($(event.currentTarget));
+        const html = `<img src="${emojiUrlFor(code)}" class="emoji"> <span>:${code}:<span>`;
+        replaceInfoContent(html);
+      },
+      mouseleave: () => replaceInfoContent()
+    }, "button.emoji");
+  },
+
+  _bindResizing() {
+    this.$(window).on("resize", () => {
+      Ember.run.throttle(this, this._positionPicker, 16);
+    });
+
+    Ember.$("#reply-control").on("div-resizing", () => {
+      Ember.run.throttle(this, this._positionPicker, 16);
+    });
+  },
+
+  _bindClearRecentEmojisGroup() {
+    const $recent = $picker.find(".section[data-section='recent'] .clear-recent");
+    $recent.on("click", () => {
+      keyValueStore.setObject({ key: EMOJI_USAGE, value: [] });
+      this.set("recentEmojis", []);
+      this._scrollTo(0);
+      return false;
+    });
+  },
+
+  _bindEmojiClick($emojisContainer) {
+    const handler = (event) => {
+      const code = this._codeForEmojiButton($(event.currentTarget));
+
+      if($(event.currentTarget).parents(".section[data-section='recent']").length === 0) {
+        this._trackEmojiUsage(code);
+      }
+
+      this.sendAction("emojiSelected", code);
+
+      if(this.$(".emoji-picker-modal").hasClass("fadeIn")) {
+        this.set("active", false);
+      }
+
+      return false;
+    };
+
+    if(this.site.isMobileDevice) {
+      const self = this;
+
+      $emojisContainer
+        .off("touchstart")
+        .on("touchstart", "button.emoji", (touchStartEvent) => {
+          const $this = $(touchStartEvent.currentTarget);
+          $this.on("touchend", (touchEndEvent) => {
+            handler.bind(self)(touchEndEvent);
+            $this.off("touchend");
+          });
+          $this.on("touchmove", () => $this.off("touchend") );
+        });
+    } else {
+      $emojisContainer.off("click").on("click", "button.emoji", e => handler.bind(this)(e) );
+    }
+  },
+
+  _bindSectionsScroll() {
+    $list.on("scroll", () => {
+      scrollPosition = $list.scrollTop();
+      Ember.run.throttle(this, this._checkVisibleSection, 150);
+    });
+  },
+
+  _checkVisibleSection() {
+    // make sure we stop loading if picker has been removed
+    if(!$picker) {
+      return;
+    }
+
+    const $sections = $list.find(".section");
+    const listHeight = $list.innerHeight();
+    let $selectedSection;
+
+    $visibleSections = _.filter($sections, section => {
+      const $section = $(section);
+      const sectionTop = $section.position().top;
+      return sectionTop + $section.height() > 0 && sectionTop < listHeight;
+    });
+
+    if (!_.isEmpty(this.get("recentEmojis")) && scrollPosition === 0) {
+      $selectedSection = $(_.first($visibleSections));
+    } else {
+      $selectedSection = $(_.last($visibleSections));
+    }
+
+    if($selectedSection) {
+      $picker.find(".category-icon").removeClass("current");
+      $picker.find(`.category-icon button[data-section='${$selectedSection.data("section")}']`)
+             .parent()
+             .addClass("current");
+
+      this._loadVisibleSections();
+    }
+  },
+
+  _loadVisibleSections() {
+    if(!$visibleSections) {
+      return;
+    }
+
+    const listHeight = $list.innerHeight();
+    $visibleSections.forEach(visibleSection => {
+      const $unloadedEmojis = $(visibleSection).find("button.emoji[data-loaded!='1']");
+      $.each($unloadedEmojis, (_, button) => {
+        const $button = $(button);
+        const buttonTop = $button.position().top;
+        const buttonHeight = $button.height();
+
+        if(buttonTop + buttonHeight > 0 && buttonTop - buttonHeight < listHeight) {
+          this._setButtonBackground($button);
+        }
+      });
+    });
+  },
+
+  _bindDiversityClick() {
+    const $diversityScales = $picker.find(".diversity-picker .diversity-scale");
+    $diversityScales.on("click", (event) => {
+      const $selectedDiversity = $(event.currentTarget);
+      this.set("selectedDiversity", parseInt($selectedDiversity.data("level")));
+      return false;
+    });
+  },
+
+  _isReplyControlExpanded() {
+    const verticalSpace = this.$(window).height() -
+                          Ember.$(".d-header").height() -
+                          Ember.$("#reply-control").height();
+
+    return verticalSpace < $picker.height() - 48;
+  },
+
+  _positionPicker(){
+    if(!this.get("active")) { return; }
+
+    let windowWidth = this.$(window).width();
+
+    const desktopModalePositioning = options => {
+      let attributes = {
+        width: Math.min(windowWidth, 400) - 12,
+        marginLeft: -(Math.min(windowWidth, 400)/2) + 6,
+        marginTop: -130,
+        left: "50%",
+        bottom: "",
+        top: "50%",
+        display: "flex"
+      };
+
+      this.$(".emoji-picker-modal").addClass("fadeIn");
+      $picker.css(_.merge(attributes, options));
+    };
+
+    const mobilePositioning = options => {
+      let attributes = {
+        width: windowWidth - 12,
+        marginLeft: 5,
+        marginTop: -130,
+        left: 0,
+        bottom: "",
+        top: "50%",
+        display: "flex"
+      };
+
+      this.$(".emoji-picker-modal").addClass("fadeIn");
+      $picker.css(_.merge(attributes, options));
+    };
+
+    const desktopPositioning = options => {
+      let attributes = {
+        width: windowWidth < 485 ? windowWidth - 12 : 400,
+        marginLeft: "",
+        marginTop: "",
+        right: "",
+        left: "",
+        bottom: 32,
+        top: "",
+        display:
+        "flex"
+      };
+
+      this.$(".emoji-picker-modal").removeClass("fadeIn");
+      $picker.css(_.merge(attributes, options));
+    };
+
+    if(Ember.testing) {
+      desktopPositioning();
+      return;
+    }
+
+    if(this.site.isMobileDevice) {
+      mobilePositioning();
+    } else {
+      if(this._isReplyControlExpanded()) {
+        let $editorWrapper = Ember.$(".d-editor-preview-wrapper");
+        if(($editorWrapper.is(":visible") && $editorWrapper.width() < 400) || windowWidth < 485) {
+          desktopModalePositioning();
+        } else {
+          if($editorWrapper.is(":visible")) {
+            let previewOffset = Ember.$(".d-editor-preview-wrapper").offset();
+            let replyControlOffset = Ember.$("#reply-control").offset();
+            let left = previewOffset.left - replyControlOffset.left;
+            desktopPositioning({left});
+          } else {
+            desktopPositioning({
+              right: (Ember.$("#reply-control").width() - Ember.$(".d-editor-container").width()) / 2
+            });
+          }
+        }
+      } else {
+        if(windowWidth < 485) {
+          desktopModalePositioning();
+        } else {
+          let previewInputOffset = Ember.$(".d-editor-input").offset();
+          let replyControlOffset = Ember.$("#reply-control").offset() || {left: 0};
+          let left = previewInputOffset.left - replyControlOffset.left;
+          desktopPositioning({left, bottom: Ember.$("#reply-control").height() - 48});
+        }
+      }
+    }
+
+    const infoMaxWidth = $picker.width() -
+                         $picker.find(".categories-column").width() -
+                         $picker.find(".diversity-picker").width() -
+                         32;
+    $picker.find(".info").css("max-width", infoMaxWidth);
+  },
+
+  _codeWithDiversity(code, diversity) {
+    if(diversity && this.get("selectedDiversity") !== 1) {
+      return `${code}:t${this.get("selectedDiversity")}`;
+    } else {
+      return code;
+    }
+  },
+
+  _trackEmojiUsage(code) {
+    let recent = keyValueStore.getObject(EMOJI_USAGE) || [];
+    recent = recent.filter(r => r !== code);
+    recent.unshift(code);
+    recent.length = Math.min(recent.length, PER_ROW);
+    keyValueStore.setObject({ key: EMOJI_USAGE, value: recent });
+    this.set("recentEmojis", recent);
+  },
+
+  _scrollTo(y) {
+    const yPosition = _.isUndefined(y) ? scrollPosition : y;
+
+    $list.scrollTop(yPosition);
+
+    // if we don’t actually scroll we need to force it
+    if(yPosition === 0) {
+      $list.scroll();
+    }
+  },
+
+  _codeForEmojiButton($button) {
+    const title = $button.attr("title");
+    return this._codeWithDiversity(title, $button.hasClass("diversity"));
+  },
+
+  _setButtonBackground(button, diversity) {
+    const $button = $(button);
+    const code = this._codeWithDiversity(
+      $button.attr("title"),
+      diversity || $button.hasClass("diversity")
+    );
+
+    // force visual reloading if needed
+    if($button.css("background-image") !== "none") {
+      $button.css("background-image", "");
+    }
+
+    $button
+      .attr("data-loaded", 1)
+      .css("background-image", `url("${emojiUrlFor(code)}")`);
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/flat-button.js.es6 b/app/assets/javascripts/discourse/components/flat-button.js.es6
new file mode 100644
index 0000000000..792db36138
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/flat-button.js.es6
@@ -0,0 +1,16 @@
+import { default as computed } from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  tagName: 'button',
+  classNames: ['btn-flat'],
+  attributeBindings: ['disabled', 'translatedTitle:title'],
+
+  @computed("title")
+  translatedTitle(title) {
+    if (title) return I18n.t(title);
+  },
+
+  click() {
+    return this.attrs.action();
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index d3ae423548..06f7e68a16 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,5 +1,5 @@
 import { on } from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import LogsNotice from 'discourse/services/logs-notice';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
diff --git a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6 b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
index fb7c9d24c5..f5b2468408 100644
--- a/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
+++ b/app/assets/javascripts/discourse/components/group-index-toggle.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
 export default Ember.Component.extend(bufferedRender({
diff --git a/app/assets/javascripts/discourse/components/group-members-input.js.es6 b/app/assets/javascripts/discourse/components/group-members-input.js.es6
index b2d892095b..691eb051bb 100644
--- a/app/assets/javascripts/discourse/components/group-members-input.js.es6
+++ b/app/assets/javascripts/discourse/components/group-members-input.js.es6
@@ -4,6 +4,7 @@ import { propertyEqual } from 'discourse/lib/computed';
 
 export default Ember.Component.extend({
   classNames: ["group-members-input"],
+  addButton: true,
 
   @computed('model.limit', 'model.offset', 'model.user_count')
   currentPage(limit, offset, userCount) {
diff --git a/app/assets/javascripts/discourse/components/group-membership-button.js.es6 b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
index b27ce66f79..5661aec122 100644
--- a/app/assets/javascripts/discourse/components/group-membership-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-membership-button.js.es6
@@ -5,9 +5,14 @@ import DiscourseURL from 'discourse/lib/url';
 export default Ember.Component.extend({
   loading: false,
 
-  @computed("model.public")
-  canJoinGroup(publicGroup) {
-    return publicGroup;
+  @computed("model.public_admission", "userIsGroupUser")
+  canJoinGroup(publicAdmission, userIsGroupUser) {
+    return publicAdmission && !userIsGroupUser;
+  },
+
+  @computed("model.public_exit", "userIsGroupUser")
+  canLeaveGroup(publicExit, userIsGroupUser) {
+    return publicExit && userIsGroupUser;
   },
 
   @computed("model.is_group_user", "model.id", "groupUserIds")
diff --git a/app/assets/javascripts/discourse/components/group-selector.js.es6 b/app/assets/javascripts/discourse/components/group-selector.js.es6
index 4beb5a3a93..563911b725 100644
--- a/app/assets/javascripts/discourse/components/group-selector.js.es6
+++ b/app/assets/javascripts/discourse/components/group-selector.js.es6
@@ -15,31 +15,27 @@ export default Ember.Component.extend({
 
   @on('didInsertElement')
   _initializeAutocomplete(opts) {
-    var self = this;
-    var selectedGroups;
-    var groupNames = this.get('groupNames');
+    let selectedGroups;
+    let groupNames = this.get('groupNames');
 
-    self.$('input').autocomplete({
+    this.$('input').autocomplete({
       allowAny: false,
       items: _.isArray(groupNames) ? groupNames : (Ember.isEmpty(groupNames)) ? [] : [groupNames],
       single: this.get('single'),
       updateData: (opts && opts.updateData) ? opts.updateData : false,
-      onChangeItems: function(items){
+      onChangeItems: items => {
         selectedGroups = items;
-        self.set("groupNames", items.join(","));
+        this.set("groupNames", items.join(","));
       },
-      transformComplete: function(g) {
+      transformComplete: g => {
         return g.name;
       },
-      dataSource: function(term) {
-        return self.get("groupFinder")(term).then(function(groups){
+      dataSource: term => {
+        return this.get("groupFinder")(term).then(groups => {
+          if(!selectedGroups) return groups;
 
-          if(!selectedGroups){
-            return groups;
-          }
-
-          return groups.filter(function(group){
-            return !selectedGroups.any(function(s){return s === group.name;});
+          return groups.filter(group => {
+            return !selectedGroups.any(s => s === group.name);
           });
         });
       },
diff --git a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6 b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
index 0db92cc461..b077ab7048 100644
--- a/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
+++ b/app/assets/javascripts/discourse/components/hide-modal-trigger.js.es6
@@ -1,6 +1,6 @@
 export default Ember.Component.extend({
   didInsertElement() {
     this._super();
-    $('#discourse-modal').modal('hide');
+    $('#discourse-modal').modal('hide').addClass('hidden');
   }
 });
diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js.es6
index ca783a23b7..a86d2dd389 100644
--- a/app/assets/javascripts/discourse/components/highlight-text.js.es6
+++ b/app/assets/javascripts/discourse/components/highlight-text.js.es6
@@ -1,13 +1,11 @@
+import highlightText from 'discourse/lib/highlight-text';
+
 export default Ember.Component.extend({
   tagName: 'span',
 
   _highlightOnInsert: function() {
     const term = this.get('highlight');
-    const self = this;
-
-    if(!_.isEmpty(term)) {
-      self.$().highlight(term.split(/\s+/), {className: 'search-highlight'});
-    }
+    highlightText(this.$(), term);
   }.observes('highlight').on('didInsertElement')
 
 });
diff --git a/app/assets/javascripts/discourse/components/input-tip.js.es6 b/app/assets/javascripts/discourse/components/input-tip.js.es6
index 0178ad7cac..4120544afe 100644
--- a/app/assets/javascripts/discourse/components/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/input-tip.js.es6
@@ -1,5 +1,5 @@
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 export default Ember.Component.extend(bufferedRender({
   classNameBindings: [':tip', 'good', 'bad'],
diff --git a/app/assets/javascripts/discourse/components/notifications-button.js.es6 b/app/assets/javascripts/discourse/components/notifications-button.js.es6
index d01f17e43d..2c1cacc860 100644
--- a/app/assets/javascripts/discourse/components/notifications-button.js.es6
+++ b/app/assets/javascripts/discourse/components/notifications-button.js.es6
@@ -1,6 +1,6 @@
 import DropdownButton from 'discourse/components/dropdown-button';
 import { allLevels, buttonDetails } from 'discourse/lib/notification-levels';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default DropdownButton.extend({
@@ -22,7 +22,8 @@ export default DropdownButton.extend({
         id: l.id,
         title: I18n.t(`${start}.title`),
         description: I18n.t(`${start}.description`),
-        styleClasses: `${l.key.dasherize()} fa fa-${l.icon}`
+        icon: l.icon,
+        iconClass: l.key.dasherize(),
       };
     });
   },
diff --git a/app/assets/javascripts/discourse/components/period-chooser.js.es6 b/app/assets/javascripts/discourse/components/period-chooser.js.es6
index efd7e15720..e3bc67fb5f 100644
--- a/app/assets/javascripts/discourse/components/period-chooser.js.es6
+++ b/app/assets/javascripts/discourse/components/period-chooser.js.es6
@@ -25,7 +25,7 @@ export default Ember.Component.extend(CleansUp, {
 
     if (!this.get('showPeriods')) {
       if (!this.site.mobileView) {
-        const $chevron = this.$('i.fa-caret-down');
+        const $chevron = this.$('.d-icon-caret-down');
         this.$('#period-popup').css($chevron.position());
       } else {
         this.$('#period-popup').css({top: this.$().height()});
diff --git a/app/assets/javascripts/discourse/components/pinned-button.js.es6 b/app/assets/javascripts/discourse/components/pinned-button.js.es6
index e08586bc52..ddd302a082 100644
--- a/app/assets/javascripts/discourse/components/pinned-button.js.es6
+++ b/app/assets/javascripts/discourse/components/pinned-button.js.es6
@@ -1,3 +1,5 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import computed from 'ember-addons/ember-computed-decorators';
 import DropdownButton from 'discourse/components/dropdown-button';
 
 export default DropdownButton.extend({
@@ -28,21 +30,28 @@ export default DropdownButton.extend({
       {id: 'pinned',
        title: I18n.t('topic_statuses.pinned' + globally + '.title'),
        description: I18n.t('topic_statuses.pinned' + globally + '.help'),
-       styleClasses: 'fa fa-thumb-tack' },
+       icon: 'thumb-tack' },
       {id: 'unpinned',
        title: I18n.t('topic_statuses.unpinned.title'),
        description: I18n.t('topic_statuses.unpinned.help'),
-       styleClasses: 'fa fa-thumb-tack unpinned' }
+       icon: 'thumb-tack',
+       iconClass: 'unpinned' }
     ];
   }.property(),
 
-  text: function() {
-    const globally = this.get('topic.pinned_globally') ? '_globally' : '';
-    const state = this.get('topic.pinned') ? 'pinned' + globally : 'unpinned';
+  @computed('topic.pinned', 'topic.pinned_globally')
+  text(pinned, pinnedGlobally) {
+    const globally = pinnedGlobally ? '_globally' : '';
+    const state = pinned ? 'pinned' + globally : 'unpinned';
 
-    return '<span class="fa fa-thumb-tack' + (state === 'unpinned' ? ' unpinned' : "") +  '"></span> ' +
+    const icon = iconHTML(
+      'thumb-tack',
+      { tagName: 'span', class: (state === 'unpinned' ? 'unpinned' : null) }
+    );
+
+    return icon +
       I18n.t('topic_statuses.' + state + '.title') + "<span class='caret'></span>";
-  }.property('topic.pinned', 'topic.unpinned'),
+  },
 
   clicked(id) {
     const topic = this.get('topic');
diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index 59e5856db0..e3e27621f9 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { default as computed, observes } from 'ember-addons/ember-computed-decorators';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 
diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
index e0fea77cd5..109182042c 100644
--- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
+++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6
@@ -10,13 +10,13 @@ const REGEXP_CATEGORY_PREFIX       = /^(category:|#)/ig;
 const REGEXP_GROUP_PREFIX          = /^group:/ig;
 const REGEXP_BADGE_PREFIX          = /^badge:/ig;
 const REGEXP_TAGS_PREFIX           = /^(tags?:|#(?=[a-z0-9\-]+::tag))/ig;
-const REGEXP_IN_PREFIX             = /^in:/ig;
+const REGEXP_IN_PREFIX             = /^(in|with):/ig;
 const REGEXP_STATUS_PREFIX         = /^status:/ig;
 const REGEXP_MIN_POST_COUNT_PREFIX = /^min_post_count:/ig;
 const REGEXP_POST_TIME_PREFIX      = /^(before|after):/ig;
 const REGEXP_TAGS_REPLACE          = /(^(tags?:|#(?=[a-z0-9\-]+::tag))|::tag\s?$)/ig;
 
-const REGEXP_IN_MATCH                 = /^in:(posted|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen)/ig;
+const REGEXP_IN_MATCH                 = /^(in|with):(posted|watching|tracking|bookmarks|first|pinned|unpinned|wiki|unseen|image)/ig;
 const REGEXP_SPECIAL_IN_LIKES_MATCH   = /^in:likes/ig;
 const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /^in:private/ig;
 const REGEXP_SPECIAL_IN_SEEN_MATCH    = /^in:seen/ig;
@@ -25,6 +25,8 @@ const REGEXP_CATEGORY_SLUG            = /^(\#[a-zA-Z0-9\-:]+)/ig;
 const REGEXP_CATEGORY_ID              = /^(category:[0-9]+)/ig;
 const REGEXP_POST_TIME_WHEN           = /^(before|after)/ig;
 
+const IN_OPTIONS_MAPPING = {'images': 'with'};
+
 export default Em.Component.extend({
   classNames: ['search-advanced-options'],
 
@@ -38,6 +40,7 @@ export default Em.Component.extend({
     {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"},
@@ -398,13 +401,17 @@ export default Em.Component.extend({
   updateSearchTermForIn() {
     const match = this.filterBlocks(REGEXP_IN_MATCH);
     const inFilter = this.get('searchedTerms.in');
+    let keyword = 'in';
+    if(inFilter in IN_OPTIONS_MAPPING) {
+        keyword = IN_OPTIONS_MAPPING[inFilter];
+    }
     let searchTerm = this.get('searchTerm') || '';
 
     if (inFilter) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match[0], `in:${inFilter}`);
+        searchTerm = searchTerm.replace(match[0], `${keyword}:${inFilter}`);
       } else {
-        searchTerm += ` in:${inFilter}`;
+        searchTerm += ` ${keyword}:${inFilter}`;
       }
 
       this.set('searchTerm', searchTerm.trim());
@@ -527,7 +534,7 @@ export default Em.Component.extend({
   },
 
   groupFinder(term) {
-    return Group.findAll({search: term, ignore_automatic: false});
+    return Group.findAll({ term: term, ignore_automatic: false });
   },
 
   badgeFinder(term) {
diff --git a/app/assets/javascripts/discourse/components/tag-drop.js.es6 b/app/assets/javascripts/discourse/components/tag-drop.js.es6
index 61e287dc88..698106c061 100644
--- a/app/assets/javascripts/discourse/components/tag-drop.js.es6
+++ b/app/assets/javascripts/discourse/components/tag-drop.js.es6
@@ -21,9 +21,8 @@ export default Ember.Component.extend({
   },
 
   @computed('expanded')
-  iconClass() {
-    if (this.get('expanded')) { return "fa fa-caret-down"; }
-    return "fa fa-caret-right";
+  expandedIcon(expanded) {
+    return expanded ? 'caret-down' : 'caret-right';
   },
 
   @computed('tagId')
@@ -70,7 +69,7 @@ export default Ember.Component.extend({
 
   @computed('tag')
   dropdownButtonClass() {
-    var result = 'badge-category category-dropdown-button';
+    let result = 'dropdown-header category-dropdown-button';
     if (Em.isNone(this.get('tag'))) {
       result += ' home';
     }
diff --git a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
index 6d1c7ae7b3..13640fde77 100644
--- a/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/tags-admin-dropdown.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import DropdownButton from 'discourse/components/dropdown-button';
 import computed from "ember-addons/ember-computed-decorators";
 
@@ -14,7 +14,7 @@ export default DropdownButton.extend({
       { id: 'manageGroups',
         title: I18n.t('tagging.manage_groups'),
         description: I18n.t('tagging.manage_groups_description'),
-        styleClasses: 'fa fa-wrench' }
+        icon: 'wrench' }
     ];
     return items;
   },
diff --git a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
index d5370e416e..0e2329fb4c 100644
--- a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import Combobox from 'discourse-common/components/combo-box';
 import { observes } from 'ember-addons/ember-computed-decorators';
 
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index bede7d57a6..f1c8695dfd 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import { escapeExpression } from 'discourse/lib/utilities';
 
@@ -8,7 +8,7 @@ export default Ember.Component.extend(bufferedRender({
   rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
 
   click(e) {
-    if ($(e.target).hasClass('fa-thumb-tack')) {
+    if ($(e.target).hasClass('d-icon-thumb-tack')) {
       const topic = this.get('topic');
 
       // only pin unpin for now
diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
index 8cb29a0b21..252b42732d 100644
--- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { bufferedRender } from 'discourse-common/lib/buffered-render';
 import Category from 'discourse/models/category';
 
@@ -35,7 +36,7 @@ export default Ember.Component.extend(bufferedRender({
 
     let autoCloseHours = this.get("duration") || 0;
 
-    buffer.push('<h3><i class="fa fa-clock-o"></i> ');
+    buffer.push(`<h3>${iconHTML('clock-o')} `);
 
     let options = {
       timeLeft: duration.humanize(true),
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 6c10b0b1dc..af23cb7d43 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -277,7 +277,17 @@ export default Ember.Controller.extend({
 
     // Toggle the reply view
     toggle() {
-      this.toggle();
+      this.closeAutocomplete();
+      if (this.get('model.composeState') === Composer.OPEN) {
+        if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
+          this.close();
+        } else {
+          this.shrink();
+        }
+      } else {
+        this.close();
+      }
+      return false;
     },
 
     togglePreview() {
@@ -330,6 +340,11 @@ export default Ember.Controller.extend({
     },
 
     hitEsc() {
+      if (Ember.$(".emoji-picker-modal").length === 1) {
+        this.appEvents.trigger('emoji-picker:close');
+        return;
+      }
+
       if ((this.get('messageCount') || 0) > 0) {
         this.appEvents.trigger('composer-messages:close');
         return;
@@ -385,20 +400,6 @@ export default Ember.Controller.extend({
     return Discourse.Category.list();
   }.property(),
 
-  toggle() {
-    this.closeAutocomplete();
-    if (this.get('model.composeState') === Composer.OPEN) {
-      if (Ember.isEmpty(this.get('model.reply')) && Ember.isEmpty(this.get('model.title'))) {
-        this.close();
-      } else {
-        this.shrink();
-      }
-    } else {
-      this.close();
-    }
-    return false;
-  },
-
   disableSubmit: Ember.computed.or("model.loading", "isUploading"),
 
   save(force) {
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index 01095e6a2d..edfa635975 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
 import ActionSummary from 'discourse/models/action-summary';
 import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
@@ -83,9 +84,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
 
   submitText: function(){
     if (this.get('selected.is_custom_flag')) {
-      return "<i class='fa fa-envelope'></i>" + (I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action"));
+      return iconHTML('envelope') + (I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action"));
     } else {
-      return "<i class='fa fa-flag'></i>" + (I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action"));
+      return iconHTML('flag') + (I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action"));
     }
   }.property('selected.is_custom_flag'),
 
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 d85760f632..f3da3585d3 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -4,7 +4,7 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor
 import Category from 'discourse/models/category';
 import { escapeExpression } from 'discourse/lib/utilities';
 import { setTransient } from 'discourse/lib/page-tracker';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 const SortOrders = [
   {name: I18n.t('search.relevance'), id: 0},
@@ -14,12 +14,13 @@ const SortOrders = [
   {name: I18n.t('search.latest_topic'), id: 4, term: 'order:latest_topic'},
 
 ];
+const PAGE_LIMIT = 10;
 
 export default Ember.Controller.extend({
   application: Ember.inject.controller(),
   bulkSelectEnabled: null,
 
-  loading: Em.computed.not("model"),
+  loading: false,
   queryParams: ["q", "expanded", "context_id", "context", "skip_context"],
   q: null,
   selected: [],
@@ -30,11 +31,8 @@ export default Ember.Controller.extend({
   sortOrder: 0,
   sortOrders: SortOrders,
   invalidSearch: false,
-
-  @computed('model.posts')
-  resultCount(posts) {
-    return posts && posts.length;
-  },
+  page: 1,
+  resultCount: null,
 
   @computed('resultCount')
   hasResults(resultCount) {
@@ -113,6 +111,7 @@ export default Ember.Controller.extend({
   @observes('sortOrder')
   triggerSearch() {
     if (this._searchOnSortChange) {
+      this.set("page", 1);
       this._search();
     }
   },
@@ -143,6 +142,11 @@ export default Ember.Controller.extend({
     this.set("application.showFooter", !this.get("loading"));
   },
 
+  @observes('model.posts.length')
+  resultCountChanged() {
+    this.set("resultCount", this.get("model.posts.length"));
+  },
+
   @computed('hasResults')
   canBulkSelect(hasResults) {
     return this.currentUser && this.currentUser.staff && hasResults;
@@ -158,6 +162,11 @@ export default Ember.Controller.extend({
     return iconHTML(expanded ? "caret-down" : "caret-right");
   },
 
+  @computed('page')
+  isLastPage(page) {
+    return page === PAGE_LIMIT;
+  },
+
   _search() {
     if (this.get("searching")) { return; }
 
@@ -169,10 +178,11 @@ export default Ember.Controller.extend({
     }
 
     this.set("searching", true);
+    this.set("loading", true);
     this.set('bulkSelectEnabled', false);
     this.get('selected').clear();
 
-    var args = { q: searchTerm };
+    var args = { q: searchTerm, page: this.get('page') };
 
     const sortOrder = this.get("sortOrder");
     if (sortOrder && SortOrders[sortOrder].term) {
@@ -180,7 +190,6 @@ export default Ember.Controller.extend({
     }
 
     this.set("q", args.q);
-    this.set("model", null);
 
     const skip = this.get("skip_context");
     if ((!skip && this.get('context')) || skip==="false"){
@@ -199,9 +208,20 @@ export default Ember.Controller.extend({
         this.set('q', results.grouped_search_result.term);
       }
 
-      setTransient('lastSearch', { searchKey, model }, 5);
-      this.set("model", model);
-    }).finally(() => this.set("searching", 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);
+        this.set("model", model);
+      }
+    }).finally(() => {
+      this.set("searching", false);
+      this.set("loading", false);
+    });
   },
 
   actions: {
@@ -227,11 +247,20 @@ export default Ember.Controller.extend({
     },
 
     search() {
+      this.set("page", 1);
       this._search();
     },
 
     toggleAdvancedSearch() {
       this.toggleProperty('expanded');
-    }
+    },
+
+    loadMore() {
+      var page = this.get('page');
+      if (this.get('model.grouped_search_result.more_full_page_results') && !this.get("loading") && page < PAGE_LIMIT){
+        this.incrementProperty("page");
+        this._search();
+      }
+    },
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/group.js.es6 b/app/assets/javascripts/discourse/controllers/group.js.es6
index 09466b4c4f..d38f15290e 100644
--- a/app/assets/javascripts/discourse/controllers/group.js.es6
+++ b/app/assets/javascripts/discourse/controllers/group.js.es6
@@ -48,6 +48,11 @@ export default Ember.Controller.extend({
     };
   },
 
+  @computed("model.mentionable")
+  displayGroupMessageButton(mentionable) {
+    return this.currentUser && mentionable;
+  },
+
   @observes('model.user_count')
   _setMembersTabCount() {
     this.get('tabs')[0].set('count', this.get('model.user_count'));
@@ -66,5 +71,11 @@ export default Ember.Controller.extend({
 
       return canSee;
     });
+  },
+
+  actions: {
+    messageGroup() {
+      this.send('createNewMessageViaParams', this.get('model.name'));
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/controllers/invite.js.es6 b/app/assets/javascripts/discourse/controllers/invite.js.es6
index f9d4d52dcd..71509d9e13 100644
--- a/app/assets/javascripts/discourse/controllers/invite.js.es6
+++ b/app/assets/javascripts/discourse/controllers/invite.js.es6
@@ -13,6 +13,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
   hasCustomMessage: false,
   customMessage: null,
   inviteIcon: "envelope",
+  invitingExistingUserToTopic: false,
 
   @computed('isMessage', 'invitingToTopic')
   title(isMessage, invitingToTopic) {
@@ -25,9 +26,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  isAdmin: function(){
-    return Discourse.User.currentProp("admin");
-  }.property(),
+  @computed
+  isAdmin() {
+    return this.currentUser.admin;
+  },
 
   @computed('isAdmin', 'emailOrUsername', 'invitingToTopic', 'isPrivateTopic', 'model.groupNames', 'model.saving', 'model.details.can_invite_to')
   disabled(isAdmin, emailOrUsername, invitingToTopic, isPrivateTopic, groupNames, saving, can_invite_to) {
@@ -46,29 +48,32 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return false;
   },
 
-  disabledCopyLink: function() {
-    if (this.get('hasCustomMessage')) return true;
-    if (this.get('model.saving')) return true;
-    if (Ember.isEmpty(this.get('emailOrUsername'))) return true;
-    const emailOrUsername = this.get('emailOrUsername').trim();
+  @computed('isAdmin', 'emailOrUsername', 'model.saving', 'isPrivateTopic', 'model.groupNames', 'hasCustomMessage')
+  disabledCopyLink(isAdmin, emailOrUsername, saving, isPrivateTopic, groupNames, hasCustomMessage) {
+    if (hasCustomMessage) return true;
+    if (saving) return true;
+    if (Ember.isEmpty(emailOrUsername)) return true;
+    const email = emailOrUsername.trim();
     // email must be valid
-    if (!emailValid(emailOrUsername)) return true;
+    if (!emailValid(email)) return true;
     // normal users (not admin) can't invite users to private topic via email
-    if (!this.get('isAdmin') && this.get('isPrivateTopic') && emailValid(emailOrUsername)) return true;
+    if (!isAdmin && isPrivateTopic && emailValid(email)) return true;
     // when inviting to private topic via email, group name must be specified
-    if (this.get('isPrivateTopic') && Ember.isEmpty(this.get('model.groupNames')) && emailValid(emailOrUsername)) return true;
+    if (isPrivateTopic && Ember.isEmpty(groupNames) && emailValid(email)) return true;
     return false;
-  }.property('emailOrUsername', 'model.saving', 'isPrivateTopic', 'model.groupNames', 'hasCustomMessage'),
+  },
 
-  buttonTitle: function() {
-    return this.get('model.saving') ? 'topic.inviting' : 'topic.invite_reply.action';
-  }.property('model.saving'),
+  @computed('model.saving')
+  buttonTitle(saving) {
+    return saving ? 'topic.inviting' : 'topic.invite_reply.action';
+  },
 
   // We are inviting to a topic if the model isn't the current user.
   // The current user would mean we are inviting to the forum in general.
-  invitingToTopic: function() {
-    return this.get('model') !== this.currentUser;
-  }.property('model'),
+  @computed('model')
+  invitingToTopic(model) {
+    return model !== this.currentUser;
+  },
 
   @computed('model', 'model.details.can_invite_via_email')
   canInviteViaEmail(model, can_invite_via_email) {
@@ -91,14 +96,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
   isMessage: Em.computed.equal('model.archetype', 'private_message'),
 
   // Allow Existing Members? (username autocomplete)
-  allowExistingMembers: function() {
-    return this.get('invitingToTopic');
-  }.property('invitingToTopic'),
+  allowExistingMembers: Ember.computed.alias('invitingToTopic'),
+
+  @computed("isAdmin", "model.group_users")
+  isGroupOwnerOrAdmin(isAdmin, groupUsers) {
+    return isAdmin || (groupUsers && groupUsers.some(groupUser => groupUser.owner));
+  },
 
   // Show Groups? (add invited user to private group)
-  @computed('isAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'canInviteViaEmail')
-  showGroups(isAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, canInviteViaEmail) {
-    return isAdmin &&
+  @computed('isGroupOwnerOrAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'canInviteViaEmail')
+  showGroups(isGroupOwnerOrAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, canInviteViaEmail) {
+    return isGroupOwnerOrAdmin &&
            canInviteViaEmail &&
            !isMessage &&
            (emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic);
@@ -141,29 +149,34 @@ export default Ember.Controller.extend(ModalFunctionality, {
     }
   },
 
-  showGroupsClass: function() {
-    return this.get('isPrivateTopic') ? 'required' : 'optional';
-  }.property('isPrivateTopic'),
-
-  groupFinder(term) {
-    return Group.findAll({search: term, ignore_automatic: true});
+  @computed('isPrivateTopic')
+  showGroupsClass(isPrivateTopic) {
+    return isPrivateTopic ? 'required' : 'optional';
   },
 
-  successMessage: function() {
+  groupFinder(term) {
+    return Group.findAll({ term: term, ignore_automatic: true });
+  },
+
+  @computed('isMessage', 'emailOrUsername', 'invitingExistingUserToTopic')
+  successMessage(isMessage, emailOrUsername, invitingExistingUserToTopic) {
     if (this.get('hasGroups')) {
       return I18n.t('topic.invite_private.success_group');
-    } else if (this.get('isMessage')) {
+    } else if (isMessage) {
       return I18n.t('topic.invite_private.success');
-    } else if ( emailValid(this.get('emailOrUsername')) ) {
-      return I18n.t('topic.invite_reply.success_email', { emailOrUsername: this.get('emailOrUsername') });
+    } else if (invitingExistingUserToTopic) {
+      return I18n.t('topic.invite_reply.success_existing_email', { emailOrUsername });
+    } else if (emailValid(emailOrUsername)) {
+      return I18n.t('topic.invite_reply.success_email', { emailOrUsername });
     } else {
       return I18n.t('topic.invite_reply.success_username');
     }
-  }.property('model.inviteLink', 'isMessage', 'emailOrUsername'),
+  },
 
-  errorMessage: function() {
-    return this.get('isMessage') ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error');
-  }.property('isMessage'),
+  @computed('isMessage')
+  errorMessage(isMessage) {
+    return isMessage ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error');
+  },
 
   @computed('canInviteViaEmail')
   placeholderKey(canInviteViaEmail) {
@@ -172,15 +185,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
             'topic.invite_reply.username_placeholder';
   },
 
-  customMessagePlaceholder: function() {
+  @computed
+  customMessagePlaceholder() {
     return I18n.t('invite.custom_message_placeholder');
-  }.property(),
+  },
 
   // Reset the modal to allow a new user to be invited.
   reset() {
     this.set('emailOrUsername', null);
     this.set('hasCustomMessage', false);
     this.set('customMessage', null);
+    this.set('invitingExistingUserToTopic', false);
     this.get('model').setProperties({
       groupNames: null,
       error: false,
@@ -189,6 +204,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
       inviteLink: null
     });
   },
+
   actions: {
 
     createInvite() {
@@ -230,6 +246,8 @@ export default Ember.Controller.extend(ModalFunctionality, {
               } else if (this.get('isMessage') && result && result.user) {
                 this.get('model.details.allowed_users').pushObject(Ember.Object.create(result.user));
                 this.appEvents.trigger('post-stream:refresh');
+              } else if (this.get('invitingToTopic') && emailValid(this.get('emailOrUsername').trim()) && result && result.user) {
+                this.set('invitingExistingUserToTopic', true);
               }
             }).catch(onerror);
       }
diff --git a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
index c7ba00e3e1..01996f3583 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/account.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import CanCheckEmails from 'discourse/mixins/can-check-emails';
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
@@ -81,7 +82,7 @@ export default Ember.Controller.extend(CanCheckEmails, PreferencesTabController,
             link:  true,
             callback: () => { this.set('deleting', false); }
           },
-          { label: '<i class="fa fa-exclamation-triangle"></i> ' + I18n.t("user.delete_account"),
+          { label: iconHTML('exclamation-triangle') + I18n.t("user.delete_account"),
             class: "btn btn-danger",
             callback() {
               model.delete().then(function() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
index fa7f7470b3..71d8265260 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/profile.js.es6
@@ -1,7 +1,7 @@
 import { default as computed } from "ember-addons/ember-computed-decorators";
 import PreferencesTabController from "discourse/mixins/preferences-tab-controller";
 import { popupAjaxError } from 'discourse/lib/ajax-error';
-import { cook } from 'discourse/lib/text';
+import { cookAsync } from 'discourse/lib/text';
 
 export default Ember.Controller.extend(PreferencesTabController, {
 
@@ -47,8 +47,6 @@ export default Ember.Controller.extend(PreferencesTabController, {
       const model = this.get('model'),
             userFields = this.get('userFields');
 
-      model.set('name', this.get('newNameInput'));
-
       // Update the user fields
       if (!Ember.isEmpty(userFields)) {
         const modelFields = model.get('user_fields');
@@ -59,9 +57,12 @@ export default Ember.Controller.extend(PreferencesTabController, {
         }
       }
 
+
       return model.save(this.get('saveAttrNames')).then(() => {
-        model.set('bio_cooked', cook(model.get('bio_raw')));
-        this.set('saved', true);
+        cookAsync(model.get('bio_raw')).then(()=>{
+          model.set('bio_cooked', );
+          this.set('saved', true);
+        }).catch(popupAjaxError);
       }).catch(popupAjaxError);
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index f015c94a02..a51d43fc35 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import BufferedContent from 'discourse/mixins/buffered-content';
 import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
 import { spinnerHTML } from 'discourse/helpers/loading-spinner';
@@ -113,7 +114,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
   @computed('model')
   suggestedTitle(model) {
     return model.get('isPrivateMessage') ?
-      `<a href="${this.get('pmPath')}"><i class='private-message-glyph fa fa-envelope'></i></a> ${I18n.t("suggested_topics.pm_title")}` :
+      `<a href="${this.get('pmPath')}">${iconHTML('envelope', { class: 'private-message-glyph' })}</a> ${I18n.t("suggested_topics.pm_title")}` :
       I18n.t("suggested_topics.title");
   },
 
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index 618eca3211..fc2524d033 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,5 +1,5 @@
 import { registerUnbound } from 'discourse-common/lib/helpers';
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 var get = Em.get,
     escapeExpression = Handlebars.Utils.escapeExpression;
@@ -24,20 +24,20 @@ export function categoryBadgeHTML(category, opts) {
 
   if ((!category) ||
         (!opts.allowUncategorized &&
-         Em.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id") &&
+         Ember.get(category, 'id') === Discourse.Site.currentProp("uncategorized_category_id") &&
          Discourse.SiteSettings.suppress_uncategorized_badge
         )
      ) return "";
 
-  var description = get(category, 'description_text'),
-      restricted = get(category, 'read_restricted'),
-      url = opts.url ? opts.url : Discourse.getURL("/c/") + Discourse.Category.slugFor(category),
-      href = (opts.link === false ? '' : url),
-      tagName = (opts.link === false || opts.link === "false" ? 'span' : 'a'),
-      extraClasses = (opts.extraClasses ? (' ' + opts.extraClasses) : ''),
-      color = get(category, 'color'),
-      html = "",
-      parentCat = null;
+  let description = get(category, 'description_text');
+  let restricted = get(category, 'read_restricted');
+  let url = opts.url ? opts.url : Discourse.getURL("/c/") + Discourse.Category.slugFor(category);
+  let href = (opts.link === false ? '' : url);
+  let tagName = (opts.link === false || opts.link === "false" ? 'span' : 'a');
+  let extraClasses = (opts.extraClasses ? (' ' + opts.extraClasses) : '');
+  let color = get(category, 'color');
+  let html = "";
+  let parentCat = null;
 
   if (!opts.hideParent) {
     parentCat = Discourse.Category.findById(get(category, 'parent_category_id'));
@@ -49,32 +49,36 @@ export function categoryBadgeHTML(category, opts) {
 
   html += categoryStripe(color, "badge-category-bg");
 
-  var classNames = "badge-category clear-badge";
+  let classNames = "badge-category clear-badge";
   if (restricted) { classNames += " restricted"; }
 
-  var textColor = "#" + get(category, 'text_color');
+  const categoryStyle = Discourse.SiteSettings.category_style;
 
-  html += "<span" + ' style="color: ' + textColor + ';" '+
+  let style = "";
+  if (categoryStyle === "box") {
+    style = `style="color: #${get(category, 'text_color')};"`;
+  }
+
+  html += `<span ${style} ` +
              'data-drop-close="true" class="' + classNames + '"' +
              (description ? 'title="' + escapeExpression(description) + '" ' : '') +
           ">";
 
-  var name = escapeExpression(get(category, 'name'));
+  let categoryName = escapeExpression(get(category, 'name'));
 
   if (restricted) {
-    html += iconHTML('lock') + " " + name;
+    html += iconHTML('lock') + " " + categoryName;
   } else {
-    html += name;
+    html += categoryName;
   }
   html += "</span>";
 
-  if(href){
-    href = " href='" + href + "' ";
+  if (href) {
+    href = ` href="${href}" `;
   }
 
-  extraClasses = Discourse.SiteSettings.category_style ? Discourse.SiteSettings.category_style + extraClasses : extraClasses;
-
-  return "<" + tagName + " class='badge-wrapper " + extraClasses + "' " + href + ">" + html + "</" + tagName + ">";
+  extraClasses = categoryStyle ? categoryStyle + extraClasses : extraClasses;
+  return `<${tagName} class="badge-wrapper ${extraClasses}" ${href}>${html}</${tagName}>`;
 }
 
 export function categoryLinkHTML(category, options) {
diff --git a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6 b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
index 84f1542025..9b5d989f5a 100644
--- a/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
+++ b/app/assets/javascripts/discourse/helpers/fa-icon-node.js.es6
@@ -1,20 +1,5 @@
-import { h } from 'virtual-dom';
-import { iconClasses } from 'discourse-common/helpers/fa-icon';
+import { renderIcon } from 'discourse-common/lib/icon-library';
 
-export function iconNode(icon, params) {
-  params = params ||  {};
-
-  const properties = {
-    className: iconClasses(icon, params),
-    attributes: { "aria-hidden": true }
-  };
-
-  if (params.title) { properties.attributes.title = params.title; }
-
-  if (params.label) {
-    return h('i', properties, h('span.sr-only', I18n.t(params.label)));
-  } else {
-    return h('i', properties);
-  }
+export function iconNode(id, params) {
+  return renderIcon('node', id, params);
 }
-
diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
index f673bb8cda..d5439c7323 100644
--- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
+++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6
@@ -1,6 +1,7 @@
 import { htmlHelper } from 'discourse-common/lib/helpers';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 
 export default htmlHelper(function(str) {
   if (Ember.isEmpty(str)) { return ""; }
-  return (str.indexOf('fa-') === 0) ? `<i class='fa ${str}'></i>` : `<img src='${str}'>`;
+  return (str.indexOf('fa-') === 0) ? iconHTML(str.replace('fa-', '')) : `<img src='${str}'>`;
 });
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index fb1a05efee..c1b64fe833 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -1,4 +1,4 @@
-import { iconHTML } from 'discourse-common/helpers/fa-icon';
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { htmlHelper } from 'discourse-common/lib/helpers';
 import { escapeExpression } from 'discourse/lib/utilities';
 
diff --git a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6 b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
index b793cb742c..943c330a10 100644
--- a/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
+++ b/app/assets/javascripts/discourse/initializers/auto-load-modules.js.es6
@@ -2,10 +2,10 @@ import { registerHelpers } from 'discourse-common/lib/helpers';
 
 export function autoLoadModules(container, registry) {
   Object.keys(requirejs.entries).forEach(entry => {
-    if ((/\/helpers\//).test(entry)) {
+    if ((/\/helpers\//).test(entry) && !(/-test/).test(entry)) {
       requirejs(entry, null, null, true);
     }
-    if ((/\/widgets\//).test(entry)) {
+    if ((/\/widgets\//).test(entry) && !(/-test/).test(entry)) {
       requirejs(entry, null, null, true);
     }
   });
diff --git a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6 b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
index 33a2e389a4..53764e0882 100644
--- a/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
+++ b/app/assets/javascripts/discourse/initializers/sharing-sources.js.es6
@@ -6,7 +6,7 @@ export default {
   initialize: function() {
     Sharing.addSource({
       id: 'twitter',
-      faIcon: 'fa-twitter-square',
+      icon: 'twitter-square',
       generateUrl: function(link, title) {
         return "http://twitter.com/intent/tweet?url=" + encodeURIComponent(link) + "&text=" + encodeURIComponent(title);
       },
@@ -17,7 +17,7 @@ export default {
 
     Sharing.addSource({
       id: 'facebook',
-      faIcon: 'fa-facebook-square',
+      icon: 'facebook-square',
       title: I18n.t('share.facebook'),
       generateUrl: function(link, title) {
         return "http://www.facebook.com/sharer.php?u=" + encodeURIComponent(link) + '&t=' + encodeURIComponent(title);
@@ -27,7 +27,7 @@ export default {
 
     Sharing.addSource({
       id: 'google+',
-      faIcon: 'fa-google-plus-square',
+      icon: 'google-plus-square',
       title: I18n.t('share.google+'),
       generateUrl: function(link) {
         return "https://plus.google.com/share?url=" + encodeURIComponent(link);
@@ -38,7 +38,7 @@ export default {
 
     Sharing.addSource({
       id: 'email',
-      faIcon: 'fa-envelope-square',
+      icon: 'envelope-square',
       title: I18n.t('share.email'),
       generateUrl: function(link, title) {
         return "mailto:?to=&subject=" + encodeURIComponent('[' + Discourse.SiteSettings.title + '] ' + title) + "&body=" + encodeURIComponent(link);
diff --git a/app/assets/javascripts/discourse/lib/after-transition.js.es6 b/app/assets/javascripts/discourse/lib/after-transition.js.es6
index 11fe20b5e4..afa1700e6d 100644
--- a/app/assets/javascripts/discourse/lib/after-transition.js.es6
+++ b/app/assets/javascripts/discourse/lib/after-transition.js.es6
@@ -25,5 +25,8 @@ var transitionEnd = (function() {
 })();
 
 export default function (element, callback) {
-  return $(element).on(transitionEnd, callback);
+  return $(element).on(transitionEnd, event => {
+    if (event.target !== event.currentTarget) return;
+    return callback(event);
+  });
 }
diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
index 4ce4adb6ee..f738b69518 100644
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@@ -3,6 +3,7 @@
 
   @module $.fn.autocomplete
 **/
+import { iconHTML } from 'discourse-common/lib/icon-library';
 export const CANCELLED_STATUS = "__CANCELLED";
 import { setCaretPosition, caretPosition } from 'discourse/lib/utilities';
 
@@ -105,7 +106,7 @@ export default function(options) {
     transformed = _.isArray(transformedItem) ? transformedItem : [transformedItem || item];
 
     const divs = transformed.map(itm => {
-      let d = $(`<div class='item'><span>${itm}<a class='remove' href><i class='fa fa-times'></i></a></span></div>`);
+      let d = $(`<div class='item'><span>${itm}<a class='remove' href>${iconHTML('times')}</a></span></div>`);
       const $parent = me.parent();
       const prev = $parent.find('.item:last');
 
diff --git a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6 b/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
deleted file mode 100644
index 6f2eaf2802..0000000000
--- a/app/assets/javascripts/discourse/lib/emoji/groups.js.es6
+++ /dev/null
@@ -1,1555 +0,0 @@
-// This file is generated by emoji.rake do not modify directly
-
-// note that these categories are copied from Slack
-const groups = [
-  {
-    "name": "people",
-    "fullname": "People",
-    "tabicon": "grinning",
-    "icons": [
-      "grinning",
-      "grin",
-      "joy",
-      "rofl",
-      "smiley",
-      "smile",
-      "sweat_smile",
-      "laughing",
-      "wink",
-      "blush",
-      "yum",
-      "sunglasses",
-      "heart_eyes",
-      "kissing_heart",
-      "kissing",
-      "kissing_smiling_eyes",
-      "kissing_closed_eyes",
-      "relaxed",
-      "slightly_smiling_face",
-      "hugs",
-      "star_struck",
-      "thinking",
-      "face_with_raised_eyebrow",
-      "neutral_face",
-      "expressionless",
-      "no_mouth",
-      "roll_eyes",
-      "smirk",
-      "persevere",
-      "disappointed_relieved",
-      "open_mouth",
-      "zipper_mouth_face",
-      "hushed",
-      "sleepy",
-      "tired_face",
-      "sleeping",
-      "relieved",
-      "stuck_out_tongue",
-      "stuck_out_tongue_winking_eye",
-      "stuck_out_tongue_closed_eyes",
-      "drooling_face",
-      "unamused",
-      "sweat",
-      "pensive",
-      "confused",
-      "upside_down_face",
-      "money_mouth_face",
-      "astonished",
-      "frowning_face",
-      "slightly_frowning_face",
-      "confounded",
-      "disappointed",
-      "worried",
-      "triumph",
-      "cry",
-      "sob",
-      "frowning",
-      "anguished",
-      "fearful",
-      "weary",
-      "exploding_head",
-      "grimacing",
-      "cold_sweat",
-      "scream",
-      "flushed",
-      "crazy_face",
-      "dizzy_face",
-      "rage",
-      "angry",
-      "face_with_symbols_over_mouth",
-      "mask",
-      "face_with_thermometer",
-      "face_with_head_bandage",
-      "nauseated_face",
-      "face_vomiting",
-      "sneezing_face",
-      "innocent",
-      "cowboy_hat_face",
-      "clown_face",
-      "lying_face",
-      "sushing_face",
-      "face_with_hand_over_mouth",
-      "face_with_monocle",
-      "nerd_face",
-      "smiling_imp",
-      "imp",
-      "japanese_ogre",
-      "japanese_goblin",
-      "skull",
-      "skull_and_crossbones",
-      "ghost",
-      "alien",
-      "space_invader",
-      "robot",
-      "poop",
-      "smiley_cat",
-      "smile_cat",
-      "joy_cat",
-      "heart_eyes_cat",
-      "smirk_cat",
-      "kissing_cat",
-      "scream_cat",
-      "crying_cat_face",
-      "pouting_cat",
-      "see_no_evil",
-      "hear_no_evil",
-      "speak_no_evil",
-      "baby",
-      "child",
-      "boy",
-      "girl",
-      "adult",
-      "man",
-      "woman",
-      "older_adult",
-      "older_man",
-      "older_woman",
-      "man_health_worker",
-      "woman_health_worker",
-      "man_student",
-      "woman_student",
-      "man_teacher",
-      "woman_teacher",
-      "man_judge",
-      "woman_judge",
-      "man_farmer",
-      "woman_farmer",
-      "man_cook",
-      "woman_cook",
-      "man_mechanic",
-      "woman_mechanic",
-      "man_factory_worker",
-      "woman_factory_worker",
-      "man_office_worker",
-      "woman_office_worker",
-      "man_scientist",
-      "woman_scientist",
-      "man_technologist",
-      "woman_technologist",
-      "man_singer",
-      "woman_singer",
-      "man_artist",
-      "woman_artist",
-      "man_pilot",
-      "woman_pilot",
-      "man_astronaut",
-      "woman_astronaut",
-      "man_firefighter",
-      "woman_firefighter",
-      "policeman",
-      "policewoman",
-      "male_detective",
-      "female_detective",
-      "guardsman",
-      "guardswoman",
-      "construction_worker_man",
-      "construction_worker_woman",
-      "prince",
-      "princess",
-      "man_with_turban",
-      "woman_with_turban",
-      "man_with_gua_pi_mao",
-      "woman_with_headscarf",
-      "bearded_person",
-      "blonde_man",
-      "blonde_woman",
-      "man_in_tuxedo",
-      "bride_with_veil",
-      "pregnant_woman",
-      "breast_feeding",
-      "angel",
-      "santa",
-      "mrs_claus",
-      "mage",
-      "fairy",
-      "vampire",
-      "merperson",
-      "elf",
-      "genie",
-      "zombie",
-      "frowning_woman",
-      "frowning_man",
-      "pouting_woman",
-      "pouting_man",
-      "no_good_woman",
-      "no_good_man",
-      "ok_woman",
-      "ok_man",
-      "tipping_hand_woman",
-      "tipping_hand_man",
-      "raising_hand_woman",
-      "raising_hand_man",
-      "bowing_man",
-      "bowing_woman",
-      "man_facepalming",
-      "woman_facepalming",
-      "man_shrugging",
-      "woman_shrugging",
-      "couple",
-      "two_men_holding_hands",
-      "two_women_holding_hands",
-      "couplekiss_man_woman",
-      "couplekiss_man_man",
-      "couplekiss_woman_woman",
-      "couple_with_heart_woman_man",
-      "couple_with_heart_man_man",
-      "couple_with_heart_woman_woman",
-      "family_man_woman_boy",
-      "family_man_woman_girl",
-      "family_man_woman_girl_boy",
-      "family_man_woman_boy_boy",
-      "family_man_woman_girl_girl",
-      "family_man_man_boy",
-      "family_man_man_girl",
-      "family_man_man_girl_boy",
-      "family_man_man_boy_boy",
-      "family_man_man_girl_girl",
-      "family_woman_woman_boy",
-      "family_woman_woman_girl",
-      "family_woman_woman_girl_boy",
-      "family_woman_woman_boy_boy",
-      "family_woman_woman_girl_girl",
-      "family_man_boy",
-      "family_man_boy_boy",
-      "family_man_girl",
-      "family_man_girl_boy",
-      "family_man_girl_girl",
-      "family_woman_boy",
-      "family_woman_boy_boy",
-      "family_woman_girl",
-      "family_woman_girl_boy",
-      "family_woman_girl_girl",
-      "selfie",
-      "muscle",
-      "point_left",
-      "point_right",
-      "point_up",
-      "point_up_2",
-      "fu",
-      "point_down",
-      "v",
-      "crossed_fingers",
-      "vulcan_salute",
-      "metal",
-      "call_me_hand",
-      "raised_hand_with_fingers_splayed",
-      "raised_hand",
-      "ok_hand",
-      "+1",
-      "-1",
-      "fist",
-      "facepunch",
-      "fist_left",
-      "fist_right",
-      "raised_back_of_hand",
-      "wave",
-      "love_you_gesture",
-      "writing_hand",
-      "clap",
-      "open_hands",
-      "raised_hands",
-      "palms_up_together",
-      "pray",
-      "handshake",
-      "nail_care",
-      "ear",
-      "nose",
-      "footprints",
-      "eyes",
-      "eye",
-      "brain",
-      "tongue",
-      "lips"
-    ]
-  },
-  {
-    "name": "nature",
-    "fullname": "Nature",
-    "tabicon": "evergreen_tree",
-    "icons": [
-      "monkey_face",
-      "monkey",
-      "gorilla",
-      "dog",
-      "dog2",
-      "poodle",
-      "wolf",
-      "fox_face",
-      "cat",
-      "cat2",
-      "lion",
-      "tiger",
-      "tiger2",
-      "leopard",
-      "horse",
-      "racehorse",
-      "unicorn",
-      "zebra",
-      "deer",
-      "cow",
-      "ox",
-      "water_buffalo",
-      "cow2",
-      "pig",
-      "pig2",
-      "boar",
-      "pig_nose",
-      "ram",
-      "sheep",
-      "goat",
-      "dromedary_camel",
-      "camel",
-      "giraffe",
-      "elephant",
-      "rhinoceros",
-      "mouse",
-      "mouse2",
-      "rat",
-      "hamster",
-      "rabbit",
-      "rabbit2",
-      "chipmunk",
-      "hedgehog",
-      "bat",
-      "bear",
-      "koala",
-      "panda_face",
-      "paw_prints",
-      "turkey",
-      "chicken",
-      "rooster",
-      "hatching_chick",
-      "baby_chick",
-      "hatched_chick",
-      "bird",
-      "penguin",
-      "dove",
-      "eagle",
-      "duck",
-      "owl",
-      "frog",
-      "crocodile",
-      "turtle",
-      "lizard",
-      "snake",
-      "dragon_face",
-      "dragon",
-      "sauropod",
-      "t_rex",
-      "whale",
-      "whale2",
-      "dolphin",
-      "fish",
-      "tropical_fish",
-      "blowfish",
-      "shark",
-      "octopus",
-      "shell",
-      "crab",
-      "shrimp",
-      "squid",
-      "snail",
-      "butterfly",
-      "bug",
-      "ant",
-      "honeybee",
-      "beetle",
-      "cricket",
-      "spider",
-      "spider_web",
-      "scorpion",
-      "bouquet",
-      "cherry_blossom",
-      "white_flower",
-      "rosette",
-      "rose",
-      "wilted_flower",
-      "hibiscus",
-      "sunflower",
-      "blossom",
-      "tulip",
-      "seedling",
-      "evergreen_tree",
-      "deciduous_tree",
-      "palm_tree",
-      "cactus",
-      "ear_of_rice",
-      "herb",
-      "shamrock",
-      "four_leaf_clover",
-      "maple_leaf",
-      "fallen_leaf",
-      "leaves",
-      "new_moon",
-      "waxing_crescent_moon",
-      "first_quarter_moon",
-      "waxing_gibbous_moon",
-      "full_moon",
-      "waning_gibbous_moon",
-      "last_quarter_moon",
-      "waning_crescent_moon",
-      "crescent_moon",
-      "new_moon_with_face",
-      "first_quarter_moon_with_face",
-      "last_quarter_moon_with_face",
-      "thermometer",
-      "sunny",
-      "full_moon_with_face",
-      "sun_with_face",
-      "star",
-      "star2",
-      "stars",
-      "cloud",
-      "partly_sunny",
-      "cloud_with_lightning_and_rain",
-      "sun_behind_small_cloud",
-      "sun_behind_large_cloud",
-      "sun_behind_rain_cloud",
-      "cloud_with_rain",
-      "cloud_with_snow",
-      "cloud_with_lightning",
-      "tornado",
-      "fog",
-      "wind_face",
-      "cyclone",
-      "rainbow",
-      "closed_umbrella",
-      "open_umbrella",
-      "umbrella",
-      "parasol_on_ground",
-      "zap",
-      "snowflake",
-      "snowman_with_snow",
-      "snowman",
-      "comet",
-      "fire",
-      "droplet",
-      "ocean"
-    ]
-  },
-  {
-    "name": "food",
-    "fullname": "Food & Drink",
-    "tabicon": "hamburger",
-    "icons": [
-      "grapes",
-      "melon",
-      "watermelon",
-      "tangerine",
-      "lemon",
-      "banana",
-      "pineapple",
-      "apple",
-      "green_apple",
-      "pear",
-      "peach",
-      "cherries",
-      "strawberry",
-      "kiwi_fruit",
-      "tomato",
-      "coconut",
-      "avocado",
-      "eggplant",
-      "potato",
-      "carrot",
-      "corn",
-      "hot_pepper",
-      "cucumber",
-      "broccoli",
-      "mushroom",
-      "peanuts",
-      "chestnut",
-      "bread",
-      "croissant",
-      "baguette_bread",
-      "pretzel",
-      "pancakes",
-      "cheese",
-      "meat_on_bone",
-      "poultry_leg",
-      "cut_of_meat",
-      "bacon",
-      "hamburger",
-      "fries",
-      "pizza",
-      "hotdog",
-      "sandwich",
-      "taco",
-      "burrito",
-      "stuffed_flatbread",
-      "egg",
-      "fried_egg",
-      "shallow_pan_of_food",
-      "stew",
-      "bowl_with_spoon",
-      "green_salad",
-      "popcorn",
-      "canned_food",
-      "bento",
-      "rice_cracker",
-      "rice_ball",
-      "rice",
-      "curry",
-      "ramen",
-      "spaghetti",
-      "sweet_potato",
-      "oden",
-      "sushi",
-      "fried_shrimp",
-      "fish_cake",
-      "dango",
-      "dumpling",
-      "fortune_cookie",
-      "takeout_box",
-      "icecream",
-      "shaved_ice",
-      "ice_cream",
-      "doughnut",
-      "cookie",
-      "birthday",
-      "cake",
-      "pie",
-      "chocolate_bar",
-      "candy",
-      "lollipop",
-      "custard",
-      "honey_pot",
-      "baby_bottle",
-      "milk_glass",
-      "coffee",
-      "tea",
-      "sake",
-      "champagne",
-      "wine_glass",
-      "cocktail",
-      "tropical_drink",
-      "beer",
-      "beers",
-      "clinking_glasses",
-      "tumbler_glass",
-      "cup_with_straw",
-      "chopsticks",
-      "plate_with_cutlery",
-      "fork_and_knife",
-      "spoon",
-      "hocho",
-      "amphora"
-    ]
-  },
-  {
-    "name": "celebration",
-    "fullname": "Celebration",
-    "tabicon": "gift",
-    "icons": [
-      "jack_o_lantern",
-      "christmas_tree",
-      "fireworks",
-      "sparkler",
-      "sparkles",
-      "balloon",
-      "tada",
-      "confetti_ball",
-      "tanabata_tree",
-      "bamboo",
-      "dolls",
-      "flags",
-      "wind_chime",
-      "rice_scene",
-      "ribbon",
-      "gift",
-      "reminder_ribbon",
-      "tickets",
-      "ticket",
-      "kiss",
-      "cupid",
-      "heart",
-      "heartbeat",
-      "broken_heart",
-      "two_hearts",
-      "sparkling_heart",
-      "heartpulse",
-      "blue_heart",
-      "green_heart",
-      "yellow_heart",
-      "orange_heart",
-      "purple_heart",
-      "black_heart",
-      "gift_heart",
-      "revolving_hearts",
-      "heart_decoration",
-      "heavy_heart_exclamation",
-      "love_letter",
-      "zzz",
-      "anger",
-      "bomb",
-      "boom",
-      "sweat_drops",
-      "dash",
-      "dizzy",
-      "speech_balloon",
-      "left_speech_bubble",
-      "right_anger_bubble",
-      "thought_balloon",
-      "hole"
-    ]
-  },
-  {
-    "name": "activity",
-    "fullname": "Activities",
-    "tabicon": "soccer",
-    "icons": [
-      "massage_woman",
-      "massage_man",
-      "haircut_woman",
-      "haircut_man",
-      "walking_man",
-      "walking_woman",
-      "running_man",
-      "running_woman",
-      "dancer",
-      "man_dancing",
-      "dancing_women",
-      "dancing_men",
-      "person_in_steamy_room",
-      "person_climbing",
-      "person_in_lotus_position",
-      "bath",
-      "sleeping_bed",
-      "business_suit_levitating",
-      "speaking_head",
-      "bust_in_silhouette",
-      "busts_in_silhouette",
-      "person_fencing",
-      "horse_racing",
-      "skier",
-      "snowboarder",
-      "golfing_man",
-      "golfing_woman",
-      "surfing_man",
-      "surfing_woman",
-      "rowing_man",
-      "rowing_woman",
-      "swimming_man",
-      "swimming_woman",
-      "basketball_man",
-      "basketball_woman",
-      "weight_lifting_man",
-      "weight_lifting_woman",
-      "biking_man",
-      "biking_woman",
-      "mountain_biking_man",
-      "mountain_biking_woman",
-      "racing_car",
-      "motorcycle",
-      "man_cartwheeling",
-      "woman_cartwheeling",
-      "men_wrestling",
-      "women_wrestling",
-      "man_playing_water_polo",
-      "woman_playing_water_polo",
-      "man_playing_handball",
-      "woman_playing_handball",
-      "man_juggling",
-      "woman_juggling",
-      "soccer",
-      "baseball",
-      "basketball",
-      "volleyball",
-      "football",
-      "rugby_football",
-      "tennis",
-      "8ball",
-      "bowling",
-      "cricket_bat_and_ball",
-      "field_hockey",
-      "ice_hockey",
-      "ping_pong",
-      "badminton",
-      "boxing_glove",
-      "martial_arts_uniform",
-      "goal_net",
-      "dart",
-      "golf",
-      "ice_skate",
-      "fishing_pole_and_fish",
-      "running_shirt_with_sash",
-      "ski",
-      "sled",
-      "curling_stone",
-      "video_game",
-      "joystick",
-      "game_die",
-      "spades",
-      "hearts",
-      "diamonds",
-      "clubs",
-      "black_joker",
-      "mahjong",
-      "flower_playing_cards",
-      "musical_score",
-      "musical_note",
-      "notes",
-      "studio_microphone",
-      "level_slider",
-      "control_knobs",
-      "microphone",
-      "headphones",
-      "radio",
-      "saxophone",
-      "guitar",
-      "musical_keyboard",
-      "trumpet",
-      "violin",
-      "drum"
-    ]
-  },
-  {
-    "name": "travel",
-    "fullname": "Travel & Places",
-    "tabicon": "airplane",
-    "icons": [
-      "earth_africa",
-      "earth_americas",
-      "earth_asia",
-      "globe_with_meridians",
-      "world_map",
-      "japan",
-      "mountain_snow",
-      "mountain",
-      "volcano",
-      "mount_fuji",
-      "camping",
-      "beach_umbrella",
-      "desert",
-      "desert_island",
-      "national_park",
-      "stadium",
-      "classical_building",
-      "building_construction",
-      "houses",
-      "cityscape",
-      "derelict_house",
-      "house",
-      "house_with_garden",
-      "office",
-      "post_office",
-      "european_post_office",
-      "hospital",
-      "bank",
-      "hotel",
-      "love_hotel",
-      "convenience_store",
-      "school",
-      "department_store",
-      "factory",
-      "japanese_castle",
-      "european_castle",
-      "wedding",
-      "tokyo_tower",
-      "statue_of_liberty",
-      "church",
-      "mosque",
-      "synagogue",
-      "shinto_shrine",
-      "kaaba",
-      "fountain",
-      "tent",
-      "foggy",
-      "night_with_stars",
-      "sunrise_over_mountains",
-      "sunrise",
-      "city_sunset",
-      "city_sunrise",
-      "bridge_at_night",
-      "hotsprings",
-      "milky_way",
-      "carousel_horse",
-      "ferris_wheel",
-      "roller_coaster",
-      "barber",
-      "circus_tent",
-      "performing_arts",
-      "framed_picture",
-      "art",
-      "slot_machine",
-      "steam_locomotive",
-      "railway_car",
-      "bullettrain_side",
-      "bullettrain_front",
-      "train2",
-      "metro",
-      "light_rail",
-      "station",
-      "tram",
-      "monorail",
-      "mountain_railway",
-      "train",
-      "bus",
-      "oncoming_bus",
-      "trolleybus",
-      "minibus",
-      "ambulance",
-      "fire_engine",
-      "police_car",
-      "oncoming_police_car",
-      "taxi",
-      "oncoming_taxi",
-      "red_car",
-      "oncoming_automobile",
-      "blue_car",
-      "truck",
-      "articulated_lorry",
-      "tractor",
-      "bike",
-      "kick_scooter",
-      "motor_scooter",
-      "busstop",
-      "motorway",
-      "railway_track",
-      "fuelpump",
-      "rotating_light",
-      "traffic_light",
-      "vertical_traffic_light",
-      "construction",
-      "stop_sign",
-      "anchor",
-      "sailboat",
-      "canoe",
-      "speedboat",
-      "passenger_ship",
-      "ferry",
-      "motor_boat",
-      "ship",
-      "airplane",
-      "small_airplane",
-      "flight_departure",
-      "flight_arrival",
-      "seat",
-      "helicopter",
-      "suspension_railway",
-      "mountain_cableway",
-      "aerial_tramway",
-      "artificial_satellite",
-      "rocket",
-      "flying_saucer",
-      "bellhop_bell",
-      "door",
-      "bed",
-      "couch_and_lamp",
-      "toilet",
-      "shower",
-      "bathtub",
-      "checkered_flag",
-      "triangular_flag_on_post",
-      "crossed_flags",
-      "black_flag",
-      "white_flag",
-      "rainbow_flag",
-      "ascension_island",
-      "andorra",
-      "united_arab_emirates",
-      "afghanistan",
-      "antigua_barbuda",
-      "anguilla",
-      "albania",
-      "armenia",
-      "angola",
-      "antarctica",
-      "argentina",
-      "american_samoa",
-      "austria",
-      "australia",
-      "aruba",
-      "aland_islands",
-      "azerbaijan",
-      "bosnia_herzegovina",
-      "barbados",
-      "bangladesh",
-      "belgium",
-      "burkina_faso",
-      "bulgaria",
-      "bahrain",
-      "burundi",
-      "benin",
-      "st_barthelemy",
-      "bermuda",
-      "brunei",
-      "bolivia",
-      "caribbean_netherlands",
-      "brazil",
-      "bahamas",
-      "bhutan",
-      "bouvet_island",
-      "botswana",
-      "belarus",
-      "belize",
-      "canada",
-      "cocos_islands",
-      "congo_kinshasa",
-      "central_african_republic",
-      "congo_brazzaville",
-      "switzerland",
-      "cote_divoire",
-      "cook_islands",
-      "chile",
-      "cameroon",
-      "cn",
-      "colombia",
-      "clipperton_island",
-      "costa_rica",
-      "cuba",
-      "cape_verde",
-      "curacao",
-      "christmas_island",
-      "cyprus",
-      "czech_republic",
-      "de",
-      "diego_garcia",
-      "djibouti",
-      "denmark",
-      "dominica",
-      "dominican_republic",
-      "algeria",
-      "ceuta_and_melilla",
-      "ecuador",
-      "estonia",
-      "egypt",
-      "western_sahara",
-      "eritrea",
-      "es",
-      "ethiopia",
-      "eu",
-      "finland",
-      "fiji",
-      "falkland_islands",
-      "micronesia",
-      "faroe_islands",
-      "fr",
-      "gabon",
-      "uk",
-      "grenada",
-      "georgia",
-      "french_guiana",
-      "guernsey",
-      "ghana",
-      "gibraltar",
-      "greenland",
-      "gambia",
-      "guinea",
-      "guadeloupe",
-      "equatorial_guinea",
-      "greece",
-      "south_georgia_south_sandwich_islands",
-      "guatemala",
-      "guam",
-      "guinea_bissau",
-      "guyana",
-      "hong_kong",
-      "heard_and_mc_donald_islands",
-      "honduras",
-      "croatia",
-      "haiti",
-      "hungary",
-      "canary_islands",
-      "indonesia",
-      "ireland",
-      "israel",
-      "isle_of_man",
-      "india",
-      "british_indian_ocean_territory",
-      "iraq",
-      "iran",
-      "iceland",
-      "it",
-      "jersey",
-      "jamaica",
-      "jordan",
-      "jp",
-      "kenya",
-      "kyrgyzstan",
-      "cambodia",
-      "kiribati",
-      "comoros",
-      "st_kitts_nevis",
-      "north_korea",
-      "kr",
-      "kuwait",
-      "cayman_islands",
-      "kazakhstan",
-      "laos",
-      "lebanon",
-      "st_lucia",
-      "liechtenstein",
-      "sri_lanka",
-      "liberia",
-      "lesotho",
-      "lithuania",
-      "luxembourg",
-      "latvia",
-      "libya",
-      "morocco",
-      "monaco",
-      "moldova",
-      "montenegro",
-      "st_martin",
-      "madagascar",
-      "marshall_islands",
-      "macedonia",
-      "mali",
-      "myanmar",
-      "mongolia",
-      "macau",
-      "northern_mariana_islands",
-      "martinique",
-      "mauritania",
-      "montserrat",
-      "malta",
-      "mauritius",
-      "maldives",
-      "malawi",
-      "mexico",
-      "malaysia",
-      "mozambique",
-      "namibia",
-      "new_caledonia",
-      "niger",
-      "norfolk_island",
-      "nigeria",
-      "nicaragua",
-      "netherlands",
-      "norway",
-      "nepal",
-      "nauru",
-      "niue",
-      "new_zealand",
-      "oman",
-      "panama",
-      "peru",
-      "french_polynesia",
-      "papua_new_guinea",
-      "philippines",
-      "pakistan",
-      "poland",
-      "st_pierre_miquelon",
-      "pitcairn_islands",
-      "puerto_rico",
-      "palestinian_territories",
-      "portugal",
-      "palau",
-      "paraguay",
-      "qatar",
-      "reunion",
-      "romania",
-      "serbia",
-      "ru",
-      "rwanda",
-      "saudi_arabia",
-      "solomon_islands",
-      "seychelles",
-      "sudan",
-      "sweden",
-      "singapore",
-      "st_helena",
-      "slovenia",
-      "svalbard_and_jan_mayen",
-      "slovakia",
-      "sierra_leone",
-      "san_marino",
-      "senegal",
-      "somalia",
-      "suriname",
-      "south_sudan",
-      "sao_tome_principe",
-      "el_salvador",
-      "sint_maarten",
-      "syria",
-      "swaziland",
-      "tristan_da_cunha",
-      "turks_caicos_islands",
-      "chad",
-      "french_southern_territories",
-      "togo",
-      "thailand",
-      "tajikistan",
-      "tokelau",
-      "timor_leste",
-      "turkmenistan",
-      "tunisia",
-      "tonga",
-      "tr",
-      "trinidad_tobago",
-      "tuvalu",
-      "taiwan",
-      "tanzania",
-      "ukraine",
-      "uganda",
-      "us_outlying_islands",
-      "united_nations",
-      "us",
-      "uruguay",
-      "uzbekistan",
-      "vatican_city",
-      "st_vincent_grenadines",
-      "venezuela",
-      "british_virgin_islands",
-      "us_virgin_islands",
-      "vietnam",
-      "vanuatu",
-      "wallis_futuna",
-      "samoa",
-      "kosovo",
-      "yemen",
-      "mayotte",
-      "south_africa",
-      "zambia",
-      "zimbabwe"
-    ]
-  },
-  {
-    "name": "objects",
-    "fullname": "Objects & Symbols",
-    "tabicon": "eyeglasses",
-    "icons": [
-      "eyeglasses",
-      "dark_sunglasses",
-      "necktie",
-      "tshirt",
-      "jeans",
-      "scarf",
-      "gloves",
-      "coat",
-      "socks",
-      "dress",
-      "kimono",
-      "bikini",
-      "womans_clothes",
-      "purse",
-      "handbag",
-      "pouch",
-      "shopping",
-      "school_satchel",
-      "mans_shoe",
-      "athletic_shoe",
-      "high_heel",
-      "sandal",
-      "boot",
-      "crown",
-      "womans_hat",
-      "tophat",
-      "mortar_board",
-      "billed_cap",
-      "rescue_worker_helmet",
-      "prayer_beads",
-      "lipstick",
-      "ring",
-      "gem",
-      "medal_military",
-      "trophy",
-      "medal_sports",
-      "1st_place_medal",
-      "2nd_place_medal",
-      "3rd_place_medal",
-      "mute",
-      "speaker",
-      "sound",
-      "loud_sound",
-      "loudspeaker",
-      "mega",
-      "postal_horn",
-      "bell",
-      "no_bell",
-      "iphone",
-      "calling",
-      "phone",
-      "telephone_receiver",
-      "pager",
-      "fax",
-      "battery",
-      "electric_plug",
-      "computer",
-      "desktop_computer",
-      "printer",
-      "keyboard",
-      "computer_mouse",
-      "trackball",
-      "minidisc",
-      "floppy_disk",
-      "cd",
-      "dvd",
-      "movie_camera",
-      "film_strip",
-      "film_projector",
-      "clapper",
-      "tv",
-      "camera",
-      "camera_flash",
-      "video_camera",
-      "vhs",
-      "mag",
-      "mag_right",
-      "microscope",
-      "telescope",
-      "satellite",
-      "candle",
-      "bulb",
-      "flashlight",
-      "izakaya_lantern",
-      "notebook_with_decorative_cover",
-      "closed_book",
-      "open_book",
-      "green_book",
-      "blue_book",
-      "orange_book",
-      "books",
-      "notebook",
-      "ledger",
-      "page_with_curl",
-      "scroll",
-      "page_facing_up",
-      "newspaper",
-      "newspaper_roll",
-      "bookmark_tabs",
-      "bookmark",
-      "label",
-      "moneybag",
-      "yen",
-      "dollar",
-      "euro",
-      "pound",
-      "money_with_wings",
-      "credit_card",
-      "chart",
-      "currency_exchange",
-      "heavy_dollar_sign",
-      "email",
-      "e-mail",
-      "incoming_envelope",
-      "envelope_with_arrow",
-      "outbox_tray",
-      "inbox_tray",
-      "package",
-      "mailbox",
-      "mailbox_closed",
-      "mailbox_with_mail",
-      "mailbox_with_no_mail",
-      "postbox",
-      "ballot_box",
-      "pencil2",
-      "black_nib",
-      "fountain_pen",
-      "pen",
-      "paintbrush",
-      "crayon",
-      "memo",
-      "briefcase",
-      "file_folder",
-      "open_file_folder",
-      "card_index_dividers",
-      "date",
-      "calendar",
-      "spiral_notepad",
-      "spiral_calendar",
-      "card_index",
-      "chart_with_upwards_trend",
-      "chart_with_downwards_trend",
-      "bar_chart",
-      "clipboard",
-      "pushpin",
-      "round_pushpin",
-      "paperclip",
-      "paperclips",
-      "straight_ruler",
-      "triangular_ruler",
-      "scissors",
-      "card_file_box",
-      "file_cabinet",
-      "wastebasket",
-      "lock",
-      "unlock",
-      "lock_with_ink_pen",
-      "closed_lock_with_key",
-      "key",
-      "old_key",
-      "hammer",
-      "pick",
-      "hammer_and_pick",
-      "hammer_and_wrench",
-      "dagger",
-      "crossed_swords",
-      "gun",
-      "bow_and_arrow",
-      "shield",
-      "wrench",
-      "nut_and_bolt",
-      "gear",
-      "clamp",
-      "alembic",
-      "balance_scale",
-      "link",
-      "chains",
-      "syringe",
-      "pill",
-      "smoking",
-      "coffin",
-      "funeral_urn",
-      "moyai",
-      "oil_drum",
-      "crystal_ball",
-      "shopping_cart",
-      "atm",
-      "put_litter_in_its_place",
-      "potable_water",
-      "wheelchair",
-      "mens",
-      "womens",
-      "restroom",
-      "baby_symbol",
-      "wc",
-      "passport_control",
-      "customs",
-      "baggage_claim",
-      "left_luggage",
-      "warning",
-      "children_crossing",
-      "no_entry",
-      "no_entry_sign",
-      "no_bicycles",
-      "no_smoking",
-      "do_not_litter",
-      "non-potable_water",
-      "no_pedestrians",
-      "no_mobile_phones",
-      "underage",
-      "radioactive",
-      "biohazard",
-      "arrow_up",
-      "arrow_upper_right",
-      "arrow_right",
-      "arrow_lower_right",
-      "arrow_down",
-      "arrow_lower_left",
-      "arrow_left",
-      "arrow_upper_left",
-      "arrow_up_down",
-      "left_right_arrow",
-      "leftwards_arrow_with_hook",
-      "arrow_right_hook",
-      "arrow_heading_up",
-      "arrow_heading_down",
-      "arrows_clockwise",
-      "arrows_counterclockwise",
-      "back",
-      "end",
-      "on",
-      "soon",
-      "top",
-      "place_of_worship",
-      "atom_symbol",
-      "om",
-      "star_of_david",
-      "wheel_of_dharma",
-      "yin_yang",
-      "latin_cross",
-      "orthodox_cross",
-      "star_and_crescent",
-      "peace_symbol",
-      "menorah",
-      "six_pointed_star",
-      "aries",
-      "taurus",
-      "gemini",
-      "cancer",
-      "leo",
-      "virgo",
-      "libra",
-      "scorpius",
-      "sagittarius",
-      "capricorn",
-      "aquarius",
-      "pisces",
-      "ophiuchus",
-      "twisted_rightwards_arrows",
-      "repeat",
-      "repeat_one",
-      "arrow_forward",
-      "fast_forward",
-      "next_track_button",
-      "play_or_pause_button",
-      "arrow_backward",
-      "rewind",
-      "previous_track_button",
-      "arrow_up_small",
-      "arrow_double_up",
-      "arrow_down_small",
-      "arrow_double_down",
-      "pause_button",
-      "stop_button",
-      "record_button",
-      "cinema",
-      "low_brightness",
-      "high_brightness",
-      "signal_strength",
-      "vibration_mode",
-      "mobile_phone_off",
-      "recycle",
-      "fleur_de_lis",
-      "trident",
-      "name_badge",
-      "beginner",
-      "o",
-      "white_check_mark",
-      "ballot_box_with_check",
-      "heavy_check_mark",
-      "heavy_multiplication_x",
-      "x",
-      "negative_squared_cross_mark",
-      "heavy_plus_sign",
-      "heavy_minus_sign",
-      "heavy_division_sign",
-      "curly_loop",
-      "loop",
-      "part_alternation_mark",
-      "eight_spoked_asterisk",
-      "eight_pointed_black_star",
-      "sparkle",
-      "bangbang",
-      "interrobang",
-      "question",
-      "grey_question",
-      "grey_exclamation",
-      "exclamation",
-      "wavy_dash",
-      "copyright",
-      "registered",
-      "tm",
-      "hash",
-      "asterisk",
-      "zero",
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-      "six",
-      "seven",
-      "eight",
-      "nine",
-      "keycap_ten",
-      "100",
-      "capital_abcd",
-      "abcd",
-      "1234",
-      "symbols",
-      "abc",
-      "a",
-      "ab",
-      "b",
-      "cl",
-      "cool",
-      "free",
-      "information_source",
-      "id",
-      "m",
-      "new",
-      "ng",
-      "o2",
-      "ok",
-      "parking",
-      "sos",
-      "up",
-      "vs",
-      "koko",
-      "sa",
-      "u6708",
-      "u6709",
-      "u6307",
-      "ideograph_advantage",
-      "u5272",
-      "u7121",
-      "u7981",
-      "accept",
-      "u7533",
-      "u5408",
-      "u7a7a",
-      "congratulations",
-      "secret",
-      "u55b6",
-      "u6e80",
-      "black_small_square",
-      "white_small_square",
-      "white_medium_square",
-      "black_medium_square",
-      "white_medium_small_square",
-      "black_medium_small_square",
-      "black_large_square",
-      "white_large_square",
-      "large_orange_diamond",
-      "large_blue_diamond",
-      "small_orange_diamond",
-      "small_blue_diamond",
-      "small_red_triangle",
-      "small_red_triangle_down",
-      "diamond_shape_with_a_dot_inside",
-      "radio_button",
-      "black_square_button",
-      "white_square_button",
-      "white_circle",
-      "black_circle",
-      "red_circle",
-      "large_blue_circle",
-      "hourglass",
-      "hourglass_flowing_sand",
-      "watch",
-      "alarm_clock",
-      "stopwatch",
-      "timer_clock",
-      "mantelpiece_clock",
-      "clock12",
-      "clock1230",
-      "clock1",
-      "clock130",
-      "clock2",
-      "clock230",
-      "clock3",
-      "clock330",
-      "clock4",
-      "clock430",
-      "clock5",
-      "clock530",
-      "clock6",
-      "clock630",
-      "clock7",
-      "clock730",
-      "clock8",
-      "clock830",
-      "clock9",
-      "clock930",
-      "clock10",
-      "clock1030",
-      "clock11",
-      "clock1130"
-    ]
-  }
-];
-
-export default groups;
diff --git a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
deleted file mode 100644
index 9ef409b3d4..0000000000
--- a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
+++ /dev/null
@@ -1,208 +0,0 @@
-import groups from 'discourse/lib/emoji/groups';
-import KeyValueStore from "discourse/lib/key-value-store";
-import { emojiList, isSkinTonableEmoji } from 'pretty-text/emoji';
-import { emojiUrlFor } from 'discourse/lib/text';
-import { findRawTemplate } from 'discourse/lib/raw-templates';
-
-const keyValueStore = new KeyValueStore("discourse_emojis_");
-const EMOJI_USAGE = "emojiUsage";
-
-let PER_ROW = 12;
-const PER_PAGE = 60;
-
-let ungroupedIcons, recentlyUsedIcons;
-let selectedSkinTone = keyValueStore.getObject('selectedSkinTone') || 1;
-
-if (!keyValueStore.getObject(EMOJI_USAGE)) {
-  keyValueStore.setObject({key: EMOJI_USAGE, value: {}});
-}
-
-function closeSelector() {
-  $('.emoji-modal, .emoji-modal-wrapper').remove();
-  $('body, textarea').off('keydown.emoji');
-}
-
-function initializeUngroupedIcons() {
-  const groupedIcons = {};
-
-  groups.forEach(group => {
-    group.icons.forEach(icon => groupedIcons[icon] = true);
-  });
-
-  ungroupedIcons = [];
-  const emojis = emojiList();
-  emojis.forEach(emoji => {
-    if (groupedIcons[emoji] !== true) {
-      ungroupedIcons.push(emoji);
-    }
-  });
-
-  if (ungroupedIcons.length) {
-    groups.push({name: 'ungrouped', icons: ungroupedIcons});
-  }
-}
-
-function trackEmojiUsage(title) {
-  const recent = keyValueStore.getObject(EMOJI_USAGE) || {};
-
-  if (!recent[title]) { recent[title] = { title: title, usage: 0 }; }
-  recent[title]["usage"]++;
-
-  keyValueStore.setObject({key: EMOJI_USAGE, value: recent});
-
-  // clear the cache
-  recentlyUsedIcons = null;
-}
-
-function sortByUsage(a, b) {
-  if (a.usage > b.usage) { return -1; }
-  if (b.usage > a.usage) { return 1; }
-  return a.title.localeCompare(b.title);
-}
-
-function initializeRecentlyUsedIcons() {
-  recentlyUsedIcons = [];
-
-  const usage = _.map(keyValueStore.getObject(EMOJI_USAGE)).sort(sortByUsage);
-  const recent = usage.slice(0, PER_ROW);
-
-  if (recent.length > 0) {
-
-    recent.forEach(emoji => recentlyUsedIcons.push(emoji.title));
-
-    const recentGroup = groups.findBy('name', 'recent');
-    if (recentGroup) {
-      recentGroup.icons = recentlyUsedIcons;
-    } else {
-      groups.push({ name: 'recent', icons: recentlyUsedIcons });
-    }
-  }
-}
-
-function toolbar(selected) {
-  if (!ungroupedIcons) { initializeUngroupedIcons(); }
-  if (!recentlyUsedIcons) { initializeRecentlyUsedIcons(); }
-
-  return groups.map((g, i) => {
-    let icon = g.tabicon;
-    let title = g.fullname;
-    if (g.name === "recent") {
-      icon = "star";
-      title = "Recent";
-    } else if (g.name === "ungrouped") {
-      icon = g.icons[0];
-      title = "Custom";
-    }
-
-    return { src: emojiUrlFor(icon),
-             title,
-             groupId: i,
-             selected: i === selected };
-  });
-}
-
-function bindEvents(page, offset, options) {
-  $('.emoji-page a').click(e => {
-    const title = $(e.currentTarget).attr('title');
-    trackEmojiUsage(title);
-    options.onSelect(title);
-    closeSelector();
-    return false;
-  }).hover(e => {
-    const title = $(e.currentTarget).attr('title');
-    const html = "<img src='" + emojiUrlFor(title) + "' class='emoji'> <span>:" + title + ":<span>";
-    $('.emoji-modal .info').html(html);
-  }, () => $('.emoji-modal .info').html(""));
-
-  $('.emoji-modal .nav .next a').click(() => render(page, offset+PER_PAGE, options));
-  $('.emoji-modal .nav .prev a').click(() => render(page, offset-PER_PAGE, options));
-
-  $('.emoji-modal .toolbar a').click(function(){
-    const p = parseInt($(this).data('group-id'));
-    render(p, 0, options);
-    return false;
-  });
-
-  $('.emoji-modal .tones-button').click(function(){
-    selectedSkinTone = parseInt($(this).data('skin-tone'));
-    keyValueStore.setObject({key: 'selectedSkinTone', value: selectedSkinTone});
-    render(page, offset, options);
-    return false;
-  });
-}
-
-function render(page, offset, options) {
-  keyValueStore.set({key: "emojiPage", value: page});
-  keyValueStore.set({key: "emojiOffset", value: offset});
-
-  const toolbarItems = toolbar(page);
-  const rows = [];
-  let row = [];
-  const icons = groups[page].icons;
-  const max = offset + PER_PAGE;
-
-  for(let i=offset; i<max; i++){
-    if(!icons[i]){ break; }
-    if(row.length === (options.perRow || PER_ROW)){
-      rows.push(row);
-      row = [];
-    }
-
-    let code = icons[i];
-    if(selectedSkinTone !== 1 && isSkinTonableEmoji(code)) {
-      code = `${code}:t${selectedSkinTone}`;
-    }
-
-    row.push({src: emojiUrlFor(code), title: code});
-  }
-  rows.push(row);
-
-  const skinTones = [];
-  const skinToneNames = ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'];
-  for(let i=1; i<skinToneNames.length+1; i++){
-    skinTones.push({
-      selected: selectedSkinTone === i,
-      level: i,
-      className: skinToneNames[i-1]
-    });
-  }
-
-  const model = {
-    toolbarItems,
-    skinTones,
-    rows,
-    prevDisabled: offset === 0,
-    nextDisabled: (max + 1) > icons.length,
-    modalClass: options.modalClass
-  };
-
-  $('.emoji-modal', options.appendTo).remove();
-  const template = findRawTemplate('emoji-toolbar');
-  options.appendTo.append(template(model));
-
-  bindEvents(page, offset, options);
-}
-
-function showSelector(options) {
-  options = options || {};
-  options.appendTo = options.appendTo || $('body');
-
-  options.appendTo.append('<div class="emoji-modal-wrapper"></div>');
-  $('.emoji-modal-wrapper').click(() => closeSelector());
-
-  if (Discourse.Site.currentProp('mobileView')) { PER_ROW = 9; }
-  const page = options.page ? _.findIndex(groups, (g) => { return g.name === options.page; })
-                            : keyValueStore.getInt("emojiPage", 0);
-  const offset = keyValueStore.getInt("emojiOffset", 0);
-
-  render(page, offset, options);
-
-  $('body, textarea').on('keydown.emoji', e => {
-    if (e.which === 27) {
-      closeSelector();
-      return false;
-    }
-  });
-}
-
-export { showSelector };
diff --git a/app/assets/javascripts/discourse/lib/highlight-text.js.es6 b/app/assets/javascripts/discourse/lib/highlight-text.js.es6
new file mode 100644
index 0000000000..6d4b6020c7
--- /dev/null
+++ b/app/assets/javascripts/discourse/lib/highlight-text.js.es6
@@ -0,0 +1,8 @@
+export default function($elem, term) {
+  if(!_.isEmpty(term)) {
+    // special case ignore "l" which is used for magic sorting
+    let words = _.reject(term.match(/"[^"]+"|[^\s]+/g), t => t === 'l');
+    words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
+    $elem.highlight(words, {className: 'search-highlight', wordsOnly: true});
+  }
+}
diff --git a/app/assets/javascripts/discourse/lib/load-script.js.es6 b/app/assets/javascripts/discourse/lib/load-script.js.es6
index 8baf4b905d..d40b17c663 100644
--- a/app/assets/javascripts/discourse/lib/load-script.js.es6
+++ b/app/assets/javascripts/discourse/lib/load-script.js.es6
@@ -36,7 +36,11 @@ export default function loadScript(url, opts) {
   opts = opts || {};
 
   $('script').each((i, tag) => {
-    _loaded[tag.getAttribute('src')] = true;
+    const src = tag.getAttribute('src');
+
+    if (src && (opts.scriptTag || src !== url)) {
+      _loaded[tag.getAttribute('src')] = true;
+    }
   });
 
 
@@ -57,12 +61,12 @@ export default function loadScript(url, opts) {
     });
 
     const cb = function(data) {
-      _loaded[url] = true;
       if (opts && opts.css) {
         $("head").append("<style>" + data + "</style>");
       }
       done();
       resolve();
+      _loaded[url] = true;
     };
 
     let cdnUrl = url;
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 5d382e4ac0..b96b551421 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { addDecorator } from 'discourse/widgets/post-cooked';
 import ComposerEditor from 'discourse/components/composer-editor';
 import { addButton } from 'discourse/widgets/post-menu';
@@ -19,10 +19,11 @@ 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 } from 'discourse-common/lib/icon-library';
 
 
 // If you add any methods to the API ensure you bump up this number
-const PLUGIN_API_VERSION = '0.8.7';
+const PLUGIN_API_VERSION = '0.8.8';
 
 class PluginApi {
   constructor(version, container) {
@@ -58,6 +59,32 @@ class PluginApi {
     return klass;
   }
 
+  /**
+   * If you want to use custom icons in your discourse application,
+   * you can register a renderer that will return an icon in the
+   * format required.
+   *
+   * For example, the follwing resolver will render a smile in the place
+   * of every icon on Discourse.
+   *
+   * api.registerIconRenderer({
+   *   name: 'smile-icons',
+   *
+   *   // for the place in code that render a string
+   *   string() {
+   *     return "<i class='fa fa-smile-o'></i>";
+   *   },
+   *
+   *   // for the places in code that render virtual dom elements
+   *   node() {
+   *     return h('i', { className: 'fa fa-smile-o' });
+   *   }
+   * });
+   **/
+  registerIconRenderer(fn) {
+    registerIconRenderer(fn);
+  }
+
   /**
    * Used for decorating the `cooked` content of a post after it is rendered using
    * jQuery.
@@ -523,7 +550,7 @@ function cmpVersions (a, b) {
 
 function getPluginApi(version) {
   version = version.toString();
-  if (cmpVersions(version,PLUGIN_API_VERSION) <= 0) {
+  if (cmpVersions(version, PLUGIN_API_VERSION) <= 0) {
     if (!_pluginv01) {
       _pluginv01 = new PluginApi(version, Discourse.__container__);
     }
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 745f7a84de..89bc99ea60 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -7,8 +7,8 @@ export function isAppleDevice() {
 }
 
 
-// we can't tell what the actual visible window height is 
-// because we cannot account for the height of the mobile keyboard 
+// we can't tell what the actual visible window height is
+// because we cannot account for the height of the mobile keyboard
 // and any other mobile autocomplete UI that may appear
 // so let's be conservative here rather than trying to max out every
 // available pixel of height for the editor
@@ -123,6 +123,10 @@ function positioningWorkaround($fixedElement) {
 
   const checkForInputs = _.debounce(function(){
     $fixedElement.find('button:not(.hide-preview),a:not(.mobile-file-upload):not(.toggle-toolbar)').each(function(idx, elem){
+      if ($(elem).parents('.emoji-picker').length > 0) {
+        return;
+      }
+
       if ($(elem).parents('.autocomplete').length > 0) {
         return;
       }
diff --git a/app/assets/javascripts/discourse/lib/sharing.js.es6 b/app/assets/javascripts/discourse/lib/sharing.js.es6
index 955618f074..ef485ed24f 100644
--- a/app/assets/javascripts/discourse/lib/sharing.js.es6
+++ b/app/assets/javascripts/discourse/lib/sharing.js.es6
@@ -9,9 +9,9 @@
       // This id must be present in the `share_links` site setting too
       id: 'twitter',
 
-      // The icon that will be displayed, choose between font awesome class name `faIcon` and custom HTML `htmlIcon`.
-      // When both provided, prefer `faIcon`
-      faIcon: 'fa-twitter-square'
+      // The icon that will be displayed, choose between icon name `icon` and custom HTML `htmlIcon`.
+      // When both provided, prefer `icon`
+      icon: 'twitter-square'
       htmlIcon: '<img src="example.com/example.jpg">',
 
       // A callback for generating the remote link from the `link` and `title`
@@ -30,6 +30,12 @@ var _sources = {};
 
 export default {
   addSource(source) {
+    // backwards compatibility for plugins
+    if (source.faIcon) {
+      source.icon = source.faIcon.replace('fa-', '');
+      delete source.faIcon;
+    }
+
     _sources[source.id] = source;
   },
 
diff --git a/app/assets/javascripts/discourse/lib/text.js.es6 b/app/assets/javascripts/discourse/lib/text.js.es6
index 476ca3ea9e..874f519010 100644
--- a/app/assets/javascripts/discourse/lib/text.js.es6
+++ b/app/assets/javascripts/discourse/lib/text.js.es6
@@ -5,11 +5,13 @@ import { sanitize as textSanitize } from 'pretty-text/sanitizer';
 import loadScript from 'discourse/lib/load-script';
 
 function getOpts(opts) {
-  const siteSettings = Discourse.__container__.lookup('site-settings: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
   }, opts);
 
@@ -26,7 +28,8 @@ export function cook(text, options) {
 export function cookAsync(text, options) {
   if (Discourse.MarkdownItURL) {
     return loadScript(Discourse.MarkdownItURL)
-      .then(()=>cook(text, options));
+      .then(()=>cook(text, options))
+      .catch(e => Ember.Logger.error(e));
   } else {
     return Ember.RSVP.Promise.resolve(cook(text));
   }
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index a1765cf9c6..3a139c9922 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -102,8 +102,10 @@ export function selectedText() {
   $div.find("img.emoji").replaceWith(function() { return this.title; });
   // replace br with newlines
   $div.find("br").replaceWith(() => "\n");
+  // enforce newline at the end of paragraphs
+  $div.find("p").append(() => "\n");
 
-  return String($div.text()).trim();
+  return String($div.text()).trim().replace(/(^\s*\n)+/gm, "\n");
 }
 
 // Determine the row and col of the caret in an element
@@ -294,7 +296,9 @@ export function uploadLocation(url) {
 
 export function getUploadMarkdown(upload) {
   if (isAnImage(upload.original_filename)) {
-    return '<img src="' + upload.url + '" width="' + upload.width + '" height="' + upload.height + '">';
+    const split = upload.original_filename.split('.');
+    const name = split[split.length-2];
+    return `![${name}|${upload.width}x${upload.height}](${upload.url})`;
   } else if (!Discourse.SiteSettings.prevent_anons_from_downloading_files && (/\.(mov|mp4|webm|ogv|mp3|ogg|wav|m4a)$/i).test(upload.original_filename)) {
     return uploadLocation(upload.url);
   } else {
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 6c9a970917..e6f0f0d9d6 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import RestModel from 'discourse/models/rest';
 import Topic from 'discourse/models/topic';
 import { throwAjaxError } from 'discourse/lib/ajax-error';
@@ -191,7 +192,7 @@ const Composer = RestModel.extend({
         const replyUsername = post.get('reply_to_user.username');
         const replyAvatarTemplate = post.get('reply_to_user.avatar_template');
         if (replyUsername && replyAvatarTemplate && this.get('action') === EDIT) {
-          postDescription += " <i class='fa fa-mail-forward reply-to-glyph'></i> " + tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
+          postDescription += ` ${iconHTML('mail-forward', { class: 'reply-to-glyph' })} ` + tinyAvatar(replyAvatarTemplate) + " " + replyUsername;
         }
       }
     }
@@ -242,10 +243,10 @@ const Composer = RestModel.extend({
   // The icon for the save button
   saveIcon: function () {
     switch (this.get('action')) {
-      case EDIT: return '<i class="fa fa-pencil"></i>';
-      case REPLY: return '<i class="fa fa-reply"></i>';
-      case CREATE_TOPIC: return '<i class="fa fa-plus"></i>';
-      case PRIVATE_MESSAGE: return '<i class="fa fa-envelope"></i>';
+      case EDIT: return iconHTML('pencil');
+      case REPLY: return iconHTML('reply');
+      case CREATE_TOPIC: iconHTML('plus');
+      case PRIVATE_MESSAGE: iconHTML('envelope');
     }
   }.property('action'),
 
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 67c70e510b..865f5b8f75 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -122,15 +122,14 @@ const Group = RestModel.extend({
 
   @observes("visibility_level")
   _updatePublic() {
-    let visibility_level = parseInt(this.get('visibility_level'));
-    if (visibility_level !== 0) {
+    if (this.get('visibility_level') !== 0) {
       this.set('public', false);
       this.set('allow_membership_requests', false);
     }
   },
 
   asJSON() {
-    return {
+    const attrs = {
       name: this.get('name'),
       alias_level: this.get('alias_level'),
       visibility_level: this.get('visibility_level'),
@@ -144,18 +143,32 @@ const Group = RestModel.extend({
       flair_bg_color: this.get('flairBackgroundHexColor'),
       flair_color: this.get('flairHexColor'),
       bio_raw: this.get('bio_raw'),
-      public: this.get('public'),
+      public_admission: this.get('public_admission'),
+      public_exit: this.get('public_exit'),
       allow_membership_requests: this.get('allow_membership_requests'),
       full_name: this.get('full_name'),
       default_notification_level: this.get('default_notification_level')
     };
+
+    if (!this.get('id')) {
+      attrs['usernames'] = this.get('usernames');
+      attrs['owner_usernames'] = this.get('ownerUsernames');
+    }
+
+    return attrs;
   },
 
   create() {
-    var self = this;
-    return ajax("/admin/groups", { type: "POST", data:  { group: this.asJSON() } }).then(function(resp) {
-      self.set('id', resp.basic_group.id);
-    });
+    return ajax("/admin/groups", { type: "POST", data:  { group: this.asJSON() } })
+      .then(resp => {
+        this.setProperties({
+          id: resp.basic_group.id,
+          usernames: null,
+          ownerUsernames: null
+        });
+
+        this.findMembers();
+      });
   },
 
   save() {
@@ -216,7 +229,7 @@ const Group = RestModel.extend({
 
 Group.reopenClass({
   findAll(opts) {
-    return ajax("/admin/groups.json", { data: opts }).then(function (groups){
+    return ajax("/groups/search.json", { data: opts }).then(groups => {
       return groups.map(g => Group.create(g));
     });
   },
diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6
index 367dee640c..9ebc0efb9a 100644
--- a/app/assets/javascripts/discourse/models/post.js.es6
+++ b/app/assets/javascripts/discourse/models/post.js.es6
@@ -6,7 +6,7 @@ import { propertyEqual } from 'discourse/lib/computed';
 import Quote from 'discourse/lib/quote';
 import computed from 'ember-addons/ember-computed-decorators';
 import { postUrl } from 'discourse/lib/utilities';
-import { cook } from 'discourse/lib/text';
+import { cookAsync } from 'discourse/lib/text';
 import { userPath } from 'discourse/lib/url';
 import Composer from 'discourse/models/composer';
 
@@ -159,6 +159,7 @@ const Post = RestModel.extend({
     done elsewhere.
   **/
   setDeletedState(deletedBy) {
+    let promise;
     this.set('oldCooked', this.get('cooked'));
 
     // Moderators can delete posts. Users can only trigger a deleted at message, unless delete_removed_posts_after is 0.
@@ -169,16 +170,19 @@ const Post = RestModel.extend({
         can_delete: false
       });
     } else {
-
-      this.setProperties({
-        cooked: cook(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})),
-        can_delete: false,
-        version: this.get('version') + 1,
-        can_recover: true,
-        can_edit: false,
-        user_deleted: true
+      promise = cookAsync(I18n.t("post.deleted_by_author", {count: Discourse.SiteSettings.delete_removed_posts_after})).then(cooked => {
+        this.setProperties({
+          cooked: cooked,
+          can_delete: false,
+          version: this.get('version') + 1,
+          can_recover: true,
+          can_edit: false,
+          user_deleted: true
+        });
       });
     }
+
+    return promise || Em.RSVP.Promise.resolve();
   },
 
   /**
@@ -201,10 +205,11 @@ const Post = RestModel.extend({
   },
 
   destroy(deletedBy) {
-    this.setDeletedState(deletedBy);
-    return ajax("/posts/" + this.get('id'), {
-      data: { context: window.location.pathname },
-      type: 'DELETE'
+    return this.setDeletedState(deletedBy).then(()=>{
+      return ajax("/posts/" + this.get('id'), {
+        data: { context: window.location.pathname },
+        type: 'DELETE'
+      });
     });
   },
 
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 5949766a91..f8e75e517f 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -50,11 +50,7 @@ const Topic = RestModel.extend({
 
   @computed('fancy_title')
   fancyTitle(title) {
-    // TODO: `siteSettings` should always be present, but there are places in the code
-    // that call Discourse.Topic.create instead of using the store.
-    // When the store is used, remove this.
-    const siteSettings = this.siteSettings || Discourse.SiteSettings;
-    return censor(emojiUnescape(title || ""), siteSettings.censored_words);
+    return censor(emojiUnescape(title || ""), Discourse.Site.currentProp('censored_words'));
   },
 
   // returns createdAt if there's no bumped date
diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6
index c4d5b7a161..f10d6ee620 100644
--- a/app/assets/javascripts/discourse/models/user-action.js.es6
+++ b/app/assets/javascripts/discourse/models/user-action.js.es6
@@ -120,10 +120,10 @@ const UserAction = RestModel.extend({
     let groups = this.get("childGroups");
     if (!groups) {
       groups = {
-        likes: UserActionGroup.create({ icon: "fa fa-heart" }),
-        stars: UserActionGroup.create({ icon: "fa fa-star" }),
-        edits: UserActionGroup.create({ icon: "fa fa-pencil" }),
-        bookmarks: UserActionGroup.create({ icon: "fa fa-bookmark" })
+        likes: UserActionGroup.create({ icon: "heart" }),
+        stars: UserActionGroup.create({ icon: "star" }),
+        edits: UserActionGroup.create({ icon: "pencil" }),
+        bookmarks: UserActionGroup.create({ icon: "bookmark" })
       };
     }
     this.set("childGroups", groups);
diff --git a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6 b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
index 781fdc131b..ffec7cc8bc 100644
--- a/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
+++ b/app/assets/javascripts/discourse/raw-views/topic-list-header-column.js.es6
@@ -7,8 +7,8 @@ export default Ember.Object.extend({
     return I18n.t(this.name);
   }.property(),
 
-  sortClass: function(){
-    return "fa fa-chevron-" + (this.parent.ascending ? "up" : "down");
+  sortIcon: function() {
+    return "chevron-" + (this.parent.ascending ? "up" : "down");
   }.property(),
 
   isSorting: function(){
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index b5191b5696..aa5027486f 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -21,7 +21,7 @@
 
       {{#if model.admins}}
         <section class='about admins'>
-          <h3>{{fa-icon "users"}} {{i18n 'about.our_admins'}}</h3>
+          <h3>{{d-icon "users"}} {{i18n 'about.our_admins'}}</h3>
 
           {{#each model.admins as |a|}}
             {{user-info user=a}}
@@ -33,7 +33,7 @@
 
       {{#if model.moderators}}
         <section class='about moderators'>
-          <h3>{{fa-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
+          <h3>{{d-icon "users"}} {{i18n 'about.our_moderators'}}</h3>
 
           <div class='users'>
             {{#each model.moderators as |m|}}
@@ -45,7 +45,7 @@
       {{/if}}
 
       <section class='about stats'>
-        <h3>{{fa-icon "bar-chart"}}  {{i18n 'about.stats'}}</h3>
+        <h3>{{d-icon "bar-chart"}}  {{i18n 'about.stats'}}</h3>
 
         <table class='table'>
           <tr>
@@ -89,7 +89,7 @@
 
       {{#if contactInfo}}
         <section class='about contact'>
-            <h3>{{fa-icon "envelope-o"}} {{i18n 'about.contact'}}</h3>
+            <h3>{{d-icon "envelope-o"}} {{i18n 'about.contact'}}</h3>
             <p>{{{contactInfo}}}</p>
         </section>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
index efbf18a33b..1c429ddb39 100644
--- a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
@@ -5,7 +5,7 @@
         {{#if option.model}}
           <a href>{{category-link option.model allowUncategorized="true" link="false"}}</a>
         {{else}}
-          <a href>{{fa-icon 'tag'}}{{option.text}} x {{option.count}}</a>
+          <a href>{{d-icon 'tag'}}{{option.text}} x {{option.count}}</a>
         {{/if}}
       </li>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs b/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
index 1e6fbe778b..50f0a8ee25 100644
--- a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs
@@ -14,11 +14,11 @@
 
   {{#if isCustom}}
     <div class="control-group">
-      {{fa-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
+      {{d-icon "calendar"}} {{date-picker-future value=date defaultDate=date}}
     </div>
 
     <div class="control-group">
-      {{fa-icon "clock-o"}}
+      {{d-icon "clock-o"}}
       {{input type="time" value=time}}
     </div>
   {{/if}}
@@ -33,7 +33,7 @@
 
     {{#if willCloseImmediately}}
       <div class="warning">
-        {{fa-icon "warning"}}
+        {{d-icon "warning"}}
         {{willCloseI18n}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 89c46363e3..b43cbb0d56 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,5 +1,5 @@
 <label class="btn" disabled={{uploading}} title="{{i18n 'user.change_avatar.upload_title'}}">
-  {{fa-icon "picture-o"}}&nbsp;{{uploadButtonText}}
+  {{d-icon "picture-o"}}&nbsp;{{uploadButtonText}}
   <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
 </label>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
index 93d3c490b6..3c519d85dd 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-card.hbs
@@ -2,7 +2,7 @@
   <span class='grant-count' title={{i18n 'badges.granted' count=displayCount}}>{{displayCount}}</span>
 {{/if}}
 {{#if badge.has_badge}}
-  <span class='check-display status-checked'>{{fa-icon "check"}}</span>
+  <span class='check-display status-checked'>{{d-icon "check"}}</span>
 {{/if}}
 <div class='badge-contents'>
   <div class='badge-icon {{badge.badgeTypeClassName}}'>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
index 8909e8a9ba..434e18fe62 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes-with-topics.hbs
@@ -9,7 +9,7 @@
 
           <h3>
             {{#if c.read_restricted}}
-              {{fa-icon 'lock'}}
+              {{d-icon 'lock'}}
             {{/if}}
             {{c.name}}
           </h3>
diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
index 3bb4fde665..c473668648 100644
--- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs
@@ -9,7 +9,7 @@
 
           <h3>
             {{#if c.read_restricted}}
-              {{fa-icon 'lock'}}
+              {{d-icon 'lock'}}
             {{/if}}
             {{c.name}}
           </h3>
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
index 9e9cc410e5..d660be87db 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
@@ -1,21 +1,23 @@
 {{#if category}}
-  <a href {{action "expand"}} class="badge-category" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
+  <a href {{action "expand"}} class="dropdown-header" style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>
     <span class="badge-category-bg" style={{categoryColor}}></span>
     {{#if category.read_restricted}}
-      {{fa-icon "lock"}}
+      {{d-icon "lock"}}
     {{/if}}
     {{category.name}}
   </a>
 {{else}}
   {{#if noSubcategories}}
-    <a href {{action "expand"}} class='badge-category home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{i18n 'categories.no_subcategory'}}</a>
+    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{i18n 'categories.no_subcategory'}}</a>
   {{else}}
-    <a href {{action "expand"}} class='badge-category home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{allCategoriesLabel}}</a>
+    <a href {{action "expand"}} class='dropdown-header home' style={{badgeStyle}} aria-label={{i18n 'categories.category_list'}} aria-expanded={{expanded}}>{{allCategoriesLabel}}</a>
   {{/if}}
 {{/if}}
 
 {{#if categories}}
-  <a href {{action "expand"}} class={{dropdownButtonClass}} style={{badgeStyle}}><i class={{iconClass}}></i></a>
+  <a href {{action "expand"}} class={{dropdownButtonClass}} style={{badgeStyle}}>
+    {{d-icon expandIcon}}
+  </a>
   <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
     <div class='cat'><a href={{allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
     {{#if subCategory}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
index 49e3b088f1..fcb0bdeb07 100644
--- a/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-title-link.hbs
@@ -1,6 +1,6 @@
 <a href={{category.url}}>
   {{#if category.read_restricted}}
-    {{fa-icon 'lock'}}
+    {{d-icon 'lock'}}
   {{/if}}
 
   <span class="category-name">{{category.name}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 46daaeb10e..3d3f6fc8eb 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -30,7 +30,7 @@
       {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}}
       {{uploadProgress}}%
       {{#if isCancellable}}
-        <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{fa-icon "times"}}</a>
+        <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
new file mode 100644
index 0000000000..09e841bd85
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/composer-toggles.hbs
@@ -0,0 +1,12 @@
+{{#if site.mobileView}}
+  {{flat-button
+    class="toggle-toolbar"
+    icon="bars"
+    action=toggleToolbar}}
+{{/if}}
+
+{{flat-button
+  class="toggler"
+  icon=toggleIcon
+  action=toggleComposer
+  title='composer.toggler'}}
diff --git a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
index a29839a790..859433546c 100644
--- a/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/csv-uploader.hbs
@@ -1,5 +1,5 @@
 <label class="btn" disabled={{uploadButtonDisabled}}>
-  {{fa-icon "upload"}}&nbsp;{{uploadButtonText}}
+  {{d-icon "upload"}}&nbsp;{{uploadButtonText}}
   <input disabled={{uploading}} type="file" accept=".csv" style="visibility: hidden; position: absolute;" />
 </label>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-button.hbs b/app/assets/javascripts/discourse/templates/components/d-button.hbs
index e01a9bb5c8..d06d14e66d 100644
--- a/app/assets/javascripts/discourse/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-button.hbs
@@ -1,5 +1,5 @@
 {{#if icon}}
-  {{fa-icon icon}}
+  {{d-icon icon}}
 {{/if}}
 
 {{#if translatedLabel}}
diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
index 78d00be874..961b63c6ef 100644
--- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs
@@ -33,3 +33,5 @@
     {{plugin-outlet name="editor-preview"}}
   </div>
 </div>
+
+{{emoji-picker active=emojiPickerIsActive emojiSelected=(action 'emojiSelected')}}
diff --git a/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
index b7749fecee..100849f312 100644
--- a/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
+++ b/app/assets/javascripts/discourse/templates/components/disabled-icon.hbs
@@ -1,5 +1,5 @@
-{{fa-icon icon modifier="stack-2x"}}
+{{d-icon icon modifier="stack-2x"}}
 
 {{#if disabled}}
-  {{fa-icon "ban" modifier="stack-2x"}}
+  {{d-icon "ban" modifier="stack-2x"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index b46760d5c1..d7e0c5e1d4 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,7 +1,9 @@
 {{#if visible}}
   <div class="row">
     <div id="banner" class={{overlay}}>
-      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
+      <div class="close" {{action "dismiss"}}>
+        {{d-icon "times" title="banner.close"}}
+      </div>
       <div id="banner-content">
         {{{banner.html}}}
         {{#if currentUser.staff}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
index 760863befe..a389e2ceab 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-security.hbs
@@ -9,7 +9,7 @@
         {{{i18n "category.can"}}}
         <span class="permission">{{p.permission.description}}</span>
         {{#if editingPermissions}}
-        <a href {{action "removePermission" p}}>{{fa-icon "times-circle"}}</a>
+        <a href {{action "removePermission" p}}>{{d-icon "times-circle"}}</a>
         {{/if}}
       </li>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index ddfb1ce11b..05f70e3b27 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -107,7 +107,7 @@
 
     <section class='field'>
       <label>
-        {{fa-icon "envelope-o"}}
+        {{d-icon "envelope-o"}}
         {{i18n 'category.email_in'}}
         {{text-field class="email-in" value=category.email_in}}
       </label>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
new file mode 100644
index 0000000000..21f80d6236
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/emoji-picker.hbs
@@ -0,0 +1 @@
+<div class='emoji-picker'></div>
diff --git a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
index 1fb6a26eac..85ad4157bb 100644
--- a/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/emoji-uploader.hbs
@@ -1,6 +1,6 @@
 {{text-field name="name" placeholderKey="admin.emoji.name" value=name}}
 <label class="btn btn-primary {{if addDisabled 'disabled'}}">
-  {{fa-icon "plus"}}
+  {{d-icon "plus"}}
   {{i18n 'admin.emoji.add'}}
   <input disabled={{addDisabled}} type="file" accept=".png,.gif" style="visibility: hidden; position: absolute;" />
 </label>
diff --git a/app/assets/javascripts/discourse/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/templates/components/expand-post.hbs
index 4d3192668d..94ba1d6290 100644
--- a/app/assets/javascripts/discourse/templates/components/expand-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/expand-post.hbs
@@ -1,5 +1,5 @@
 {{#if item.truncated}}
   <a class="expand-item" href {{action "expandItem"}} title={{i18n "post.expand_collapse"}}>
-    {{fa-icon "chevron-down"}}
+    {{d-icon "chevron-down"}}
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/templates/components/flat-button.hbs
new file mode 100644
index 0000000000..5c8be2b5ea
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/flat-button.hbs
@@ -0,0 +1 @@
+{{d-icon icon}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs b/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
index 11c1eb7b55..f9f13474c7 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-logs-filter.hbs
@@ -1,6 +1,6 @@
 {{#if value}}
   {{#d-button class="btn-small group-logs-filter" action="clearFilter" actionParam=type}}
     <span>{{label}}</span>: {{filterText}}
-    {{fa-icon "times-circle"}}
+    {{d-icon "times-circle"}}
   {{/d-button}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs b/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
index 31d6303995..6fe9bfd858 100644
--- a/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-logs-row.hbs
@@ -36,9 +36,9 @@
   <td {{action "toggleDetails"}} class="group-logs-expand-details">
     {{#if log.prev_value}}
       {{#if expandDetails}}
-        {{fa-icon 'ellipsis-v'}}
+        {{d-icon 'ellipsis-v'}}
       {{else}}
-        {{fa-icon 'ellipsis-h'}}
+        {{d-icon 'ellipsis-h'}}
       {{/if}}
     {{/if}}
   </td>
diff --git a/app/assets/javascripts/discourse/templates/components/group-member.hbs b/app/assets/javascripts/discourse/templates/components/group-member.hbs
index d476fdf033..ddc6456b83 100644
--- a/app/assets/javascripts/discourse/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-member.hbs
@@ -1 +1 @@
-<a href={{member.adminPath}}>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "remove"}}>{{fa-icon "times"}}</a>{{/unless}}
+<a href={{member.adminPath}}>{{avatar member imageSize="small"}}</a> {{member.username}} {{#unless automatic}}<a class='remove' {{action "remove"}}>{{d-icon "times"}}</a>{{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
index c720c630f5..ad66499dbb 100644
--- a/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-members-input.hbs
@@ -1,23 +1,30 @@
 <label>{{i18n 'groups.members'}} ({{model.user_count}})</label>
-<div>
-  <a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{fa-icon "fast-backward"}}</a>
-  {{currentPage}}/{{totalPages}}
-  <a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{fa-icon "fast-forward"}}</a>
-</div>
-<div class="ac-wrap clearfix">
-  {{#each model.members as |member|}}
-    {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
-  {{/each}}
-</div>
+
+{{#if model.members}}
+  <div>
+    <a class="previous {{if showingFirst 'disabled'}}" {{action "previous"}}>{{d-icon "fast-backward"}}</a>
+    {{currentPage}}/{{totalPages}}
+    <a class="next {{if showingLast 'disabled'}}" {{action "next"}}>{{d-icon "fast-forward"}}</a>
+  </div>
+  <div class="ac-wrap clearfix">
+    {{#each model.members as |member|}}
+      {{group-member member=member automatic=model.automatic removeAction="removeMember"}}
+    {{/each}}
+  </div>
+{{/if}}
 
 {{#unless model.automatic}}
   <div class="group-members-input-selector">
-    {{user-selector usernames=model.usernames}}
+    {{user-selector usernames=model.usernames
+          placeholderKey="admin.groups.selector_placeholder"
+          id="member-selector"}}
 
-    {{d-button action="addMembers"
-        class="add"
-        icon="plus"
-        disabled=disableAddButton
-        label="groups.edit.add_members"}}
+    {{#if addButton}}
+      {{d-button action="addMembers"
+          class="add"
+          icon="plus"
+          disabled=disableAddButton
+          label="groups.edit.add_members"}}
+    {{/if}}
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
index ed17b2a79b..a154287430 100644
--- a/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-membership-button.hbs
@@ -1,17 +1,15 @@
 {{#if canJoinGroup}}
-  {{#if userIsGroupUser}}
-    {{d-button action="leaveGroup"
-        class="btn-danger group-index-leave"
-        icon="minus"
-        label="groups.leave"
-        disabled=updatingMembership}}
-  {{else}}
-    {{d-button action="joinGroup"
-        class="group-index-join"
-        icon="plus"
-        label="groups.join"
-        disabled=updatingMembership}}
-  {{/if}}
+  {{d-button action="joinGroup"
+      class="group-index-join"
+      icon="user-plus"
+      label="groups.join"
+      disabled=updatingMembership}}
+{{else if canLeaveGroup}}
+  {{d-button action="leaveGroup"
+      class="btn-danger group-index-leave"
+      icon="user-times"
+      label="groups.leave"
+      disabled=updatingMembership}}
 {{else if model.allow_membership_requests}}
   {{#if userIsGroupUser}}
     {{#if showMembershipStatus}}
@@ -25,7 +23,7 @@
     {{d-button action="requestMembership"
         class="group-index-request"
         disabled=loading
-        icon="envelope"
+        icon="user-plus"
         label="groups.request"}}
 
     {{#if loading}}
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 14f0695fd2..5a12cff39b 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -1,11 +1,11 @@
 <div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
   <div class="image-upload-controls">
     <label class="btn pad-left no-text {{if uploading 'disabled'}}">
-      {{fa-icon "picture-o"}}
+      {{d-icon "picture-o"}}
       <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
     </label>
     {{#if backgroundStyle}}
-      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{fa-icon "trash-o"}}</button>
+      <button {{action "trash"}} class="btn btn-danger pad-left no-text">{{d-icon "trash-o"}}</button>
     {{/if}}
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 35d5afd0bb..44e1b1809b 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -1,11 +1,11 @@
 {{#if ip}}
   <button class="btn" {{action "lookup"}}>
-    {{fa-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
+    {{d-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
   </button>
 {{/if}}
 {{#if show}}
   <div class="location-box">
-    <a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a>
+    <a class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
     <h4>{{i18n 'ip_lookup.title'}}</h4>
     <dl>
       {{#if location}}
@@ -42,7 +42,7 @@
         <strong>{{totalOthersWithSameIP}}</strong>
         {{#if other_accounts.length}}
           <button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}>
-            {{fa-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
+            {{d-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
           </button>
         {{/if}}
       </dt>
diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
index 3defac6a02..ce4d6066c5 100644
--- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
+++ b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs
@@ -1,5 +1,5 @@
 <h2>{{period-title period showDateRange=true}}</h2>
-<button>{{fa-icon "caret-down"}}</button>
+<button>{{d-icon "caret-down"}}</button>
 
 <div id='period-popup' class="{{unless showPeriods 'hidden'}} period-popup">
   <ul>
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index 4b094fdb21..78a7723ab6 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -11,7 +11,7 @@
           {{post.user.username}}
         {{/user-link}}
         {{#if post.user.blocked}}
-        <i class='fa fa-ban' title='{{i18n "user.blocked_tooltip"}}'></i>
+          {{d-icon "ban" title="user.blocked_tooltip"}}
         {{/if}}
       </span>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index b6f77b67c3..ad3dc852dd 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -16,13 +16,13 @@
 {{#if topic.details.can_reply_as_new_topic}}
   <div class='reply-as-new-topic'>
     {{#if topic.isPrivateMessage}}
-      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_private_message'}} title={{i18n 'post.reply_as_new_private_message'}}>{{fa-icon "plus"}}{{i18n 'user.new_private_message'}}</a>
+      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_private_message'}} title={{i18n 'post.reply_as_new_private_message'}}>{{d-icon "plus"}}{{i18n 'user.new_private_message'}}</a>
     {{else}}
-      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_topic'}} title={{i18n 'post.reply_as_new_topic'}}>{{fa-icon "plus"}}{{i18n 'topic.create'}}</a>
+      <a href {{action "replyAsNewTopic"}} aria-label={{i18n 'post.reply_as_new_topic'}} title={{i18n 'post.reply_as_new_topic'}}>{{d-icon "plus"}}{{i18n 'topic.create'}}</a>
     {{/if}}
   </div>
 {{/if}}
 
 <div class='link'>
-  <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{fa-icon "close"}}</a>
+  <a href {{action "close"}} class="close-share" aria-label={{i18n 'share.close'}} title={{i18n 'share.close'}}>{{d-icon "close"}}</a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/share-source.hbs b/app/assets/javascripts/discourse/templates/components/share-source.hbs
index 64242d17fe..185f80ab9c 100644
--- a/app/assets/javascripts/discourse/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-source.hbs
@@ -1,6 +1,6 @@
 <a href {{action "share" source}} title="{{unbound source.title}}" aria-label="{{unbound source.title}}" >
-  {{#if source.faIcon}}
-    <i class="fa {{source.faIcon}}"></i>
+  {{#if source.icon}}
+    {{d-icon source.icon}}
   {{else}}
     {{{source.htmlIcon}}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs
index 821ed4ff91..852ef95aba 100644
--- a/app/assets/javascripts/discourse/templates/components/small-action.hbs
+++ b/app/assets/javascripts/discourse/templates/components/small-action.hbs
@@ -1,10 +1,10 @@
 <div class='small-action-desc'>
   {{#if post}}
     {{#if post.can_delete}}
-      <button {{action "delete"}} title={{i18n "post.controls.delete"}}>{{fa-icon "times"}}</button>
+      <button {{action "delete"}} title={{i18n "post.controls.delete"}}>{{d-icon "times"}}</button>
     {{/if}}
     {{#if post.can_edit}}
-      <button {{action "edit"}} title={{i18n "post.controls.edit"}}>{{fa-icon "pencil"}}</button>
+      <button {{action "edit"}} title={{i18n "post.controls.edit"}}>{{d-icon "pencil"}}</button>
     {{/if}}
     <a href={{post.usernameUrl}} data-user-card={{post.username}}>
       {{avatar post imageSize="small"}}
diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
index ea3c9dcec9..f2f44fc734 100644
--- a/app/assets/javascripts/discourse/templates/components/stream-item.hbs
+++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
@@ -10,7 +10,7 @@
 
   {{#if item.deleted_by}}
     <span class="delete-info">
-      {{fa-icon "trash-o"}}
+      {{d-icon "trash-o"}}
       {{avatar item.deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
       {{format-date item.deleted_at leaveAgo="true"}}
     </span>
@@ -27,11 +27,11 @@
 
 {{#each item.children as |child|}}
   <div class='child-actions'>
-    <i class="icon {{child.icon}}"></i>
+    {{d-icon child.icon class="icon"}}
     {{#each child.items as |grandChild|}}
       {{#if grandChild.removableBookmark}}
         <button class="btn btn-default remove-bookmark" {{action removeBookmark grandChild}}>
-          {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
+          {{d-icon 'times'}} {{i18n "bookmarks.remove"}}
         </button>
       {{else}}
           <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true" avatarTemplatePath="acting_avatar_template"}}</div></a>
diff --git a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
index 833ab89590..8dc8869f6f 100644
--- a/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/tag-drop.hbs
@@ -1,19 +1,21 @@
 {{#if showTagDropdown}}
   {{#if tagId}}
     {{#if noTagsSelected}}
-      <a href {{action "expand"}} class="badge-category {{tagClass}} home">{{noTagsLabel}}</a>
+      <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{noTagsLabel}}</a>
     {{else}}
-      <a href {{action "expand"}} class="badge-category {{tagClass}}">{{tagId}}</a>
+      <a href {{action "expand"}} class="dropdown-header {{tagClass}}">{{tagId}}</a>
     {{/if}}
   {{else}}
-    <a href {{action "expand"}} class="badge-category {{tagClass}} home">{{allTagsLabel}}</a>
+    <a href {{action "expand"}} class="dropdown-header {{tagClass}} home">{{allTagsLabel}}</a>
   {{/if}}
 
   {{#if tags}}
-    <a href {{action "expand"}} class={{dropdownButtonClass}}><i class={{iconClass}}></i></a>
+    <a href {{action "expand"}} class={{dropdownButtonClass}}>
+      {{d-icon expandedIcon}}
+    </a>
     <section class="{{unless expanded 'hidden'}} category-dropdown-menu chooser">
-      <div class='cat'><a href={{allTagsUrl}} data-drop-close="true" class='badge-category home'>{{allTagsLabel}}</a></div>
-      <div class='cat'><a href={{noTagsUrl}}  data-drop-close="true" class='badge-category home'>{{noTagsLabel}}</a></div>
+      <div class='cat'><a href={{allTagsUrl}} data-drop-close="true" class='dropdown-header home'>{{allTagsLabel}}</a></div>
+      <div class='cat'><a href={{noTagsUrl}}  data-drop-close="true" class='dropdown-header home'>{{noTagsLabel}}</a></div>
       {{#if renderTags}}
         {{#each tags as |t|}}
           <div class='cat'>
diff --git a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
index 399ac0bdaf..c6885392c4 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 {{#d-button action="enterTop" class="full jump-top"}}
-  {{fa-icon 'caret-up'}} {{{topDate}}}
+  {{d-icon 'caret-up'}} {{{topDate}}}
 {{/d-button}}
 
 {{#d-button action="enterBottom" class="full jump-button"}}
-  {{{bottomDate}}} {{fa-icon 'caret-down'}}
+  {{{bottomDate}}} {{d-icon 'caret-down'}}
 {{/d-button}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
index 7e28cc0f9a..15b5882a00 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
@@ -28,7 +28,7 @@
                action=toggleBookmark}}
 
     <button class="btn share" data-share-url={{topic.shareUrl}} title={{i18n "topic.share.help"}}>
-      {{fa-icon "link"}}
+      {{d-icon "link"}}
       {{i18n "topic.share.title"}}
     </button>
 
diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
index a7041a5065..1c948ba800 100644
--- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
@@ -36,25 +36,25 @@
 
     <ul class="usercard-controls">
       {{#if user.can_send_private_message_to_user}}
-        <li><a class='btn btn-primary' {{action "composePrivateMessage" user post}}>{{fa-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
+        <li><a class='btn btn-primary' {{action "composePrivateMessage" user post}}>{{d-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
       {{/if}}
 
       {{#if showFilter}}
-        <li><a class='btn' href {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username=username count=topicPostCount}}</a></li>
+        <li><a class='btn' href {{action "togglePosts" user}}>{{d-icon "filter"}}{{i18n 'topic.filter_to' username=username count=topicPostCount}}</a></li>
       {{/if}}
 
       {{#if hasUserFilters}}
-        <li><a class='btn' href {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
+        <li><a class='btn' href {{action "cancelFilter"}}>{{d-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
       {{/if}}
 
       {{#if showDelete}}
-        <li><a class='btn btn-danger' href {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
+        <li><a class='btn btn-danger' href {{action "deleteUser" user}}>{{d-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
       {{/if}}
     </ul>
 
     {{#if isSuspended}}
       <div class='suspended'>
-        {{fa-icon "ban"}}
+        {{d-icon "ban"}}
         <b>{{i18n 'user.suspended_notice' date=user.suspendedTillDate}}</b><br/>
         <b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}}
       </div>
@@ -71,12 +71,12 @@
     {{#if hasLocationOrWebsite}}
       <div class="location-and-website">
         {{#if user.location}}
-          <span class='location'>{{fa-icon "map-marker"}} {{user.location}}</span>
+          <span class='location'>{{d-icon "map-marker"}} {{user.location}}</span>
         {{/if}}
 
         {{#if user.website_name}}
           <span class='website-name'>
-            {{fa-icon "globe"}}
+            {{d-icon "globe"}}
             {{#if linkWebsite}}
               <a href={{user.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{user.website_name}}</a>
             {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 67d28d7276..72bfaedac6 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,5 +1,5 @@
 <span class='value'>
-  {{#if icon}}{{fa-icon icon}}{{/if}}
+  {{#if icon}}{{d-icon icon}}{{/if}}
   {{number value}}
 </span>
 <span class='label'>{{{i18n label count=value}}}</span>
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index 9e20fd7330..9ddc7aeedb 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -22,10 +22,10 @@
       {{composer-messages composer=model messageCount=messageCount addLinkLookup="addLinkLookup"}}
 
       <div class='control'>
-        {{#if site.mobileView}}
-          <a href class='toggle-toolbar' {{action "toggleToolbar" bubbles=false}}></a>
-        {{/if}}
-        <a href class='toggler' {{action "toggle" bubbles=false}} title={{i18n 'composer.toggler'}}></a>
+        {{composer-toggles
+          composeState=model.composeState
+          toggleComposer=(action "toggle")
+          toggleToolbar=(action "toggleToolbar")}}
 
         {{#if model.viewOpen}}
           <div class='control-row reply-area'>
@@ -112,7 +112,9 @@
 
                 {{#if site.mobileView}}
                 {{#if whisperOrUnlistTopic}}
-                  <span class='whisper'><i class='fa fa-eye-slash'></i></span>
+                  <span class='whisper'>
+                    {{d-icon "eye-slash"}}
+                  </span>
                 {{/if}}
                 {{/if}}
               </div>
@@ -130,7 +132,7 @@
               </div>
               <div class='draft-text'>
                 {{#if model.topic}}
-                  {{fa-icon "mail-forward"}} {{{draftTitle}}}
+                  {{d-icon "mail-forward"}} {{{draftTitle}}}
                 {{else}}
                   {{i18n "composer.saved_draft"}}
                 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
index 4b2be21c2d..60493d7526 100644
--- a/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
 {{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
 <p>{{{message.body}}}</p>
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index a461a9b512..c2d574cb69 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "times"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "times"}}</a>
 {{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
index 8497ac5dbd..a91a313e0f 100644
--- a/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
 {{{message.body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
index 304352f549..bdd2cd5a3f 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar-topics.hbs
@@ -1,4 +1,4 @@
-<a href {{action "closeMessage"}} class='close'>{{fa-icon "close"}}</a>
+<a href {{action "closeMessage"}} class='close'>{{d-icon "close"}}</a>
 <h3>{{i18n 'composer.similar_topics'}}</h3>
 
 <ul class='topics'>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 22e5eb3a60..fb1a079d26 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -8,7 +8,7 @@
       <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss_new'}}</button>
+    <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
   </div>
 {{/if}}
@@ -60,7 +60,8 @@
       <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss_new'}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>
+        {{d-icon "check"}} {{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
     {{#if latest}}
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker-recent.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-picker-recent.raw.hbs
new file mode 100644
index 0000000000..0ead5e5aee
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/emoji-picker-recent.raw.hbs
@@ -0,0 +1,3 @@
+{{#each recentEmojis as |emoji|}}
+  <button style="background-image: url('{{emoji.src}}')" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
new file mode 100644
index 0000000000..e2570e95b0
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
@@ -0,0 +1,75 @@
+<div class='categories-column'>
+  <div class='category-icon'>
+    <button type="button" class="emoji" tabindex="-1" title="{{i18n 'emoji_picker.recent'}}" data-section="recent" data-tabicon="star"></button>
+  </div>
+
+  <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+    <div class='category-icon'>
+      <button type="button" class="emoji" tabindex="-1" data-tabicon="<%= group["tabicon"] %>" data-section="<%= group["name"] %>" title="<%= group["fullname"] %>"></button>
+    </div>
+  <% end %>
+
+  <% if !Emoji.custom.blank? %>
+    <div class='category-icon'>
+      <button data-tabicon="<%= Emoji.custom.first.name %>" type="button" class="emoji" tabindex="-1" data-section="ungrouped" title="{{i18n 'emoji_picker.custom'}}"></button>
+    </div>
+  <% end %>
+</div>
+
+<div class='main-column'>
+  <div class='filter'>
+    {{d-icon 'search'}}
+    <input type='text' name="filter" placeholder="{{i18n 'emoji_picker.filter_placeholder'}}" autocomplete="off" autofocus/>
+    <button class='clear-filter'>
+      {{d-icon 'times'}}
+    </button>
+  </div>
+
+  <div class='results'></div>
+
+  <div class='list'>
+    <div class='section' data-section='recent'>
+      <div class='section-header'>
+        <span class="title">{{i18n 'emoji_picker.recent'}}</span>
+        <a href='#' class='clear-recent'>{{d-icon 'trash'}}</a>
+      </div>
+      <div class='section-group'></div>
+    </div>
+
+    <% JSON.parse(File.read("lib/emoji/groups.json")).each.with_index do |group, group_index| %>
+      <div class='section' data-section='<%= group["name"] %>'>
+        <div class='section-header'>
+          <span class="title">{{i18n 'emoji_picker.<%= group["name"] %>'}}</span>
+        </div>
+        <div class='section-group'>
+          <% group["icons"].each  do |icon| %>
+            <button type="button" class="emoji <%= "diversity" if icon["diversity"] %>" tabindex="-1" title="<%= icon['name']%>"></button>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    {{#if customEmojis.length}}
+      <div class='section' data-section='ungrouped'>
+        <div class='section-header'>
+          <span class="title">{{i18n 'emoji_picker.custom'}}</span>
+        </div>
+        <div class='section-group'>
+          {{#each customEmojis as |emoji|}}
+            <button style="background-url: url("{{emoji.src}}")" type="button" class="emoji" tabindex="-1" title="{{emoji.code}}"></button>
+          {{/each}}
+        </div>
+      </div>
+    {{/if}}
+  </div>
+  <div class='footer'>
+    <div class='info'></div>
+    <div class='diversity-picker'>
+      <% ['default', 'light', 'medium-light', 'medium', 'medium-dark', 'dark'].each.with_index do |diversity, index| %>
+        <a href='#' title="{{i18n 'emoji_picker.<%= diversity.gsub('-', '_') %>_tone'}}" class='diversity-scale <%= diversity %>' data-level="<%= index + 1 %>">
+          {{d-icon "check"}}
+        </a>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
deleted file mode 100644
index fb684b57d6..0000000000
--- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class='emoji-modal {{modalClass}}'>
-  <ul class='toolbar'>
-    {{#each toolbarItems as |item|}}<li><a title='{{item.title}}' {{#if item.selected}}class='selected'{{/if}} data-group-id='{{item.groupId}}'><img src='{{item.src}}' class='emoji'></a></li>{{/each}}
-  </ul>
-  <div class='emoji-table-wrapper'>
-  <table class='emoji-page'>
-    {{#each rows as |row|}}
-      <tr>
-        {{#each row as |item|}}
-          <td><a title='{{item.title}}'><img src='{{item.src}}' class='emoji'></a></td>
-        {{/each}}
-      </tr>
-    {{/each}}
-  </table>
-  </div>
-
-  <div class='footer'>
-    <div class='info'></div>
-    <div class='tones'>
-      {{#each skinTones as |skinTone|}}
-        <a href='#' class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}">
-          {{#if skinTone.selected}}{{fa-icon "check"}}{{/if}}
-        </a>
-      {{/each}}
-    </div>
-    <div class='nav'>
-      <span class='prev'>
-        {{#if prevDisabled}}
-          {{fa-icon "fast-backward"}}
-        {{else}}
-          <a>{{fa-icon "fast-backward"}}</a>
-        {{/if}}
-      </span>
-      <span class='next'>
-        {{#if nextDisabled}}
-          {{fa-icon "fast-forward"}}
-        {{else}}
-          <a>{{fa-icon "fast-forward"}}</a>
-        {{/if}}
-      </span>
-    </div>
-  </div>
-
-  <div class='clearfix'></div>
-</div>
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index 69537d6d70..2c6d59e487 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -7,7 +7,7 @@
     </div>
     <div class="desc">
       {{#if networkFixed}}
-        <i class="fa fa-check-circle"></i>
+        {{d-icon "check-circle"}}
       {{/if}}
 
       {{desc}}
diff --git a/app/assets/javascripts/discourse/templates/flat-button.raw.hbs b/app/assets/javascripts/discourse/templates/flat-button.raw.hbs
new file mode 100644
index 0000000000..9b5f10eebc
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/flat-button.raw.hbs
@@ -0,0 +1,3 @@
+<button class='btn-flat {{class}}' title='{{i18n "topics.bulk.toggle"}}'>
+  {{d-icon icon}}
+</button>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index e3962efe12..712529c40e 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -45,32 +45,23 @@
     </div>
   {{/if}}
 
-  {{#conditional-loading-spinner condition=loading}}
-
-    {{#unless hasResults}}
-      <h3>
-        {{#if searchActive}}
-          {{i18n "search.no_results"}}
-        {{/if}}
-      </h3>
-    {{/unless}}
-
-    {{#if hasResults}}
-      <div class='search-title clearfix'>
-        <div class='result-count'>
-          <span>
-            {{{i18n "search.result_count" count=resultCount term=noSortQ}}}
-          </span>
-        </div>
-        <div class='sort-by'>
-          <span class='desc'>
-            {{i18n "search.sort_by"}}
-          </span>
-          {{combo-box value=sortOrder content=sortOrders castInteger="true"}}
-        </div>
+  {{#if hasResults}}
+    <div class='search-title clearfix'>
+      <div class='result-count'>
+        <span>
+          {{{i18n "search.result_count" count=resultCount term=noSortQ}}}
+        </span>
       </div>
-    {{/if}}
+      <div class='sort-by'>
+        <span class='desc'>
+          {{i18n "search.sort_by"}}
+        </span>
+        {{combo-box value=sortOrder content=sortOrders castInteger="true"}}
+      </div>
+    </div>
+  {{/if}}
 
+  {{#load-more selector=".fps-result" action="loadMore"}}
     {{#each model.posts as |result|}}
       <div class='fps-result'>
         <div class='author'>
@@ -116,7 +107,7 @@
           {{#if showLikeCount}}
             {{#if result.like_count}}
               <span class='like-count'>
-                {{result.like_count}} {{fa-icon "heart"}}
+                {{result.like_count}} {{d-icon "heart"}}
               </span>
             {{/if}}
           {{/if}}
@@ -124,11 +115,30 @@
       </div>
     {{/each}}
 
-    {{#if hasResults}}
-      <h3 class="search-footer">
-        {{i18n "search.no_more_results"}}
-      </h3>
-    {{/if}}
+    {{#conditional-loading-spinner condition=loading }}
+      {{#unless hasResults}}
+        <h3>
+          {{#if searchActive}}
+              {{i18n "search.no_results"}}
+          {{/if}}
+        </h3>
+      {{/unless}}
+
+      {{#if hasResults}}
+        {{#unless loading}}
+          <h3 class="search-footer">
+            {{#if model.grouped_search_result.more_full_page_results}}
+              {{#if isLastPage }}
+                {{i18n "search.more_results"}}
+              {{/if}}
+            {{else}}
+              {{i18n "search.no_more_results"}}
+            {{/if}}
+          </h3>
+        {{/unless}}
+      {{/if}}
+    {{/conditional-loading-spinner}}
+
+  {{/load-more}}
 
-  {{/conditional-loading-spinner}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/group-edit.hbs b/app/assets/javascripts/discourse/templates/group-edit.hbs
index 03122d2aba..d5552e5327 100644
--- a/app/assets/javascripts/discourse/templates/group-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/group-edit.hbs
@@ -21,11 +21,22 @@
     <div class="control-group">
       <label>
         {{input type='checkbox'
-            checked=model.public
-            class="group-edit-public"
+            checked=model.public_admission
+            class="group-edit-public-admission"
             disabled=model.allow_membership_requests}}
 
-        {{i18n 'groups.public'}}
+        {{i18n 'groups.public_admission'}}
+      </label>
+    </div>
+
+    <div class="control-group">
+      <label>
+        {{input type='checkbox'
+            checked=model.public_exit
+            class="group-edit-public-exit"
+            disabled=model.allow_membership_requests}}
+
+        {{i18n 'groups.public_exit'}}
       </label>
     </div>
 
@@ -34,7 +45,7 @@
         {{input type='checkbox'
             checked=model.allow_membership_requests
             class="group-edit-allow-membership-requests"
-            disabled=model.public}}
+            disabled=model.public_admission}}
 
         {{i18n 'groups.allow_membership_requests'}}
       </label>
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index 24afa5a0c7..aa34b15c1a 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -35,7 +35,7 @@
         {{#each getTabs as |tab|}}
           <li>
             {{#link-to tab.location model title=tab.message}}
-              {{#if tab.icon}}{{fa-icon tab.icon}}{{/if}}
+              {{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
               {{tab.message}}
               {{#if tab.count}}<span class='count'>({{tab.count}})</span>{{/if}}
             {{/link-to}}
@@ -43,6 +43,14 @@
         {{/each}}
       {{/mobile-nav}}
 
+      {{#if displayGroupMessageButton}}
+        {{d-button
+            action="messageGroup"
+            class="btn-primary group-message-button"
+            icon="envelope"
+            label="groups.message"}}
+      {{/if}}
+
       {{group-membership-button model=model showLogin='showLogin'}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 69f3611a79..ade57c9d26 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -42,7 +42,8 @@
             &nbsp;{{input-tip validation=passwordValidation}}
             <div class="instructions">
               {{passwordInstructions}} {{i18n 'invites.optional_description'}}
-              <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
+              <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+                {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
             </div>
           </div>
 
diff --git a/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs b/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
index 428a5c53a7..5714b98d83 100644
--- a/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/action-list.raw.hbs
@@ -1,6 +1,6 @@
 {{#if postNumbers}}
 <div class='post-actions {{className}}'>
-  <i class='fa fa-{{icon}}'></i>
+  {{d-icon icon}}
   {{#each postNumbers as |postNumber|}}
     <a href='{{topic.url}}/{{postNumber}}'>#{{postNumber}}</a>
   {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs b/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
index 599d695abf..94106df50d 100644
--- a/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/posts-count-column.raw.hbs
@@ -1,3 +1,4 @@
 <{{view.tagName}} class='num posts-map posts {{view.likesHeat}}' title='{{view.title}}'>
+  {{raw-plugin-outlet name="topic-list-before-reply-count"}}
   <a href class='posts-map badge-posts {{view.likesHeat}}'>{{number topic.replyCount noTitle="true"}}</a>
 </{{view.tagName}}>
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index d38f958ab3..3ad017f622 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -45,7 +45,7 @@
 <td class="num likes">
   {{#if hasLikes}}
     <a href='{{topic.summaryUrl}}'>
-      {{number topic.like_count}} <i class='fa fa-heart'></i></td>
+      {{number topic.like_count}} {{d-icon "heart"}}</td>
     </a>
   {{/if}}
 {{/if}}
@@ -54,7 +54,7 @@
 <td class="num likes">
   {{#if hasOpLikes}}
     <a href='{{topic.summaryUrl}}'>
-      {{number topic.op_like_count}} <i class='fa fa-heart'></i></td>
+      {{number topic.op_like_count}} {{d-icon "heart"}}</td>
     </a>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
index 8a58906d19..83bdf44a11 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/mobile-nav.hbs
@@ -1,5 +1,7 @@
 {{#if selectedHtml}}
-  <li><a class='expander' {{action 'toggleExpanded'}}>{{{selectedHtml}}} <i class='fa fa-caret-down'></i></a></li>
+  <li><a class='expander' {{action 'toggleExpanded'}}>{{{selectedHtml}}}
+      {{d-icon "caret-down"}}
+    </a></li>
 {{/if}}
 <ul class='drop {{if expanded 'expanded'}}'>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
index 456db2abce..f52a6b16ca 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs
@@ -1,7 +1,7 @@
 <li>
   <a {{action "toggleDrop"}}>
   {{selectedNavItem.displayName}}
-  <i class='fa fa-caret-down'></i>
+  {{d-icon "caret-down"}}
   </a>
 </li>
 {{#if expanded}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index c17937e618..4eb7503e29 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -35,7 +35,9 @@
       <button title="{{i18n 'topics.bulk.dismiss_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissReadPosts"}}>{{i18n 'topics.bulk.dismiss_button'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss_new'}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>
+        {{d-icon "check"}}
+        {{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
     {{#if latest}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index d156ca66dd..0e191a6c8d 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -46,7 +46,7 @@
       <button class='btn btn-large btn-primary'
         disabled={{loginDisabled}}
         {{action "login"}}>
-          <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
+          {{d-icon "unlock"}}&nbsp;{{loginButtonText}}
       </button>
 
       {{#if showSignupLink}}
diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/templates/modal.hbs
index 0366d78a54..a52aa8276f 100644
--- a/app/assets/javascripts/discourse/templates/modal.hbs
+++ b/app/assets/javascripts/discourse/templates/modal.hbs
@@ -1,10 +1,10 @@
-{{#d-modal modalClass=modalClass title=title}}
+{{#d-modal modalClass=modalClass title=title class="hidden"}}
   <div class="modal-outer-container">
     <div class="modal-middle-container">
       <div class="modal-inner-container">
         <div class="modal-header">
           <div class='modal-close'>
-            <a class="close" {{action "closeModal"}}>{{fa-icon "times"}}</a>
+            <a class="close" {{action "closeModal"}}>{{d-icon "times"}}</a>
           </div>
 
           <h3>{{title}}</h3>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index bdaa3d8239..c32fe8e3c1 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -70,7 +70,8 @@
               <td></td>
               <td>
                 <label>{{passwordInstructions}}</label>
-                <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
+                <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+                  {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
               </td>
             </tr>
           {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
index 4dc7a96b32..367359d9e7 100644
--- a/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/dismiss-read.hbs
@@ -5,5 +5,6 @@
 {{/d-modal-body}}
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "dismissReadTopics" dismissTopics}}><i class="fa fa-check"></i> {{i18n 'topics.bulk.dismiss'}}</button>
+  <button class='btn btn-primary' {{action "dismissReadTopics" dismissTopics}}>
+    {{d-icon "check"}} {{i18n 'topics.bulk.dismiss'}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
index aebd7ad77f..1a15dbd88b 100644
--- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
@@ -38,7 +38,7 @@
         </p>
         <p class="with-validation">
           {{{pinMessage}}}
-          {{fa-icon "clock-o"}}
+          {{d-icon "clock-o"}}
           {{date-picker-future value=model.pinnedInCategoryUntil}}
           {{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
         </p>
@@ -64,7 +64,7 @@
         </p>
         <p class="with-validation">
           {{i18n "topic.feature_topic.pin_globally"}}
-          {{fa-icon "clock-o"}}
+          {{d-icon "clock-o"}}
           {{date-picker-future value=model.pinnedGloballyUntil}}
           {{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
         </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 3b0da39123..465b0a0ed4 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -16,14 +16,14 @@
   <button class='btn btn-primary' {{action "createFlag"}} disabled={{submitDisabled}} title="{{i18n 'flagging.submit_tooltip'}}">{{{submitText}}}</button>
 
   {{#if canSendWarning}}
-    <button class="btn btn-danger" {{action "createFlagAsWarning" }} disabled={{submitDisabled}} title="{{i18n 'flagging.official_warning'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'flagging.official_warning'}}</button>
+  <button class="btn btn-danger" {{action "createFlagAsWarning" }} disabled={{submitDisabled}} title="{{i18n 'flagging.official_warning'}}">{{d-icon "exclamation-triangle"}} {{i18n 'flagging.official_warning'}}</button>
   {{/if}}
 
   {{#if canTakeAction}}
-    <button class='btn btn-danger' {{action "takeAction"}} disabled={{submitDisabled}} title="{{i18n 'flagging.take_action_tooltip'}}"><i class="fa fa-gavel"></i>{{i18n 'flagging.take_action'}}</button>
+  <button class='btn btn-danger' {{action "takeAction"}} disabled={{submitDisabled}} title="{{i18n 'flagging.take_action_tooltip'}}">{{d-icon "gavel"}}{{i18n 'flagging.take_action'}}</button>
   {{/if}}
 
   {{#if canDeleteSpammer}}
-    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} disabled={{submitDisabled}} title="{{i18n 'flagging.delete_spammer'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'flagging.delete_spammer'}}</button>
+  <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} disabled={{submitDisabled}} title="{{i18n 'flagging.delete_spammer'}}">{{d-icon "exclamation-triangle"}} {{i18n 'flagging.delete_spammer'}}</button>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 8597721283..7b83a8961f 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -40,7 +40,7 @@
     </div>
   </div>
   <div id="revision-details">
-    {{fa-icon "pencil"}}
+    {{d-icon "pencil"}}
     {{#link-to 'user' model.username}}
       {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
     {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index f7a7d616bc..81b3fb611d 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -27,7 +27,7 @@
             </tr>
             <tr>
               <td></td>
-              <td><div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div></td>
+              <td><div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">{{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div></td>
               <td></td>
             </tr>
           </table>
@@ -43,7 +43,7 @@
       <button class="btn btn-large btn-primary"
         disabled={{loginDisabled}}
         {{action "login"}}>
-          <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
+          {{d-icon "unlock"}} &nbsp;{{loginButtonText}}
       </button>
 
       {{#if showSignupLink}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
index 8cd51857b7..a94f8b40e4 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
@@ -8,6 +8,6 @@
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToExistingTopic"}}
-    {{fa-icon 'sign-out'}} {{buttonTitle}}
+    {{d-icon 'sign-out'}} {{buttonTitle}}
   {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
index b18a2d793b..3902c3daf1 100644
--- a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
@@ -12,6 +12,6 @@
 
 <div class="modal-footer">
   {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}}
-    {{fa-icon 'sign-out'}} {{buttonTitle}}
+    {{d-icon 'sign-out'}} {{buttonTitle}}
   {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index 567e484a99..72204f6063 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -1,4 +1,4 @@
-{{#d-section bodyClass="navigation-categories"}}
+{{#d-section bodyClass="navigation-categories" class="navigation-categories"}}
   {{bread-crumbs categories=categories}}
 
   {{navigation-bar navItems=navItems filterMode=filterMode}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index 07fb2f693d..fbf412f7b2 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -1,9 +1,10 @@
-{{#d-section bodyClass="navigation-topics" scrollTop="false"}}
+{{#d-section bodyClass="navigation-topics" class="navigation-topics" scrollTop="false"}}
   {{bread-crumbs categories=categories}}
 
   {{navigation-bar navItems=navItems filterMode=filterMode}}
 
   {{#if canCreateTopic}}
-    <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i><span>{{i18n 'topic.create'}}</span></button>
+    <button id="create-topic" class='btn btn-default' {{action "createTopic"}}>
+      {{d-icon "plus"}} <span>{{i18n 'topic.create'}}</span></button>
   {{/if}}
 {{/d-section}}
diff --git a/app/assets/javascripts/discourse/templates/password-reset.hbs b/app/assets/javascripts/discourse/templates/password-reset.hbs
index e101ed0b94..e999fedb1e 100644
--- a/app/assets/javascripts/discourse/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/templates/password-reset.hbs
@@ -25,7 +25,8 @@
         </div>
 
         <div class="instructions">
-          <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
+          <div class="caps-lock-warning {{unless capsLockOn 'invisible'}}">
+            {{d-icon "exclamation-triangle"}} {{i18n 'login.caps_lock_warning'}}</div>
         </div>
 
         <button class='btn btn-primary' {{action "submit"}}>{{i18n 'user.change_password.set_password'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 27e50337a3..239c8d0ecf 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -3,7 +3,8 @@
   <div class="controls">
     <span class='static'>{{model.username}}</span>
     {{#if model.can_edit_username}}
-      {{#link-to "preferences.username" class="btn btn-small pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}}
+      {{#link-to "preferences.username" class="btn btn-small pad-left no-text"}}
+      {{d-icon "pencil"}} {{/link-to}}
     {{/if}}
   </div>
   <div class='instructions'>
@@ -34,7 +35,7 @@
       <div class="controls">
         <span class='static'>{{model.email}}</span>
         {{#if model.can_edit_email}}
-          {{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
+          {{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
         {{/if}}
       </div>
       <div class='instructions'>
@@ -53,7 +54,7 @@
   <label class="control-label">{{i18n 'user.password.title'}}</label>
   <div class="controls">
     <a href {{action "changePassword"}} class='btn'>
-      {{fa-icon "envelope"}}
+      {{d-icon "envelope"}}
       {{#if model.no_password}}
         {{i18n 'user.change_password.set_password'}}
       {{else}}
@@ -81,7 +82,7 @@
     <label class="control-label">{{i18n 'user.title.title'}}</label>
     <div class="controls">
       <span class="static">{{model.title}}</span>
-      {{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
+      {{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index d9be733524..856feedcf7 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -3,7 +3,7 @@
   <label class="control-label">{{i18n 'user.categories_settings'}}</label>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-exclamation-circle watching"></span> {{i18n 'user.watched_categories'}}</label>
+    <label>{{d-icon "exclamation-circle" class="icon watching"}} {{i18n 'user.watched_categories'}}</label>
     {{category-selector categories=model.watchedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
@@ -12,7 +12,7 @@
   </div>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-circle tracking"></span> {{i18n 'user.tracked_categories'}}</label>
+    <label>{{d-icon "circle" class="icon tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
@@ -21,13 +21,13 @@
   </div>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-dot-circle-o watching-first-post"></span> {{i18n 'user.watched_first_post_categories'}}</label>
+    <label>{{d-icon "dot-circle-o" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_categories'}}</label>
     {{category-selector categories=model.watchedFirstPostCategories}}
   </div>
   <div class="instructions">{{i18n 'user.watched_first_post_categories_instructions'}}</div>
 
   <div class="controls category-controls">
-    <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_categories'}}</label>
+    <label>{{d-icon "times-circle" class="icon muted"}} {{i18n 'user.muted_categories'}}</label>
     {{category-selector categories=model.mutedCategories blacklist=selectedCategories}}
   </div>
   <div class="instructions">{{i18n 'user.muted_categories_instructions'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 6c81046e27..c9cf37ac4d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -29,7 +29,7 @@
 <div class="control-group muting">
   <label class="control-label">{{i18n 'user.users'}}</label>
   <div class="controls category-controls">
-    <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_users'}}</label>
+    <label>{{d-icon "times-circle" class="muted icon"}} {{i18n 'user.muted_users'}}</label>
     {{user-selector excludeCurrentUser=true usernames=model.muted_usernames class="user-selector"}}
   </div>
   <div class="instructions">{{i18n 'user.muted_users_instructions'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index c80b98e783..c94a78775d 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -56,7 +56,7 @@
     {{#if model.card_image_badge}}
       {{icon-or-image model.card_image_badge}}
     {{/if}}
-    {{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
+    {{#link-to "preferences.card-badge" class="btn btn-small pad-left no-text"}}{{d-icon "pencil"}}{{/link-to}}
   </div>
 </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
index e2e9507b5b..390429833f 100644
--- a/app/assets/javascripts/discourse/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/tags.hbs
@@ -4,25 +4,25 @@
   <label class="control-label">{{i18n 'user.tag_settings'}}</label>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-exclamation-circle watching"></span> {{i18n 'user.watched_tags'}}</label>
+    <label>{{d-icon "exclamation-circle" class="icon watching"}} {{i18n 'user.watched_tags'}}</label>
     {{tag-chooser tags=model.watched_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.watched_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-circle tracking"></span> {{i18n 'user.tracked_tags'}}</label>
+    <label>{{d-icon "circle" class="icon tracking"}} {{i18n 'user.tracked_tags'}}</label>
     {{tag-chooser tags=model.tracked_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.tracked_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-dot-circle-o watching-first-post"></span> {{i18n 'user.watched_first_post_tags'}}</label>
+    <label>{{d-icon "dot-circle-o" class="icon watching-first-post"}} {{i18n 'user.watched_first_post_tags'}}</label>
     {{tag-chooser tags=model.watching_first_post_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.watched_first_post_tags_instructions'}}</div>
 
   <div class="controls tag-controls">
-    <label><span class="icon fa fa-times-circle muted"></span> {{i18n 'user.muted_tags'}}</label>
+    <label>{{d-icon "times-circle" class="icon muted"}} {{i18n 'user.muted_tags'}}</label>
     {{tag-chooser tags=model.muted_tags blacklist=selectedTags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
   </div>
   <div class="instructions">{{i18n 'user.muted_tags_instructions'}}</div>
diff --git a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
index 58b80d565e..26fde8830f 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups-show.hbs
@@ -20,6 +20,6 @@
   </section>
 
   <button {{action "save"}} disabled={{model.disableSave}} class='btn'>{{i18n 'tagging.groups.save'}}</button>
-  <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n 'tagging.groups.delete'}}</button>
+  <button {{action "destroy"}} disabled={{model.disableSave}} class='btn btn-danger'>{{d-icon "trash-o"}} {{i18n 'tagging.groups.delete'}}</button>
   <span class="saving {{unless model.savingStatus 'hidden'}}">{{model.savingStatus}}</span>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/templates/tag-groups.hbs b/app/assets/javascripts/discourse/templates/tag-groups.hbs
index 139874e75d..a4c0ec21de 100644
--- a/app/assets/javascripts/discourse/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/templates/tag-groups.hbs
@@ -7,10 +7,10 @@
         <li><a {{action "selectTagGroup" tagGroup}} class="{{if tagGroup.selected 'active'}}">{{tagGroup.name}}</a></li>
       {{/each}}
     </ul>
-    <button {{action "newTagGroup"}} class='btn'><i class="fa fa-plus"></i>{{i18n 'tagging.groups.new'}}</button>
+    <button {{action "newTagGroup"}} class='btn'>{{d-icon "plus"}}{{i18n 'tagging.groups.new'}}</button>
   </div>
 
   {{outlet}}
 
   <div class="clearfix" />
-</div>
\ No newline at end of file
+</div>
diff --git a/app/assets/javascripts/discourse/templates/tags/show.hbs b/app/assets/javascripts/discourse/templates/tags/show.hbs
index 5ad165da8c..18659601d1 100644
--- a/app/assets/javascripts/discourse/templates/tags/show.hbs
+++ b/app/assets/javascripts/discourse/templates/tags/show.hbs
@@ -16,7 +16,7 @@
       {{d-button action="renameTag" actionParam=tag icon="pencil" class="admin-tag"}}
     {{else}}
       {{#if canCreateTopic}}
-        <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
+      <button id="create-topic" class='btn btn-default' {{action "createTopic"}}>{{d-icon "plus"}}{{i18n 'topic.create'}}</button>
       {{/if}}
     {{/if}}
 
@@ -30,7 +30,7 @@
     {{else}}
       <h2 class="tag-show-heading">
         {{#link-to 'tags'}}{{i18n "tagging.tags"}}{{/link-to}}
-        {{fa-icon "angle-right"}}
+        {{d-icon "angle-right"}}
         {{discourse-tag-bound tagRecord=tag style="simple"}}
         {{#each additionalTags as |tag|}}
           <span>&amp;</span>
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
index 2c7ea0c947..762ed1e996 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header-column.raw.hbs
@@ -1,7 +1,7 @@
 <th data-sort-order='{{order}}' class='{{view.className}}'>
   {{~#if canBulkSelect}}
     {{~#if showBulkToggle}}
-        <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
+      {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
     {{/if ~}}
     {{~#if bulkSelectEnabled}}
       <span class='bulk-select-topics'>
@@ -12,6 +12,6 @@
   {{/if ~}}
   {{view.localizedName}}
   {{~#if view.isSorting}}
-    <i class='{{view.sortClass}}'></i>
+    {{d-icon sortIcon}}
   {{/if ~}}
 </th>
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
index 2faae1a5d6..9f4646b3ad 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
@@ -1,7 +1,7 @@
 {{#if bulkSelectEnabled}}
   <th class='star'>
     {{#if canBulkSelect}}
-      <button class='btn bulk-select' title='{{i18n "topics.bulk.toggle"}}'><i class='fa fa-list'></i></button>
+      {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
     {{/if}}
   </th>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic-status.raw.hbs b/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
index 621415dfa1..cfcbe836cf 100644
--- a/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-status.raw.hbs
@@ -3,9 +3,9 @@
 {{/if ~}}
 {{~#each view.statuses as |status|~}}
 {{~#if status.href ~}}
-<a href='{{status.href}}' title='{{status.title}}' class='topic-status {{status.extraClasses}}'><i class='fa fa-{{status.icon}}'></i></a>
+<a href='{{status.href}}' title='{{status.title}}' class='topic-status {{status.extraClasses}}'>{{d-icon status.icon}}</a>
 {{~else ~}}
-<{{status.openTag}} title='{{status.title}}' class='topic-status'><i class='fa fa-{{status.icon}}'></i></{{status.closeTag}}>
+<{{status.openTag}} title='{{status.title}}' class='topic-status'>{{d-icon status.icon}}</{{status.closeTag}}>
 {{~/if ~}}
 {{~/each}}
 {{~#if view.renderDiv ~}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 7cdd7568d9..db748edd81 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -10,10 +10,10 @@
 
   {{#if model.postStream.loaded}}
     {{#if model.postStream.firstPostPresent}}
-      {{#topic-title cancelled="cancelEditingTopic" save="finishedEditingTopic"}}
+      {{#topic-title cancelled="cancelEditingTopic" save="finishedEditingTopic" model=model}}
         {{#if editingTopic}}
           {{#if model.isPrivateMessage}}
-            <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
+            <span class="private-message-glyph">{{d-icon "envelope"}}</span>
           {{/if}}
 
           {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
@@ -36,7 +36,7 @@
           <h1>
             {{#unless model.is_warning}}
               <a href={{pmPath}}>
-                <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
+                <span class="private-message-glyph">{{d-icon "envelope"}}</span>
               </a>
             {{/unless}}
 
@@ -48,7 +48,7 @@
             {{/if}}
 
             {{#if model.details.can_edit}}
-              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{fa-icon "pencil"}}</a>
+              <a href {{action "editTopic"}} class="edit-topic" title="{{i18n "edit"}}">{{d-icon "pencil"}}</a>
             {{/if}}
           </h1>
 
@@ -230,7 +230,7 @@
 
                   {{#if currentUser.show_queued_posts}}
                     {{#link-to "queued-posts"}}
-                      {{fa-icon "check"}}
+                      {{d-icon "check"}}
                       {{i18n "queue.view_pending"}}
                     {{/link-to}}
                   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 12a26aa3a0..fab58ece1f 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -17,7 +17,7 @@
               {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}}
               {{#if canBulkInvite}}
                 {{csv-uploader uploading=uploading}}
-                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{fa-icon "question-circle"}}</a>
+                <a href="https://meta.discourse.org/t/sending-bulk-user-invites/16468" target="_blank" style="color:black;">{{d-icon "question-circle"}}</a>
               {{/if}}
               {{#if showBulkActionButtons}}
                 {{#if rescindedAll}}
diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
index 02a8b005dd..4c353fbd06 100644
--- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
@@ -13,7 +13,7 @@
       {{#each options.groups as |group|}}
         <li>
           <a href title="{{group.full_name}}">
-            <i class='fa fa-users'></i>
+            {{d-icon "users"}}
             <span class='username'>{{group.name}}</span>
             <span class='name'>{{group.full_name}}</span>
           </a>
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 7970c3f9a0..5634f64102 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -39,13 +39,13 @@
               {{#if model.can_send_private_message_to_user}}
               <li>
                 <a class='btn btn-primary' {{action "composePrivateMessage" model}}>
-                  {{fa-icon "envelope"}}
+                  {{d-icon "envelope"}}
                   {{i18n 'user.private_message'}}
                 </a>
               </li>
               {{/if}}
               {{#if currentUser.staff}}
-                <li><a href={{model.adminPath}} class="btn">{{fa-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
+                <li><a href={{model.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
               {{/if}}
               {{plugin-outlet name="user-profile-controls"
                               connectorTagName="li"
@@ -53,7 +53,7 @@
 
               {{#if collapsedInfo}}
               {{#if viewingSelf}}
-              <li><a {{action "expandProfile"}} href class="btn">{{fa-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
+              <li><a {{action "expandProfile"}} href class="btn">{{d-icon "angle-double-down"}}{{i18n 'user.expand_profile'}}</a></li>
               {{/if}}
               {{/if}}
 
@@ -68,9 +68,9 @@
             {{/if}}
             {{plugin-outlet name="user-post-names" args=(hash model=model)}}
             <h3>
-            {{#if model.location}}{{fa-icon "map-marker"}} {{model.location}}{{/if}}
+            {{#if model.location}}{{d-icon "map-marker"}} {{model.location}}{{/if}}
             {{#if model.website_name}}
-              {{fa-icon "globe"}}
+              {{d-icon "globe"}}
               {{#if linkWebsite}}
                 <a href={{model.website}} rel={{unless removeNoFollow 'nofollow noopener'}} target="_blank">{{model.website_name}}</a>
               {{else}}
@@ -83,7 +83,7 @@
             <div class='bio'>
               {{#if model.isSuspended}}
                 <div class='suspended'>
-                  {{fa-icon "ban"}}
+                  {{d-icon "ban"}}
                   <b>{{i18n 'user.suspended_notice' date=model.suspendedTillDate}}</b><br/>
                   <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
                 </div>
@@ -167,22 +167,22 @@
       {{#if showNotificationsTab}}
         <li>
           {{#link-to 'userNotifications'}}
-            {{fa-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
+            {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
           {{/link-to}}
         </li>
       {{/if}}
       {{#if showPrivateMessages}}
-        <li>{{#link-to 'userPrivateMessages'}}{{fa-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
+        <li>{{#link-to 'userPrivateMessages'}}{{d-icon "envelope-o"}}{{i18n 'user.private_messages'}}{{/link-to}}</li>
       {{/if}}
       {{#if canInviteToForum}}
-        <li>{{#link-to 'userInvited'}}{{fa-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'userInvited'}}{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
       {{/if}}
       {{#if showBadges}}
-        <li>{{#link-to 'user.badges'}}{{fa-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'user.badges'}}{{d-icon "certificate"}}{{i18n 'badges.title'}}{{/link-to}}</li>
       {{/if}}
       {{plugin-outlet name="user-main-nav" connectorTagName='li' args=(hash model=model)}}
       {{#if model.can_edit}}
-        <li>{{#link-to 'preferences'}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+        <li>{{#link-to 'preferences'}}{{d-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
       {{/if}}
     {{/mobile-nav}}
 
diff --git a/app/assets/javascripts/discourse/templates/user/activity.hbs b/app/assets/javascripts/discourse/templates/user/activity.hbs
index b0fa84ba14..165e0cfbcf 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/templates/user/activity.hbs
@@ -8,18 +8,18 @@
     </li>
     <li>
       {{#link-to 'userActivity.replies'}}
-        <i class="glyph fa fa-reply"></i>{{i18n 'user_action_groups.5'}}
+        {{d-icon "reply" class="glyph"}}{{i18n 'user_action_groups.5'}}
       {{/link-to}}
     </li>
     <li>
       {{#link-to 'userActivity.likesGiven'}}
-        <i class="glyph fa fa-heart"></i>{{i18n 'user_action_groups.1'}}
+        {{d-icon "heart" class="glyph"}}{{i18n 'user_action_groups.1'}}
       {{/link-to}}
     </li>
     {{#if showBookmarks}}
     <li>
       {{#link-to 'userActivity.bookmarks'}}
-        <i class="glyph fa fa-bookmark"></i>{{i18n 'user_action_groups.3'}}
+        {{d-icon "bookmark" class="glyph"}}{{i18n 'user_action_groups.3'}}
       {{/link-to}}
     </li>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/messages.hbs b/app/assets/javascripts/discourse/templates/user/messages.hbs
index ece0c407b7..3e19ee722a 100644
--- a/app/assets/javascripts/discourse/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/templates/user/messages.hbs
@@ -26,7 +26,7 @@
     {{#if group.has_messages}}
     <li>
       {{#link-to 'userPrivateMessages.group' group.name}}
-        <i class='glyph fa fa-group'></i>
+        {{d-icon "group" class="glyph"}}
         {{capitalize-string group.name}}
       {{/link-to}}
     </li>
@@ -44,7 +44,7 @@
 
 <div class="clearfix list-actions">
     <button {{action "toggleBulkSelect"}} class="btn bulk-select" title="{{i18n "user.messages.bulk_select"}}">
-      <i class="fa fa-list"></i>
+      {{d-icon "list"}}
     </button>
 
     {{#if site.mobileView}}
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index ce0128519f..19e549d6c1 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -5,17 +5,17 @@
     </li>
     <li>
       {{#link-to 'userNotifications.responses'}}
-        <i class="glyph fa fa-reply"></i>
+        {{d-icon "reply" class="glyph"}}
         {{i18n 'user_action_groups.6'}}
       {{/link-to}}
     </li>
     <li>
       {{#link-to 'userNotifications.likesReceived'}}
-        <i class="glyph fa fa-heart"></i>{{i18n 'user_action_groups.2'}}
+        {{d-icon "heart" class="glyph"}}{{i18n 'user_action_groups.2'}}
       {{/link-to}}
     </li>
-    <li>{{#link-to 'userNotifications.mentions'}}<i class="glyph fa fa-at"></i>{{i18n 'user_action_groups.7'}}{{/link-to}}</li>
-    <li>{{#link-to 'userNotifications.edits'}}<i class="glyph fa fa-pencil"></i>{{i18n 'user_action_groups.11'}}{{/link-to}}</li>
+    <li>{{#link-to 'userNotifications.mentions'}}{{d-icon "at" class="glyph"}}{{i18n 'user_action_groups.7'}}{{/link-to}}</li>
+    <li>{{#link-to 'userNotifications.edits'}}{{d-icon "pencil" class="glyph"}}{{i18n 'user_action_groups.11'}}{{/link-to}}</li>
   {{/mobile-nav}}
 
   {{#if model}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index 19150c2be8..d28eef4a30 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -54,7 +54,7 @@
                 {{format-date reply.createdAt format="tiny" noTitle="true"}}
                 {{#if reply.like_count}}
                   &middot;
-                  {{fa-icon 'heart'}}&nbsp;<span class='like-count'>{{number reply.like_count}}</span>
+                  {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number reply.like_count}}</span>
                 {{/if}}
               </span>
               <br>
@@ -79,7 +79,7 @@
                 {{format-date topic.createdAt format="tiny" noTitle="true"}}
                 {{#if topic.like_count}}
                   &middot;
-                  {{fa-icon 'heart'}}&nbsp;<span class='like-count'>{{number topic.like_count}}</span>
+                  {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number topic.like_count}}</span>
                 {{/if}}
               </span>
               <br>
@@ -127,7 +127,7 @@
           {{#each model.most_replied_to_users as |user|}}
             <li>
               {{#user-info user=user}}
-                {{fa-icon "reply"}}
+                {{d-icon "reply"}}
                 <span class='replies'>{{number user.count}}</span>
               {{/user-info}}
             </li>
@@ -147,7 +147,7 @@
           {{#each model.most_liked_by_users as |user|}}
             <li>
               {{#user-info user=user}}
-                {{fa-icon "heart"}}
+                {{d-icon "heart"}}
                 <span class='likes'>{{number user.count}}</span>
               {{/user-info}}
             </li>
@@ -164,7 +164,7 @@
           {{#each model.most_liked_users as |user|}}
             <li>
               {{#user-info user=user}}
-                {{fa-icon "heart"}}
+                {{d-icon "heart"}}
                 <span class='likes'>{{number user.count}}</span>
               {{/user-info}}
             </li>
diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
index df852621b9..0e8212f35a 100644
--- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
+++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { avatarFor } from 'discourse/widgets/post';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import { dateNode } from 'discourse/helpers/node';
 import { userPath } from 'discourse/lib/url';
diff --git a/app/assets/javascripts/discourse/widgets/button.js.es6 b/app/assets/javascripts/discourse/widgets/button.js.es6
index f3893f1f69..ece396abaa 100644
--- a/app/assets/javascripts/discourse/widgets/button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/button.js.es6
@@ -1,7 +1,8 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 
-export default createWidget('button', {
+
+const ButtonClass = {
   tagName: 'button.widget-button',
 
   buildClasses(attrs) {
@@ -59,4 +60,10 @@ export default createWidget('button', {
     }
     return this.sendWidgetAction(attrs.action);
   }
-});
+};
+
+export default createWidget('button', ButtonClass);
+
+createWidget('flat-button', jQuery.extend(ButtonClass, {
+  tagName: 'button.widget-button.btn-flat'
+}));
diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
index 6f572388ab..11036d8541 100644
--- a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
@@ -2,7 +2,7 @@ import PostCooked from 'discourse/widgets/post-cooked';
 import DecoratorHelper from 'discourse/widgets/decorator-helper';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import DiscourseURL from 'discourse/lib/url';
 
 createWidget('post-link-arrow', {
diff --git a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6 b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
index 8a083df660..65ae654c5d 100644
--- a/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header-topic-info.js.es6
@@ -1,6 +1,6 @@
 import { applyDecorators, createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import DiscourseURL from 'discourse/lib/url';
 import RawHtml from 'discourse/widgets/raw-html';
 import renderTags from 'discourse/lib/render-tags';
diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6
index 0dc7716211..600bd75308 100644
--- a/app/assets/javascripts/discourse/widgets/header.js.es6
+++ b/app/assets/javascripts/discourse/widgets/header.js.es6
@@ -1,9 +1,10 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { avatarImg } from 'discourse/widgets/post';
 import DiscourseURL from 'discourse/lib/url';
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import { applySearchAutocomplete } from "discourse/lib/search";
+import { ajax } from 'discourse/lib/ajax';
 
 import { h } from 'virtual-dom';
 
@@ -249,7 +250,29 @@ export default createWidget('header', {
   },
 
   linkClickedEvent(attrs) {
-    if (!(attrs && attrs.searchContextEnabled)) this.closeAll();
+
+    let searchContextEnabled = false;
+    if (attrs) {
+      searchContextEnabled = attrs.searchContextEnabled;
+
+      const { searchLogId, searchResultId, searchResultType } = attrs;
+      if (searchLogId && searchResultId && searchResultType) {
+
+        ajax('/search/click', {
+          type: 'POST',
+          data: {
+            search_log_id: searchLogId,
+            search_result_id: searchResultId,
+            search_result_type: searchResultType
+          }
+        });
+      }
+    }
+
+    if (!searchContextEnabled) {
+      this.closeAll();
+    }
+
     this.updateHighlight();
   },
 
@@ -306,8 +329,12 @@ export default createWidget('header', {
 
     // If we're viewing a topic, only intercept search if there are cloaked posts
     if (showSearch && currentPath.match(/^topic\./)) {
-      showSearch = ($('.topic-post .cooked, .small-action:not(.time-gap)').length <
-                    this.register.lookup('controller:topic').get('model.postStream.stream.length'));
+      const controller = this.register.lookup('controller:topic');
+      const total = controller.get('model.postStream.stream.length') || 0;
+      const chunkSize = controller.get('model.chunk_size') || 0;
+
+      showSearch = (total > chunkSize) &&
+        $('.topic-post .cooked, .small-action:not(.time-gap)').length < total;
     }
 
     if (state.searchVisible) {
diff --git a/app/assets/javascripts/discourse/widgets/home-logo.js.es6 b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
index ad4c59b26a..c226d944eb 100644
--- a/app/assets/javascripts/discourse/widgets/home-logo.js.es6
+++ b/app/assets/javascripts/discourse/widgets/home-logo.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import DiscourseURL from 'discourse/lib/url';
 
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index 4f6beef6bf..c6426a8623 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -1,6 +1,6 @@
 import { wantsNewWindow } from 'discourse/lib/intercept-click';
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
 
diff --git a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
index eb868b0343..4fb293745a 100644
--- a/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-admin-menu.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index 2786f7df73..11eaf277dc 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -1,3 +1,4 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
 import { ajax } from 'discourse/lib/ajax';
 import { isValidLink } from 'discourse/lib/click-track';
 import { number } from 'discourse/lib/formatter';
@@ -140,7 +141,7 @@ export default class PostCooked {
         $blockQuote.showHtml(div, 'fast', finished);
       }).catch((e) => {
         if (e.jqXHR.status === 404) {
-          $blockQuote.showHtml($("<div class='expanded-quote'><i class='fa fa-trash-o'></i></div>"), 'fast', finished);
+          $blockQuote.showHtml($(`<div class='expanded-quote'>${iconHTML('trash-o')}</div>`), 'fast', finished);
         }
       });
     } else {
@@ -178,7 +179,7 @@ export default class PostCooked {
     // Only add the expand/contract control if it's not a full post
     let expandContract = "";
     if (!$aside.data('full')) {
-      expandContract = `<i class='fa fa-${desc}' title='${I18n.t("post.expand_collapse")}'></i>`;
+      expandContract = iconHTML(desc, { title: "post.expand_collapse" });
       $('.title', $aside).css('cursor', 'pointer');
     }
     $('.quote-controls', $aside).html(expandContract + navLink);
diff --git a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6 b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
index 531e439685..7d8f492807 100644
--- a/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
@@ -1,5 +1,5 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { longDate } from 'discourse/lib/formatter';
 import { h } from 'virtual-dom';
 
diff --git a/app/assets/javascripts/discourse/widgets/post-links.js.es6 b/app/assets/javascripts/discourse/widgets/post-links.js.es6
index 9182191451..69340bc86b 100644
--- a/app/assets/javascripts/discourse/widgets/post-links.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-links.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { replaceEmoji } from 'discourse/widgets/emoji';
diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
index 06c30eb7dc..b7f97b697e 100644
--- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6
@@ -230,7 +230,7 @@ export default createWidget('post-menu', {
     if (builder) {
       const buttonAtts = builder(attrs, this.state, this.siteSettings);
       if (buttonAtts) {
-        return this.attach('button', buttonAtts);
+        return this.attach('flat-button', buttonAtts);
       }
     }
   },
@@ -360,7 +360,7 @@ export default createWidget('post-menu', {
       return this.sendWidgetAction('toggleLike');
     }
 
-    const $heart = $(`[data-post-id=${attrs.id}] .fa-heart`);
+    const $heart = $(`[data-post-id=${attrs.id}] .d-icon-heart`);
     $heart.closest('button').addClass('has-like');
 
     if (!Ember.testing) {
diff --git a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6 b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
index b128b246ce..680a625911 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import RawHtml from 'discourse/widgets/raw-html';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import { actionDescriptionHtml } from 'discourse/components/small-action';
 import { avatarFor } from 'discourse/widgets/post';
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index c6c9f581f4..016a2c4030 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -1,7 +1,7 @@
 import PostCooked from 'discourse/widgets/post-cooked';
 import DecoratorHelper from 'discourse/widgets/decorator-helper';
 import { createWidget, applyDecorators } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { transformBasicPost } from 'discourse/lib/transform-post';
 import { h } from 'virtual-dom';
 import DiscourseURL from 'discourse/lib/url';
@@ -88,7 +88,7 @@ createWidget('post-avatar', {
   html(attrs) {
     let body;
     if (!attrs.user_id) {
-      body = h('i', { className: 'fa fa-trash-o deleted-user-avatar' });
+      body = iconNode('trash-o', { class: 'deleted-user-avatar' });
     } else {
       body = avatarFor.call(this, this.settings.size, {
         template: attrs.avatar_template,
diff --git a/app/assets/javascripts/discourse/widgets/poster-name.js.es6 b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
index f514b9ac8b..2bf64d738d 100644
--- a/app/assets/javascripts/discourse/widgets/poster-name.js.es6
+++ b/app/assets/javascripts/discourse/widgets/poster-name.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 
diff --git a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6 b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
index 1c43153798..60441867e1 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -1,4 +1,4 @@
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { avatarFor } from 'discourse/widgets/post';
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 41216e414e..c195c962f6 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -3,7 +3,8 @@ import { dateNode } from 'discourse/helpers/node';
 import RawHtml from 'discourse/widgets/raw-html';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
+import highlightText from 'discourse/lib/highlight-text';
 
 class Highlighted extends RawHtml {
   constructor(html, term) {
@@ -12,26 +13,30 @@ class Highlighted extends RawHtml {
   }
 
   decorate($html) {
-    if (this.term) {
-      // special case ignore "l" which is used for magic sorting
-      const words = _.reject(this.term.split(/\s+/), t => t === 'l');
-      $html.highlight(words, { className: 'search-highlight' });
-    }
+    highlightText($html, this.term);
   }
 }
 
-function createSearchResult(type, linkField, fn) {
+function createSearchResult({ type, linkField, builder }) {
   return createWidget(`search-result-${type}`, {
     html(attrs) {
       return attrs.results.map(r => {
+
+        let searchResultId;
+        if (type === "topic") {
+          searchResultId = r.get('topic_id');
+        }
         return h('li', this.attach('link', {
           href: r.get(linkField),
-          contents: () => fn.call(this, r, attrs.term),
+          contents: () => builder.call(this, r, attrs.term),
           className: 'search-link',
-          searchContextEnabled: this.attrs.searchContextEnabled
+          searchResultId,
+          searchResultType: type,
+          searchContextEnabled: attrs.searchContextEnabled,
+          searchLogId: attrs.searchLogId
         }));
       });
-    }
+    },
   });
 }
 
@@ -47,27 +52,43 @@ function postResult(result, link, term) {
   return html;
 }
 
-createSearchResult('user', 'path', function(u) {
-  return [ avatarImg('small', { template: u.avatar_template, username: u.username }), ' ', h('span.user-results', h('b', u.username)), ' ',  h('span.user-results', u.name ? u.name : '') ];
+createSearchResult({
+  type: 'user',
+  linkField: 'path',
+  builder(u) {
+    return [ avatarImg('small', { template: u.avatar_template, username: u.username }), ' ', h('span.user-results', h('b', u.username)), ' ',  h('span.user-results', u.name ? u.name : '') ];
+  }
 });
 
-createSearchResult('topic', 'url', function(result, term) {
-  const topic = result.topic;
-  const link = h('span.topic', [
-    this.attach('topic-status', { topic, disableActions: true }),
-    h('span.topic-title', new Highlighted(topic.get('fancyTitle'), term)),
-    this.attach('category-link', { category: topic.get('category'), link: false })
-  ]);
+createSearchResult({
+  type: 'topic',
+  linkField: 'url',
+  builder(result, term) {
+    const topic = result.topic;
+    const link = h('span.topic', [
+      this.attach('topic-status', { topic, disableActions: true }),
+      h('span.topic-title', new Highlighted(topic.get('fancyTitle'), term)),
+      this.attach('category-link', { category: topic.get('category'), link: false })
+    ]);
 
-  return postResult.call(this, result, link, term);
+    return postResult.call(this, result, link, term);
+  }
 });
 
-createSearchResult('post', 'url', function(result, term) {
-  return postResult.call(this, result, I18n.t('search.post_format', result), term);
+createSearchResult({
+  type: 'post',
+  linkField: 'url',
+  builder(result, term) {
+    return postResult.call(this, result, I18n.t('search.post_format', result), term);
+  }
 });
 
-createSearchResult('category', 'url', function (c) {
-  return this.attach('category-link', { category: c, link: false });
+createSearchResult({
+  type: 'category',
+  linkField: 'url',
+  builder(c) {
+    return this.attach('category-link', { category: c, link: false });
+  }
 });
 
 createWidget('search-menu-results', {
@@ -102,7 +123,8 @@ createWidget('search-menu-results', {
 
       return [
         h('ul', this.attach(rt.componentName, {
-          searchContextEnabled: this.attrs.searchContextEnabled,
+          searchContextEnabled: attrs.searchContextEnabled,
+          searchLogId: attrs.results.grouped_search_result.search_log_id,
           results: rt.results,
           term: attrs.term
         })),
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index ba68383e59..d5e9b12e9a 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -127,11 +127,13 @@ export default createWidget('search-menu', {
       if (searchData.loading) {
         results.push(h('div.searching', h('div.spinner')));
       } else {
-        results.push(this.attach('search-menu-results', { term: searchData.term,
-                                                          noResults: searchData.noResults,
-                                                          results: searchData.results,
-                                                          invalidTerm: searchData.invalidTerm,
-                                                          searchContextEnabled: searchData.contextEnabled }));
+        results.push(this.attach('search-menu-results', {
+          term: searchData.term,
+          noResults: searchData.noResults,
+          results: searchData.results,
+          invalidTerm: searchData.invalidTerm,
+          searchContextEnabled: searchData.contextEnabled
+        }));
       }
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/time-gap.js.es6 b/app/assets/javascripts/discourse/widgets/time-gap.js.es6
index f2ce1cfdb9..30cfd24483 100644
--- a/app/assets/javascripts/discourse/widgets/time-gap.js.es6
+++ b/app/assets/javascripts/discourse/widgets/time-gap.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 
 function description(attrs) {
   const daysSince = attrs.daysSince;
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 75fad312f4..64ca6395c0 100644
--- a/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
@@ -32,7 +32,7 @@ createWidget('topic-admin-menu-button', {
     // We don't show the button when expanded on the right side
     if (!(attrs.rightSide && state.expanded)) {
       result.push(this.attach('button', {
-        className: 'btn ' + (attrs.fixed ? " show-topic-admin" : ""),
+        className: 'btn toggle-admin-menu' + (attrs.fixed ? " show-topic-admin" : ""),
         title: 'topic_admin_menu',
         icon: 'wrench',
         action: 'showAdminMenu',
diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
index c489eb7ec2..6e77bd18e4 100644
--- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6
@@ -17,11 +17,16 @@ function renderParticipants(userFilters, participants) {
 
 createWidget('topic-map-show-links', {
   tagName: 'div.link-summary',
-  html(attrs) {
-    return h('a', I18n.t('topic_map.links_shown', { totalLinks: attrs.totalLinks }));
+  html() {
+    return h('span', this.attach('button', {
+      title: 'topic_map.links_shown',
+      icon: 'chevron-down',
+      action: 'showLinks',
+      className: 'btn'
+    }));
   },
 
-  click() {
+  showLinks() {
     this.sendWidgetAction('showAllLinks');
   }
 });
@@ -181,7 +186,7 @@ createWidget('topic-map-expanded', {
       ];
 
       if (!state.allLinksShown && links.length < attrs.topicLinks.length) {
-        showAllLinksContent.push(this.attach('topic-map-show-links', { totalLinks: attrs.topicLinks.length }));
+        showAllLinksContent.push(this.attach('topic-map-show-links'));
       }
 
       const section = h('section.links', showAllLinksContent);
diff --git a/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6 b/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6
index bd37c8b4d8..6dddbb2272 100644
--- a/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-notifications-button.js.es6
@@ -2,6 +2,7 @@ import { createWidget } from 'discourse/widgets/widget';
 import { topicLevels, buttonDetails } from 'discourse/lib/notification-levels';
 import { h } from 'virtual-dom';
 import RawHTML from 'discourse/widgets/raw-html';
+import { iconNode } from 'discourse-common/lib/icon-library';
 
 createWidget('notification-option', {
   buildKey: attrs => `topic-notifications-button-${attrs.id}`,
@@ -9,7 +10,7 @@ createWidget('notification-option', {
 
   html(attrs) {
     return h('a', [
-        h('span.icon', { className: `fa fa-${attrs.icon} ${attrs.key}`}),
+        iconNode(attrs.icon, { class: `icon ${attrs.key}`, tagName: 'span' }),
         h('div', [
           h('span.title', I18n.t(`topic.notifications.${attrs.key}.title`)),
           h('span.desc', I18n.t(`topic.notifications.${attrs.key}.description`)),
@@ -42,7 +43,7 @@ export default createWidget('topic-notifications-button', {
     const details = buttonDetails(level);
 
     const button = {
-      className: `btn`,
+      className: `btn toggle-notification-options`,
       label: null,
       icon: details.icon,
       action: 'toggleDropdown',
@@ -52,7 +53,7 @@ export default createWidget('topic-notifications-button', {
     if (this.attrs.showFullTitle) {
       button.label = `topic.notifications.${details.key}.title`;
     } else {
-      button.className = 'btn notifications-dropdown';
+      button.className = 'btn toggle-notifications-options notifications-dropdown';
     }
 
     return this.attach('button', button);
diff --git a/app/assets/javascripts/discourse/widgets/topic-status.js.es6 b/app/assets/javascripts/discourse/widgets/topic-status.js.es6
index d0b8ac5ef6..763ce7e216 100644
--- a/app/assets/javascripts/discourse/widgets/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-status.js.es6
@@ -1,5 +1,5 @@
 import { createWidget } from 'discourse/widgets/widget';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import { h } from 'virtual-dom';
 import { escapeExpression } from 'discourse/lib/utilities';
 
diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
index f71e7b892d..bccb90f80f 100644
--- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
@@ -1,7 +1,7 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { relativeAge } from 'discourse/lib/formatter';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import RawHtml from 'discourse/widgets/raw-html';
 
 const SCROLLAREA_HEIGHT = 300;
diff --git a/app/assets/javascripts/markdown-it-bundle.js b/app/assets/javascripts/markdown-it-bundle.js
index 51fe107f81..81c05f719f 100644
--- a/app/assets/javascripts/markdown-it-bundle.js
+++ b/app/assets/javascripts/markdown-it-bundle.js
@@ -1,14 +1,16 @@
 //= require markdown-it.js
-//= require ./pretty-text/engines/markdown-it/helpers
-//= require ./pretty-text/engines/markdown-it/mentions
-//= require ./pretty-text/engines/markdown-it/quotes
-//= require ./pretty-text/engines/markdown-it/emoji
-//= require ./pretty-text/engines/markdown-it/onebox
-//= require ./pretty-text/engines/markdown-it/bbcode-block
-//= require ./pretty-text/engines/markdown-it/bbcode-inline
-//= require ./pretty-text/engines/markdown-it/code
-//= require ./pretty-text/engines/markdown-it/category-hashtag
-//= require ./pretty-text/engines/markdown-it/censored
-//= require ./pretty-text/engines/markdown-it/table
-//= require ./pretty-text/engines/markdown-it/paragraph
-//= require ./pretty-text/engines/markdown-it/newline
+//= require ./pretty-text/engines/discourse-markdown/helpers
+//= require ./pretty-text/engines/discourse-markdown/mentions
+//= require ./pretty-text/engines/discourse-markdown/quotes
+//= require ./pretty-text/engines/discourse-markdown/emoji
+//= require ./pretty-text/engines/discourse-markdown/onebox
+//= require ./pretty-text/engines/discourse-markdown/bbcode-block
+//= require ./pretty-text/engines/discourse-markdown/bbcode-inline
+//= require ./pretty-text/engines/discourse-markdown/code
+//= require ./pretty-text/engines/discourse-markdown/category-hashtag
+//= require ./pretty-text/engines/discourse-markdown/censored
+//= require ./pretty-text/engines/discourse-markdown/table
+//= require ./pretty-text/engines/discourse-markdown/paragraph
+//= require ./pretty-text/engines/discourse-markdown/newline
+//= require ./pretty-text/engines/discourse-markdown/html-img
+//= require ./pretty-text/engines/discourse-markdown/text-post-process
diff --git a/app/assets/javascripts/pretty-text-bundle.js b/app/assets/javascripts/pretty-text-bundle.js
index 691fad8e9a..a572344df8 100644
--- a/app/assets/javascripts/pretty-text-bundle.js
+++ b/app/assets/javascripts/pretty-text-bundle.js
@@ -3,12 +3,10 @@
 //= require ./pretty-text/censored-words
 //= require ./pretty-text/emoji/data
 //= require ./pretty-text/emoji
-//= require ./pretty-text/engines/discourse-markdown
 //= require ./pretty-text/engines/discourse-markdown-it
-//= require_tree ./pretty-text/engines/discourse-markdown
 //= require xss.min
-//= require better_markdown.js
 //= require ./pretty-text/xss
 //= require ./pretty-text/white-lister
 //= require ./pretty-text/sanitizer
 //= require ./pretty-text/oneboxer
+//= require ./pretty-text/inline-oneboxer
diff --git a/app/assets/javascripts/pretty-text/emoji.js.es6 b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
similarity index 88%
rename from app/assets/javascripts/pretty-text/emoji.js.es6
rename to app/assets/javascripts/pretty-text/emoji.js.es6.erb
index 1675e6e5e2..136c290426 100644
--- a/app/assets/javascripts/pretty-text/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/emoji.js.es6.erb
@@ -1,7 +1,7 @@
 import { emojis, aliases, translations, tonableEmojis } from 'pretty-text/emoji/data';
 
 // bump up this number to expire all emojis
-export const IMAGE_VERSION = "5";
+export const IMAGE_VERSION = "<%= Emoji::EMOJI_VERSION %>";
 
 const extendedEmoji = {};
 
@@ -10,10 +10,8 @@ export function registerEmoji(code, url) {
   extendedEmoji[code] = url;
 }
 
-export function emojiList() {
-  const result = emojis.slice(0);
-  _.each(extendedEmoji, (v,k) => result.push(k));
-  return result;
+export function extendedEmojiList() {
+  return extendedEmoji;
 }
 
 const emojiHash = {};
@@ -54,8 +52,7 @@ export function isCustomEmoji(code, opts) {
 
 export function buildEmojiUrl(code, opts) {
   let url;
-  code = code.toLowerCase();
-
+  code = String(code).toLowerCase();
   if (extendedEmoji.hasOwnProperty(code)) {
     url = extendedEmoji[code];
   }
@@ -64,7 +61,7 @@ export function buildEmojiUrl(code, opts) {
     url = opts.customEmoji[code];
   }
 
-  const noToneMatch = code.match(/(.?[\w-]*)?:?/);
+  const noToneMatch = code.match(/([^:]+):?/);
   if (noToneMatch && !url && (emojiHash.hasOwnProperty(noToneMatch[1]) || aliasHash.hasOwnProperty(noToneMatch[1]))) {
     url = opts.getURL(`/images/emoji/${opts.emojiSet}/${code.replace(/:t/, '/')}.png`);
   }
@@ -116,10 +113,9 @@ export function emojiSearch(term, options) {
 };
 
 export function isSkinTonableEmoji(term) {
-  let match = term.match(/^:?(.*?):?$/);
+  const match = _.compact(term.split(":"))[0];
   if (match) {
-    return tonableEmojis.indexOf(match[1]) !== -1;
-  } else {
-    return tonableEmojis.indexOf(term) !== -1;
+    return tonableEmojis.indexOf(match) !== -1;
   }
+  return false;
 }
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 9b9a971828..1174be579c 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,4 +1,4 @@
-import { default as WhiteLister, whiteListFeature } from 'pretty-text/white-lister';
+import { default as WhiteLister } from 'pretty-text/white-lister';
 import { sanitize } from 'pretty-text/sanitizer';
 import guid from 'pretty-text/guid';
 
@@ -10,10 +10,10 @@ function deprecate(feature, name){
   };
 }
 
-function createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions) {
+function createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions, whiteListed) {
   let helper = {};
   helper.markdownIt = true;
-  helper.whiteList = info => whiteListFeature(featureName, info);
+  helper.whiteList = info => whiteListed.push([featureName, info]);
   helper.registerInline = deprecate(featureName,'registerInline');
   helper.replaceBlock = deprecate(featureName,'replaceBlock');
   helper.addPreProcessor = deprecate(featureName,'addPreProcessor');
@@ -71,11 +71,16 @@ class Ruler {
 
 // block bb code ruler for parsing of quotes / code / polls
 function setupBlockBBCode(md) {
-  md.block.bbcode_ruler = new Ruler();
+  md.block.bbcode = { ruler: new Ruler() };
 }
 
 function setupInlineBBCode(md) {
-  md.inline.bbcode_ruler = new Ruler();
+  md.inline.bbcode = { ruler: new Ruler() };
+}
+
+function setupTextPostProcessRuler(md) {
+  const TextPostProcessRuler = requirejs('pretty-text/engines/discourse-markdown/text-post-process').TextPostProcessRuler;
+  md.core.textPostProcess = { ruler: new TextPostProcessRuler() };
 }
 
 function renderHoisted(tokens, idx, options) {
@@ -99,11 +104,60 @@ function setupHoister(md) {
   md.renderer.rules.html_raw = renderHoisted;
 }
 
+const IMG_SIZE_REGEX = /^([1-9]+[0-9]*)x([1-9]+[0-9]*)(\s*,\s*([1-9][0-9]?)%)?$/;
+function renderImage(tokens, idx, options, env, slf) {
+  var token = tokens[idx];
+
+  let alt = slf.renderInlineAsText(token.children, options, env);
+
+  let split = alt.split('|');
+  if (split.length > 1) {
+    let match;
+    let info = split.splice(split.length-1)[0];
+
+    if (match = info.match(IMG_SIZE_REGEX)) {
+      if (match[1] && match[2]) {
+        alt = split.join('|');
+
+        let width = match[1];
+        let height = match[2];
+
+        if (match[4]) {
+          let percent = parseFloat(match[4]) / 100.0;
+          width = parseInt(width * percent);
+          height = parseInt(height * percent);
+        }
+
+        if (token.attrIndex('width') === -1) {
+          token.attrs.push(['width', width]);
+        }
+
+        if (token.attrIndex('height') === -1) {
+          token.attrs.push(['height', height]);
+        }
+      }
+
+    }
+  }
+
+  token.attrs[token.attrIndex('alt')][1] = alt;
+  return slf.renderToken(tokens, idx, options);
+}
+
+function setupImageDimensions(md) {
+  md.renderer.rules.image = renderImage;
+}
+
+let Helpers;
+
 export function setup(opts, siteSettings, state) {
   if (opts.setup) {
     return;
   }
 
+  // we got to require this late cause bundle is not loaded in pretty-text
+  Helpers = Helpers || requirejs('pretty-text/engines/discourse-markdown/helpers');
+
   opts.markdownIt = true;
 
   let optionCallbacks = [];
@@ -116,6 +170,7 @@ export function setup(opts, siteSettings, state) {
 
   const check = /discourse-markdown\/|markdown-it\//;
   let features = [];
+  let whiteListed = [];
 
   Object.keys(require._eak_seen).forEach(entry => {
     if (check.test(entry)) {
@@ -124,7 +179,7 @@ export function setup(opts, siteSettings, state) {
 
         const featureName = entry.split('/').reverse()[0];
         features.push(featureName);
-        module.setup(createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions));
+        module.setup(createHelper(featureName, opts, optionCallbacks, pluginCallbacks, getOptions, whiteListed));
       }
     }
   });
@@ -146,6 +201,10 @@ export function setup(opts, siteSettings, state) {
     delete opts[entry];
   });
 
+  copy.helpers = {
+    textReplace: Helpers.textReplace
+  };
+
   opts.discourse = copy;
   getOptions.f = () => opts.discourse;
 
@@ -154,14 +213,16 @@ export function setup(opts, siteSettings, state) {
     html: true,
     breaks: opts.discourse.features.newline,
     xhtmlOut: false,
-    linkify: true,
+    linkify: opts.discourse.features.linkify,
     typographer: siteSettings.enable_markdown_typographer
   });
 
   setupUrlDecoding(opts.engine);
   setupHoister(opts.engine);
+  setupImageDimensions(opts.engine);
   setupBlockBBCode(opts.engine);
   setupInlineBBCode(opts.engine);
+  setupTextPostProcessRuler(opts.engine);
 
   pluginCallbacks.forEach(([feature, callback])=>{
     if (opts.discourse.features[feature]) {
@@ -173,10 +234,16 @@ export function setup(opts, siteSettings, state) {
   opts.markdownIt = true;
   opts.setup = true;
 
-  if (!opts.discourse.sanitizer) {
+  if (!opts.discourse.sanitizer || !opts.sanitizer) {
     const whiteLister = new WhiteLister(opts.discourse);
+
+    whiteListed.forEach(([feature, info]) => {
+      whiteLister.whiteListFeature(feature, info);
+    });
+
     opts.sanitizer = opts.discourse.sanitizer = (!!opts.discourse.sanitize) ? a=>sanitize(a, whiteLister) : a=>a;
   }
+
 }
 
 export function cook(raw, opts) {
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
deleted file mode 100644
index 3303cc34b9..0000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown.js.es6
+++ /dev/null
@@ -1,597 +0,0 @@
-import guid from 'pretty-text/guid';
-import { default as WhiteLister, whiteListFeature } from 'pretty-text/white-lister';
-import { escape } from 'pretty-text/sanitizer';
-
-var parser = window.BetterMarkdown,
-    MD = parser.Markdown,
-    DialectHelpers = parser.DialectHelpers,
-    hoisted;
-
-let currentOpts;
-
-const emitters = [];
-const preProcessors = [];
-const parseNodes = [];
-
-function findEndPos(text, start, stop, args, offset) {
-  let endPos, nextStart;
-  do {
-    endPos = text.indexOf(stop, offset);
-    if (endPos === -1) { return -1; }
-    nextStart = text.indexOf(start, offset);
-    offset = endPos + stop.length;
-  } while (nextStart !== -1 && nextStart < endPos);
-  return endPos;
-}
-
-class DialectHelper {
-  constructor() {
-    this._dialect = MD.dialects.Discourse = DialectHelpers.subclassDialect(MD.dialects.Gruber);
-    this._setup = false;
-  }
-
-  escape(str) {
-    return escape(str);
-  }
-
-  getOptions() {
-    return currentOpts;
-  }
-
-  registerInlineFeature(featureName, start, fn) {
-    this._dialect.inline[start] = function() {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    };
-  }
-
-  addPreProcessorFeature(featureName, fn) {
-    preProcessors.push(raw => {
-      if (!currentOpts.features[featureName]) { return raw; }
-      return fn(raw, hoister);
-    });
-  }
-
-  /**
-    The simplest kind of replacement possible. Replace a stirng token with JsonML.
-
-    For example to replace all occurrances of :) with a smile image:
-
-    ```javascript
-      helper.inlineReplace(':)', text => ['img', {src: '/images/smile.png'}]);
-    ```
-  **/
-  inlineReplaceFeature(featureName, token, emitter) {
-    this.registerInline(token, (text, match, prev) => {
-      if (!currentOpts.features[featureName]) { return; }
-      return [token.length, emitter.call(this, token, match, prev)];
-    });
-  }
-
-  /**
-    After the parser has been executed, change the contents of a HTML tag.
-
-    Let's say you want to replace the contents of all code tags to prepend
-    "EVIL TROUT HACKED YOUR CODE!":
-
-    ```javascript
-      helper.postProcessTag('code', contents => `EVIL TROUT HACKED YOUR CODE!\n\n${contents}`);
-    ```
-  **/
-  postProcessTagFeature(featureName, tag, emitter) {
-    this.onParseNode(event => {
-      if (!currentOpts.features[featureName]) { return; }
-      const node = event.node;
-      if (node[0] === tag) {
-        node[node.length-1] = emitter(node[node.length-1]);
-      }
-    });
-  }
-
-  /**
-    Matches inline using a regular expression. The emitter function is passed
-    the matches from the regular expression.
-
-    For example, this auto links URLs:
-
-    ```javascript
-      helper.inlineRegexp({
-        matcher: /((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/gm,
-        spaceBoundary: true,
-        start: 'http',
-
-        emitter(matches) {
-          const url = matches[1];
-          return ['a', {href: url}, url];
-        }
-      });
-    ```
-  **/
-  inlineRegexpFeature(featureName, args) {
-    this.registerInline(args.start, function(text, match, prev) {
-      if (!currentOpts.features[featureName]) { return; }
-      if (invalidBoundary(args, prev)) { return; }
-
-      args.matcher.lastIndex = 0;
-      const m = args.matcher.exec(text);
-      if (m) {
-        const result = args.emitter.call(this, m);
-        if (result) {
-          return [m[0].length, result];
-        }
-      }
-    });
-  }
-
-  /**
-    Handles inline replacements surrounded by tokens.
-
-    For example, to handle markdown style bold. Note we use `concat` on the array because
-    the contents are JsonML too since we didn't pass `rawContents` as true. This supports
-    recursive markup.
-
-    ```javascript
-      helper.inlineBetween({
-        between: '**',
-        wordBoundary: true.
-        emitter(contents) {
-          return ['strong'].concat(contents);
-        }
-      });
-    ```
-  **/
-  inlineBetweenFeature(featureName, args) {
-    const start = args.start || args.between;
-    const stop = args.stop || args.between;
-    const startLength = start.length;
-
-    this.registerInline(start, function(text, match, prev) {
-      if (!currentOpts.features[featureName]) { return; }
-      if (invalidBoundary(args, prev)) { return; }
-
-      const endPos = findEndPos(text, start, stop, args, startLength);
-      if (endPos === -1) { return; }
-      var between = text.slice(startLength, endPos);
-
-      // If rawcontents is set, don't process inline
-      if (!args.rawContents) {
-        between = this.processInline(between);
-      }
-
-      var contents = args.emitter.call(this, between);
-      if (contents) {
-        return [endPos+stop.length, contents];
-      }
-    });
-  }
-
-  /**
-    Replaces a block of text between a start and stop. As opposed to inline, these
-    might span multiple lines.
-
-    Here's an example that takes the content between `[code]` ... `[/code]` and
-    puts them inside a `pre` tag:
-
-    ```javascript
-      helper.replaceBlock({
-        start: /(\[code\])([\s\S]*)/igm,
-        stop: '[/code]',
-        rawContents: true,
-
-        emitter(blockContents) {
-          return ['p', ['pre'].concat(blockContents)];
-        }
-      });
-    ```
-  **/
-  replaceBlockFeature(featureName, args) {
-    function blockFunc(block, next) {
-      if (!currentOpts.features[featureName]) { return; }
-
-      const linebreaks = currentOpts.traditionalMarkdownLinebreaks;
-      if (linebreaks && args.skipIfTradtionalLinebreaks) { return; }
-
-      args.start.lastIndex = 0;
-      const result = [];
-      const match = (args.start).exec(block);
-      if (!match) { return; }
-
-      const lastChance = () => !next.some(blk => blk.match(args.stop));
-
-      // shave off start tag and leading text, if any.
-      const pos = args.start.lastIndex - match[0].length;
-      const leading = block.slice(0, pos);
-      const trailing = match[2] ? match[2].replace(/^\n*/, "") : "";
-
-      // The other leading block should be processed first! eg a code block wrapped around a code block.
-      if (args.withoutLeading && args.withoutLeading.test(leading)) {
-        return;
-      }
-
-      // just give up if there's no stop tag in this or any next block
-      args.stop.lastIndex = block.length - trailing.length;
-      if (!args.stop.exec(block) && lastChance()) { return; }
-      if (leading.length > 0) {
-        var parsedLeading = this.processBlock(MD.mk_block(leading), []);
-        if (parsedLeading && parsedLeading[0]) {
-          result.push(parsedLeading[0]);
-        }
-      }
-      if (trailing.length > 0) {
-        next.unshift(MD.mk_block(trailing, block.trailing,
-          block.lineNumber + countLines(leading) + (match[2] ? match[2].length : 0) - trailing.length));
-      }
-
-      // go through the available blocks to find the matching stop tag.
-      const contentBlocks = [];
-      let nesting = 0;
-      let actualEndPos = -1;
-      let currentBlock;
-
-      blockloop:
-      while (currentBlock = next.shift()) {
-
-        // collect all the start and stop tags in the current block
-        args.start.lastIndex = 0;
-        const startPos = [];
-        let m;
-        while (m = (args.start).exec(currentBlock)) {
-          startPos.push(args.start.lastIndex - m[0].length);
-          args.start.lastIndex = args.start.lastIndex - (m[2] ? m[2].length : 0);
-        }
-        args.stop.lastIndex = 0;
-        const endPos = [];
-        while (m = (args.stop).exec(currentBlock)) {
-          endPos.push(args.stop.lastIndex - m[0].length);
-        }
-
-        // go through the available end tags:
-        let ep = 0;
-        let sp = 0;
-        while (ep < endPos.length) {
-          if (sp < startPos.length && startPos[sp] < endPos[ep]) {
-            // there's an end tag, but there's also another start tag first. we need to go deeper.
-            sp++; nesting++;
-          } else if (nesting > 0) {
-            // found an end tag, but we must go up a level first.
-            ep++; nesting--;
-          } else {
-            // found an end tag and we're at the top: done! -- or: start tag and end tag are
-            // identical, (i.e. startPos[sp] == endPos[ep]), so we don't do nesting at all.
-            actualEndPos = endPos[ep];
-            break blockloop;
-          }
-        }
-
-        if (lastChance()) {
-          // when lastChance() becomes true the first time, currentBlock contains the last
-          // end tag available in the input blocks but it's not on the right nesting level
-          // or we would have terminated the loop already. the only thing we can do is to
-          // treat the last available end tag as tho it were matched with our start tag
-          // and let the emitter figure out how to render the garbage inside.
-          actualEndPos = endPos[endPos.length - 1];
-          break;
-        }
-
-        // any left-over start tags still increase the nesting level
-        nesting += startPos.length - sp;
-        contentBlocks.push(currentBlock);
-      }
-
-      const stopLen = currentBlock.match(args.stop)[0].length;
-      const before = currentBlock.slice(0, actualEndPos).replace(/\n*$/, "");
-      const after = currentBlock.slice(actualEndPos + stopLen).replace(/^\n*/, "");
-      if (before.length > 0) contentBlocks.push(MD.mk_block(before, "", currentBlock.lineNumber));
-      if (after.length > 0) next.unshift(MD.mk_block(after, currentBlock.trailing, currentBlock.lineNumber + countLines(before)));
-
-      const emitterResult = args.emitter.call(this, contentBlocks, match);
-      if (emitterResult) { result.push(emitterResult); }
-      return result;
-    };
-
-    if (args.priority) {
-      blockFunc.priority = args.priority;
-    }
-
-    this.registerBlock(args.start.toString(), blockFunc);
-  }
-
-  /**
-    After the parser has been executed, post process any text nodes in the HTML document.
-    This is useful if you want to apply a transformation to the text.
-
-    If you are generating HTML from the text, it is preferable to use the replacer
-    functions and do it in the parsing part of the pipeline. This function is best for
-    simple transformations or transformations that have to happen after all earlier
-    processing is done.
-
-    For example, to convert all text to upper case:
-
-    ```javascript
-      helper.postProcessText(function (text) {
-        return text.toUpperCase();
-      });
-    ```
-  **/
-  postProcessTextFeature(featureName, fn) {
-    emitters.push(function () {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    });
-  }
-
-  onParseNodeFeature(featureName, fn) {
-    parseNodes.push(function () {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    });
-  }
-
-  registerBlockFeature(featureName, name, fn) {
-    const blockFunc = function() {
-      if (!currentOpts.features[featureName]) { return; }
-      return fn.apply(this, arguments);
-    };
-
-    blockFunc.priority = fn.priority;
-    this._dialect.block[name] = blockFunc;
-  }
-
-  applyFeature(featureName, module) {
-    helper.registerInline = (code, fn) => helper.registerInlineFeature(featureName, code, fn);
-    helper.replaceBlock = args => helper.replaceBlockFeature(featureName, args);
-    helper.addPreProcessor = fn => helper.addPreProcessorFeature(featureName, fn);
-    helper.inlineReplace = (token, emitter) => helper.inlineReplaceFeature(featureName, token, emitter);
-    helper.postProcessTag = (token, emitter) => helper.postProcessTagFeature(featureName, token, emitter);
-    helper.inlineRegexp = args => helper.inlineRegexpFeature(featureName, args);
-    helper.inlineBetween = args => helper.inlineBetweenFeature(featureName, args);
-    helper.postProcessText = fn => helper.postProcessTextFeature(featureName, fn);
-    helper.onParseNode = fn => helper.onParseNodeFeature(featureName, fn);
-    helper.registerBlock = (name, fn) => helper.registerBlockFeature(featureName, name, fn);
-
-    module.setup(this);
-  }
-
-  setup() {
-    if (this._setup) { return; }
-    this._setup = true;
-
-    Object.keys(require._eak_seen).forEach(entry => {
-      if (entry.indexOf('discourse-markdown') !== -1) {
-        const module = requirejs(entry);
-        if (module && module.setup) {
-          const featureName = entry.split('/').reverse()[0];
-          helper.whiteList = info => whiteListFeature(featureName, info);
-
-          this.applyFeature(featureName, module);
-          helper.whiteList = undefined;
-        }
-      }
-    });
-
-    MD.buildBlockOrder(this._dialect.block);
-    var index = this._dialect.block.__order__.indexOf("code");
-    if (index > -1) {
-      this._dialect.block.__order__.splice(index, 1);
-      this._dialect.block.__order__.unshift("code");
-    }
-    MD.buildInlinePatterns(this._dialect.inline);
-  }
-};
-
-const helper = new DialectHelper();
-
-export function cook(raw, opts) {
-  currentOpts = opts;
-
-  hoisted = {};
-
-  if (!currentOpts.enableExperimentalMarkdownIt) {
-    raw = hoistCodeBlocksAndSpans(raw);
-    preProcessors.forEach(p => raw = p(raw));
-  }
-
-  const whiteLister = new WhiteLister(opts);
-
-  let result;
-
-  if (currentOpts.enableExperimentalMarkdownIt) {
-    result = opts.sanitizer(
-        requirejs('pretty-text/engines/markdown-it/instance').default(opts).render(raw),
-        whiteLister
-    );
-  } else {
-    const tree = parser.toHTMLTree(raw, 'Discourse');
-    result = opts.sanitizer(parser.renderJsonML(parseTree(tree, opts)), whiteLister);
-  }
-
-  // If we hoisted out anything, put it back
-  const keys = Object.keys(hoisted);
-  if (keys.length) {
-    let found = true;
-
-    const unhoist = function(key) {
-      result = result.replace(new RegExp(key, "g"), function() {
-        found = true;
-        return hoisted[key];
-      });
-    };
-
-    while (found) {
-      found = false;
-      keys.forEach(unhoist);
-    }
-  }
-
-  return result.trim();
-}
-
-export function setup() {
-  helper.setup();
-}
-
-function processTextNodes(node, event, emitter) {
-  if (node.length < 2) { return; }
-
-  if (node[0] === '__RAW') {
-    const hash = guid();
-    hoisted[hash] = node[1];
-    node[1] = hash;
-    return;
-  }
-
-  for (var j=1; j<node.length; j++) {
-    var textContent = node[j];
-    if (typeof textContent === "string") {
-      var result = emitter(textContent, event);
-      if (result) {
-        if (result instanceof Array) {
-          node.splice.apply(node, [j, 1].concat(result));
-        } else {
-          node[j] = result;
-        }
-      } else {
-        node[j] = textContent;
-      }
-
-    }
-  }
-}
-
-// Parse a JSON ML tree, using registered handlers to adjust it if necessary.
-function parseTree(tree, options, path, insideCounts) {
-
-  if (tree instanceof Array) {
-    const event = {node: tree, options, path, insideCounts: insideCounts || {}};
-    parseNodes.forEach(fn => fn(event));
-
-    for (var j=0; j<emitters.length; j++) {
-      processTextNodes(tree, event, emitters[j]);
-    }
-
-    path = path || [];
-    insideCounts = insideCounts || {};
-
-    path.push(tree);
-
-    for (var i=1; i<tree.length; i++) {
-      var n = tree[i],
-          tagName = n[0];
-
-      insideCounts[tagName] = (insideCounts[tagName] || 0) + 1;
-
-      if (n && n.length === 2 && n[0] === "p" && /^<!--([\s\S]*)-->$/.exec(n[1])) {
-        // Remove paragraphs around comment-only nodes.
-        tree[i] = n[1];
-      } else {
-        parseTree(n, options, path, insideCounts);
-      }
-
-      insideCounts[tagName] = insideCounts[tagName] - 1;
-    }
-
-    // If raw nodes are in paragraphs, pull them up
-    if (tree.length === 2 && tree[0] === 'p' && tree[1] instanceof Array && tree[1][0] === "__RAW") {
-      var text = tree[1][1];
-      tree[0] = "__RAW";
-      tree[1] = text;
-    }
-
-    path.pop();
-  }
-  return tree;
-}
-
-// Returns true if there's an invalid word boundary for a match.
-function invalidBoundary(args, prev) {
-  if (!(args.wordBoundary || args.spaceBoundary || args.spaceOrTagBoundary)) { return false; }
-
-  var last = prev[prev.length - 1];
-  if (typeof last !== "string") { return false; }
-
-  if (args.wordBoundary && (!last.match(/\W$/))) { return true; }
-  if (args.spaceBoundary && (!last.match(/\s$/))) { return true; }
-  if (args.spaceOrTagBoundary && (!last.match(/(\s|\>|\()$/))) { return true; }
-}
-
-function countLines(str) {
-  let index = -1, count = 0;
-  while ((index = str.indexOf("\n", index + 1)) !== -1) { count++; }
-  return count;
-}
-
-function hoister(t, target, replacement) {
-  const regexp = new RegExp(target.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), "g");
-  if (t.match(regexp)) {
-    const hash = guid();
-    t = t.replace(regexp, hash);
-    hoisted[hash] = replacement;
-  }
-  return t;
-}
-
-function outdent(t) {
-  return t.replace(/^([ ]{4}|\t)/gm, "");
-}
-
-function removeEmptyLines(t) {
-  return t.replace(/^\n+/, "").replace(/\s+$/, "");
-}
-
-function hideBackslashEscapedCharacters(t) {
-  return t.replace(/\\\\/g, "\u1E800").replace(/\\`/g, "\u1E8001");
-}
-
-function showBackslashEscapedCharacters(t) {
-  return t.replace(/\u1E8001/g, "\\`").replace(/\u1E800/g, "\\\\");
-}
-
-function hoistCodeBlocksAndSpans(text) {
-  // replace all "\`" with a single character
-  text = hideBackslashEscapedCharacters(text);
-
-  // /!\ the order is important /!\
-
-  // fenced code blocks (AKA GitHub code blocks)
-  text = text.replace(/(^\n*|\n)```([a-z0-9\-]*)\n([\s\S]*?)\n```/g, function(_, before, language, content) {
-    const hash = guid();
-    hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
-    return before + "```" + language + "\n" + hash + "\n```";
-  });
-
-  // markdown code blocks
-  text = text.replace(/(^\n*|\n\n)((?:(?:[ ]{4}|\t).*\n*)+)/g, function(match, before, content, index) {
-    // make sure we aren't in a list
-    var previousLine = text.slice(0, index).trim().match(/.*$/);
-    if (previousLine && previousLine[0].length) {
-      previousLine = previousLine[0].trim();
-      if (/^(?:\*|\+|-|\d+\.)\s+/.test(previousLine)) {
-        return match;
-      }
-    }
-    // we can safely hoist the code block
-    const hash = guid();
-    hoisted[hash] = escape(outdent(showBackslashEscapedCharacters(removeEmptyLines(content))));
-    return before + "    " + hash + "\n";
-  });
-
-  // <pre>...</pre> code blocks
-  text = text.replace(/(\s|^)<pre>([\s\S]*?)<\/pre>/ig, function(_, before, content) {
-    const hash = guid();
-    hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
-    return before + "<pre>" + hash + "</pre>";
-  });
-
-  // code spans (double & single `)
-  ["``", "`"].forEach(function(delimiter) {
-    var regexp = new RegExp("(^|[^`])" + delimiter + "([^`\\n]+?)" + delimiter + "([^`]|$)", "g");
-    text = text.replace(regexp, function(_, before, content, after) {
-      const hash = guid();
-      hoisted[hash] = escape(showBackslashEscapedCharacters(content.trim()));
-      return before + delimiter + hash + delimiter + after;
-    });
-  });
-
-  // replace back all weird character with "\`"
-  return showBackslashEscapedCharacters(text);
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/auto-link.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/auto-link.js.es6
deleted file mode 100644
index 78ebe441fd..0000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/auto-link.js.es6
+++ /dev/null
@@ -1,27 +0,0 @@
-//  This addition handles auto linking of text. When included, it will parse out links and create
-//  `<a href>`s for them.
-
-const urlReplacerArgs = {
-  matcher: /^((?:https?:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.])(?:[^\s()<>]+|\([^\s()<>]+\))+(?:\([^\s()<>]+\)|[^`!()\[\]{};:'".,<>?«»“”‘’\s]))/,
-  spaceOrTagBoundary: true,
-
-  emitter(matches) {
-    const url = matches[1];
-    let href = url;
-
-    // Don't autolink a markdown link to something
-    if (url.match(/\]\[\d$/)) { return; }
-
-    // If we improperly caught a markdown link abort
-    if (url.match(/\(http/)) { return; }
-
-    if (url.match(/^www/)) { href = "http://" + url; }
-    return ['a', { href }, url];
-  }
-};
-
-export function setup(helper) {
-  if (helper.markdownIt) { return; }
-  helper.inlineRegexp(_.merge({start: 'http'}, urlReplacerArgs));
-  helper.inlineRegexp(_.merge({start: 'www'}, urlReplacerArgs));
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/bbcode-block.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
similarity index 59%
rename from app/assets/javascripts/pretty-text/engines/markdown-it/bbcode-block.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
index 51050f9206..c2706b7e66 100644
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/bbcode-block.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-block.js.es6
@@ -11,6 +11,8 @@ function trailingSpaceOnly(src, start, max) {
   return true;
 }
 
+const ATTR_REGEX = /^\s*=(.+)$|((([a-z0-9]*)\s*)=)(["“”'].*["“”']|\S+)/ig;
+
 // parse a tag [test a=1 b=2] to a data structure
 // {tag: "test", attrs={a: "1", b: "2"}
 export function parseBBCodeTag(src, start, max, multiline) {
@@ -71,30 +73,21 @@ export function parseBBCodeTag(src, start, max, multiline) {
     // trivial parser that is going to have to be rewritten at some point
     if (raw) {
 
-      // reading a key 0, reading a val = 1
-      let readingKey = true;
-      let startSplit = 0;
-      let key;
+      let match, key, val;
 
-      for(i=0; i<raw.length; i++) {
-        if (raw[i] === '=' || i === (raw.length-1)) {
-          // one more offset to allow room to capture last
-          if (raw[i] !== '=' || i === (raw.length-1)) {
-            i+=1;
-          }
+      while(match = ATTR_REGEX.exec(raw)) {
+        if (match[1]) {
+          key = '_default';
+        } else {
+          key = match[4];
+        }
 
-          let cur = raw.slice(startSplit, i).trim();
-          if (readingKey) {
-            key =  cur || '_default';
-          } else {
-            let val = raw.slice(startSplit, i).trim();
-            if (val && val.length > 0) {
-              val = val.replace(/^["'](.*)["']$/, '$1');
-              attrs[key] = val;
-            }
-          }
-          readingKey = !readingKey;
-          startSplit = i+1;
+        val = match[1] || match[5];
+
+        if (val) {
+          val = val.trim();
+          val = val.replace(/^["'“”](.*)["'“”]$/, '$1');
+          attrs[key] = val;
         }
       }
     }
@@ -109,48 +102,25 @@ export function parseBBCodeTag(src, start, max, multiline) {
   }
 }
 
-function applyBBCode(state, startLine, endLine, silent, md) {
+function findBlockCloseTag(state, openTag, startLine, endLine) {
 
-  var nextLine,
-      old_parent, old_line_max, rule,
-      start = state.bMarks[startLine] + state.tShift[startLine],
-      initial = start,
-      max = state.eMarks[startLine];
-
-  // [ === 91
-  if (91 !== state.src.charCodeAt(start)) { return false; }
-
-  let info = parseBBCodeTag(state.src, start, max, true);
-
-  if (!info || info.closing) {
-    return false;
-  }
-
-  let ruleInfo = md.block.bbcode_ruler.getRuleForTag(info.tag);
-  if (!ruleInfo) { return false; }
-
-  rule = ruleInfo.rule;
-
-  // Since start is found, we can report success here in validation mode
-  if (silent) { return true; }
-
-  // Search for the end of the block
-  nextLine = startLine;
-
-  let closeTag;
-  let nesting = 0;
+  let nesting = 0,
+    line = startLine-1,
+    start,
+    closeTag,
+    max;
 
   for (;;) {
-    nextLine++;
-    if (nextLine >= endLine) {
+    line++;
+    if (line >= endLine) {
       // unclosed bbcode block should not be autoclosed by end of document.
-      return false;
+      return;
     }
 
-    start = state.bMarks[nextLine] + state.tShift[nextLine];
-    max = state.eMarks[nextLine];
+    start = state.bMarks[line] + state.tShift[line];
+    max = state.eMarks[line];
 
-    if (start < max && state.sCount[nextLine] < state.blkIndent) {
+    if (start < max && state.sCount[line] < state.blkIndent) {
       // non-empty line with negative indent should stop the list:
       // - ```
       //  test
@@ -161,35 +131,111 @@ function applyBBCode(state, startLine, endLine, silent, md) {
     // bbcode close [ === 91
     if (91 !== state.src.charCodeAt(start)) { continue; }
 
-    if (state.sCount[nextLine] - state.blkIndent >= 4) {
-      // closing fence should be indented less than 4 spaces
+    if (state.sCount[line] - state.blkIndent >= 4) {
+      // closing bbcode less than 4 spaces
       continue;
     }
 
     closeTag = parseBBCodeTag(state.src, start, max, true);
 
-    if (closeTag && closeTag.closing && closeTag.tag === info.tag) {
+    if (closeTag && closeTag.closing && closeTag.tag === openTag.tag) {
       if (nesting === 0) {
+        closeTag.line = line;
+        closeTag.block = true;
         break;
       }
       nesting--;
     }
 
-    if (closeTag && !closeTag.closing && closeTag.tag === info.tag) {
+    if (closeTag && !closeTag.closing && closeTag.tag === openTag.tag) {
       nesting++;
     }
 
     closeTag = null;
   }
 
+  return closeTag;
+}
+
+function findInlineCloseTag(state, openTag, start, max) {
+
+  let closeTag;
+  let possibleTag = false;
+
+  for(let j=max-1;j>start;j--){
+    if (!possibleTag) {
+      if (state.src.charCodeAt(j) === 93 /* ] */) {
+        possibleTag = true;
+        continue;
+      }
+      if(!isWhiteSpace(state.src.charCodeAt(j))) {
+        break;
+      }
+    } else {
+      if (state.src.charCodeAt(j) === 91 /* [ */) {
+        closeTag = parseBBCodeTag(state.src, j, max);
+        if (!closeTag || closeTag.tag !== openTag.tag || !closeTag.closing) {
+          closeTag = null;
+        }
+        closeTag.start = j;
+        break;
+      }
+    }
+  }
+
+  return closeTag;
+}
+
+function applyBBCode(state, startLine, endLine, silent, md) {
+
+  var nextLine,
+      oldParent, oldLineMax, rule,
+      start = state.bMarks[startLine] + state.tShift[startLine],
+      initial = start,
+      max = state.eMarks[startLine];
+
+  // [ === 91
+  if (91 !== state.src.charCodeAt(start)) { return false; }
+
+  let info = parseBBCodeTag(state.src, start, max);
+
+  if (!info || info.closing) {
+    return false;
+  }
+
+  let ruleInfo = md.block.bbcode.ruler.getRuleForTag(info.tag);
+  if (!ruleInfo) { return false; }
+
+  rule = ruleInfo.rule;
+
+  // Since start is found, we can report success here in validation mode
+  if (silent) { return true; }
+
+  // Search for the end of the block
+  nextLine = startLine;
+
+  // We might have a single inline bbcode
+
+  let closeTag = findInlineCloseTag(state, info, start + info.length, max);
+
+  if (!closeTag) {
+    if (!trailingSpaceOnly(state.src, start + info.length, max)) {
+      return false;
+    }
+    closeTag = findBlockCloseTag(state, info, nextLine+1, endLine);
+  }
+
   if (!closeTag) {
     return false;
   }
 
-  old_parent = state.parentType;
-  old_line_max = state.lineMax;
+  nextLine = closeTag.line || startLine;
+
+  oldParent = state.parentType;
+  oldLineMax = state.lineMax;
 
   // this will prevent lazy continuations from ever going past our end marker
+  // which can happen if we are parsing a bbcode block
   state.lineMax = nextLine;
 
   if (rule.replace) {
@@ -200,7 +246,7 @@ function applyBBCode(state, startLine, endLine, silent, md) {
   } else {
 
     if (rule.before) {
-      rule.before.call(this, state, info.attrs, md, state.src.slice(initial, initial + info.length + 1));
+      rule.before.call(this, state, info, state.src.slice(initial, initial + info.length + 1));
     }
 
     let wrapTag;
@@ -236,30 +282,39 @@ function applyBBCode(state, startLine, endLine, silent, md) {
     let lastToken = state.tokens[state.tokens.length-1];
     lastToken.map    = [ startLine, nextLine ];
 
-    state.md.block.tokenize(state, startLine + 1, nextLine);
+    if (closeTag.block) {
+      state.md.block.tokenize(state, startLine + 1, nextLine);
+    } else {
+      let token = state.push('paragraph_open', 'p', 1);
+      token.map = [startLine, startLine];
+
+      token = state.push('inline', '', 0);
+      token.children = [];
+      token.map = [startLine, startLine];
+      token.content = state.src.slice(start + info.length, closeTag.start);
+
+      state.push('paragraph_close', 'p', -1);
+    }
 
     if (rule.wrap) {
       state.push('wrap_bbcode', wrapTag, -1);
     }
 
     if (rule.after) {
-      rule.after.call(this, state, lastToken, md, 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 = old_parent;
-  state.lineMax = old_line_max;
+  state.parentType = oldParent;
+  state.lineMax = oldLineMax;
   state.line = nextLine+1;
 
   return true;
 }
 
 export function setup(helper) {
-  if (!helper.markdownIt) { return; }
-
-
   helper.registerPlugin(md => {
-    const ruler = md.block.bbcode_ruler;
+    const ruler = md.block.bbcode.ruler;
 
     ruler.push('code', {
       tag: 'code',
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/bbcode-inline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
similarity index 74%
rename from app/assets/javascripts/pretty-text/engines/markdown-it/bbcode-inline.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
index 2184adb7ff..e508509298 100644
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/bbcode-inline.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode-inline.js.es6
@@ -1,4 +1,4 @@
-import { parseBBCodeTag } from 'pretty-text/engines/markdown-it/bbcode-block';
+import { parseBBCodeTag } from 'pretty-text/engines/discourse-markdown/bbcode-block';
 
 function tokanizeBBCode(state, silent, ruler) {
 
@@ -57,6 +57,7 @@ function tokanizeBBCode(state, silent, ruler) {
 
     let token = state.push('text', '' , 0);
     token.content = state.src.slice(pos, pos+tagInfo.length);
+    token.meta = 'bbcode';
 
     state.delimiters.push({
       bbInfo: tagInfo,
@@ -105,10 +106,15 @@ function processBBCode(state, silent) {
     let tag, className;
 
     if (typeof tagInfo.rule.wrap === 'function') {
-      if (!tagInfo.rule.wrap(token, tagInfo)) {
-        return false;
+      let content = "";
+      for (let j = startDelim.token+1; j < endDelim.token; j++) {
+        let inner = state.tokens[j];
+        if (inner.type === 'text' && inner.meta !== 'bbcode') {
+          content += inner.content;
+        }
       }
-      tag = token.tag;
+      tagInfo.rule.wrap(token, state.tokens[endDelim.token], tagInfo, content);
+      continue;
     } else {
       let split = tagInfo.rule.wrap.split('.');
       tag = split[0];
@@ -135,9 +141,6 @@ function processBBCode(state, silent) {
 }
 
 export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
   helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
 
   helper.registerOptions(opts => {
@@ -145,7 +148,7 @@ export function setup(helper) {
   });
 
   helper.registerPlugin(md => {
-    const ruler = md.inline.bbcode_ruler;
+    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);
@@ -160,19 +163,34 @@ export function setup(helper) {
       }
     });
 
+    const simpleUrlRegex = /^http[s]?:\/\//;
     ruler.push('url', {
       tag: 'url',
-      replace: function(state, tagInfo, content) {
-        let token;
+      wrap: function(startToken, endToken, tagInfo, content) {
+        const url = (tagInfo.attrs['_default'] || content).trim();
 
-        token = state.push('link_open', 'a', 1);
-        token.attrs = [['href', content], ['data-bbcode', 'true']];
+        if (simpleUrlRegex.test(url)) {
+          startToken.type = 'link_open';
+          startToken.tag = 'a';
+          startToken.attrs = [['href', url], ['data-bbcode', 'true']];
+          startToken.content = '';
+          startToken.nesting = 1;
 
-        token = state.push('text', '', 0);
-        token.content = content;
+          endToken.type = 'link_close';
+          endToken.tag = 'a';
+          endToken.content = '';
+          endToken.nesting = -1;
+        } else {
+          // just strip the bbcode tag
+          endToken.content = '';
+          startToken.content = '';
 
-        token = state.push('link_close', 'a', -1);
-        return true;
+          // edge case, we don't want this detected as a onebox if auto linked
+          // this ensures it is not stripped
+          startToken.type = 'html_inline';
+        }
+
+        return false;
       }
     });
 
@@ -180,9 +198,10 @@ export function setup(helper) {
       tag: 'email',
       replace: function(state, tagInfo, content) {
         let token;
+        let email = tagInfo.attrs['_default'] || content;
 
         token = state.push('link_open', 'a', 1);
-        token.attrs = [['href', 'mailto:' + content], ['data-bbcode', 'true']];
+        token.attrs = [['href', 'mailto:' + email], ['data-bbcode', 'true']];
 
         token = state.push('text', '', 0);
         token.content = content;
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
deleted file mode 100644
index d011849752..0000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6
+++ /dev/null
@@ -1,170 +0,0 @@
-export function register(helper, codeName, args, emitter) {
-  // Optional second param for args
-  if (typeof args === "function") {
-    emitter = args;
-    args = {};
-  }
-
-  helper.replaceBlock({
-    start: new RegExp("\\[" + codeName + "(=[^\\[\\]]+)?\\]([\\s\\S]*)", "igm"),
-    stop: new RegExp("\\[\\/" + codeName + "\\]", "igm"),
-    emitter(blockContents, matches) {
-
-
-      const options = helper.getOptions();
-      while (blockContents.length && (typeof blockContents[0] === "string" || blockContents[0] instanceof String)) {
-        blockContents[0] = String(blockContents[0]).replace(/^\s+/, '');
-        if (!blockContents[0].length) {
-          blockContents.shift();
-        } else {
-          break;
-        }
-      }
-
-      let contents = [];
-      if (blockContents.length) {
-        const nextContents = blockContents.slice(1);
-        blockContents = this.processBlock(blockContents[0], nextContents);
-
-        nextContents.forEach(nc => {
-          blockContents = blockContents.concat(this.processBlock(nc, []));
-        });
-
-        blockContents.forEach(bc => {
-          if (typeof bc === "string" || bc instanceof String) {
-            var processed = this.processInline(String(bc));
-            if (processed.length) {
-              contents.push(['p'].concat(processed));
-            }
-          } else {
-            contents.push(bc);
-          }
-        });
-      }
-      if (!args.singlePara && contents.length === 1 && contents[0] instanceof Array && contents[0][0] === "para") {
-        contents[0].shift();
-        contents = contents[0];
-      }
-      const result = emitter(contents, matches[1] ? matches[1].replace(/^=|\"/g, '') : null, options);
-      return args.noWrap ? result : ['p', result];
-    }
-  });
-};
-
-export function builders(helper) {
-  function replaceBBCode(tag, emitter, opts) {
-    const start = `[${tag}]`;
-    const stop = `[/${tag}]`;
-
-    opts = opts || {};
-    opts = _.merge(opts, { start, stop, emitter });
-    helper.inlineBetween(opts);
-
-    opts = _.merge(opts, { start: start.toUpperCase(), stop: stop.toUpperCase(), emitter });
-    helper.inlineBetween(opts);
-  }
-
-  return {
-    replaceBBCode,
-
-    register(codeName, args, emitter) {
-      register(helper, codeName, args, emitter);
-    },
-
-    rawBBCode(tag, emitter) {
-      replaceBBCode(tag, emitter, { rawContents: true });
-    },
-
-    removeEmptyLines(contents) {
-      const result = [];
-      for (let i=0; i < contents.length; i++) {
-        if (contents[i] !== "\n") { result.push(contents[i]); }
-      }
-      return result;
-    },
-
-    replaceBBCodeParamsRaw(tag, emitter) {
-      var opts = {
-        rawContents: true,
-        emitter(contents) {
-          const m = /^([^\]]+)\]([\S\s]*)$/.exec(contents);
-          if (m) { return emitter.call(this, m[1], m[2]); }
-        }
-      };
-
-      helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
-
-      tag = tag.toUpperCase();
-      helper.inlineBetween(_.merge(opts, { start: "[" + tag + "=", stop: "[/" + tag + "]" }));
-    }
-  };
-}
-
-export function setup(helper) {
-
-  if (helper.markdownIt) { return; }
-
-  helper.whiteList(['span.bbcode-b', 'span.bbcode-i', 'span.bbcode-u', 'span.bbcode-s']);
-
-  const { replaceBBCode, rawBBCode, removeEmptyLines, replaceBBCodeParamsRaw } = builders(helper);
-
-  replaceBBCode('b', contents => ['span', {'class': 'bbcode-b'}].concat(contents));
-  replaceBBCode('i', contents => ['span', {'class': 'bbcode-i'}].concat(contents));
-  replaceBBCode('u', contents => ['span', {'class': 'bbcode-u'}].concat(contents));
-  replaceBBCode('s', contents => ['span', {'class': 'bbcode-s'}].concat(contents));
-
-  replaceBBCode('ul', contents => ['ul'].concat(removeEmptyLines(contents)));
-  replaceBBCode('ol', contents => ['ol'].concat(removeEmptyLines(contents)));
-  replaceBBCode('li', contents => ['li'].concat(removeEmptyLines(contents)));
-
-  rawBBCode('img', href => ['img', {href}]);
-  rawBBCode('email', contents => ['a', {href: "mailto:" + contents, 'data-bbcode': true}, contents]);
-
-  replaceBBCode('url', contents => {
-    if (!Array.isArray(contents)) { return; }
-
-    const first = contents[0];
-    if (contents.length === 1 && Array.isArray(first) && first[0] === 'a') {
-      // single-line bbcode links shouldn't be oneboxed, so we mark this as a bbcode link.
-      if (typeof first[1] !== 'object') { first.splice(1, 0, {}); }
-      first[1]['data-bbcode'] = true;
-    }
-    return ['concat'].concat(contents);
-  });
-
-  replaceBBCodeParamsRaw('url', function(param, contents) {
-    const url = param.replace(/(^")|("$)/g, '');
-    return ['a', {'href': url}].concat(this.processInline(contents));
-  });
-
-  replaceBBCodeParamsRaw("email", function(param, contents) {
-    return ['a', {href: "mailto:" + param, 'data-bbcode': true}].concat(contents);
-  });
-
-  helper.onParseNode(event => {
-    if (!Array.isArray(event.node)) { return; }
-    const result = [event.node[0]];
-    const nodes = event.node.slice(1);
-    for (let i = 0; i < nodes.length; i++) {
-      if (Array.isArray(nodes[i]) && nodes[i][0] === 'concat') {
-        for (let j = 1; j < nodes[i].length; j++) { result.push(nodes[i][j]); }
-      } else {
-        result.push(nodes[i]);
-      }
-    }
-    for (let i = 0; i < result.length; i++) { event.node[i] = result[i]; }
-  });
-
-  helper.replaceBlock({
-    start: /(\[code\])([\s\S]*)/igm,
-    stop: /\[\/code\]/igm,
-    rawContents: true,
-
-    emitter(blockContents) {
-      const options = helper.getOptions();
-      const inner = blockContents.join("\n");
-      const defaultCodeLang = options.defaultCodeLang;
-      return ['p', ['pre', ['code', {'class': `lang-${defaultCodeLang}`}, inner]]];
-    }
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bold-italics.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bold-italics.js.es6
deleted file mode 100644
index a79a983b08..0000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bold-italics.js.es6
+++ /dev/null
@@ -1,73 +0,0 @@
-import guid from 'pretty-text/guid';
-
-/**
-  markdown-js doesn't ensure that em/strong codes are present on word boundaries.
-  So we create our own handlers here.
-**/
-
-// From PageDown
-const aLetter = /[a-zA-Z0-9\u00aa\u00b5\u00ba\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376-\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f2\u0621-\u064a\u0660-\u0669\u066e-\u066f\u0671-\u06d3\u06d5\u06e5-\u06e6\u06ee-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07c0-\u07ea\u07f4-\u07f5\u07fa\u0904-\u0939\u093d\u0950\u0958-\u0961\u0966-\u096f\u0971-\u0972\u097b-\u097f\u0985-\u098c\u098f-\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc-\u09dd\u09df-\u09e1\u09e6-\u09f1\u0a05-\u0a0a\u0a0f-\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32-\u0a33\u0a35-\u0a36\u0a38-\u0a39\u0a59-\u0a5c\u0a5e\u0a66-\u0a6f\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2-\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0-\u0ae1\u0ae6-\u0aef\u0b05-\u0b0c\u0b0f-\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32-\u0b33\u0b35-\u0b39\u0b3d\u0b5c-\u0b5d\u0b5f-\u0b61\u0b66-\u0b6f\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99-\u0b9a\u0b9c\u0b9e-\u0b9f\u0ba3-\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0be6-\u0bef\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58-\u0c59\u0c60-\u0c61\u0c66-\u0c6f\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0-\u0ce1\u0ce6-\u0cef\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d28\u0d2a-\u0d39\u0d3d\u0d60-\u0d61\u0d66-\u0d6f\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0e01-\u0e30\u0e32-\u0e33\u0e40-\u0e46\u0e50-\u0e59\u0e81-\u0e82\u0e84\u0e87-\u0e88\u0e8a\u0e8d\u0e94-\u0e97\u0e99-\u0e9f\u0ea1-\u0ea3\u0ea5\u0ea7\u0eaa-\u0eab\u0ead-\u0eb0\u0eb2-\u0eb3\u0ebd\u0ec0-\u0ec4\u0ec6\u0ed0-\u0ed9\u0edc-\u0edd\u0f00\u0f20-\u0f29\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8b\u1000-\u102a\u103f-\u1049\u1050-\u1055\u105a-\u105d\u1061\u1065-\u1066\u106e-\u1070\u1075-\u1081\u108e\u1090-\u1099\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1159\u115f-\u11a2\u11a8-\u11f9\u1200-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u1676\u1681-\u169a\u16a0-\u16ea\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1780-\u17b3\u17d7\u17dc\u17e0-\u17e9\u1810-\u1819\u1820-\u1877\u1880-\u18a8\u18aa\u1900-\u191c\u1946-\u196d\u1970-\u1974\u1980-\u19a9\u19c1-\u19c7\u19d0-\u19d9\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b50-\u1b59\u1b83-\u1ba0\u1bae-\u1bb9\u1c00-\u1c23\u1c40-\u1c49\u1c4d-\u1c7d\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u203f-\u2040\u2054\u2071\u207f\u2090-\u2094\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2183-\u2184\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2c6f\u2c71-\u2c7d\u2c80-\u2ce4\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005-\u3006\u3031-\u3035\u303b-\u303c\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fc-\u30ff\u3105-\u312d\u3131-\u318e\u31a0-\u31b7\u31f0-\u31ff\u3400-\u4db5\u4e00-\u9fc3\ua000-\ua48c\ua500-\ua60c\ua610-\ua62b\ua640-\ua65f\ua662-\ua66e\ua67f-\ua697\ua717-\ua71f\ua722-\ua788\ua78b-\ua78c\ua7fb-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8d0-\ua8d9\ua900-\ua925\ua930-\ua946\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uaa50-\uaa59\uac00-\ud7a3\uf900-\ufa2d\ufa30-\ufa6a\ufa70-\ufad9\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe33-\ufe34\ufe4d-\ufe4f\ufe70-\ufe74\ufe76-\ufefc\uff10-\uff19\uff21-\uff3a\uff3f\uff41-\uff5a\uff66-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]/;
-
-
-function unhoist(obj,from,to){
-  let unhoisted = 0;
-  const regex = new RegExp(from, "g");
-
-  if(_.isArray(obj)){
-    for (let i=0; i<obj.length; i++){
-      const item = obj[i];
-
-      if (_.isString(item)) {
-        // Odd, but we need +1 for the / in front of /*
-        const matches = item.match(regex);
-        unhoisted -= matches ? matches.length : 0;
-
-        obj[i] = item.replace(regex, to);
-        unhoisted += item.length - obj[i].length;
-      }
-      if (_.isArray(item)) {
-        unhoisted += unhoist(item, from, to);
-      }
-    }
-  }
-  return unhoisted;
-};
-
-export function setup(helper) {
-
-  if (helper.markdownIt) { return; }
-
-  function replaceMarkdown(match, tag) {
-    const hash = guid();
-
-    helper.registerInline(match, function(text, matched, prev) {
-      if (!text || text.length < match.length + 1) { return; }
-
-      let lastText = prev[prev.length-1];
-      lastText = typeof lastText === "string" && lastText;
-      lastText = lastText && lastText[lastText.length-1];
-
-      if (lastText && (lastText === "/" || lastText.match(aLetter))) { return; }
-      if (text[match.length].match(/\s/)) { return; }
-
-      // hoist out escaped \*
-      text = text.replace(new RegExp("\\\\\\" + match[0], "g"), hash);
-
-      const endText = new RegExp("[^\\s|" + match[0] + "]" + match.replace(/\*/g,"\\*") + "([^" + match[0] + "]|$)");
-      const finish = text.split("\n")[0].search(endText);
-      if (finish && finish >= 0) {
-        const newText = this.processInline(text.substring(match.length, finish+1));
-        const unhoisted_length = unhoist(newText,hash,match[0]);
-        const array = typeof tag === "string" ? [tag].concat(newText) : [tag[0], [tag[1]].concat(newText)];
-        return [(finish + match.length + 1) - unhoisted_length, array];
-      }
-    });
-  }
-
-  replaceMarkdown('***', ['strong','em']);
-  replaceMarkdown('___', ['strong','em']);
-  replaceMarkdown('**', 'strong');
-  replaceMarkdown('__', 'strong');
-  replaceMarkdown('*', 'em');
-  replaceMarkdown('_', 'em');
-};
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
index c33eeff65f..488a528211 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/category-hashtag.js.es6
@@ -1,20 +1,55 @@
+function addHashtag(buffer, matches, state) {
+  const options = state.md.options.discourse;
+  const slug = matches[1];
+  const categoryHashtagLookup = options.categoryHashtagLookup;
+  const result = categoryHashtagLookup && categoryHashtagLookup(slug);
+
+  let token;
+
+  if (result) {
+    token = new state.Token('link_open', 'a', 1);
+    token.attrs = [['class', 'hashtag'], ['href', result[0]]];
+    token.block = false;
+    buffer.push(token);
+
+    token = new state.Token('text', '', 0);
+    token.content = '#';
+    buffer.push(token);
+
+    token = new state.Token('span_open', 'span', 1);
+    token.block = false;
+    buffer.push(token);
+
+    token = new state.Token('text', '', 0);
+    token.content = result[1];
+    buffer.push(token);
+
+    buffer.push(new state.Token('span_close', 'span', -1));
+
+    buffer.push(new state.Token('link_close', 'a', -1));
+  } else {
+
+    token = new state.Token('span_open', 'span', 1);
+    token.attrs = [['class', 'hashtag']];
+    buffer.push(token);
+
+    token = new state.Token('text', '', 0);
+    token.content = matches[0];
+    buffer.push(token);
+
+    token = new state.Token('span_close', 'span', -1);
+    buffer.push(token);
+  }
+}
+
 export function setup(helper) {
+  helper.registerPlugin(md=>{
 
-  if (helper.markdownIt) { return; }
+    const rule = {
+      matcher: /#([\w-:]{1,101})/,
+      onMatch: addHashtag
+    };
 
-  helper.inlineRegexp({
-    start: '#',
-    matcher: /^#([\w-:]{1,101})/i,
-    spaceOrTagBoundary: true,
-
-    emitter(matches) {
-      const options = helper.getOptions();
-      const [hashtag, slug] = matches;
-      const categoryHashtagLookup = options.categoryHashtagLookup;
-      const result = categoryHashtagLookup && categoryHashtagLookup(slug);
-
-      return result ? ['a', { class: 'hashtag', href: result[0] }, '#', ["span", {}, result[1]]]
-                    : ['span', { class: 'hashtag' }, hashtag];
-    }
+    md.core.textPostProcess.ruler.push('category-hashtag', rule);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
index d3ed549fe0..91a0d297ba 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
@@ -1,18 +1,40 @@
-import { censor } from 'pretty-text/censored-words';
-import { registerOption } from 'pretty-text/pretty-text';
+import { censorFn } from 'pretty-text/censored-words';
 
-registerOption((siteSettings, opts) => {
-  opts.features.censored = true;
-  opts.censoredWords = siteSettings.censored_words;
-  opts.censoredPattern = siteSettings.censored_pattern;
-});
+function recurse(tokens, apply) {
+  let i;
+  for(i=0;i<tokens.length;i++) {
+    apply(tokens[i]);
+    if (tokens[i].children) {
+      recurse(tokens[i].children, apply);
+    }
+  }
+}
 
-export function setup(helper) {
+function censorTree(state, censor) {
+  if (!state.tokens) {
+    return;
+  }
 
-  if (helper.markdownIt) { return; }
-
-  helper.addPreProcessor(text => {
-    const options = helper.getOptions();
-    return censor(text, options.censoredWords, options.censoredPattern);
+  recurse(state.tokens, token => {
+    if (token.content) {
+      token.content = censor(token.content);
+    }
+  });
+}
+
+export function setup(helper) {
+  helper.registerOptions((opts, siteSettings) => {
+    opts.censoredPattern = siteSettings.censored_pattern;
+  });
+
+  helper.registerPlugin(md => {
+    const words = md.options.discourse.censoredWords;
+    const patterns = md.options.discourse.censoredPattern;
+
+    if ((words && words.length > 0) || (patterns && patterns.length > 0)) {
+      const replacement = String.fromCharCode(9632);
+      const censor = censorFn(words, patterns, replacement);
+      md.core.ruler.push('censored', state => censorTree(state, censor));
+    }
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
index 048b27a36d..a8def62ce2 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/code.js.es6
@@ -1,27 +1,36 @@
-import { escape } from 'pretty-text/sanitizer';
-import { registerOption } from 'pretty-text/pretty-text';
+// we need a custom renderer for code blocks cause we have a slightly non compliant
+// format with special handling for text and so on
 
-// Support for various code blocks
 const TEXT_CODE_CLASSES = ["text", "pre", "plain"];
 
-function codeFlattenBlocks(blocks) {
-  let result = "";
-  blocks.forEach(function(b) {
-    result += b;
-    if (b.trailing) { result += b.trailing; }
-  });
-  return result;
+
+function render(tokens, idx, options, env, slf, md) {
+  let token = tokens[idx],
+      info = token.info ? md.utils.unescapeAll(token.info) : '',
+      langName = md.options.discourse.defaultCodeLang,
+      className,
+      escapedContent = md.utils.escapeHtml(token.content);
+
+  if (info) {
+    // strip off any additional languages
+    info = info.trim().split(/\s+/g)[0];
+  }
+
+  const acceptableCodeClasses = md.options.discourse.acceptableCodeClasses;
+  if (acceptableCodeClasses && info && acceptableCodeClasses.indexOf(info) !== -1) {
+    langName = info;
+  }
+
+  className = TEXT_CODE_CLASSES.indexOf(info) !== -1 ? 'lang-nohighlight' : 'lang-' + langName;
+
+  return `<pre><code class="${className}">${escapedContent}</code></pre>\n`;
 }
 
-registerOption((siteSettings, opts) => {
-  opts.features.code = true;
-  opts.defaultCodeLang = siteSettings.default_code_lang;
-  opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "").split("|").concat(['auto', 'nohighlight']);
-});
-
 export function setup(helper) {
-
-  if (helper.markdownIt) { return; }
+  helper.registerOptions((opts, siteSettings) => {
+    opts.defaultCodeLang = siteSettings.default_code_lang;
+    opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "").split("|").concat(['auto', 'nohighlight']);
+  });
 
   helper.whiteList({
     custom(tag, name, value) {
@@ -34,50 +43,7 @@ export function setup(helper) {
     }
   });
 
-  helper.replaceBlock({
-    start: /^`{3}([^\n\[\]]+)?\n?([\s\S]*)?/gm,
-    stop: /^```$/gm,
-    withoutLeading: /\[quote/gm, //if leading text contains a quote this should not match
-    emitter(blockContents, matches) {
-      const opts = helper.getOptions();
-
-      let codeLang = opts.defaultCodeLang;
-      const acceptableCodeClasses = opts.acceptableCodeClasses;
-      if (acceptableCodeClasses && matches[1] && acceptableCodeClasses.indexOf(matches[1]) !== -1) {
-        codeLang = matches[1];
-      }
-
-      if (TEXT_CODE_CLASSES.indexOf(matches[1]) !== -1) {
-        return ['p', ['pre', ['code', {'class': 'lang-nohighlight'}, codeFlattenBlocks(blockContents) ]]];
-      } else  {
-        return ['p', ['pre', ['code', {'class': 'lang-' + codeLang}, codeFlattenBlocks(blockContents) ]]];
-      }
-    }
-  });
-
-  helper.replaceBlock({
-    start: /(<pre[^\>]*\>)([\s\S]*)/igm,
-    stop: /<\/pre>/igm,
-    rawContents: true,
-    skipIfTradtionalLinebreaks: true,
-
-    emitter(blockContents) {
-      return ['p', ['pre', codeFlattenBlocks(blockContents)]];
-    }
-  });
-
-  // Ensure that content in a code block is fully escaped. This way it's not white listed
-  // and we can use HTML and Javascript examples.
-  helper.onParseNode(function(event) {
-    const node = event.node,
-    path = event.path;
-
-    if (node[0] === 'code') {
-      const regexp = (path && path[path.length-1] && path[path.length-1][0] && path[path.length-1][0] === "pre") ?
-                     / +$/g : /^ +| +$/g;
-
-      const contents = node[node.length-1];
-      node[node.length-1] = escape(contents.replace(regexp,''));
-    }
+  helper.registerPlugin(md=>{
+    md.renderer.rules.fence = (tokens,idx,options,env,slf)=>render(tokens,idx,options,env,slf,md);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
index 60864a2263..0472216a65 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,117 +1,243 @@
-import { registerOption } from 'pretty-text/pretty-text';
 import { buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji';
 import { translations } from 'pretty-text/emoji/data';
 
-let _unicodeReplacements;
-let _unicodeRegexp;
-export function setUnicodeReplacements(replacements) {
-  _unicodeReplacements = replacements;
-  if (replacements) {
-    // We sort and reverse to match longer emoji sequences first
-    _unicodeRegexp = new RegExp(Object.keys(replacements).sort().reverse().join("|"), "g");
-  }
-};
+const MAX_NAME_LENGTH = 60;
 
-function escapeRegExp(s) {
-  return s.replace(/[-/\\^$*+?.()|[\]{}]/gi, '\\$&');
-}
+let translationTree = null;
 
-function checkPrev(prev) {
-  if (prev && prev.length) {
-    const lastToken = prev[prev.length-1];
-    if (lastToken && lastToken.charAt) {
-      const lastChar = lastToken.charAt(lastToken.length-1);
-      if (!/\W/.test(lastChar)) return false;
-    }
-  }
-  return true;
-}
+// This allows us to efficiently search for aliases
+// We build a data structure that allows us to quickly
+// search through our N next chars to see if any match
+// one of our alias emojis.
+//
+function buildTranslationTree() {
+  let tree = [];
+  let lastNode;
 
-registerOption((siteSettings, opts, state) => {
-  opts.features.emoji = !!siteSettings.enable_emoji;
-  opts.emojiSet = siteSettings.emoji_set || "";
-  opts.customEmoji = state.customEmoji;
-});
+  Object.keys(translations).forEach(function(key){
+    let i;
+    let node = tree;
 
-export function setup(helper) {
+    for(i=0;i<key.length;i++) {
+      let code = key.charCodeAt(i);
+      let j;
 
-  if (helper.markdownIt) { return; }
+      let found = false;
 
-  helper.whiteList('img.emoji');
-
-  function imageFor(code) {
-    code = code.toLowerCase();
-    const opts = helper.getOptions();
-    const url = buildEmojiUrl(code, opts);
-    if (url) {
-      const title = `:${code}:`;
-      const classes = isCustomEmoji(code, opts) ? "emoji emoji-custom" : "emoji";
-      return ['img', { href: url, title, 'class': classes, alt: title }];
-    }
-  }
-
-  const translationsWithColon = {};
-  Object.keys(translations).forEach(t => {
-    if (t[0] === ':') {
-      translationsWithColon[t] = translations[t];
-    } else {
-      const replacement = translations[t];
-      helper.inlineReplace(t, (token, match, prev) => {
-        return checkPrev(prev) ? imageFor(replacement) : token;
-      });
-    }
-  });
-  const translationColonRegexp = new RegExp(Object.keys(translationsWithColon).map(t => `(${escapeRegExp(t)})`).join("|"));
-
-  helper.registerInline(':', (text, match, prev) => {
-    const endPos = text.indexOf(':', 1);
-    const firstSpace = text.search(/\s/);
-    if (!checkPrev(prev)) { return; }
-
-    // If there is no trailing colon, check our translations that begin with colons
-    if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
-      translationColonRegexp.lastIndex = 0;
-      const m = translationColonRegexp.exec(text);
-      if (m && m[0] && text.indexOf(m[0]) === 0) {
-        // Check outer edge
-        const lastChar = text.charAt(m[0].length);
-        if (lastChar && !/\s/.test(lastChar)) return;
-        const contents = imageFor(translationsWithColon[m[0]]);
-        if (contents) {
-          return [m[0].length, contents];
+      for (j=0;j<node.length;j++){
+        if (node[j][0] === code) {
+          node = node[j][1];
+          found = true;
+          break;
         }
       }
+
+      if (!found) {
+        // token, children, value
+        let tmp = [code, []];
+        node.push(tmp);
+        lastNode = tmp;
+        node = tmp[1];
+      }
+    }
+
+    lastNode[1] = translations[key];
+  });
+
+  return tree;
+}
+
+
+function imageFor(code, opts) {
+  code = code.toLowerCase();
+  const url = buildEmojiUrl(code, opts);
+  if (url) {
+    const title = `:${code}:`;
+    const classes = isCustomEmoji(code, opts) ? "emoji emoji-custom" : "emoji";
+    return {url, title, classes};
+  }
+}
+
+function getEmojiName(content, pos, state) {
+
+  if (content.charCodeAt(pos) !== 58) {
+    return;
+  }
+
+  if (pos > 0) {
+    let prev = content.charCodeAt(pos-1);
+    if (!state.md.utils.isSpace(prev) && !state.md.utils.isPunctChar(String.fromCharCode(prev))) {
       return;
     }
+  }
 
-    let between;
-    const emojiNameMatch = text.match(/(?:.*?)(:(?!:).?[\w-]*(?::t\d)?:)/);
-    if (emojiNameMatch) {
-      between = emojiNameMatch[0].slice(1, -1);
-    } else {
-      between = text.slice(1, -1);
+  pos++;
+  if (content.charCodeAt(pos) === 58) {
+    return;
+  }
+
+  let length = 0;
+  while(length < MAX_NAME_LENGTH) {
+    length++;
+
+    if (content.charCodeAt(pos+length) === 58) {
+      // check for t2-t6
+      if (content.substr(pos+length+1, 3).match(/t[2-6]:/)) {
+        length += 3;
+      }
+      break;
     }
 
-    const contents = imageFor(between);
-    if (contents) {
-      return [text.indexOf(between, 1) + between.length + 1, contents];
+    if (pos+length > content.length) {
+      return;
     }
-  });
+  }
 
-  helper.addPreProcessor(text => {
-    if (_unicodeReplacements) {
-      _unicodeRegexp.lastIndex = 0;
+  if (length === MAX_NAME_LENGTH) {
+    return;
+  }
 
-      let m;
-      while ((m = _unicodeRegexp.exec(text)) !== null) {
-        let replacement = ":" + _unicodeReplacements[m[0]] + ":";
-        const before = text.charAt(m.index-1);
-        if (!/\B/.test(before)) {
-          replacement = "\u200b" + replacement;
+  return content.substr(pos, length);
+}
+
+// straight forward :smile: to emoji image
+function getEmojiTokenByName(name, state) {
+
+  let info;
+  if (info = imageFor(name, state.md.options.discourse)) {
+    let token = new state.Token('emoji', 'img', 0);
+    token.attrs = [['src', info.url],
+                   ['title', info.title],
+                   ['class', info.classes],
+                   ['alt', info.title]];
+
+    return token;
+  }
+}
+
+function getEmojiTokenByTranslation(content, pos, state) {
+
+  translationTree = translationTree || buildTranslationTree();
+
+  let currentTree = translationTree;
+
+  let i;
+  let search = true;
+  let found = false;
+  let start = pos;
+
+  while(search) {
+
+    search = false;
+    let code = content.charCodeAt(pos);
+
+    for (i=0;i<currentTree.length;i++) {
+      if(currentTree[i][0] === code) {
+        currentTree = currentTree[i][1];
+        pos++;
+        search = true;
+        if (typeof currentTree === "string") {
+          found = currentTree;
         }
-        text = text.replace(m[0], replacement);
+        break;
       }
     }
-    return text;
+  }
+
+  if (!found) {
+    return;
+  }
+
+  // quick boundary check
+  if (start > 0) {
+    let leading = content.charAt(start-1);
+    if (!state.md.utils.isSpace(leading.charCodeAt(0)) && !state.md.utils.isPunctChar(leading)) {
+      return;
+    }
+  }
+
+  // check trailing for punct or space
+  if (pos < content.length) {
+    let trailing = content.charCodeAt(pos);
+    if (!state.md.utils.isSpace(trailing)){
+      return;
+    }
+  }
+
+  let token = getEmojiTokenByName(found, state);
+  if (token) {
+    return { pos, token };
+  }
+}
+
+function applyEmoji(content, state, emojiUnicodeReplacer) {
+  let i;
+  let result = null;
+  let contentToken = null;
+
+  let start = 0;
+
+  if (emojiUnicodeReplacer) {
+    content = emojiUnicodeReplacer(content);
+  }
+
+  let endToken = content.length;
+
+  for (i=0; i<content.length-1; i++) {
+    let offset = 0;
+    let emojiName = getEmojiName(content,i,state);
+    let token = null;
+
+    if (emojiName) {
+      token = getEmojiTokenByName(emojiName, state);
+      if (token) {
+        offset = emojiName.length+2;
+      }
+    }
+
+    if (!token) {
+      // handle aliases (note: we can't do this in inline cause ; is not a split point)
+      //
+      let info = getEmojiTokenByTranslation(content, i, state);
+
+      if (info) {
+        offset = info.pos - i;
+        token = info.token;
+      }
+    }
+
+    if (token) {
+      result = result || [];
+      if (i-start>0) {
+        contentToken = new state.Token('text', '', 0);
+        contentToken.content = content.slice(start,i);
+        result.push(contentToken);
+      }
+
+      result.push(token);
+      endToken = start = i + offset;
+    }
+  }
+
+  if (endToken < content.length) {
+    contentToken = new state.Token('text', '', 0);
+    contentToken.content = content.slice(endToken);
+    result.push(contentToken);
+  }
+
+  return result;
+}
+
+export function setup(helper) {
+  helper.registerOptions((opts, siteSettings, state)=>{
+    opts.features.emoji = !!siteSettings.enable_emoji;
+    opts.emojiSet = siteSettings.emoji_set || "";
+    opts.customEmoji = state.customEmoji;
+  });
+
+  helper.registerPlugin((md)=>{
+    md.core.ruler.push('emoji', state => md.options.discourse.helpers.textReplace(
+      state, (c,s)=>applyEmoji(c,s,md.options.discourse.emojiUnicodeReplacer))
+    );
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/helpers.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
similarity index 52%
rename from app/assets/javascripts/pretty-text/engines/markdown-it/helpers.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
index b016b5a86c..c689d5c633 100644
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/helpers.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/helpers.js.es6
@@ -13,66 +13,6 @@ export default null;
 //   emitter: emitter
 // });
 
-export function inlineRegexRule(md, options) {
-
-  const start = options.start.charCodeAt(0);
-  const maxLength = (options.maxLength || 500) + 1;
-
-  return function(state, silent) {
-    const pos = state.pos;
-
-    if (state.src.charCodeAt(pos) !== start || silent) {
-      return false;
-    }
-
-    // test prev
-    if (pos > 0) {
-      let prev = state.src.charCodeAt(pos-1);
-      if (!md.utils.isWhiteSpace(prev) && !md.utils.isPunctChar(String.fromCharCode(prev))) {
-        return false;
-      }
-    }
-
-    // skip if in a link
-    if (options.skipInLink && state.tokens) {
-      let i;
-      for(i=state.tokens.length-1;i>=0;i--) {
-        let token = state.tokens[i];
-        let type = token.type;
-        if (type === 'link_open' || (type === 'html_inline' && token.content.substr(0,2).toLowerCase() === "<a")) {
-          return false;
-        }
-        if (type.block || type === 'link_close' || (type === 'html_inline' && token.content.substr(0,4).toLowerCase() === "</a>")) {
-          break;
-        }
-      }
-    }
-
-    const substr = state.src.slice(pos, Math.min(pos + maxLength,state.posMax));
-
-    const matches = options.matcher.exec(substr);
-    if (!matches) {
-      return false;
-    }
-
-    // got to test trailing boundary
-    const finalPos = pos+matches[0].length;
-    if (finalPos < state.posMax) {
-      const trailing = state.src.charCodeAt(finalPos);
-      if (!md.utils.isSpace(trailing) && !md.utils.isPunctChar(String.fromCharCode(trailing))) {
-        return false;
-      }
-    }
-
-    if (options.emitter(matches, state)) {
-      state.pos = Math.min(state.posMax, finalPos);
-      return true;
-    }
-
-    return false;
-
-  };
-}
 
 // based off https://github.com/markdown-it/markdown-it-emoji/blob/master/dist/markdown-it-emoji.js
 //
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6
new file mode 100644
index 0000000000..02adc2cf1e
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html-img.js.es6
@@ -0,0 +1,71 @@
+// special handling for IMG tags on a line by themeselves
+// we always have to handle it as so it is an inline
+// see: https://talk.commonmark.org/t/newline-and-img-tags/2511
+
+const REGEX = /^<img.*\\?>\s*$/i;
+
+function rule(state, startLine, endLine) {
+
+  var nextLine, token, lineText,
+      pos = state.bMarks[startLine] + state.tShift[startLine],
+      max = state.eMarks[startLine];
+
+  // if it's indented more than 3 spaces, it should be a code block
+  if (state.sCount[startLine] - state.blkIndent >= 4) { return false; }
+
+  if (!state.md.options.html) { return false; }
+
+  if (state.src.charCodeAt(pos) !== 0x3C/* < */) { return false; }
+  let pos1 = state.src.charCodeAt(pos+1);
+  if (pos1 !== 73 /* I */ && pos1 !== 105 /* i */) { return false; }
+
+  lineText = state.src.slice(pos, max);
+
+  if (!REGEX.test(lineText)) {
+    return false;
+  }
+
+  let lines = [];
+  lines.push(lineText);
+
+  nextLine = startLine + 1;
+  for (; nextLine < endLine; nextLine++) {
+    pos = state.bMarks[nextLine] + state.tShift[nextLine];
+    max = state.eMarks[nextLine];
+    lineText = state.src.slice(pos, max);
+
+    if (lineText.trim() === "") {
+      break;
+    }
+
+    if (!REGEX.test(lineText)) {
+      break;
+    }
+
+    lines.push(lineText);
+  }
+
+  state.line = nextLine;
+  let oldParentType = state.parentType;
+  state.parentType = 'paragraph';
+
+  token = state.push('paragraph_open', 'p', 1);
+  token.map = [startLine, state.line];
+
+  token = state.push('inline', '', 0);
+  token.content = lines.join('\n');
+  token.map = [startLine, state.line];
+  token.children = [];
+
+  token = state.push('paragraph_close', 'p', -1);
+  state.parentType = oldParentType;
+
+  return true;
+}
+
+
+export function setup(helper) {
+  helper.registerPlugin(md=>{
+     md.block.ruler.before('html_block', 'html_img', rule, {alt: ['fence']});
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6
deleted file mode 100644
index 1d8f21a205..0000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/html.js.es6
+++ /dev/null
@@ -1,52 +0,0 @@
-const BLOCK_TAGS = ['address', 'article', 'aside', 'audio', 'blockquote', 'canvas', 'dd', 'details',
-                    'div', 'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3',
-                    'h4', 'h5', 'h6', 'header', 'hgroup', 'hr', 'iframe', 'noscript', 'ol', 'output',
-                    'p', 'pre', 'section', 'table', 'tfoot', 'ul', 'video', 'summary'];
-
-function splitAtLast(tag, block, next, first) {
-  const endTag = `</${tag}>`;
-  let endTagIndex = first ? block.indexOf(endTag) : block.lastIndexOf(endTag);
-
-  if (endTagIndex !== -1) {
-    endTagIndex += endTag.length;
-
-    const trailing = block.substr(endTagIndex).replace(/^\s+/, '');
-    if (trailing.length) {
-      next.unshift(trailing);
-    }
-
-    return [ block.substr(0, endTagIndex) ];
-  }
-};
-
-export function setup(helper) {
-
-  if (helper.markdownIt) { return; }
-
-  // If a row begins with HTML tags, don't parse it.
-  helper.registerBlock('html', function(block, next) {
-    let split, pos;
-
-    // Fix manual blockquote paragraphing even though it's not strictly correct
-    // PERF NOTE: /\S+<blockquote/ is a perf hog for search, try on huge string
-    if (pos = block.search(/<blockquote/) >= 0) {
-      if(block.substring(0, pos).search(/\s/) === -1) {
-        split = splitAtLast('blockquote', block, next, true);
-        if (split) { return this.processInline(split[0]); }
-      }
-    }
-
-    const m = /^\s*<\/?([^>]+)\>/.exec(block);
-    if (m && m[1]) {
-      const tag = m[1].split(/\s/);
-      if (tag && tag[0] && BLOCK_TAGS.indexOf(tag[0]) !== -1) {
-        split = splitAtLast(tag[0], block, next);
-        if (split) {
-          if (split.length === 1 && split[0] === block) { return; }
-          return split;
-        }
-        return [ block.toString() ];
-      }
-    }
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
index 84be9e5f32..54a5284372 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6
@@ -1,51 +1,48 @@
-/**
-  Supports our custom @mention syntax for calling out a user in a post.
-  It will add a special class to them, and create a link if the user is found in a
-  local map.
-**/
+function addMention(buffer, matches, state) {
+  let username = matches[1] || matches[2];
+  let mentionLookup = state.md.options.discourse.mentionLookup;
+  let getURL = state.md.options.discourse.getURL;
+
+  let type = mentionLookup && mentionLookup(username);
+
+  let tag = 'a';
+  let className = 'mention';
+  let href = null;
+
+  if (type === 'user') {
+    href = getURL('/u/') + username.toLowerCase();
+  } else if (type === 'group') {
+    href = getURL('/groups/') + username;
+    className = 'mention-group';
+  } else {
+    tag = 'span';
+  }
+
+  let token = new state.Token('mention_open', tag, 1);
+  token.attrs = [['class', className]];
+  if (href) {
+    token.attrs.push(['href', href]);
+  }
+
+  buffer.push(token);
+
+  token = new state.Token('text', '', 0);
+  token.content = '@'+username;
+
+  buffer.push(token);
+
+  token = new state.Token('mention_close', tag, -1);
+  buffer.push(token);
+}
+
 export function setup(helper) {
+  helper.registerPlugin(md => {
 
-  if (helper.markdownIt) { return; }
+    const rule = {
+      matcher: /@(\w[\w.-]{0,58}\w)|@(\w)/,
+      onMatch: addMention
+    };
 
-  // We have to prune @mentions that are within links.
-  helper.onParseNode(event => {
-    const node = event.node,
-    path = event.path;
-
-    if (node[1] && node[1]["class"] === 'mention')  {
-      const parent = path[path.length - 1];
-
-      // If the parent is an 'a', remove it
-      if (parent && parent[0] === 'a') {
-        const name = node[2];
-        node.length = 0;
-        node[0] = "__RAW";
-        node[1] = name;
-      }
-    }
-  });
-
-  helper.inlineRegexp({
-    start: '@',
-    // NOTE: since we can't use SiteSettings here (they loads later in process)
-    // we are being less strict to account for more cases than allowed
-    matcher: /^@(\w[\w.-]{0,59})\b/i,
-    wordBoundary: true,
-
-    emitter(matches) {
-      const mention = matches[0].trim();
-      const name = matches[1];
-      const opts = helper.getOptions();
-      const mentionLookup = opts.mentionLookup;
-
-      const type = mentionLookup && mentionLookup(name);
-      if (type === "user") {
-        return ['a', {'class': 'mention', href: opts.getURL("/u/") + name.toLowerCase()}, mention];
-      } else if (type === "group") {
-        return ['a', {'class': 'mention-group', href: opts.getURL("/groups/") + name}, mention];
-      } else {
-        return ['span', {'class': 'mention'}, mention];
-      }
-    }
+    md.core.textPostProcess.ruler.push('mentions', rule);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
index a453445a2c..f1eb2ba759 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/newline.js.es6
@@ -1,30 +1,53 @@
-// Support for the newline behavior in markdown that most expect. Look through all text nodes
-// in the tree, replace any new lines with `br`s.
+// see: https://github.com/markdown-it/markdown-it/issues/375
+//
+// we use a custom paragraph rule cause we have to signal when a
+// link starts with a space, so we can bypass a onebox
+// this is a freedom patch, so careful, may break on updates
+
+
+function newline(state, silent) {
+  var token, pmax, max, pos = state.pos;
+
+  if (state.src.charCodeAt(pos) !== 0x0A/* \n */) { return false; }
+
+  pmax = state.pending.length - 1;
+  max = state.posMax;
+
+  // '  \n' -> hardbreak
+  // Lookup in pending chars is bad practice! Don't copy to other rules!
+  // Pending string is stored in concat mode, indexed lookups will cause
+  // convertion to flat mode.
+  if (!silent) {
+    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {
+      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {
+        state.pending = state.pending.replace(/ +$/, '');
+        token = state.push('hardbreak', 'br', 0);
+      } else {
+        state.pending = state.pending.slice(0, -1);
+        token = state.push('softbreak', 'br', 0);
+      }
+
+    } else {
+      token = state.push('softbreak', 'br', 0);
+    }
+  }
+
+  pos++;
+
+  // skip heading spaces for next line
+  while (pos < max && state.md.utils.isSpace(state.src.charCodeAt(pos))) {
+    if (token) {
+      token.leading_space = true;
+    }
+    pos++;
+  }
+
+  state.pos = pos;
+  return true;
+};
 
 export function setup(helper) {
-
-  if (helper.markdownIt) { return; }
-
-  helper.postProcessText((text, event) => {
-    const { options, insideCounts } = event;
-    if (options.traditionalMarkdownLinebreaks || (insideCounts.pre > 0)) { return; }
-
-    if (text === "\n") {
-      // If the tag is just a new line, replace it with a `<br>`
-      return [['br']];
-    } else {
-      // If the text node contains new lines, perhaps with text between them, insert the
-      // `<br>` tags.
-      const split = text.split(/\n+/);
-      if (split.length) {
-        const replacement = [];
-        for (var i=0; i<split.length; i++) {
-          if (split[i].length > 0) { replacement.push(split[i]); }
-          if (i !== split.length-1) { replacement.push(['br']); }
-        }
-
-        return replacement;
-      }
-    }
+  helper.registerPlugin(md => {
+    md.inline.ruler.at('newline', newline);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js.es6
index 875321911f..eff7ee4ae2 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,71 +1,116 @@
 import { lookupCache } from 'pretty-text/oneboxer';
+import { cachedInlineOnebox } from 'pretty-text/inline-oneboxer';
 
-//  Given a node in the document and its parent, determine whether it is on its own line or not.
-function isOnOneLine(link, parent) {
-  if (!parent) { return false; }
+const ONEBOX = 1;
+const INLINE = 2;
 
-  const siblings = parent.slice(1);
-  if ((!siblings) || (siblings.length < 1)) { return false; }
-
-  const idx = siblings.indexOf(link);
-  if (idx === -1) { return false; }
-
-  if (idx > 0) {
-    const prev = siblings[idx-1];
-    if (prev[0] !== 'br') { return false; }
+function applyOnebox(state, silent) {
+  if (silent || !state.tokens) {
+    return;
   }
 
-  if (idx < siblings.length) {
-    const next = siblings[idx+1];
-    if (next && (!((next[0] === 'br') || (typeof next === 'string' && next.trim() === "")))) { return false; }
-  }
+  for(let i=1;i<state.tokens.length;i++) {
+    let token = state.tokens[i];
+    let prev = state.tokens[i-1];
+    let prevAccepted =  prev.type === "paragraph_open" && prev.level === 0;
+    let mode = prevAccepted ? ONEBOX : INLINE;
 
-  return true;
-}
+    if (token.type === "inline" && prevAccepted) {
 
-//  We only onebox stuff that is on its own line.
-export function setup(helper) {
+      let children = token.children;
+      for(let j=0;j<children.length-2;j++){
+        let child = children[j];
 
-  if (helper.markdownIt) { return; }
+        if (child.type === "link_open" && child.markup === 'linkify' && child.info === 'auto') {
 
-  helper.onParseNode(event => {
-    const node = event.node,
-    path = event.path;
+          if (j > children.length-3) {
+            continue;
+          }
 
-    // We only care about links
-    if (node[0] !== 'a')  { return; }
+          if (j === 0 && token.leading_space) {
+            mode = INLINE;
+          } else if (j > 0) {
+            let prevSibling = children[j-1];
+            if (prevSibling.tag !== 'br' || prevSibling.leading_space) {
+              mode = INLINE;
+            }
+          }
 
-    const parent = path[path.length - 1];
+          // look ahead for soft or hard break
+          let text = children[j+1];
+          let close = children[j+2];
+          let lookahead = children[j+3];
 
-    // We don't onebox bbcode
-    if (node[1]['data-bbcode']) {
-      delete node[1]['data-bbcode'];
-      return;
-    }
+          if (lookahead && lookahead.tag !== 'br') {
+            mode = INLINE;
+          }
 
-    // We don't onebox mentions
-    if (node[1]['class'] === 'mention') { return; }
+          // check attrs only include a href
+          let attrs = child.attrs;
 
-    // Don't onebox links within a list
-    for (var i=0; i<path.length; i++) {
-      if (path[i][0] === 'li') { return; }
-    }
+          if (!attrs || attrs.length !== 1 || attrs[0][0] !== "href") {
+            continue;
+          }
 
-    // If the link has a different label text than the link itself, don't onebox it.
-    const label = node[node.length-1];
-    if (label !== node[1]['href']) { return; }
+          let href = attrs[0][1];
 
-    if (isOnOneLine(node, parent)) {
+          // edge case ... what if this is not http or protocoless?
+          if (!/^http|^\/\//i.test(href)) {
+            continue;
+          }
 
-      node[1]['class'] = 'onebox';
-      node[1].target = '_blank';
+          // we already know text matches cause it is an auto link
+          if (!close || close.type !== "link_close") {
+            continue;
+          }
 
-      const contents = lookupCache(node[1].href);
-      if (contents) {
-        node[0] = '__RAW';
-        node[1] = contents;
-        node.length = 2;
+          if (mode === ONEBOX) {
+            // we already determined earlier that 0 0 was href
+            let cached = lookupCache(attrs[0][1]);
+
+            if (cached) {
+              // replace link with 2 blank text nodes and inline html for onebox
+              child.type = 'html_raw';
+              child.content = cached;
+              child.inline = true;
+
+              text.type = 'html_raw';
+              text.content = '';
+              text.inline = true;
+
+              close.type = 'html_raw';
+              close.content = '';
+              close.inline = true;
+
+            } else {
+              // decorate...
+              attrs.push(["class", "onebox"]);
+              attrs.push(["target", "_blank"]);
+            }
+          } else if (mode === INLINE) {
+            let onebox = cachedInlineOnebox(href);
+
+            let options = state.md.options.discourse;
+            if (options.lookupInlineOnebox) {
+              onebox = options.lookupInlineOnebox(href);
+            }
+
+            if (onebox) {
+              text.content = onebox.title;
+            } else if (state.md.options.discourse.previewing) {
+              attrs.push(["class", "inline-onebox-loading"]);
+            }
+          }
+
+        }
       }
     }
+  }
+}
+
+
+export function setup(helper) {
+  helper.registerPlugin(md => {
+    md.core.ruler.after('linkify', 'onebox', applyOnebox);
   });
 }
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/paragraph.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
similarity index 100%
rename from app/assets/javascripts/pretty-text/engines/markdown-it/paragraph.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/paragraph.js.es6
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
deleted file mode 100644
index e8a4a9a131..0000000000
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6
+++ /dev/null
@@ -1,83 +0,0 @@
-import { register } from 'pretty-text/engines/discourse-markdown/bbcode';
-import { registerOption } from 'pretty-text/pretty-text';
-import { performEmojiUnescape } from 'pretty-text/emoji';
-
-registerOption((siteSettings, opts) => {
-  opts.enableEmoji = siteSettings.enable_emoji;
-  opts.emojiSet = siteSettings.emoji_set;
-});
-
-
-export function setup(helper) {
-
-  if (helper.markdownIt) { return; }
-
-  register(helper, 'quote', {noWrap: true, singlePara: true}, (contents, bbParams, options) => {
-
-    const params = {'class': 'quote'};
-    let username = null;
-    const opts = helper.getOptions();
-
-    if (bbParams) {
-      const paramsSplit = bbParams.split(/\,\s*/);
-      username = paramsSplit[0];
-
-      paramsSplit.forEach(function(p,i) {
-        if (i > 0) {
-          var assignment = p.split(':');
-          if (assignment[0] && assignment[1]) {
-            const escaped = helper.escape(assignment[0]);
-            // don't escape attributes, makes no sense
-            if (escaped === assignment[0]) {
-              params['data-' + assignment[0]] = helper.escape(assignment[1].trim());
-            }
-          }
-        }
-      });
-    }
-
-    let avatarImg;
-    const postNumber = parseInt(params['data-post'], 10);
-    const topicId = parseInt(params['data-topic'], 10);
-
-    if (options.lookupAvatarByPostNumber) {
-      // client-side, we can retrieve the avatar from the post
-      avatarImg = options.lookupAvatarByPostNumber(postNumber, topicId);
-    } else if (options.lookupAvatar) {
-      // server-side, we need to lookup the avatar from the username
-      avatarImg = options.lookupAvatar(username);
-    }
-
-    // If there's no username just return a simple quote
-    if (!username) {
-      return ['p', ['aside', params, ['blockquote'].concat(contents)]];
-    }
-
-    const header = ['div', {'class': 'title'},
-                    ['div', {'class': 'quote-controls'}],
-                    avatarImg ? ['__RAW', avatarImg] : "",
-                    username ? `${username}:` : "" ];
-
-    if (options.topicId && postNumber && options.getTopicInfo && topicId !== options.topicId) {
-      const topicInfo = options.getTopicInfo(topicId);
-      if (topicInfo) {
-        var href = topicInfo.href;
-        if (postNumber > 0) { href += "/" + postNumber; }
-        // get rid of username said stuff
-        header.pop();
-
-        let title = topicInfo.title;
-
-        if (opts.enableEmoji) {
-          title = performEmojiUnescape(topicInfo.title, {
-            getURL: opts.getURL, emojiSet: opts.emojiSet
-          });
-        }
-
-        header.push(['a', {'href': href}, title]);
-      }
-    }
-
-    return ['aside', params, header, ['blockquote'].concat(contents)];
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
similarity index 93%
rename from app/assets/javascripts/pretty-text/engines/markdown-it/quotes.js.es6
rename to app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
index 05afd6bc9e..06de98068f 100644
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/quotes.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -3,9 +3,10 @@ import { performEmojiUnescape } from 'pretty-text/emoji';
 const rule = {
   tag: 'quote',
 
-  before: function(state, attrs, md) {
+  before: function(state, tagInfo) {
 
-    let options = md.options.discourse;
+    const attrs = tagInfo.attrs;
+    let options = state.md.options.discourse;
 
     let quoteInfo = attrs['_default'];
     let username, postNumber, topicId, avatarImg, full;
@@ -26,7 +27,7 @@ const rule = {
           continue;
         }
 
-        if (split[i].indexOf(/full:\s*true/) === 0) {
+        if (/full:\s*true/.test(split[i])) {
           full = true;
           continue;
         }
@@ -121,14 +122,12 @@ const rule = {
 
 export function setup(helper) {
 
-  if (!helper.markdownIt) { return; }
-
   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);
   });
 }
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 1b148e6843..c3760799e0 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,35 +1,28 @@
-import { registerOption } from 'pretty-text/pretty-text';
-
-function tableFlattenBlocks(blocks) {
-  let result = "";
-
-  blocks.forEach(b => {
-    result += b;
-    if (b.trailing) { result += b.trailing; }
-  });
-
-  // bypass newline insertion
-  return result.replace(/[\n\r]/g, " ");
-};
-
-registerOption((siteSettings, opts) => {
-  opts.features.table = !!siteSettings.allow_html_tables;
-});
-
 export function setup(helper) {
+  // this is built in now
+  // TODO: sanitizer needs fixing, does not properly support this yet
 
-  if (helper.markdownIt) { return; }
+  // we need a custom callback for style handling
+  helper.whiteList({
+    custom: function(tag,attr,val) {
+      if (tag !== 'th' && tag !== 'td') {
+        return false;
+      }
 
-  helper.whiteList(['table', 'table.md-table', 'tbody', 'thead', 'tr', 'th', 'td']);
+      if (attr !== 'style') {
+        return false;
+      }
 
-  helper.replaceBlock({
-    start: /(<table[^>]*>)([\S\s]*)/igm,
-    stop: /<\/table>/igm,
-    rawContents: true,
-    priority: 1,
-
-    emitter(contents) {
-      return ['table', {"class": "md-table"}, tableFlattenBlocks.apply(this, [contents])];
+      return (val === 'text-align:right' || val === 'text-align:left' || val === 'text-align:center');
     }
   });
+
+  helper.whiteList([
+      'table',
+      'tbody',
+      'thead',
+      'tr',
+      'th',
+      'td',
+  ]);
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6
new file mode 100644
index 0000000000..38bea8abf1
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/text-post-process.js.es6
@@ -0,0 +1,127 @@
+
+export class TextPostProcessRuler {
+  constructor() {
+    this.rules = [];
+  }
+
+  getRules() {
+    return this.rules;
+  }
+
+  // TODO error handling
+  getMatcher() {
+    if (this.matcher) { return this.matcher; }
+
+    this.matcherIndex = [];
+
+    let rules = this.rules.map((r) =>
+      "(" + r.rule.matcher.toString().slice(1,-1) + ")"
+    );
+
+    let i;
+    let regexString = "";
+    let last = 1;
+
+    // this code is a bit tricky, our matcher may have multiple capture groups
+    // we want to dynamically determine how many
+    for(i=0; i<rules.length; i++) {
+      this.matcherIndex[i] = last;
+
+      if (i === rules.length-1) {
+        break;
+      }
+
+      if (i>0) {
+        regexString = regexString + '|';
+      }
+      regexString = regexString + rules[i];
+
+      let regex = new RegExp(regexString + '|(x)');
+      last = 'x'.match(regex).length - 1;
+    }
+
+    this.matcher = new RegExp(rules.join('|'), 'g');
+    return this.matcher;
+  }
+
+  applyRule(buffer, match, state) {
+    let i;
+    for(i=0; i<this.rules.length; i++) {
+      let index = this.matcherIndex[i];
+
+      if (match[index]) {
+        this.rules[i].rule.onMatch(buffer, match.slice(index, this.matcherIndex[i+1]), state);
+        break;
+      }
+    }
+  }
+
+  // TODO validate inputs
+  push(name, rule) {
+    this.rules.push({name, rule});
+    this.matcher = null;
+  }
+
+}
+
+function allowedBoundary(content, index, utils) {
+  let code = content.charCodeAt(index);
+  return (utils.isWhiteSpace(code) || utils.isPunctChar(String.fromCharCode(code)));
+}
+
+function textPostProcess(content, state, ruler) {
+  let result = null,
+      match,
+      pos = 0;
+
+  const matcher = ruler.getMatcher();
+
+  while (match = matcher.exec(content)) {
+    // check boundary
+    if (match.index > 0) {
+      if (!allowedBoundary(content, match.index-1, state.md.utils)) {
+        continue;
+      }
+    }
+
+    // check forward boundary as well
+    if (match.index + match[0].length < content.length) {
+      if (!allowedBoundary(content, match.index + match[0].length, state.md.utils)) {
+        continue;
+      }
+    }
+
+    if (match.index > pos) {
+      result = result || [];
+      let token = new state.Token('text', '', 0);
+      token.content = content.slice(pos, match.index);
+      result.push(token);
+    }
+
+    result = result || [];
+
+    ruler.applyRule(result, match, state);
+
+    pos = match.index + match[0].length;
+  }
+
+  if (result && pos < content.length) {
+    let token = new state.Token('text', '', 0);
+    token.content = content.slice(pos);
+    result.push(token);
+  }
+
+  return result;
+}
+
+
+export function setup(helper) {
+  helper.registerPlugin(md => {
+    const ruler = md.core.textPostProcess.ruler;
+    const replacer = (content, state) => textPostProcess(content, state, ruler);
+
+    md.core.ruler.push('text-post-process', state =>
+      md.options.discourse.helpers.textReplace(state, replacer, true)
+    );
+  });
+}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/category-hashtag.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/category-hashtag.js.es6
deleted file mode 100644
index b2c1e8ab44..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/category-hashtag.js.es6
+++ /dev/null
@@ -1,106 +0,0 @@
-import { textReplace } from 'pretty-text/engines/markdown-it/helpers';
-
-function addHashtag(buffer, matches, state) {
-  const options = state.md.options.discourse;
-  const [hashtag, slug] = matches;
-  const categoryHashtagLookup = options.categoryHashtagLookup;
-  const result = categoryHashtagLookup && categoryHashtagLookup(slug);
-
-  let token;
-
-  if (result) {
-    token = new state.Token('link_open', 'a', 1);
-    token.attrs = [['class', 'hashtag'], ['href', result[0]]];
-    token.block = false;
-    buffer.push(token);
-
-    token = new state.Token('text', '', 0);
-    token.content = '#';
-    buffer.push(token);
-
-    token = new state.Token('span_open', 'span', 1);
-    token.block = false;
-    buffer.push(token);
-
-    token = new state.Token('text', '', 0);
-    token.content = result[1];
-    buffer.push(token);
-
-    buffer.push(new state.Token('span_close', 'span', -1));
-
-    buffer.push(new state.Token('link_close', 'a', -1));
-  } else {
-
-    token = new state.Token('span_open', 'span', 1);
-    token.attrs = [['class', 'hashtag']];
-    buffer.push(token);
-
-    token = new state.Token('text', '', 0);
-    token.content = hashtag;
-    buffer.push(token);
-
-    token = new state.Token('span_close', 'span', -1);
-    buffer.push(token);
-  }
-}
-
-const REGEX = /#([\w-:]{1,101})/gi;
-
-function allowedBoundary(content, index, utils) {
-  let code = content.charCodeAt(index);
-  return (utils.isWhiteSpace(code) || utils.isPunctChar(String.fromCharCode(code)));
-}
-
-function applyHashtag(content, state) {
-  let result = null,
-      match,
-      pos = 0;
-
-  while (match = REGEX.exec(content)) {
-    // check boundary
-    if (match.index > 0) {
-      if (!allowedBoundary(content, match.index-1, state.md.utils)) {
-        continue;
-      }
-    }
-
-    // check forward boundary as well
-    if (match.index + match[0].length < content.length) {
-      if (!allowedBoundary(content, match.index + match[0].length, state.md.utils)) {
-        continue;
-      }
-    }
-
-    if (match.index > pos) {
-      result = result || [];
-      let token = new state.Token('text', '', 0);
-      token.content = content.slice(pos, match.index);
-      result.push(token);
-    }
-
-    result = result || [];
-    addHashtag(result, match, state);
-
-    pos = match.index + match[0].length;
-  }
-
-  if (result && pos < content.length) {
-    let token = new state.Token('text', '', 0);
-    token.content = content.slice(pos);
-    result.push(token);
-  }
-
-  return result;
-}
-
-export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
-  helper.registerPlugin(md=>{
-
-    md.core.ruler.push('category-hashtag', state => textReplace(
-      state, applyHashtag, true /* skip all links */
-    ));
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/censored.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/censored.js.es6
deleted file mode 100644
index 3d5cb8d931..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/censored.js.es6
+++ /dev/null
@@ -1,44 +0,0 @@
-import { censorFn } from 'pretty-text/censored-words';
-
-function recurse(tokens, apply) {
-  let i;
-  for(i=0;i<tokens.length;i++) {
-    apply(tokens[i]);
-    if (tokens[i].children) {
-      recurse(tokens[i].children, apply);
-    }
-  }
-}
-
-function censorTree(state, censor) {
-  if (!state.tokens) {
-    return;
-  }
-
-  recurse(state.tokens, token => {
-    if (token.content) {
-      token.content = censor(token.content);
-    }
-  });
-}
-
-export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
-  helper.registerOptions((opts, siteSettings) => {
-    opts.censoredWords = siteSettings.censored_words;
-    opts.censoredPattern = siteSettings.censored_pattern;
-  });
-
-  helper.registerPlugin(md => {
-    const words = md.options.discourse.censoredWords;
-    const patterns = md.options.discourse.censoredPattern;
-
-    if ((words && words.length > 0) || (patterns && patterns.length > 0)) {
-      const replacement = String.fromCharCode(9632);
-      const censor = censorFn(words, patterns, replacement);
-      md.core.ruler.push('censored', state => censorTree(state, censor));
-    }
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/code.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/code.js.es6
deleted file mode 100644
index c8d94967a1..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/code.js.es6
+++ /dev/null
@@ -1,51 +0,0 @@
-// we need a custom renderer for code blocks cause we have a slightly non compliant
-// format with special handling for text and so on
-
-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);
-
-  if (info) {
-    // strip off any additional languages
-    info = info.split(/\s+/g)[0];
-  }
-
-  const acceptableCodeClasses = md.options.discourse.acceptableCodeClasses;
-  if (acceptableCodeClasses && info && acceptableCodeClasses.indexOf(info) !== -1) {
-    langName = info;
-  }
-
-  className = TEXT_CODE_CLASSES.indexOf(info) !== -1 ? 'lang-nohighlight' : 'lang-' + langName;
-
-  return `<pre><code class='${className}'>${escapedContent}</code></pre>\n`;
-}
-
-export function setup(helper) {
-  if (!helper.markdownIt) { return; }
-
-  helper.registerOptions((opts, siteSettings) => {
-    opts.defaultCodeLang = siteSettings.default_code_lang;
-    opts.acceptableCodeClasses = (siteSettings.highlighted_languages || "").split("|").concat(['auto', 'nohighlight']);
-  });
-
-  helper.whiteList({
-    custom(tag, name, value) {
-      if (tag === 'code' && name === 'class') {
-        const m = /^lang\-(.+)$/.exec(value);
-        if (m) {
-          return helper.getOptions().acceptableCodeClasses.indexOf(m[1]) !== -1;
-        }
-      }
-    }
-  });
-
-  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/markdown-it/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/emoji.js.es6
deleted file mode 100644
index dd85d24f34..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/emoji.js.es6
+++ /dev/null
@@ -1,247 +0,0 @@
-import { buildEmojiUrl, isCustomEmoji } from 'pretty-text/emoji';
-import { translations } from 'pretty-text/emoji/data';
-import { textReplace } from 'pretty-text/engines/markdown-it/helpers';
-
-const MAX_NAME_LENGTH = 60;
-
-let translationTree = null;
-
-// This allows us to efficiently search for aliases
-// We build a data structure that allows us to quickly
-// search through our N next chars to see if any match
-// one of our alias emojis.
-//
-function buildTranslationTree() {
-  let tree = [];
-  let lastNode;
-
-  Object.keys(translations).forEach(function(key){
-    let i;
-    let node = tree;
-
-    for(i=0;i<key.length;i++) {
-      let code = key.charCodeAt(i);
-      let j;
-
-      let found = false;
-
-      for (j=0;j<node.length;j++){
-        if (node[j][0] === code) {
-          node = node[j][1];
-          found = true;
-          break;
-        }
-      }
-
-      if (!found) {
-        // token, children, value
-        let tmp = [code, []];
-        node.push(tmp);
-        lastNode = tmp;
-        node = tmp[1];
-      }
-    }
-
-    lastNode[1] = translations[key];
-  });
-
-  return tree;
-}
-
-
-function imageFor(code, opts) {
-  code = code.toLowerCase();
-  const url = buildEmojiUrl(code, opts);
-  if (url) {
-    const title = `:${code}:`;
-    const classes = isCustomEmoji(code, opts) ? "emoji emoji-custom" : "emoji";
-    return {url, title, classes};
-  }
-}
-
-function getEmojiName(content, pos, state) {
-
-  if (content.charCodeAt(pos) !== 58) {
-    return;
-  }
-
-  if (pos > 0) {
-    let prev = content.charCodeAt(pos-1);
-    if (!state.md.utils.isSpace(prev) && !state.md.utils.isPunctChar(String.fromCharCode(prev))) {
-      return;
-    }
-  }
-
-  pos++;
-  if (content.charCodeAt(pos) === 58) {
-    return;
-  }
-
-  let length = 0;
-  while(length < MAX_NAME_LENGTH) {
-    length++;
-
-    if (content.charCodeAt(pos+length) === 58) {
-      // check for t2-t6
-      if (content.substr(pos+length+1, 3).match(/t[2-6]:/)) {
-        length += 3;
-      }
-      break;
-    }
-
-    if (pos+length > content.length) {
-      return;
-    }
-  }
-
-  if (length === MAX_NAME_LENGTH) {
-    return;
-  }
-
-  return content.substr(pos, length);
-}
-
-// straight forward :smile: to emoji image
-function getEmojiTokenByName(name, state) {
-
-  let info;
-  if (info = imageFor(name, state.md.options.discourse)) {
-    let token = new state.Token('emoji', 'img', 0);
-    token.attrs = [['src', info.url],
-                   ['title', info.title],
-                   ['class', info.classes],
-                   ['alt', info.title]];
-
-    return token;
-  }
-}
-
-function getEmojiTokenByTranslation(content, pos, state) {
-
-  translationTree = translationTree || buildTranslationTree();
-
-  let currentTree = translationTree;
-
-  let i;
-  let search = true;
-  let found = false;
-  let start = pos;
-
-  while(search) {
-
-    search = false;
-    let code = content.charCodeAt(pos);
-
-    for (i=0;i<currentTree.length;i++) {
-      if(currentTree[i][0] === code) {
-        currentTree = currentTree[i][1];
-        pos++;
-        search = true;
-        if (typeof currentTree === "string") {
-          found = currentTree;
-        }
-        break;
-      }
-    }
-  }
-
-  if (!found) {
-    return;
-  }
-
-  // quick boundary check
-  if (start > 0) {
-    let leading = content.charAt(start-1);
-    if (!state.md.utils.isSpace(leading.charCodeAt(0)) && !state.md.utils.isPunctChar(leading)) {
-      return;
-    }
-  }
-
-  // check trailing for punct or space
-  if (pos < content.length) {
-    let trailing = content.charCodeAt(pos);
-    if (!state.md.utils.isSpace(trailing)){
-      return;
-    }
-  }
-
-  let token = getEmojiTokenByName(found, state);
-  if (token) {
-    return { pos, token };
-  }
-}
-
-function applyEmoji(content, state, emojiUnicodeReplacer) {
-  let i;
-  let result = null;
-  let contentToken = null;
-
-  let start = 0;
-
-  if (emojiUnicodeReplacer) {
-    content = emojiUnicodeReplacer(content);
-  }
-
-  let endToken = content.length;
-
-  for (i=0; i<content.length-1; i++) {
-    let offset = 0;
-    let emojiName = getEmojiName(content,i,state);
-    let token = null;
-
-    if (emojiName) {
-      token = getEmojiTokenByName(emojiName, state);
-      if (token) {
-        offset = emojiName.length+2;
-      }
-    }
-
-    if (!token) {
-      // handle aliases (note: we can't do this in inline cause ; is not a split point)
-      //
-      let info = getEmojiTokenByTranslation(content, i, state);
-
-      if (info) {
-        offset = info.pos - i;
-        token = info.token;
-      }
-    }
-
-    if (token) {
-      result = result || [];
-      if (i-start>0) {
-        contentToken = new state.Token('text', '', 0);
-        contentToken.content = content.slice(start,i);
-        result.push(contentToken);
-      }
-
-      result.push(token);
-      endToken = start = i + offset;
-    }
-  }
-
-  if (endToken < content.length) {
-    contentToken = new state.Token('text', '', 0);
-    contentToken.content = content.slice(endToken);
-    result.push(contentToken);
-  }
-
-  return result;
-}
-
-export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
-  helper.registerOptions((opts, siteSettings, state)=>{
-    opts.features.emoji = !!siteSettings.enable_emoji;
-    opts.emojiSet = siteSettings.emoji_set || "";
-    opts.customEmoji = state.customEmoji;
-  });
-
-  helper.registerPlugin((md)=>{
-    md.core.ruler.push('emoji', state => textReplace(
-      state, (c,s)=>applyEmoji(c,s,md.options.discourse.emojiUnicodeReplacer))
-    );
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/mentions.js.es6
deleted file mode 100644
index 602af3c15a..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/mentions.js.es6
+++ /dev/null
@@ -1,88 +0,0 @@
-const regex = /^(\w[\w.-]{0,59})\b/i;
-
-function applyMentions(state, silent, isWhiteSpace, isPunctChar, mentionLookup, getURL) {
-
-  let pos = state.pos;
-
-  // 64 = @
-  if (silent || state.src.charCodeAt(pos) !== 64) {
-    return false;
-  }
-
-  if (pos > 0) {
-    let prev = state.src.charCodeAt(pos-1);
-    if (!isWhiteSpace(prev) && !isPunctChar(String.fromCharCode(prev))) {
-      return false;
-    }
-  }
-
-  // skip if in a link
-  if (state.tokens) {
-    let last = state.tokens[state.tokens.length-1];
-    if (last) {
-      if (last.type === 'link_open') {
-        return false;
-      }
-      if (last.type === 'html_inline' && last.content.substr(0,2) === "<a") {
-        return false;
-      }
-    }
-  }
-
-  let maxMention = state.src.substr(pos+1, 60);
-
-  let matches = maxMention.match(regex);
-
-  if (!matches) {
-    return false;
-  }
-
-  let username = matches[1];
-
-  let type = mentionLookup && mentionLookup(username);
-
-  let tag = 'a';
-  let className = 'mention';
-  let href = null;
-
-  if (type === 'user') {
-    href = getURL('/u/') + username.toLowerCase();
-  } else if (type === 'group') {
-    href = getURL('/groups/') + username;
-    className = 'mention-group';
-  } else {
-    tag = 'span';
-  }
-
-  let token = state.push('mention_open', tag, 1);
-  token.attrs = [['class', className]];
-  if (href) {
-    token.attrs.push(['href', href]);
-  }
-
-  token = state.push('text', '', 0);
-  token.content = '@'+username;
-
-  state.push('mention_close', tag, -1);
-
-  state.pos = pos + username.length + 1;
-
-  return true;
-}
-
-export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
-  helper.registerPlugin(md => {
-    md.inline.ruler.push('mentions', (state,silent)=> applyMentions(
-          state,
-          silent,
-          md.utils.isWhiteSpace,
-          md.utils.isPunctChar,
-          md.options.discourse.mentionLookup,
-          md.options.discourse.getURL
-    ));
-  });
-}
-
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/newline.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/newline.js.es6
deleted file mode 100644
index f1eb2ba759..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/newline.js.es6
+++ /dev/null
@@ -1,53 +0,0 @@
-// see: https://github.com/markdown-it/markdown-it/issues/375
-//
-// we use a custom paragraph rule cause we have to signal when a
-// link starts with a space, so we can bypass a onebox
-// this is a freedom patch, so careful, may break on updates
-
-
-function newline(state, silent) {
-  var token, pmax, max, pos = state.pos;
-
-  if (state.src.charCodeAt(pos) !== 0x0A/* \n */) { return false; }
-
-  pmax = state.pending.length - 1;
-  max = state.posMax;
-
-  // '  \n' -> hardbreak
-  // Lookup in pending chars is bad practice! Don't copy to other rules!
-  // Pending string is stored in concat mode, indexed lookups will cause
-  // convertion to flat mode.
-  if (!silent) {
-    if (pmax >= 0 && state.pending.charCodeAt(pmax) === 0x20) {
-      if (pmax >= 1 && state.pending.charCodeAt(pmax - 1) === 0x20) {
-        state.pending = state.pending.replace(/ +$/, '');
-        token = state.push('hardbreak', 'br', 0);
-      } else {
-        state.pending = state.pending.slice(0, -1);
-        token = state.push('softbreak', 'br', 0);
-      }
-
-    } else {
-      token = state.push('softbreak', 'br', 0);
-    }
-  }
-
-  pos++;
-
-  // skip heading spaces for next line
-  while (pos < max && state.md.utils.isSpace(state.src.charCodeAt(pos))) {
-    if (token) {
-      token.leading_space = true;
-    }
-    pos++;
-  }
-
-  state.pos = pos;
-  return true;
-};
-
-export function setup(helper) {
-  helper.registerPlugin(md => {
-    md.inline.ruler.at('newline', newline);
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/onebox.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/onebox.js.es6
deleted file mode 100644
index 5f04b72b1d..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/onebox.js.es6
+++ /dev/null
@@ -1,89 +0,0 @@
-import { lookupCache } from 'pretty-text/oneboxer';
-
-function applyOnebox(state, silent) {
-  if (silent || !state.tokens || state.tokens.length < 3) {
-    return;
-  }
-
-  let i;
-  for(i=1;i<state.tokens.length;i++) {
-    let token = state.tokens[i];
-
-    let prev = state.tokens[i-1];
-    let prevAccepted =  prev.type === "paragraph_open" && prev.level === 0;
-
-    if (token.type === "inline" && prevAccepted) {
-      let j;
-      for(j=0;j<token.children.length;j++){
-        let child = token.children[j];
-
-        if (child.type === "link_open" && child.markup === 'linkify' && child.info === 'auto') {
-
-          if (j === 0 && token.leading_space) {
-            continue;
-          } else if (j > 0) {
-            let prevSibling = token.children[j-1];
-
-            if (prevSibling.tag !== 'br' || prevSibling.leading_space) {
-              continue;
-            }
-          }
-
-          // look ahead for soft or hard break
-          let text = token.children[j+1];
-          let close = token.children[j+2];
-          let lookahead = token.children[j+3];
-
-          if (lookahead && lookahead.tag !== 'br') {
-            continue;
-          }
-
-          // check attrs only include a href
-          let attrs = child["attrs"];
-
-          if (!attrs || attrs.length !== 1 || attrs[0][0] !== "href") {
-            continue;
-          }
-
-          // we already know text matches cause it is an auto link
-
-          if (!close || close.type !== "link_close") {
-            continue;
-          }
-
-          // we already determined earlier that 0 0 was href
-          let cached = lookupCache(attrs[0][1]);
-
-          if (cached) {
-            // replace link with 2 blank text nodes and inline html for onebox
-            child.type = 'html_raw';
-            child.content = cached;
-            child.inline = true;
-
-            text.type = 'html_raw';
-            text.content = '';
-            text.inline = true;
-
-            close.type = 'html_raw';
-            close.content = '';
-            close.inline = true;
-
-          } else {
-            // decorate...
-            attrs.push(["class", "onebox"]);
-          }
-        }
-      }
-    }
-  }
-}
-
-
-export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
-  helper.registerPlugin(md => {
-    md.core.ruler.after('linkify', 'onebox', applyOnebox);
-  });
-}
diff --git a/app/assets/javascripts/pretty-text/engines/markdown-it/table.js.es6 b/app/assets/javascripts/pretty-text/engines/markdown-it/table.js.es6
deleted file mode 100644
index 4bb5ef92d6..0000000000
--- a/app/assets/javascripts/pretty-text/engines/markdown-it/table.js.es6
+++ /dev/null
@@ -1,31 +0,0 @@
-export function setup(helper) {
-
-  if (!helper.markdownIt) { return; }
-
-  // this is built in now
-  // TODO: sanitizer needs fixing, does not properly support this yet
-
-  // we need a custom callback for style handling
-  helper.whiteList({
-    custom: function(tag,attr,val) {
-      if (tag !== 'th' && tag !== 'td') {
-        return false;
-      }
-
-      if (attr !== 'style') {
-        return false;
-      }
-
-      return (val === 'text-align:right' || val === 'text-align:left' || val === 'text-align:center');
-    }
-  });
-
-  helper.whiteList([
-      'table',
-      'tbody',
-      'thead',
-      'tr',
-      'th',
-      'td',
-  ]);
-}
diff --git a/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6 b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
new file mode 100644
index 0000000000..b8be79f60e
--- /dev/null
+++ b/app/assets/javascripts/pretty-text/inline-oneboxer.js.es6
@@ -0,0 +1,19 @@
+let _cache = {};
+
+export function applyInlineOneboxes(inline, ajax) {
+  return ajax("/inline-onebox", {
+    data: { urls: Object.keys(inline) },
+  }).then(result => {
+    result['inline-oneboxes'].forEach(onebox => {
+      _cache[onebox.url] = onebox;
+      let links = inline[onebox.url] || [];
+      links.forEach(link => {
+        link.text(onebox.title);
+      });
+    });
+  });
+};
+
+export function cachedInlineOnebox(url) {
+  return _cache[url];
+}
diff --git a/app/assets/javascripts/pretty-text/pretty-text.js.es6 b/app/assets/javascripts/pretty-text/pretty-text.js.es6
index f2c4633d20..68fd360dc6 100644
--- a/app/assets/javascripts/pretty-text/pretty-text.js.es6
+++ b/app/assets/javascripts/pretty-text/pretty-text.js.es6
@@ -1,13 +1,10 @@
-import { cook, setup } from 'pretty-text/engines/discourse-markdown';
 import { cook as cookIt, setup as setupIt } from 'pretty-text/engines/discourse-markdown-it';
-import { sanitize } from 'pretty-text/sanitizer';
-import WhiteLister from 'pretty-text/white-lister';
 
-const _registerFns = [];
-const identity = value => value;
-
-export function registerOption(fn) {
-  _registerFns.push(fn);
+export function registerOption() {
+  // TODO next major version deprecate this
+  // if (window.console) {
+  //   window.console.log("registerOption is deprecated");
+  // }
 }
 
 export function buildOptions(state) {
@@ -22,14 +19,14 @@ export function buildOptions(state) {
     getCurrentUser,
     currentUser,
     lookupAvatarByPostNumber,
-    emojiUnicodeReplacer
+    emojiUnicodeReplacer,
+    lookupInlineOnebox,
+    previewing,
+    linkify,
+    censoredWords
   } = state;
 
-  if (!siteSettings.enable_experimental_markdown_it) {
-    setup();
-  }
-
-  const features = {
+  let features = {
     'bold-italics': true,
     'auto-link': true,
     'mentions': true,
@@ -38,9 +35,14 @@ export function buildOptions(state) {
     'html': true,
     'category-hashtag': true,
     'onebox': true,
+    'linkify': linkify !== false,
     'newline': !siteSettings.traditional_markdown_linebreaks
   };
 
+  if (state.features) {
+    features = _.merge(features, state.features);
+  }
+
   const options = {
     sanitize: true,
     getURL,
@@ -55,45 +57,41 @@ export function buildOptions(state) {
     lookupAvatarByPostNumber,
     mentionLookup: state.mentionLookup,
     emojiUnicodeReplacer,
+    lookupInlineOnebox,
+    censoredWords,
     allowedHrefSchemes: siteSettings.allowed_href_schemes ? siteSettings.allowed_href_schemes.split('|') : null,
-    markdownIt: siteSettings.enable_experimental_markdown_it
+    markdownIt: true,
+    previewing
   };
 
-  if (siteSettings.enable_experimental_markdown_it) {
-    setupIt(options, siteSettings, state);
-  } else {
-    // TODO deprecate this
-    _registerFns.forEach(fn => fn(siteSettings, options, state));
-  }
+  // note, this will mutate options due to the way the API is designed
+  // may need a refactor
+  setupIt(options, siteSettings, state);
 
   return options;
 }
 
 export default class {
   constructor(opts) {
-    this.opts = opts || {};
-    this.opts.features = this.opts.features || {};
-    this.opts.sanitizer = (!!this.opts.sanitize) ? (this.opts.sanitizer || sanitize) : identity;
-    // We used to do a failsafe call to setup here
-    // under new engine we always expect setup to be called by buildOptions.
-    // setup();
+    if (!opts) {
+      opts = buildOptions({ siteSettings: {}});
+    }
+    this.opts = opts;
+  }
+
+  disableSanitizer() {
+    this.opts.sanitizer = this.opts.discourse.sanitizer = ident => ident;
   }
 
   cook(raw) {
     if (!raw || raw.length === 0) { return ""; }
 
     let result;
-
-    if (this.opts.markdownIt) {
-      result = cookIt(raw, this.opts);
-    } else {
-      result = cook(raw, this.opts);
-    }
-
+    result = cookIt(raw, this.opts);
     return result ? result : "";
   }
 
   sanitize(html) {
-    return this.opts.sanitizer(html, new WhiteLister(this.opts));
+    return this.opts.sanitizer(html).trim();
   }
 };
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index e1c1d56a4a..30f8f23c96 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -1,120 +1,118 @@
-const masterList = {};
-const masterCallbacks = {};
-
-const _whiteLists = {};
-const _callbacks = {};
-
-function concatUniq(src, elems) {
-  src = src || [];
-  if (!Array.isArray(elems)) {
-    elems = [elems];
-  }
-  return src.concat(elems.filter(e => src.indexOf(e) === -1));
-}
+// to match:
+// abcd
+// abcd[test]
+// abcd[test=bob]
+const WHITELIST_REGEX = /([^\[]+)(\[([^=]+)(=(.*))?\])?/;
 
 export default class WhiteLister {
   constructor(options) {
-    options = options || {
-      features: {
-        default: true
-      }
-    };
 
-    options.features.default = true;
+    this._enabled = { "default": true };
+    this._allowedHrefSchemes =  (options && options.allowedHrefSchemes) || [];
+    this._rawFeatures = [["default", DEFAULT_LIST]];
 
-    this._featureKeys = Object.keys(options.features).filter(f => options.features[f]);
-    this._key = this._featureKeys.join(':');
-    this._features = options.features;
-    this._options = options;
+    this._cache = null;
+
+    if (options && options.features) {
+      Object.keys(options.features).forEach(f => {
+        if (options.features[f]) {
+          this._enabled[f] = true;
+        }
+      });
+    }
   }
 
-  getCustom() {
-    if (!_callbacks[this._key]) {
-      const callbacks = [];
-      this._featureKeys.forEach(f => {
-        (masterCallbacks[f] || []).forEach(cb => callbacks.push(cb));
-      });
-      _callbacks[this._key] = callbacks;
-    }
+  whiteListFeature(feature, info) {
+    this._rawFeatures.push([feature, info]);
+  }
 
-    return _callbacks[this._key];
+  disable(feature) {
+    this._enabled[feature] = false;
+    this._cache = null;
+  }
+
+  enable(feature) {
+    this._enabled[feature] = true;
+    this._cache = null;
+  }
+
+  _buildCache() {
+    const tagList = {};
+    const attrList = {};
+    const custom = [];
+
+    this._rawFeatures.forEach(([name, info]) => {
+      if (!this._enabled[name]) return;
+
+      if (info.custom) {
+        custom.push(info.custom);
+        return;
+      }
+
+      if (typeof info === "string") {
+        info = [info];
+      }
+
+      (info || []).forEach(tag => {
+        const classes = tag.split('.');
+        const tagWithAttr = classes.shift();
+
+        const m = WHITELIST_REGEX.exec(tagWithAttr);
+        if (m) {
+
+          const [,tagname,,attr,,val] = m;
+          tagList[tagname] = [];
+
+          let attrs = attrList[tagname] = attrList[tagname] || {};
+          if (classes.length > 0) {
+            attrs["class"] = (attrs["class"] || []).concat(classes);
+          }
+
+          if (attr) {
+            let attrInfo = attrs[attr] = attrs[attr] || [];
+
+            if (val) {
+              attrInfo.push(val);
+            } else {
+              attrs[attr] = ["*"];
+            }
+          }
+        }
+      });
+    });
+
+
+    this._cache = {custom, whiteList: {tagList, attrList}};
+  }
+
+  _ensureCache() {
+    if (!this._cache) { this._buildCache(); }
   }
 
   getWhiteList() {
-    if (!_whiteLists[this._key]) {
-      const tagList = {};
-      let attrList = {};
+    this._ensureCache();
+    return this._cache.whiteList;
+  }
 
-      // merge whitelists for these features
-      this._featureKeys.forEach(f => {
-        const info = masterList[f] || {};
-        Object.keys(info).forEach(t => {
-          tagList[t] = [];
-          attrList[t] = attrList[t] || {};
-
-          const attrs = info[t];
-          Object.keys(attrs).forEach(a => attrList[t][a] = concatUniq(attrList[t][a], attrs[a]));
-        });
-      });
-
-      _whiteLists[this._key] = { tagList, attrList };
-    }
-    return _whiteLists[this._key];
+  getCustom() {
+    this._ensureCache();
+    return this._cache.custom;
   }
 
   getAllowedHrefSchemes() {
-    return this._options.allowedHrefSchemes || [];
+    return this._allowedHrefSchemes;
   }
 }
 
-// Builds our object that represents whether something is sanitized for a particular feature.
-export function whiteListFeature(feature, info) {
-  const featureInfo = {};
-
-  // we can supply a callback instead
-  if (info.custom) {
-    masterCallbacks[feature] = masterCallbacks[feature] || [];
-    masterCallbacks[feature].push(info.custom);
-    return;
-  }
-
-  if (typeof info === "string") { info = [info]; }
-
-  (info || []).forEach(tag => {
-    const classes = tag.split('.');
-    const tagName = classes.shift();
-    const m = /\[([^\]]+)]/.exec(tagName);
-    if (m) {
-      const [full, inside] = m;
-      const stripped = tagName.replace(full, '');
-      const vals = inside.split('=');
-
-      featureInfo[stripped] = featureInfo[stripped] || {};
-      if (vals.length === 2) {
-        const [name, value] = vals;
-        featureInfo[stripped][name] = value;
-      } else {
-        featureInfo[stripped][inside] = '*';
-      }
-    }
-
-    featureInfo[tagName] = featureInfo[tagName] || {};
-    if (classes.length) {
-      featureInfo[tagName]['class'] = concatUniq(featureInfo[tagName]['class'], classes);
-    }
-  });
-
-  masterList[feature] = featureInfo;
-}
-
 // Only add to `default` when you always want your whitelist to occur. In other words,
 // don't change this for a plugin or a feature that can be disabled
-whiteListFeature('default', [
+const DEFAULT_LIST = [
   'a.attachment',
   'a.hashtag',
   'a.mention',
   'a.mention-group',
   'a.onebox',
+  'a.inline-onebox-loading',
   'a[data-bbcode]',
   'a[name]',
   'a[rel=nofollow]',
@@ -174,4 +172,4 @@ whiteListFeature('default', [
   'sub',
   'sup',
   'ul',
-]);
+];
diff --git a/app/assets/javascripts/wizard-vendor.js b/app/assets/javascripts/wizard-vendor.js
index 2236d33669..ecb8d2bd7e 100644
--- a/app/assets/javascripts/wizard-vendor.js
+++ b/app/assets/javascripts/wizard-vendor.js
@@ -3,3 +3,5 @@
 //= require jquery.ui.widget.js
 //= require jquery.fileupload.js
 //= require sweetalert.js
+//= require virtual-dom
+//= require virtual-dom-amd
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
index b957827ad1..c31d80349a 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list-user.hbs
@@ -2,5 +2,5 @@
 <span class='role'>{{roleName}}</span>
 
 <button class="wizard-btn small danger remove-user" {{action "removeUser" user}}>
-  {{fa-icon "times"}}
+  {{d-icon "times"}}
 </button>
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 6b38377668..718ef5bd16 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -15,6 +15,6 @@
   {{combo-box value=inviteRole content=roles nameProperty="label" width="200px"}}
 
   <button class="wizard-btn small add-user" {{action "addUser"}}>
-    {{fa-icon "plus"}}{{i18n "wizard.invites.add_user"}}
+    {{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
   </button>
 </div>
diff --git a/app/assets/javascripts/wizard/templates/components/radio-button.hbs b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
index 3973d91324..e93347513a 100644
--- a/app/assets/javascripts/wizard/templates/components/radio-button.hbs
+++ b/app/assets/javascripts/wizard/templates/components/radio-button.hbs
@@ -2,7 +2,7 @@
   <input type="radio" name={{label}} tabindex="9">
   <span class='radio-label'>
     {{#if icon}}
-      {{fa-icon icon}}
+      {{d-icon icon}}
     {{/if}}
     {{label}}
   </span>
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
index 209f344e0f..05f1cb2951 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-image.hbs
@@ -7,7 +7,7 @@
     {{i18n "wizard.uploading"}}
   {{else}}
     {{i18n "wizard.upload"}}
-    {{fa-icon "picture-o"}}
+    {{d-icon "picture-o"}}
   {{/if}}
 
   <input disabled={{uploading}} type="file" accept="image/*" style="visibility: hidden; position: absolute;" />
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
index 9c945cf60a..b7371dc1b5 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-step.hbs
@@ -39,7 +39,7 @@
     {{#if showNextButton}}
       <button class='wizard-btn next primary' {{action "nextStep"}} disabled={{saving}} tabindex="10">
         {{i18n "wizard.next"}}
-        {{fa-icon "chevron-right"}}
+        {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
index ca42183bb6..3ea019a062 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -1,7 +1,7 @@
 import startApp from 'wizard/test/helpers/start-app';
 
 var wizard;
-module("Acceptance: wizard", {
+QUnit.module("Acceptance: wizard", {
   beforeEach() {
     wizard = startApp();
   },
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index de075cb545..6ad6b69dce 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -36,8 +36,8 @@ $mobile-breakpoint: 700px;
   tr {text-align: left;}
   td, th {padding: 8px;}
   td {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
+    border-top: 1px solid $primary-low; 
   }
   th {
     text-align: left;
@@ -51,8 +51,8 @@ $mobile-breakpoint: 700px;
         background-color: lighten($primary, 80%);
       }
 
-      i.fa-chevron-down,
-      i.fa-chevron-up {
+      .d-icon-chevron-down,
+      .d-icon-chevron-up {
         margin-left: 0.5em;
       }
     }
@@ -94,11 +94,11 @@ td.flaggers td {
 
   .site-text {
     cursor: pointer;
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
     margin-bottom: 0.5em;
 
     &.overridden {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -60%);
+      background-color: $highlight-medium;
     }
 
     h3 {
@@ -112,7 +112,7 @@ td.flaggers td {
     .site-text-value {
       margin: 0.5em 5em 0.5em 0;
       max-height: 100px;
-      color: dark-light-diff($primary, $secondary, 40%, -10%);
+      color: $primary-medium; 
     }
 
   }
@@ -136,7 +136,7 @@ td.flaggers td {
   font-size: 0.857em;
   float: right;
   margin-right: 10px;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low; 
   padding: 2px 5px;
   border-radius: 5px;
   color: $primary;
@@ -222,16 +222,16 @@ td.flaggers td {
 }
 
 .admin-controls {
-  background-color: dark-light-diff($primary, $secondary, 90%, -65%);
+  background-color: $primary-low; 
   padding: 10px 10px 3px 0;
   @include clearfix;
   .nav.nav-pills {
     li.active {
       a {
-        border-color: dark-light-diff($primary, $secondary, 90%, -90%);
-        background-color: dark-light-diff($primary, $secondary, 40%, -10%);
+        border-color: $primary-low; 
+        background-color: $primary-medium; 
         &:hover {
-          background-color: dark-light-diff($primary, $secondary, 40%, -10%);
+          background-color: $primary-medium; 
         }
       }
     }
@@ -396,7 +396,7 @@ td.flaggers td {
   // Todo: set this properly - it needs to be >= the menu height
   min-height: 875px;
   margin-left: 0;
-  border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+  border-left: solid 1px $primary-low; 
   padding: 30px 0 30px 30px;
   @media (max-width: $mobile-breakpoint) {
     padding: 30px 0;
@@ -461,7 +461,7 @@ td.flaggers td {
     .setting-controls {
       float: left;
     }
-    .input-setting-string {
+    .input-setting-string, .input-setting-textarea {
       box-sizing: border-box;
       height: 30px;
       width: 100%;
@@ -469,13 +469,16 @@ td.flaggers td {
         width: 100%;
       }
     }
+    .input-setting-textarea {
+      height: 150px;
+    }
     .input-setting-list {
       @media (max-width: $mobile-breakpoint) {
         width: 100%;
       }
       padding: 1px;
       background-color: $secondary;
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low; 
       border-radius: 3px;
       box-shadow: inset 0 1px 1px rgba(51, 51, 51, 0.3);
       transition: border linear 0.2s, box-shadow linear 0.2s;
@@ -531,8 +534,8 @@ td.flaggers td {
   }
 
   .setting.overridden.string {
-    input[type=text] {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -60%);
+    input[type=text], textarea {
+      background-color: $highlight-medium;
     }
   }
 }
@@ -543,7 +546,7 @@ section.details {
     color: $primary;
     padding: 5px 10px;
     margin: 30px 0 5px 0;
-    border-bottom: 5px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 5px solid $primary-low; 
   }
 }
 
@@ -586,7 +589,7 @@ section.details {
   &.highlight-danger {
     background-color: scale-color($danger, $lightness: 50%);
   }
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low; 
   &:before, &:after {
     display: table;
     content: "";
@@ -706,14 +709,14 @@ section.details {
     font-size: 1em;
     line-height: 16px;
     padding: 4px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
   }
 
   .badge-query-plan {
     font-size: 0.857em;
     line-height: 13px;
     padding: 4px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
   }
 
   .count-warning {
@@ -776,8 +779,8 @@ section.details {
     background-color: scale-color($danger, $lightness: 70%);
   }
 
-  .message { background-color: dark-light-diff($highlight, $secondary, 50%, -70%); }
-  .message:hover { background-color: dark-light-diff($highlight, $secondary, 60%, -60%); }
+  .message { background-color: $highlight-medium; }
+  .message:hover { background-color: $highlight-low; }
 
   .flagged-post-avatar {
     margin-right: 10px;
@@ -866,7 +869,7 @@ section.details {
 }
 
 .update-nag {
-  i.fa {
+  .d-icon {
     font-size: 1.429em;
   }
 }
@@ -901,10 +904,10 @@ table.api-keys {
     width: 100%;
 
     .title {
-      i.fa {
+      .d-icon {
         color: $primary;
       }
-      i.fa-heart {
+      .d-icon-heart {
         color: $love;
       }
     }
@@ -912,7 +915,7 @@ table.api-keys {
     th {
       font-weight: normal;
       text-align: center;
-      background: dark-light-diff($primary, $secondary, 80%, -65%);
+      background: $primary-low; 
     }
     th.title {
       text-align: left;
@@ -962,7 +965,7 @@ table.api-keys {
   }
 
   &.detected-problems {
-    background: dark-light-diff($primary, $secondary, 90%, -75%);
+    background: $primary-low; 
     margin-bottom: 20px;
 
     .look-here {
@@ -987,7 +990,7 @@ table.api-keys {
         text-align: right;
       }
       .btn {
-        background: dark-light-diff($primary, $secondary, 80%, -85%);
+        background: $primary-low; 
       }
       ul {
         margin-left: 0;
@@ -1037,7 +1040,7 @@ table.api-keys {
 }
 
 .commits-widget {
-  border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+  border: solid 1px $primary-low; 
   height: 180px;
   margin-bottom: 36px;
 
@@ -1060,7 +1063,7 @@ table.api-keys {
     color: $primary;
     font-weight: bold;
     height: 30px;
-    background: dark-light-diff($primary, $secondary, 80%, -75%);
+    background: $primary-low; 
     cursor: pointer;
 
     h1 {
@@ -1083,7 +1086,7 @@ table.api-keys {
       @extend .clearfix;
       line-height: 1.0em;
       padding: 6px 8px;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
       .left {
         float: left;
       }
@@ -1093,7 +1096,7 @@ table.api-keys {
 
       img {
         margin-top: 2px;
-        border: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+        border: solid 1px $primary-low; 
         padding: 2px;
         background-color: $secondary;
       }
@@ -1124,11 +1127,11 @@ table.api-keys {
     width: 6px;
   }
   ::-webkit-scrollbar-thumb {
-    background: dark-light-diff($primary, $secondary, 90%, -75%);
+    background: $primary-low; 
     -webkit-border-radius: 3px;
   }
   ::-webkit-scrollbar-track {
-    border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+    border-left: solid 1px $primary-low; 
   }
 }
 
@@ -1303,7 +1306,7 @@ table.api-keys {
     color: $primary;
     &:hover {
       color: $primary;
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low; 
 
 
     }
@@ -1333,7 +1336,7 @@ table.api-keys {
 
   .heading-container {
     width: 100%;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
   }
   .col.heading {
     font-weight: bold;
@@ -1349,7 +1352,7 @@ table.api-keys {
 
   .ember-list-item-view {
     width: 100%;
-    border-top: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: solid 1px $primary-low; 
   }
 }
 
@@ -1360,10 +1363,10 @@ table.api-keys {
 }
 
 .tl3-requirements {
-  .fa-check {
+  .d-icon-check {
     color: $success;
   }
-  .fa-times {
+  .d-icon-times {
     color: $danger;
   }
 }
@@ -1539,7 +1542,7 @@ tr.not-activated {
   .user-field {
     padding: 10px;
     margin-bottom: 10px;
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
 
     .form-display {
       width: 25%;
@@ -1844,6 +1847,47 @@ table#user-badges {
   }
 }
 
+.watched-word-box {
+  display: inline-block;
+  width: 250px;
+  margin-bottom: 1em;
+  float: left;
+}
+
+.watched-words-list {
+  margin-top: 40px;
+}
+.watched-word {
+  display: inline-block;
+  cursor: pointer;
+  .d-icon {
+    margin-right: 0.25em;
+    color: dark-light-diff($primary, $secondary, 50%, -50%);
+  }
+  &:hover .d-icon {
+    color: $primary;
+  }
+}
+.watched-word-form {
+  display: inline-block;
+  .success-message {
+    margin-left: 1em;
+  }
+}
+.watched-words-uploader {
+  float: right;
+  text-align: right;
+  .instructions {
+    font-size: 12px;
+  }
+}
+.watched-words-detail {
+  .about {
+    margin-top: 24px;
+    margin-bottom: 40px;
+  }
+}
+
 // Mobile specific styles
 // Mobile view text-inputs need some padding
 .mobile-view .admin-contents {
@@ -1929,11 +1973,11 @@ table#user-badges {
 .dbox20 { background: dark-light-diff($primary, $secondary, 20%, -20%); }
 .dbox30 { background: dark-light-diff($primary, $secondary, 30%, -30%); }
 .dbox40 { background: dark-light-diff($primary, $secondary, 40%, -40%); }
-.dbox50 { background: dark-light-diff($primary, $secondary, 50%, -50%); }
+.dbox50 { background: blend-primary-secondary(50%); }
 .dbox60 { background: dark-light-diff($primary, $secondary, 60%, -60%); }
 .dbox70 { background: dark-light-diff($primary, $secondary, 70%, -70%); }
 .dbox80 { background: dark-light-diff($primary, $secondary, 80%, -80%); }
-.dbox90 { background: dark-light-diff($primary, $secondary, 90%, -90%); }
+.dbox90 { background: $primary-low;  }
 .dbox100 { background: dark-light-diff($primary, $secondary, 100%, -100%); }
 .dbox5 { background: dark-light-diff($primary, $secondary, 5%, -5%); }
 .dbox15 { background: dark-light-diff($primary, $secondary, 15%, -15%); }
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 9a62dcff91..1ba3bbc507 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -10,7 +10,7 @@
   .field-error {
     margin-top: 10px;
     margin-bottom: 10px;
-    background-color: dark-light-diff($quaternary, $secondary, 70%, -70%);
+    background-color: $quaternary-low;
     padding: 5px;
   }
 
@@ -98,7 +98,7 @@
       li.mobile a {
         padding-right: 25px;
       }
-      .fa-mobile {
+      .d-icon-mobile {
         position: absolute;
         right: 10px;
         top: 3px;
@@ -210,4 +210,3 @@
     margin-top: 20px;
   }
 }
-
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index cb1bccb1fc..73460e47c3 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -16,8 +16,8 @@
   }
 }
 
-html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-light-diff($primary, $secondary, 45%, -30%);}
-.topic-list a.title.visited:not(.badge-notification) {color: dark-light-diff($primary, $secondary, 45%, -30%);}
+html.anon .topic-list a.title:visited:not(.badge-notification) {color: $primary-medium; }
+.topic-list a.title.visited:not(.badge-notification) {color: $primary-medium; }
 
 .topic-list {
   width: 100%;
@@ -28,7 +28,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
       vertical-align: top;
       margin-top: 2px;
     }
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border-bottom: 1px solid $primary-low; 
 
     &.last-visit {
       border-bottom: none;
@@ -58,7 +58,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
   }
 
   > tbody > tr:first-of-type {
-    border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border-top: 3px solid $primary-low; 
   }
 
   th,
@@ -72,7 +72,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
     font-weight: normal;
     font-size: 1em;
-    button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));}
+    button .d-icon {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));}
 
   }
   td {
@@ -238,7 +238,7 @@ ol.category-breadcrumb {
   overflow-x: hidden;
   overflow-y: auto;
   position: absolute;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   background-color: $secondary;
   z-index: 100;
 
@@ -247,7 +247,7 @@ ol.category-breadcrumb {
     overflow:hidden;
     margin-bottom: 0;
   }
-  a.badge-category {
+  a.badge-category, .dropdown-header {
     font-size: 0.929em;
     font-weight: bold;
     float: none;
@@ -257,7 +257,7 @@ ol.category-breadcrumb {
   }
 }
 
-.fa-thumb-tack.unpinned {
+.d-icon-thumb-tack.unpinned {
   @include fa-icon-rotate(180deg, 1);
   color: $primary;
   /* because it is rotated, right becomes left! */
@@ -300,7 +300,7 @@ ol.category-breadcrumb {
     @include unselectable;
 
     font-size: 1.2em;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
     padding: 5px;
     background: $secondary;
     position: absolute;
@@ -326,7 +326,7 @@ ol.category-breadcrumb {
           font-size: 0.8em;
         }
         &:hover {
-          background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+          background-color: $highlight-medium;
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 2afb3d10ed..892151a3b2 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -30,15 +30,15 @@
     -webkit-appearance: none;
   }
   &.alert-success {
-    background-color:  dark-light-diff($success, $secondary, 50%, -60%);
+    background-color:  $success-low;
     color: $primary;
   }
   &.alert-error {
-    background-color:  rgba(dark-light-diff($danger, $secondary, 50%, -60%), .5);
+    background-color:  rgba($danger-low, .5);
     color: $primary;
   }
   &.alert-info {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color: $tertiary-low;
     color: $primary;
     &.clickable {
       color: $tertiary;
diff --git a/app/assets/stylesheets/common/base/colorpicker.scss b/app/assets/stylesheets/common/base/colorpicker.scss
index 6bcf8ae659..83f29f7853 100644
--- a/app/assets/stylesheets/common/base/colorpicker.scss
+++ b/app/assets/stylesheets/common/base/colorpicker.scss
@@ -18,7 +18,7 @@
     max-width: 300px;
 
     .colorpicker {
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low; 
       margin-right: 2px;
       width: 16px;
       height: 16px;
diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/base/combobox.scss
index cd9f44b52c..4c80abc5c6 100644
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/base/combobox.scss
@@ -1,5 +1,5 @@
 .select2-results .select2-highlighted {
-    background: dark-light-diff($highlight, $secondary, 50%, -80%);
+    background: $highlight-medium;
     color: $primary;
 }
 
@@ -25,7 +25,7 @@
 
 .select2-drop {
   background: $secondary;
-  i.fa {
+  .d-icon {
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
   }
 }
@@ -36,7 +36,7 @@
 
 .select2-container {
   border-radius: 3px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   min-width: 200px;
 
   &.select2-dropdown-open {
@@ -71,7 +71,7 @@
   border-color: $tertiary;
 }
 .select2-drop {
-  color: dark-light-diff($primary, $secondary, -50%, 50%);
+  color: $primary;
 }
 .select2-drop-active {
   border: 1px solid $tertiary;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 9f86c23d94..233519fcc8 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -3,19 +3,19 @@
   position: absolute;
   width: 240px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   ul {
     list-style: none;
     padding: 0;
     margin: 0;
 
     li {
-      .fa-users {
+      .d-icon-users {
         color: lighten($primary, 40%);
         padding: 0 2px;
       }
 
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
 
       a {
         padding: 5px;
@@ -32,10 +32,10 @@
           vertical-align: middle;
         }
         &.selected {
-          background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+          background-color: $tertiary-low;
         }
         @include hover {
-          background-color: dark-light-diff($highlight, $secondary, 90%, -80%);
+          background-color: $highlight-low;
           text-decoration: none;
         }
       }
@@ -52,11 +52,13 @@
   .d-editor-button-bar {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
-
     margin: 0px;
     padding: 5px;
-    border-bottom: 2px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 2px solid $primary-low; 
     height: 33px;
+    .btn:hover {
+      color: $primary-low; 
+    }
   }
 
   textarea {
@@ -88,7 +90,7 @@ div.ac-wrap div.item a.remove, .remove-link {
   border-radius: 12px;
   width: 10px;
   display: inline-block;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   &:hover {
     background-color: scale-color($danger, $lightness: 75%);
     border: 1px solid scale-color($danger, $lightness: 30%);
@@ -101,7 +103,7 @@ div.ac-wrap {
   overflow: auto;
   max-height: 150px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px 4px 1px 4px;
   div.item {
     float: left;
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 6af69033aa..8a31885b8c 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -12,7 +12,7 @@
     float: right;
   }
   .total-rows {
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    color: blend-primary-secondary(50%);
     text-align: right;
   }
   .spinner {
@@ -26,17 +26,17 @@
     td, th {
       padding: 0.5em;
       text-align: left;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
 
       .number, .time-read {
         font-size: 1.4em;
-        color: dark-light-diff($primary, $secondary, 50%, -20%);
+        color: $primary-medium; 
       }
     }
 
     tr.me {
       td {
-        background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+        background-color: $highlight-low;
 
         .username a, .name, .title, .number, .time-read {
           color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%));
@@ -49,16 +49,16 @@
       white-space: nowrap;
 
       width: 13%;
-      i.fa-heart {
+      .d-icon-heart {
         color: $love;
         margin-right: 0.5em;
       }
-      i.fa-chevron-down, i.fa-chevron-up {
+      .d-icon-chevron-down, .d-icon-chevron-up {
         margin-left: 0.5em;
       }
 
       &:hover {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+        background-color: $primary-low; 
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 1aeaf7cfe3..1960f4b603 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -314,7 +314,7 @@ body {
   animation: rotate-forever 1s infinite linear;
   height: 30px;
   width: 30px;
-  border: 4px solid dark-light-diff($primary, $secondary, 50%, -50%);
+  border: 4px solid blend-primary-secondary(50%);
   border-right-color: transparent;
   border-radius: 50%;
 
@@ -329,7 +329,7 @@ body {
 .content-list {
 
   h3 {
-    color: dark-light-diff($primary, $secondary, 50%, -20%);
+    color: $primary-medium; 
     font-size: 1.071em;
     padding-left: 5px;
     margin-bottom: 10px;
@@ -340,10 +340,10 @@ body {
     margin: 0;
 
     li:first-of-type {
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-top: 1px solid $primary-low; 
     }
     li {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
 
     li a {
@@ -352,7 +352,7 @@ body {
       color: $primary;
 
       &:hover {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+        background-color: $primary-low; 
         color: $primary;
       }
 
@@ -380,7 +380,7 @@ span.relative-date {
 
 @keyframes background-fade-highlight {
   0% {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color: $tertiary-low;
   }
   100% {
     background-color: transparent;
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 10b1a6812b..df240bc38f 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -4,125 +4,117 @@ body img.emoji {
   vertical-align: middle;
 }
 
-.wmd-emoji-button:before {
-  content:  "\f118";
-}
-
-.emoji-modal {
+.emoji-picker {
+  box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+  background-clip: padding-box;
   z-index: 10000;
   position: fixed;
-  left: 50%;
-  top: 50%;
-  width: 445px;
-  min-height: 264px;
-  margin-top: -132px;
-  margin-left: -222px;
-  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
+  display: none;
+  flex-direction: row;
+  height: 300px;
+  border-radius: 3px;
+  color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
+  background-color: $secondary;
+  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+}
+
+.emoji-picker .categories-column {
   display: flex;
   flex-direction: column;
+  flex: 1;
+  align-items: center;
+  justify-content: space-between;
+  border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  min-width: 36px;
+}
+
+.emoji-picker .category-icon {
+  display: block;
+  margin: 4px auto;
+  -webkit-filter: grayscale(100%);
+  filter: grayscale(100%);
+
+  button.emoji {
+    margin: 0;
+    padding: 0;
+  }
+}
+
+.emoji-picker .category-icon.current, .emoji-picker .category-icon:hover {
+  -webkit-filter: grayscale(0%);
+  filter: grayscale(0%);
+}
+
+.emoji-picker .main-column {
+  display: flex;
+  flex-direction: column;
+  flex: 20;
+}
+
+.emoji-picker .list {
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  padding: 0px;
+  flex: 1;
+  flex-direction: column;
 }
 
-table.emoji-page td {
-  border: 1px solid transparent;
-  background-color: dark-light-choose(white, $secondary);
-  padding: 0 !important;
-}
-
-.emoji-page a {
+.emoji-picker .section-header {
   padding: 8px;
-  display: block;
-  border-radius: 20px;
-}
-
-.emoji-page a:hover {
-  background-color: dark-light-choose(rgb(210, 236, 252), rgb(45, 19, 3));
-}
-
-.emoji-table-wrapper {
-  min-width: 442px;
-  min-height: 185px;
-  background-color: $secondary;
-}
-
-.emoji-modal-wrapper {
-  z-index: 9999;
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  opacity: dark-light-choose(0.8, 0.5);
-  background-color: black;
-}
-
-.emoji-modal .toolbar {
-  margin: 8px 0 5px;
-}
-
-.emoji-modal .toolbar li {
-  display: inline;
-  padding-right: 1px;
-}
-
-.emoji-modal .toolbar li a {
-  padding: 8px;
-  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
-}
-
-.emoji-modal .toolbar li a.selected {
-  background-color: $secondary;
-}
-
-.emoji-modal .nav span {
-  color: dark-light-choose(#aaa, #555);
-}
-
-.emoji-modal .nav span.next {
-  margin-left: 10px;
-}
-
-.emoji-modal .nav a {
-  color: dark-light-choose(#333, #ccc);
-}
-
-.emoji-shortname {
-  display: inline-block;
-  max-width: 200px;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  vertical-align: middle;
-}
-
-.emoji-modal .footer {
+  margin-bottom: 4px;
+  padding-bottom: 4px;
+  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  justify-content: space-between;
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  flex-direction: row;
-  flex-grow: 2;
-  padding: 8px;
 }
 
-.emoji-modal .info {
-  flex: 10;
-}
-
-.emoji-modal .info span {
-  margin-left: 5px;
-  font-weight: bold;
+.emoji-picker .section-header .title {
   color: $primary;
 }
 
-.emoji-modal .nav {
-  margin-left: 10px;
+.emoji-picker .section-header .clear-recent .fa{
+  margin: 0;
+  padding: 0;
+  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+
+  &:hover {
+    color: $primary;
+  }
 }
 
-.emoji-modal .tones {
+.emoji-picker .section-group {
+  flex-wrap: wrap;
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  justify-content: flex-start;
+  padding: 4px;
 }
 
-.emoji-modal .tones-button {
+.emoji-picker .footer {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+}
+
+.emoji-picker .info {
+  text-overflow: ellipsis;
+  max-width: 232px;
+  padding-left: 8px;
+  white-space: nowrap;
+  overflow: hidden;
+  font-weight: 700;
+  max-width: 125px;
+}
+
+.emoji-picker .diversity-picker {
+  display: flex;
+  justify-content: flex-end;
+  padding: 8px;
+}
+
+.emoji-picker .diversity-picker .diversity-scale {
   width: 20px;
   height: 20px;
   margin-left: 5px;
@@ -133,14 +125,125 @@ table.emoji-page td {
   justify-content: center;
   cursor: pointer;
 }
-.emoji-modal .tones-button.default { background: #ffcc4d; }
-.emoji-modal .tones-button.light { background: #f7dece; }
-.emoji-modal .tones-button.medium-light { background: #f3d2a2; }
-.emoji-modal .tones-button.medium { background: #d5ab88; }
-.emoji-modal .tones-button.medium-dark { background: #af7e57; }
-.emoji-modal .tones-button.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-modal .tones-button i.fa {
+.emoji-picker .diversity-picker .diversity-scale.selected i {
+  display: block;
+}
+
+.emoji-picker .diversity-picker i {
+  display: none;
+}
+
+.emoji-picker .diversity-picker .d-icon {
   color: #fff;
+  font-size: 12px;
   text-shadow: 0.5px 1.5px 0 rgba(0,0,0,0.3);
 }
+
+.emoji-picker button.emoji {
+  background: transparent;
+  background-position: center;
+  background-repeat: no-repeat;
+  border-radius: 0;
+  background-size: 20px 20px;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 20px;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  vertical-align: top;
+  width: 20px;
+  outline: none;
+  padding: 3px;
+  margin: 2px;
+}
+
+.emoji-picker .section-group button.emoji:hover, .emoji-picker .results button.emoji:hover {
+  display: inline-block;
+  vertical-align: top;
+  border-radius: 50%;
+  background-color: lighten($tertiary, 40%);
+}
+
+.wmd-emoji-button:before {
+  content:  "\f118";
+}
+
+.emoji-picker-modal.fadeIn {
+  z-index: 9999;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: .8;
+  background-color: black;
+}
+
+.emoji-picker .filter {
+  background-color: none;
+  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  padding: 5px;
+  display: flex;
+  position: relative;
+  align-items: center;
+}
+
+.emoji-picker .filter .d-icon-search {
+  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  font-size: 16px;
+  margin-left: 5px;
+  margin-right: 5px;
+}
+
+.emoji-picker .filter input {
+  height: 24px;
+  margin: 0;
+  flex: 1;
+  border: none;
+  box-shadow: none;
+  padding-right: 24px;
+  outline: none;
+  color: $primary;
+  background: $secondary;
+
+  &:focus {
+    border: none;
+    box-shadow: none;
+  }
+}
+
+.emoji-picker .filter input::-ms-clear {
+  display: none;
+}
+
+.emoji-picker .results {
+  display: none;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 4px;
+  flex: 1;
+}
+
+.emoji-picker .filter .clear-filter {
+  position: absolute;
+  right: 5px;
+  top: 12px;
+  border: 0;
+  background: none;
+  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  outline: none;
+  display: none;
+
+  &:hover {
+    color: $primary;
+  }
+}
diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss
index c9a7087651..9bdc0df4bb 100644
--- a/app/assets/stylesheets/common/base/exception.scss
+++ b/app/assets/stylesheets/common/base/exception.scss
@@ -16,7 +16,7 @@
   }
   .desc {
     margin-top: 16px;
-    .fa-check-circle {
+    .d-icon-check-circle {
       color: $success;
     }
   }
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index 5287a777c3..6c55db08f1 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -51,7 +51,7 @@ table.group-logs {
   width: 100%;
 
   th, tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
   }
 
   th {
@@ -67,7 +67,7 @@ table.group-logs {
     cursor: pointer;
 
     i {
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
   }
 }
@@ -77,7 +77,7 @@ table.group-members {
   table-layout: fixed;
 
   tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
   }
 
   th:first-child {
@@ -90,7 +90,7 @@ table.group-members {
   }
 
   th {
-    border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 3px solid $primary-low; 
     text-align: center;
     padding: 5px 0px 5px 5px;
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
@@ -104,7 +104,7 @@ table.group-members {
 
     &:hover {
       cursor: pointer;
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low; 
     }
   }
 
@@ -119,7 +119,7 @@ table.group-members {
 
     td {
       text-align: center;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
       padding: 0.8em 0;
     }
   }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index f40697b01c..6dae404db0 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -8,16 +8,16 @@
   width: 100%;
 
   th {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
     padding: 5px 0px;
     text-align: left;
   }
 
   tr {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
 
     td {
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
       padding: 0.8em 0;
     }
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 1991799767..2245734e84 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -26,7 +26,7 @@
       max-height: 40px;
     }
 
-    .fa-home {
+    .d-icon-home {
       font-size: 1.643em;
     }
 
@@ -69,14 +69,14 @@
 
         &:hover {
           color: $primary;
-          background-color:  dark-light-diff($primary, $secondary, 90%, -60%);
+          background-color:  $primary-low;
           border-top: 1px solid transparent;
           border-left: 1px solid transparent;
           border-right: 1px solid transparent;
         }
         &:active {
           color: $primary;
-          background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+          background-color: $primary-low;
         }
       }
       .drop-down-visible & {
@@ -85,9 +85,9 @@
           color: #7b7b7b;
           background-color: $secondary;
           cursor: default;
-          border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-          border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-          border-right: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+          border-top: 1px solid $primary-low;
+          border-left: 1px solid $primary-low;
+          border-right: 1px solid $primary-low;
 
           .badge-notification {
             top: -10px;
@@ -113,7 +113,8 @@
           }
         }
       }
-      [class^="fa fa-"] {
+
+      .d-icon {
         width: 32px;
         height: 32px;
         font-size: 1.714em;
@@ -147,7 +148,7 @@
 
 
 .highlight-strong {
-  background-color: dark-light-diff($highlight, $secondary, 40%, -45%);
+  background-color: $highlight-medium;
 }
 
 .search-highlight {
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 23a094624f..0de3abad17 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -80,7 +80,7 @@
     background-color: lighten($highlight, 23%);
     padding: 3px 5px 5px 5px;
   }
-  .fa-ban {
+  .d-icon-ban {
     color: #f00;
   }
   .hidden-revision-either {
diff --git a/app/assets/stylesheets/common/base/lightbox.scss b/app/assets/stylesheets/common/base/lightbox.scss
index 61a93372f2..2570034d60 100644
--- a/app/assets/stylesheets/common/base/lightbox.scss
+++ b/app/assets/stylesheets/common/base/lightbox.scss
@@ -42,7 +42,7 @@
   .informations {
     margin: 6px;
     padding-right: 20px;
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    color: blend-primary-secondary(50%);
     font-size: 1em;
   }
 
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index deb79628d5..21e80fb44e 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -18,7 +18,7 @@
 }
 
 .menu-panel {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   box-shadow: 0 2px 2px rgba(0,0,0, .25);
   background-color: $secondary;
   z-index: 1100;
@@ -60,7 +60,7 @@
       padding: 0.25em 0.5em;
       display: block;
       &:hover {
-        background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+        background-color: $highlight-medium;
       }
     }
 
@@ -191,7 +191,7 @@
     }
 
     &:hover a:not(.badge-notification) {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+      background-color: $highlight-medium;
     }
 
     button {margin-left: 5px;}
@@ -210,7 +210,7 @@
     .fa { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
     .icon { color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); }
     li {
-      background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+      background-color: $tertiary-low;
       padding: 0.25em 0.5em;
       i {
         float: left;
@@ -218,7 +218,7 @@
         padding-top: 2px;
       }
       span { color: $primary; }
-      &:hover { background-color: dark-light-diff($highlight, $secondary, 50%, -55%); }
+      &:hover { background-color: $highlight-medium; }
       a { padding: 0; }
       p {
         margin: 0;
@@ -226,7 +226,7 @@
       }
     }
     .is-warning {
-      i.fa-envelope-o {
+      .d-icon-envelope-o {
         &:before {
           content: "\f0e0";
         }
@@ -256,7 +256,7 @@
 .notifications .logout {
   padding: 0.25em;
   &:hover {
-    background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+    background-color: $highlight-medium;
   }
 }
 
@@ -269,7 +269,7 @@ div.menu-links-header {
     display: table-row;
   }
   a:hover {
-    background-color: dark-light-diff($highlight, $secondary, 50%, -55%);
+    background-color: $highlight-medium;
   }
   a {
     padding: 0.5em;
@@ -301,7 +301,7 @@ div.menu-links-header {
   a {
     font-size: 1.1em;
   }
-  .fa-user {
+  .d-icon-user {
     margin-right: 0.2em;
   }
 }
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 8cf03acc16..f41175a732 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -13,11 +13,11 @@
 
 .input-hint-text {
   margin-left: 0.5em;
-  color: dark-light-diff($secondary, $primary, 30%, -35%);
+  color: $secondary-medium;
 }
 
 .modal-header {
-  border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-bottom: 1px solid $primary-low; 
 }
 
 .modal-backdrop {
@@ -96,7 +96,7 @@
 }
 .modal-footer {
   padding: 14px 15px 15px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low; 
 }
 .modal-footer:before,
 .modal-footer:after {
@@ -118,15 +118,15 @@
 .modal {
   .nav {
     padding: 10px 30px 10px 15px;
-    background-color: dark-light-diff($secondary, $primary, 10%, -15%);
+    background-color: $secondary;
     li > a {
       font-size: 1em;
     }
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 1px solid $primary-low; 
 
   }
 
-    &.hidden {
+  &.hidden {
     display: none;
   }
 
@@ -235,7 +235,7 @@
         font-weight: normal;
       }
       &.btn-reply-here {
-        background: dark-light-diff($primary, $secondary, 90%, -60%);
+        background: $primary-low; 
         text-shadow: none;
         color: $primary;
       }
@@ -292,7 +292,7 @@
   .permission {
     margin-left: 20px;
   }
-  .fa-times-circle {
+  .d-icon-times-circle {
     margin-left: 5px;
   }
   li {
@@ -356,7 +356,7 @@
       font-weight: bold;
     }
     &:focus {
-      outline: 2px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      outline: 2px solid $primary-low; 
     }
   }
   .incoming-email-tabs {
@@ -367,7 +367,7 @@
     textarea, .incoming-email-html-part {
       height: 95%;
       border: none;
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-top: 1px solid $primary-low; 
       padding-top: 10px;
     }
     textarea {
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 5b718047c7..86e505e622 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -89,7 +89,7 @@ a.loading-onebox {
 }
 
 aside.onebox {
-  border: 5px solid dark-light-diff($primary, $secondary, 90%, -85%);
+  border: 5px solid $primary-low; 
 
   padding: 12px 25px 12px 12px;
   font-size: 1em;
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 045df633a6..71163ef835 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -7,7 +7,7 @@
   right: 0 !important;
 }
 
-// This is used to flip the .fa-caret-right icon
+// This is used to flip the .d-icon-caret-right 
 @mixin rotate( $degrees ) {
   -webkit-transform: rotate(#{$degrees}deg);
   -moz-transform: rotate(#{$degrees}deg);
@@ -21,7 +21,7 @@
 }
 
 // Get the right caret to point left
-.rtl .fa-caret-right {
+.rtl .d-icon-caret-right {
   @include rotate(180);
 }
 
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 7fa038db9c..eeb82c5d04 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -108,7 +108,7 @@
   }
 
   .search-advanced-options {
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+    border: 1px solid $primary-low; 
     padding: 10px;
 
     .control-group.pull-left {
@@ -147,7 +147,7 @@
   }
   margin: 10px 0 15px;
   max-width: 780px;
-  border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-bottom: 3px solid $primary-low; 
   width: 100%;
   .sort-by {
     .desc {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index f691175120..be2a28cc3f 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -171,6 +171,10 @@ header .discourse-tag {color: $tag-color }
 .tag-chooser {
   width: 100%;
   margin: 5px 0;
+  ul.select2-choices {
+    max-height: 40px;
+    overflow-y: auto;
+  }
 }
 
 .title-wrapper .tag-chooser {
@@ -203,7 +207,7 @@ header .discourse-tag {color: $tag-color }
 }
 
 .autocomplete {
-  .fa-tag {
+  .d-icon-tag {
    color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
    padding-right: 5px;
   }
diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss
index 2c20a0fa5d..7816086dc9 100644
--- a/app/assets/stylesheets/common/base/topic-admin-menu.scss
+++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss
@@ -12,7 +12,7 @@
   background-color: $secondary;
   width: 205px;
   padding: 10px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   z-index: 999;
 
   ul {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 216a691520..3f34809d20 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -1,6 +1,6 @@
 .placeholder-avatar {
   display: inline-block;
-  background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+  background-color: $primary-low;
   width: 45px;
   height: 45px;
   border-radius: 50%;
@@ -8,7 +8,7 @@
 
 .placeholder-text {
   display: inline-block;
-  background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+  background-color: $primary-low;
   width: 100%;
   height: 1.5em;
   margin-bottom: 0.6em;
@@ -92,7 +92,7 @@ aside.quote {
 }
 
 .cooked .highlight {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   padding: 2px;
   margin: -2px;
 }
@@ -137,7 +137,7 @@ aside.quote {
 .quote-button {
   display: none;
   position: absolute;
-  background-color: dark-light-diff($primary, $secondary, 50%, -50%);
+  background-color: blend-primary-secondary(50%);
   color: dark-light-choose($secondary, $primary);
   padding: 10px;
   z-index: 401;
@@ -149,7 +149,7 @@ aside.quote {
   }
 
   &:hover {
-    background-color: dark-light-diff($primary, $secondary, 40%, -40%);
+    background-color: $primary-medium;
     cursor: pointer;
   }
 }
@@ -242,7 +242,7 @@ aside.quote {
 .post-info {
   &.via-email, &.whisper {
     margin-right: 5px;
-    i.fa {
+    .d-icon {
       font-size: 1em;
     }
   }
@@ -273,7 +273,7 @@ pre {
 kbd
 {
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   border-radius: 3px;
   box-shadow: 0 1px 0 rgba(0,0,0, .8);
   color: $primary;
@@ -395,15 +395,15 @@ blockquote > *:last-child {
   .topic-body {
     .cooked {
       font-style: italic;
-      color: dark-light-diff($primary, $secondary, 55%, -40%);
+      color: $primary-medium;
     }
   }
 }
 
 a.mention, a.mention-group {
   padding: 2px 4px;
-  color: dark-light-diff($primary, $secondary, 30%, -20%);
-  background: dark-light-diff($primary, $secondary, 95%, -60%);
+  color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+  background: $primary-low;
   border-radius: 8px;
   font-weight: bold;
   font-size: 0.93em;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index bce213d819..5a6b735fc9 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -91,7 +91,7 @@
 
 .has-pending-posts {
   padding: 0.5em;
-  background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+  background-color: $highlight-medium;
   a[href] {
     float: right;
   }
@@ -143,7 +143,7 @@
   .post-links {
     margin-top: 1em;
     padding-top: 1em;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border-top: 1px solid $primary-low; 
   }
 
   .expand-links {
@@ -185,7 +185,7 @@
     &:hover {
       color: $tertiary;
       i {
-        background: dark-light-diff($tertiary, $secondary, 85%, -65%);
+        background: $tertiary-low;
       }
     }
   }
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 7c25c2652a..7e98f3c2c0 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -2,7 +2,7 @@
 .user-badge {
   padding: 3px 8px;
   color: $primary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+  border: 1px solid $primary-low;
   line-height: 19px;
   display: inline-block;
   background-color: $secondary;
@@ -126,7 +126,7 @@
 .badge-card {
   position: relative;
   display: inline-block;
-  background-color: dark-light-diff($primary, $secondary, 95%, -65%);
+  background-color: $primary-low;
   margin-right: 5px;
   margin-bottom: 10px;
   box-shadow: 1px 1px 3px rgba(0.0, 0.0, 0.0, 0.2);
@@ -142,7 +142,7 @@
     right: 5px;
     top: 5px;
     font-weight: bold;
-    color: dark-light-diff($primary, $secondary, 50%, -15%);
+    color: $primary-medium;
     font-size: 1.2em;
   }
 
@@ -156,7 +156,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      background-color: dark-light-diff($primary, $secondary, 92%, -60%);
+      background-color: $primary-low;
       font-size: 3em;
 
       img {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index a36fb62df4..70926d68a3 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -21,7 +21,7 @@
 }
 
 .user-main {
-  i.fa-heart {
+  .d-icon-heart {
     color: $love !important;
   }
   .nav-pills {
@@ -177,10 +177,10 @@
 .user-nav {
   margin: 5px 0px;
   padding-top: 10px;
-  .fa {
+  .d-icon {
     margin-right: 5px;
   }
-  .fa.fa-comment {
+  .d-icon-comment {
     margin-right: 2px;
   }
 }
@@ -227,7 +227,7 @@
         width: 100%;
         height: 100%;
         display: block;
-        color: black;
+        color: $primary;
       }
     }
   }
@@ -242,7 +242,7 @@
   }
 
   .label {
-    color: dark-light-diff($primary, $secondary, 50%, -50%);
+    color: blend-primary-secondary(50%);
   }
 }
 
@@ -254,7 +254,7 @@
   }
 
   li {
-    border-left: dark-light-diff($primary, $secondary, 90%, -65%) solid 2px;
+    border-left: $primary-low solid 2px;
     padding: 5px 8px;
     margin: 10px 0;
   }
@@ -294,7 +294,7 @@ and (max-width : 600px) {
 }
 
 .user-preferences .tags .select2-container-multi {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   width: 540px;
   border-radius: 0;
   .select2-choices {
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 8273d97c8b..c26997e4d9 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -28,7 +28,7 @@
     display: inline-flex;
 
     span.badge-category {
-      color: $primary !important;
+      color: $primary;
       padding: 3px;
       vertical-align: text-top;
       margin-top: -2px; //vertical alignment fix
@@ -37,7 +37,7 @@
       text-overflow: ellipsis;
 
       .extra-info-wrapper & {
-        color: $header-primary !important;
+        color: $header-primary;
       }
     }
 
@@ -59,7 +59,7 @@
     line-height: 15px;
 
     span.badge-category {
-      color: $primary !important;
+      color: $primary;
       display: inline-block;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -69,7 +69,7 @@
       }
 
       .extra-info-wrapper & {
-        color: $header-primary !important;
+        color: $header-primary;
       }
     }
 
@@ -149,7 +149,7 @@
 
 .list-controls {
 .category-breadcrumb {
-  a.badge-category {
+  a.badge-category, .dropdown-header {
       display: inline-block;
       padding: 5px 8px;
       line-height: 20px;
@@ -158,24 +158,25 @@
       padding: 5px;
       width: 13px;
 
-      .fa-caret-right {
+      .d-icon-caret-right {
         margin-left: 2px;
         }
       }
     }
 
-    li.bar>.badge-category:not(.home):first-child {
+    li.bar>.dropdown-header:not(.home):first-child {
       border-left: 5px solid;
+      font-size: 1em;
     }
 
-    li.bar>.badge-category {
-      background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
-      color: $primary !important;
+    li.bar>.dropdown-header {
+      background: $primary-low;
+      color: $primary;
     }
 
-    li.bullet>.badge-category {
-      background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
-      color: $primary !important;
+    li.bullet>.dropdown-header {
+      background: $primary-low;
+      color: $primary;
 
       .badge-category-bg {
         width: 10px;
@@ -189,7 +190,7 @@
   }
 
   .category-dropdown-menu {
-    .badge-category {
+    .dropdown-header {
       &.home {
         margin-left: 4px;
         padding-left: 0;
@@ -279,9 +280,9 @@
 
   &.clicks {
     font-weight: normal;
-    background-color: dark-light-diff($primary, $secondary, 88%, -60%);
+    background-color: $primary-low;
     top: -1px;
-    color: dark-light-diff($primary, $secondary, 40%, -20%);
+    color: $primary-medium;
     position: relative;
     margin-left: 2px;
     border: none;
@@ -308,8 +309,8 @@
   padding: 4px 5px 2px 5px;
   color: $primary;
   text-shadow: 0 1px 0 rgba($primary, 0.1);
-  background-color: dark-light-diff($primary, $secondary, 90%, -65%);
-  border-color: dark-light-diff($primary, $secondary, 90%, -65%);
+  background-color: $primary-low;
+  border-color: $primary-low;
   font-size: 0.857em;
   box-shadow: inset 0 1px 0 rgba(0,0,0, 0.22);
 }
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index a1a3f4bc6d..f73c5e3ea0 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -46,25 +46,25 @@
   border: none;
   color: $primary;
   font-weight: normal;
-  background: dark-light-diff($primary, $secondary, 90%, -65%);
+  background: $primary-low; 
 
   &[href] {
     color: $primary;
   }
   &:hover {
-    background: dark-light-diff($primary, $secondary, 65%, -75%);
+    background: $primary-medium; 
     color: $secondary;
   }
   &[disabled], &.disabled {
-    background: dark-light-diff($primary, $secondary, 90%, -60%);
+    background: $primary-low; 
     &:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); }
     cursor: not-allowed;
   }
 
-  i.fa {
+  .d-icon {
     opacity: 0.7;
   }
-  &.btn-primary i.fa {
+  &.btn-primary .d-icon {
     opacity: 1;
   }
 }
@@ -189,3 +189,12 @@
   font-size: 1.143em;
   line-height: 20px;
 }
+
+.btn-flat {
+  background: transparent;
+  border: 0;
+  outline: 0;
+  .d-icon {
+    opacity: 0.7;
+  }
+}
diff --git a/app/assets/stylesheets/common/components/navs.scss b/app/assets/stylesheets/common/components/navs.scss
index 59a34aad62..6beae3c591 100644
--- a/app/assets/stylesheets/common/components/navs.scss
+++ b/app/assets/stylesheets/common/components/navs.scss
@@ -32,7 +32,7 @@
       transition: background .15s;
       &:hover {
         color: $quaternary;
-        background-color: dark-light-diff($quaternary, $secondary, 70%, -70%);
+        background-color: $quaternary-low;
       }
     }
     &.active > a, > a.active {
@@ -49,9 +49,9 @@
   @extend %nav;
   padding: 0;
   overflow: hidden;
-  background: dark-light-diff($primary, $secondary, 90%, -75%);
+  background: $primary-low;
   li {
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 80%, -60%);
+    border-bottom: 1px solid $primary-low;
     position: relative;
     &:last-of-type {
       border-bottom: 0;
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 8d3d618390..b1a97021b0 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -1,5 +1,5 @@
 .d-editor {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
 }
 
 .d-editor-container {
@@ -22,7 +22,7 @@
   min-width: 400px;
   position: absolute;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   padding: 1em;
   top: 25px;
 
@@ -71,7 +71,7 @@
   height: 20px;
   margin-right: 8px;
   margin-left: 5px;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low;
   display: inline-block;
   float: left;
 }
@@ -82,13 +82,13 @@
   height: 200px;
 
   &:disabled {
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low;
   }
 }
 
 .d-editor-preview {
   color: $primary;
-  border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px dashed $primary-low;
   overflow: auto;
   cursor: default;
   margin-top: 8px;
@@ -110,7 +110,7 @@
 .composing-whisper {
   .d-editor-preview {
     font-style: italic;
-    color: dark-light-diff($primary, $secondary, 55%, -40%) !important;
+    color: $primary-medium !important;
   }
 }
 
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 35b0418187..bf08280bb1 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -41,7 +41,7 @@ hr {
   height: 1px;
   margin: 1em 0;
   border: 0;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   padding: 0;
 }
 
@@ -49,7 +49,6 @@ hr {
 // --------------------------------------------------
 
 ul,
-ol,
 dd {
   margin: 0 0 9px 25px;
   padding: 0;
@@ -60,6 +59,11 @@ dd {
   clear: both;
 }
 
+.cooked ul, .d-editor-preview ul {
+  margin: 0;
+  padding-left: 40px;
+}
+
 li {
   > ul,
   > ol {
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index f9c3ca2a5a..ed55c8f522 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -97,7 +97,7 @@
 
 // Stuff we repeat
 @mixin post-aside {
-  border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%);
+  border-left: 5px solid $primary-low;
   background-color: blend-primary-secondary(5%);
 }
 
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 43eb44cdb2..2d7c6186bb 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -78,3 +78,33 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
     @return $dark-theme-result;
   }
 }
+
+// standard color transformations, use these if possible, and add any new dark-light-diffs here
+
+//primary
+$primary-low: dark-light-diff($primary, $secondary, 90%, -65%);
+$primary-medium: dark-light-diff($primary, $secondary, 50%, -20%);
+
+//secondary
+$secondary-low: dark-light-diff($secondary, $primary, 50%, -50%);
+$secondary-medium: dark-light-diff($secondary, $primary, 30%, -35%);
+
+//tertiary
+$tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%);
+
+//quaternary
+$quaternary-low: dark-light-diff($quaternary, $secondary, 70%, -70%);
+
+//highlight
+$highlight-low: dark-light-diff($highlight, $secondary, 70%, -80%);
+$highlight-medium: dark-light-diff($highlight, $secondary, 50%, -55%);
+
+//danger
+$danger-low: dark-light-diff($danger, $secondary, 50%, -40%);
+$danger-medium: dark-light-diff($danger, $secondary, 30%, -60%);
+
+//success
+$success-low: dark-light-diff($success, $secondary, 50%, -60%);
+
+//love
+$love-low: dark-light-diff($love, $secondary, 85%, -60%);
diff --git a/app/assets/stylesheets/common/input_tip.scss b/app/assets/stylesheets/common/input_tip.scss
index fae0176e2a..5f02aeb111 100644
--- a/app/assets/stylesheets/common/input_tip.scss
+++ b/app/assets/stylesheets/common/input_tip.scss
@@ -7,7 +7,7 @@
   padding: 5px 10px;
   z-index: 101;
   &.bad {
-    background: dark-light-diff($danger, $secondary, 20%, -40%);
+    background: $danger-medium;
     color: white;
     box-shadow: 1px 1px 5px rgba(0,0,0, .7);
   }
diff --git a/app/assets/stylesheets/common/topic-entrance.scss b/app/assets/stylesheets/common/topic-entrance.scss
index 847edc46a8..6e9e1aa209 100644
--- a/app/assets/stylesheets/common/topic-entrance.scss
+++ b/app/assets/stylesheets/common/topic-entrance.scss
@@ -1,6 +1,6 @@
 #topic-entrance {
 
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
   box-shadow: 0 0px 2px rgba(0,0,0, .2);
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index 4b40fc3483..e6926808ed 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -90,9 +90,9 @@
 
   tbody {
     tr {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+      border-bottom: 1px solid $primary-low; 
       &:first-of-type {
-        border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+        border-top: 3px solid $primary-low; 
       }
     }
 
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index c8aa5306ea..197169c728 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -36,14 +36,14 @@
   padding: 10px;
 
   box-shadow: 3px 3px 3px rgba(0,0,0, 0.34);
-  background: dark-light-diff($highlight, $secondary, 50%, -80%);
+  background: $highlight-medium;
 
   &.urgent {
-    background: dark-light-diff($danger, $secondary, 50%, -40%);
+    background: $danger-low;
   }
 
   &.education-message {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+    background-color: $tertiary-low;
   }
 
   h3 {
@@ -79,17 +79,17 @@
 }
 
 .custom-body {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   p {
     max-width: 98%;
   }
 }
 
 .similar-topics {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
 
   a[href] {
-    color: dark-light-diff($primary, $secondary, -10%, 10%);
+    color: $primary-medium;
   }
 
   .posts-count {
@@ -140,21 +140,16 @@
   width: 100%;
   z-index: 999;
   height: 0;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low;
   bottom: 0;
   font-size: 1em;
   position: fixed;
   .toggler {
-    width: 15px;
     right: 1px;
     position: absolute;
-    font-size: 1.071em;
+    i { font-size: 1.1em; }
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
     padding: 0 10px 5px 10px;
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f078";
-    }
   }
   a.cancel {
     padding-left: 7px;
@@ -184,7 +179,7 @@
   &.draft {
     height: 40px !important;
     cursor: pointer;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low;
     .draft-text {
       display: block;
 
@@ -192,25 +187,13 @@
         color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
       }
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
   &.saving {
     height: 40px !important;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low;
     .saving-text {
       display: block;
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
   .reply-area {
     max-width: 1500px;
@@ -299,7 +282,7 @@
       margin-right: 10px;
       float: left;
       &:disabled {
-        background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+        background-color: $primary-low;
       }
     }
     #topic-featured-link {
@@ -308,14 +291,14 @@
       width: 400px;
     }
     .d-editor-input:disabled {
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low;
     }
     .d-editor-input, .d-editor-preview {
       color: $primary;
     }
 
     .d-editor-preview {
-      border: 1px dashed dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px dashed $primary-low;
       overflow: auto;
       visibility: visible;
       cursor: default;
@@ -353,7 +336,7 @@
   .show-admin-options {
     vertical-align: top;
     margin-top: 8px;
-    background: dark-light-diff($primary, $secondary, 90%, -60%);
+    background: $primary-low;
   &:hover {
     color: $secondary;
     background: $primary;
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 20e1ebc1ee..aa120ec8a9 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -31,7 +31,7 @@ body {
   }
   #main {
     a.star {
-      color: dark-light-diff($secondary, $primary, 80%, -20%);
+      color: $secondary-medium;
       &:before {
         font-family: "FontAwesome";
         content: "\f005";
@@ -96,7 +96,7 @@ body {
       }
   }
 
-  i.fa-envelope {
+  .d-icon-envelope {
     color: $danger;
   }
 }
@@ -213,14 +213,14 @@ body {
     width: 210px;
     height: auto;
     background-color:$secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
     border-radius: 3px;
     box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
   }
   input {
     &[type="text"], &[type="password"], &[type="datetime"], &[type="datetime-local"], &[type="date"], &[type="month"], &[type="time"], &[type="week"], &[type="number"], &[type="email"], &[type="url"], &[type="search"], &[type="tel"], &[type="color"] {
       background-color: $secondary;
-      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border: 1px solid $primary-low; 
       border-radius: 3px;
       box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
     }
@@ -244,7 +244,7 @@ body {
 
   select {
     width: 220px;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
     &[multiple], &[size] {
       height: auto;
     }
@@ -272,8 +272,8 @@ body {
   }
   input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
     cursor: not-allowed;
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
-    border-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
+    border-color: $primary-low; 
   }
   input {
     &[type="radio"][disabled], &[type="checkbox"][disabled], &[type="radio"][readonly], &[type="checkbox"][readonly] {
@@ -372,7 +372,7 @@ body {
     text-align: center;
     vertical-align: middle;
     background-color: $secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low; 
   }
   .input-prepend .add-on, .input-append .add-on, .input-prepend .btn, .input-append .btn {
     margin-left: -1px;
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 5c913eef7f..5bd0b3b9e6 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -48,7 +48,7 @@
 }
 
 .group-edit {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 10px;
 
   .form-horizontal {
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index f4ce15a022..4c4d3da302 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -7,7 +7,7 @@
   z-index: 1000;
   padding-top: 3px;
   height: 60px;
-  .fa-home {
+  .d-icon-home {
     padding:8px;
     font-size: 2.1em;
   }
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 858796f21b..4519450e1a 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -12,10 +12,10 @@
 
     .btn[disabled] {
       cursor: not-allowed;
-      background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+      background-color: $primary-low; 
     }
     .btn-danger[disabled] {
-      background-color: dark-light-diff($danger, $secondary, 30%, -60%);
+      background-color: $danger-medium;
     }
   }
   #display-modes {
@@ -25,7 +25,7 @@
 
     .btn {
       background-color:inherit;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
     .btn-primary {
       color: $primary;
@@ -35,7 +35,7 @@
   #revision-details {
     padding: 5px;
     margin-top: 10px;
-    border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-bottom: 3px solid $primary-low; 
   }
   #revisions {
     word-wrap: break-word;
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index c345acd0cd..35b4f4d6f1 100644
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -16,7 +16,7 @@
   height: auto;
   margin: -250px 0 0 -305px;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
 
   box-shadow: 0 3px 7px rgba(0,0,0, .8);
   background-clip: padding-box;
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index 6d306bae6e..363eca2dc8 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -31,7 +31,7 @@
       }
     }
     .post-title {
-      color: dark-light-diff($primary, $secondary, 20%, -60%);
+      color: $primary-medium;
       font-weight: bold;
 
       .badge-wrapper {
@@ -41,4 +41,3 @@
 
   }
 }
-
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 58932112a1..f877f044d6 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -23,8 +23,7 @@
     float: none;
   }
 
-
-  a.badge-category {
+  a.badge-category, .dropdown-header {
     padding: 3px 12px;
     font-size: 1.143em;
   }
@@ -36,10 +35,10 @@
 
 .topic-list {
   margin: 0 0 10px;
-  .fa-thumb-tack { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
-  .fa-thumb-tack.unpinned { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+  .d-icon-thumb-tack { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+  .d-icon-thumb-tack.unpinned { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
   a.title {color: $primary;}
-  .fa-bookmark { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+  .d-icon-bookmark { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
   th,
   td {
     padding: 12px 5px;
@@ -51,7 +50,7 @@
     }
   }
   th {
-    button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+    button .d-icon {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
   }
 
   > tbody > tr {
@@ -61,16 +60,14 @@
   }
   button.bulk-select {
     padding: 0;
-    background: transparent;
-    &:hover {
-      color: dark-light-diff($primary, $secondary, 90%, -60%);
-    }
+    font-size: 1.05em;
+    margin-right: 0.3em;
   }
 
   .star {
     width: 20px;
     padding-right: 0;
-    .fa-star {
+    .d-icon-star {
       position: relative;
     }
     + .main-link {
@@ -115,7 +112,7 @@
   .sortable {
     cursor: pointer;
     &:hover {
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low; 
     }
     @include unselectable;
   }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 33a9bf1c5d..5229331141 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -53,17 +53,23 @@ section.post-menu-area {
 
 nav.post-controls {
 
-    .like-count {
-      font-size: inherit;
-      margin-right: -5px;
-    }
+  padding: 0;
 
-    padding: 0;
-    .highlight-action {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
-    }
-    a, button {
+  .like-count {
+    font-size: inherit;
+    margin-right: -5px;
+  }
+
+  .highlight-action {
+    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+  }
+
+  a, button {
     color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+
+    .d-icon {
+      opacity: 1.0;
+    }
     margin-right: 2px;
     display: inline-block;
   }
@@ -94,7 +100,7 @@ nav.post-controls {
     font-size: inherit;
     span.badge-posts {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
     &:hover {
-      background: dark-light-diff($primary, $secondary, 90%, -65%);
+      background: $primary-low;
       span.badge-posts {color: $primary;}
     }
     i {
@@ -122,7 +128,7 @@ nav.post-controls {
     margin-left: 3px;
 
     &.d-hover {
-      background: dark-light-diff($primary, $secondary, 90%, -60%);
+      background: $primary-low;
       color: $primary;
     }
 
@@ -144,7 +150,7 @@ nav.post-controls {
 
     &.like.d-hover {
       color: $love;
-      background: dark-light-diff($love, $secondary, 85%, -60%)
+      background: $love-low;
     }
 
     &.has-like {color: $love;}
@@ -179,7 +185,7 @@ nav.post-controls {
     background-color: $secondary;
     width: 205px;
     padding: 10px;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border: 1px solid $primary-low;
     position: absolute;
     text-align: left;
     bottom: -2px;
@@ -201,7 +207,7 @@ nav.post-controls {
       width: 176px;
       margin-bottom: 5px;
 
-      i.fa {
+      .d-icon {
         width: 14px;
         margin-right: 14px;
       }
@@ -255,7 +261,7 @@ nav.post-controls {
   }
 
   .post-date { color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
-  .fa-arrow-up, .fa-arrow-down { margin-left: 5px; }
+  .d-icon-arrow-up, .d-icon-arrow-down { margin-left: 5px; }
   .reply:first-of-type .row { border-top: none; }
 
   .topic-meta-data {
@@ -288,11 +294,11 @@ a.star {
 .topic-map {
   margin: 20px 0 0 0;
   background: blend-primary-secondary(5%);
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+  border: 1px solid $primary-low;
   border-top: none; // would cause double top border
 
   section {
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border-top: 1px solid $primary-low;
   }
 
   h3 {
@@ -379,7 +385,7 @@ a.star {
       font-weight: bold;
       font-size: 0.929em;
     }
-    i.fa-times {
+    .d-icon-times {
       color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
     }
   }
@@ -402,11 +408,11 @@ a.star {
       padding: 0 23px;
       color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
       background: blend-primary-secondary(5%);
-      border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+      border-left: 1px solid $primary-low;
+      border-top: 1px solid $primary-low;
       &:hover {
         color: $primary;
-        background: dark-light-diff($primary, $secondary, 90%, -80%);
+        background: $primary-low;
       }
 
       &.collapsed {
@@ -419,6 +425,16 @@ a.star {
       }
     }
   }
+
+  .link-summary .btn {
+    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    background: blend-primary-secondary(5%);
+    width: 100%;
+    &:hover {
+      color: $primary;
+      background: dark-light-diff($primary, $secondary, 90%, -80%);
+    }
+  }
 }
 
 #topic-footer-buttons {
@@ -430,10 +446,10 @@ a.star {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .fa-bookmark.bookmarked { color: $tertiary; }
+    .d-icon-bookmark.bookmarked { color: $tertiary; }
   }
 
-  .bookmark.bookmarked .fa-bookmark {
+  .bookmark.bookmarked .d-icon-bookmark {
     color: $tertiary;
   }
 
@@ -510,7 +526,7 @@ video {
 
   .topic-statuses {
     i { color: $header_primary; }
-    i.fa-envelope { color: $danger; }
+    .d-icon-envelope { color: $danger; }
     .unpinned { color: $header_primary; }
   }
 
@@ -565,7 +581,7 @@ video {
 
 .moderator {
   .topic-body {
-    background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+    background-color: $highlight-low;
   }
 }
 
@@ -615,7 +631,7 @@ blockquote {
   aside {
     .quote, .title, blockquote, .onebox, .onebox-result {
       background: blend-primary-secondary(5%);
-      border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%);
+      border-left: 5px solid $primary-low;
     }
 
     aside.quote>blockquote, aside.quote>.title {
@@ -635,12 +651,12 @@ $topic-avatar-width: 45px;
   float: left;
   position: relative;
   z-index: 2;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low;
   padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
 }
 
 .topic-avatar {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low;
   padding-top: 15px;
   width: $topic-avatar-width;
   float: left;
@@ -653,7 +669,7 @@ $topic-avatar-width: 45px;
 
 .small-action {
   max-width: 755px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low;
 }
 
 .small-action.deleted {
@@ -696,7 +712,7 @@ $topic-avatar-width: 45px;
   margin: 1px 0 0;
   list-style: none;
   background-color: $secondary;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   box-shadow: 0 1px 5px rgba(0,0,0, .4);
   background-clip: padding-box;
   span {
@@ -728,7 +744,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .active > a:hover {
   color: $primary;
   text-decoration: none;
-  background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
+  background-color: $highlight-medium;
 
 }
 
@@ -736,7 +752,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .disabled > a:hover {
   text-decoration: none;
   color: $primary;
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   cursor: default;
 }
 
@@ -755,7 +771,7 @@ $topic-avatar-width: 45px;
   width: 200px;
   position: fixed;
   z-index: 1000;
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
   border: 1px solid $tertiary;
   padding: 5px;
   margin-bottom: 5px;
@@ -874,7 +890,7 @@ a.attachment:before {
   display: block;
   position: absolute;
   left: 767px;
-  color: rgba(dark-light-diff($primary, $secondary, 90%, -65%) , .8);
+  color: rgba($primary-low, .8);
   font: 6.429em/1 FontAwesome;
   content: "\f014";
   z-index: -5;
@@ -909,7 +925,7 @@ a.attachment:before {
 }
 
 span.highlighted {
-  background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  background-color: $tertiary-low;
 }
 
 .username.new-user a {
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index c5f88134b6..4adbbcd4d0 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -80,7 +80,7 @@
 }
 
 .topic-status-info {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low; 
   padding-top: 10px;
   height: 20px;
   max-width: 757px;
@@ -99,7 +99,7 @@
 }
 
 #topic-progress-expanded {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
 
@@ -149,7 +149,7 @@
   }
   background-color: $secondary;
   color: $tertiary;
-  border: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
+  border: 1px solid $tertiary-low;
   border-bottom: none;
   width: 145px;
   height: 34px;
@@ -167,7 +167,7 @@
     text-align: center;
     z-index: 1;
   }
-  i.fa {
+  .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
@@ -183,8 +183,8 @@
     top: 0;
     bottom: 0;
     width: 0;
-    border-right: 1px solid  dark-light-diff($tertiary, $secondary, 85%, -65%);
-    background-color:  dark-light-diff($tertiary, $secondary, 85%, -65%);
+    border-right: 1px solid  $tertiary-low;
+    background-color:  $tertiary-low;
     transition: width .75s;
   }
 }
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 2d48ec8e00..0920d97213 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -205,17 +205,12 @@ $user_card_background: $secondary;
 
     .names {
       float: left;
-      height: 60px;
-      position: relative;
       width: 45%;
 
       span {
-        position: absolute;
-        bottom: 0;
         display: block;
         width: 250px;
       }
-
     }
 
     .badge-section {
@@ -226,7 +221,7 @@ $user_card_background: $secondary;
 
       .user-badge {
         background: scale-color($user_card_background, $lightness: -5%);
-        border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border: 1px solid $primary-low; 
         color: $user_card_primary;
       }
 
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index db7302369e..07d645809f 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -48,6 +48,9 @@
     font-size: 80%;
     line-height: 1.4em;
   }
+  .form-horizontal .instructions {
+    margin-left: 160px;
+  }
   .avatar {
     margin-left: 3px;
   }
@@ -159,7 +162,7 @@
 
       th {
         text-align: left;
-        border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 3px solid $primary-low; 
         padding: 0 0 10px 0;
         color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
         font-weight: normal;
@@ -167,7 +170,7 @@
 
       td {
         padding: 10px 0 10px 0;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 1px solid $primary-low; 
       }
     }
 
@@ -179,7 +182,7 @@
     }
 
     .user-invite-controls {
-      background-color: dark-light-diff($primary, $secondary, 90%, -75%);
+      background-color: $primary-low; 
       padding: 5px 10px 0px 0;
       height: 35px;
     }
@@ -211,8 +214,8 @@
 
   .secondary {
     background: scale-color($secondary, $lightness: -5%);
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low; 
+    border-bottom: 1px solid $primary-low; 
     font-size: 0.929em;
       .btn { padding: 3px 12px; }
 
@@ -249,7 +252,7 @@
       }
 
       dt {
-        color: dark-light-diff($secondary, $primary, 50%, -40%);
+        color: $secondary-medium;
         margin: 0;
       }
     }
@@ -261,8 +264,8 @@
       transition: margin .15s linear;
 
       blockquote {
-        background-color: dark-light-diff($secondary, $primary, 30%, -70%);
-        border-left-color: dark-light-diff($secondary, $primary, 50%, -50%);
+        background-color: $secondary-low; 
+        border-left-color: $secondary-low; 
       }
 
       h1 {
@@ -389,7 +392,7 @@
       padding: 0 0 2px 0;
       margin-top: 0;
       background: rgba($secondary, .85);
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
       .bio { display: none; }
 
       .primary {
@@ -433,7 +436,7 @@
       color: $primary;
     }
     .item.moderator-action {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
+      background-color: $highlight-medium;
     }
     .item.deleted {
       opacity: 0.8;
@@ -446,7 +449,7 @@
     .item {
       padding: 20px 8px 15px 8px;
       background-color: $secondary;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
     .type {
       color: $primary;
@@ -490,7 +493,7 @@
     }
     .notification {
       &.unread {
-        background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+        background-color: $tertiary-low;
       }
 
       li { display: inline-block; }
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 66af74d3d0..65a25aa8f1 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -16,8 +16,8 @@ article.post {
   }
 
   .quote .title {
-    border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%);
-    background-color: dark-light-diff($primary, $secondary, 97%, -45%);
+    border-left: 5px solid darken($primary-low, 10%);
+    background-color: $primary-low;
     padding: 10px 10px 0 12px;
     .avatar { margin-right: 7px; }
   }
@@ -29,8 +29,8 @@ article.post {
   blockquote {
     padding: 10px 8px 10px 13px;
     margin: 0 0 10px 0;
-    background-color: dark-light-diff($primary, $secondary, 97%, -45%);
-    border-left: 5px solid darken(dark-light-diff($primary, $secondary, 97%, -45%), 10%);
+    background-color: $primary-low;
+    border-left: 5px solid darken($primary-low, 10%);
     p {
       margin: 0 0 10px 0;
     }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 405349f46d..1256f823e2 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -19,7 +19,7 @@ input {
   padding: 4px;
   border-radius: 3px;
   box-shadow: inset 0 1px 1px rgba(0,0,0, .3);
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
 }
 input[type=radio], input[type=checkbox] {
   box-shadow: none;
@@ -38,28 +38,19 @@ input[type=radio], input[type=checkbox] {
   width: 100%;
   z-index: 1039;
   height: 0;
-  background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+  background-color: $primary-low; 
   bottom: 0;
   font-size: 1em;
   position: fixed;
   .toggle-toolbar, .toggler {
-    width: 15px;
     right: 1px;
     position: absolute;
     font-size: 1.071em;
     color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
-    padding: 0 10px 5px 10px;
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f078";
-    }
   }
 
   .toggle-toolbar {
     right: 30px;
-    &:before {
-      content: "\f0c9";
-    }
   }
 
   a.cancel {
@@ -97,7 +88,7 @@ input[type=radio], input[type=checkbox] {
   &.draft {
     height: 35px !important;
     cursor: pointer;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low; 
     .draft-text {
       display: block;
       position: absolute;
@@ -111,25 +102,13 @@ input[type=radio], input[type=checkbox] {
         color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
       }
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
   &.saving {
     height: 40px !important;
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+    border-top: 1px solid $primary-low;
     .saving-text {
       display: block;
     }
-    .toggler {
-      &:before {
-        font-family: "FontAwesome";
-        content: "\f00d";
-      }
-    }
   }
 
   // if this is a new topic, make room for the category field in the editor on
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index bbdbf8cf02..4cd15c8900 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -18,12 +18,12 @@
 }
 
 .directory .user {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 80%, -20%);
+  border-top: 1px solid $primary-low;
   padding: 1em;
 
 
   &.me {
-    background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+    background-color: $highlight-low;
 
     .username a, .name, .title, .number, .time-read, .user-stat .label {
       color: scale-color($highlight, $lightness: -50%);
@@ -38,9 +38,9 @@
     }
     .label {
       margin-left: 0.2em;
-      color: dark-light-diff($primary, $secondary, 50%, -50%);
+      color: blend-primary-secondary(50%);
     }
-    i.fa-heart {
+    .d-icon-heart {
       color: $love;
     }
   }
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index 97c23d2427..18726ee67e 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -73,7 +73,7 @@ blockquote {
   display: inline-block;
   .topic-status {
     i {
-      color: dark-light-diff($secondary, $primary, 40%, -20%);
+      color: $secondary-medium;
     }
   }
 }
@@ -123,7 +123,7 @@ h2#site-text-logo
   }
   margin: 0;
   padding: 0;
-  background: dark-light-diff($primary, $secondary, 90%, -65%);
+  background: $primary-low; 
   list-style: none;
   overflow: visible;
   position: relative;
@@ -136,7 +136,7 @@ h2#site-text-logo
     box-sizing: border-box;
     display: block;
   }
-  .fa-caret-down {
+  .d-icon-caret-down {
     position: absolute;
     right: 0px;
   }
diff --git a/app/assets/stylesheets/mobile/emoji.scss b/app/assets/stylesheets/mobile/emoji.scss
index 6d94493756..e69de29bb2 100644
--- a/app/assets/stylesheets/mobile/emoji.scss
+++ b/app/assets/stylesheets/mobile/emoji.scss
@@ -1,10 +0,0 @@
-.emoji-table-wrapper {
-  min-width: 320px;
-}
-
-.emoji-modal {
-  width: 340px;
-  margin-top: -132px;
-  margin-left: -170px;
-  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
-}
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index 0f52dbb84a..395f8ca956 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -9,7 +9,7 @@
     line-height: 2em;
   }
   #revision-details {
-    background-color: dark-light-diff($primary, $secondary, 90%, -60%);
+    background-color: $primary-low; 
     padding: 5px;
     margin-top: 10px;
   }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index d66aa8115a..7e8c56da2d 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -26,7 +26,7 @@
     position: relative;
   }
   .nav-pills .drop {
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border: 1px solid $primary-low; 
     position: absolute;
     z-index: 1000;
     background-color: $secondary;
@@ -47,8 +47,8 @@
 
   }
   .nav-pills > li {
-    background: dark-light-diff($primary, $secondary, 90%, -65%);
-    i.fa-caret-down {
+    background: $primary-low;
+    .d-icon-caret-down {
       margin-left: 8px;
     }
   }
@@ -146,9 +146,9 @@
 
   tbody {
     tr {
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+      border-bottom: 1px solid $primary-low; 
       &:first-of-type {
-        border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
+        border-top: 3px solid $primary-low; 
       }
     }
     .category {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 453f863efd..4068eb00ae 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -3,7 +3,7 @@
 }
 
 .small-action {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   color: lighten($primary, 50%);
   padding-bottom: 3px;
   text-transform: uppercase;
@@ -28,7 +28,7 @@
 }
 
 .topic-post article {
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border-top: 1px solid $primary-low;
   padding: 8px 0;
 }
 
@@ -47,6 +47,9 @@ span.badge-posts {
 
 nav.post-controls {
   clear: both;
+  .d-icon {
+    opacity: 1.0;
+  }
 }
 
 .who-liked {
@@ -109,7 +112,7 @@ nav.post-controls {
   background-color: $secondary;
   width: 205px;
   padding: 10px;
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low;
   position: absolute;
   text-align: left;
   bottom: 0;
@@ -131,7 +134,7 @@ nav.post-controls {
     width: 176px;
     margin-bottom: 5px;
 
-    i.fa {
+    .d-icon {
       width: 14px;
       margin-right: 14px;
     }
@@ -181,11 +184,11 @@ a.star {
 
   margin: 10px 0;
   background: blend-primary-secondary(5%);
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+  border: 1px solid $primary-low;
   border-top: none; // would cause double top border
 
   section {
-    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+    border-top: 1px solid $primary-low;
   }
 
   h3 {
@@ -300,8 +303,8 @@ a.star {
       padding: 0 15px;
       color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
       background: blend-primary-secondary(5%);
-      border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
-      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
+      border-left: 1px solid $primary-low;
+      border-top: 1px solid $primary-low;
       .fa {
         margin: 0;
         font-size: 1.286em;
@@ -309,12 +312,18 @@ a.star {
       }
     }
   }
+
+  .link-summary .btn {
+    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    background: blend-primary-secondary(5%);
+    width: 100%;
+  }
 }
 
 #topic-footer-buttons {
   @include clearfix;
   padding: 20px 0 0 0;
-  .fa-bookmark.bookmarked { color: $tertiary; }
+  .d-icon-bookmark.bookmarked { color: $tertiary; }
 
   .combobox {
     float: left;
@@ -362,7 +371,7 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .fa-star {margin-right: 5px;}
+    .d-icon-star {margin-right: 5px;}
   }
 }
 
@@ -386,7 +395,7 @@ span.post-count {
 }
 
 .moderator .topic-body {
-  background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+  background-color: $highlight-low;
 }
 
 .quote-button.visible {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index e823050cb7..f52b3ce0fc 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -45,7 +45,7 @@
 
 .topic-status-info {
   padding-left: 10px;
-  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  border-top: 1px solid $primary-low; 
   padding-top: 10px;
   h3 {
     margin: 0;
@@ -66,7 +66,7 @@
 }
 
 #topic-progress-expanded {
-  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  border: 1px solid $primary-low; 
   padding: 5px;
   background: $secondary;
 
@@ -113,7 +113,7 @@
   }
   background-color: $secondary;
   color: $tertiary;
-  border: 1px solid dark-light-diff($tertiary, $secondary, 85%, -65%);
+  border: 1px solid $tertiary-low;
   border-bottom: none;
   width: 145px;
   height: 34px;
@@ -133,7 +133,7 @@
     font-size: 1.286em;
     line-height: 15px;
   }
-  i.fa {
+  .d-icon {
     position: absolute;
     right: 8px;
     bottom: 9px;
@@ -144,8 +144,8 @@
     top: 0;
     bottom: 0;
     width: 0;
-    border-right: 1px solid  dark-light-diff($tertiary, $secondary, 85%, -65%);
-    background-color:  dark-light-diff($tertiary, $secondary, 85%, -65%);
+    border-right: 1px solid  $tertiary-low;
+    background-color:  $tertiary-low;
     transition: width .75s;
   }
 }
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index 7136d89613..3bcb6fb745 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -159,11 +159,11 @@
     th {
       padding: 0.5em;
       text-align: right;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
     td {
       padding: 0.5em;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
       img {
         margin-right: 10px;
       }
@@ -196,13 +196,13 @@
 
       th {
         text-align: left;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 1px solid $primary-low; 
         padding: 5px;
       }
 
       td {
         padding: 5px;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        border-bottom: 1px solid $primary-low; 
       }
     }
   }
@@ -215,7 +215,7 @@
     color: $secondary;
 
     .secondary {
-      background: dark-light-diff($primary, $secondary, 90%, -65%);
+      background: $primary-low; 
       font-size: 0.929em;
 
       .btn { padding: 3px 12px; }
@@ -241,7 +241,7 @@
       }
 
       dt {
-        color: dark-light-diff($secondary, $primary, 50%, -40%);
+        color: $secondary-medium;
         margin: 0;
       }
     }
@@ -251,8 +251,8 @@
       background: rgba($secondary, .85);
 
       blockquote {
-        background-color: dark-light-diff($secondary, $primary, 30%, -70%);
-        border-left-color: dark-light-diff($secondary, $primary, 50%, -50%);
+        background-color: $secondary-low; 
+        border-left-color: $secondary-low; 
       }
 
       h1 {
@@ -399,7 +399,7 @@
       color: $primary;
     }
     .item.moderator-action {
-      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
+      background-color: $highlight-medium;
     }
     .item.deleted {
       opacity: 0.8;
@@ -412,7 +412,7 @@
     .item {
       padding: 20px 0 15px 0;
       background-color: $secondary;
-      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid $primary-low; 
     }
     .type {
       color: $primary;
diff --git a/app/assets/stylesheets/vendor/pikaday.scss b/app/assets/stylesheets/vendor/pikaday.scss
index 8465631879..7880b8bc65 100644
--- a/app/assets/stylesheets/vendor/pikaday.scss
+++ b/app/assets/stylesheets/vendor/pikaday.scss
@@ -14,20 +14,20 @@ $pd-text-color: $primary !default;
 $pd-title-color: $primary !default;
 $pd-title-bg: $secondary !default;
 $pd-picker-bg: $secondary !default;
-$pd-picker-border: dark-light-diff($secondary, $primary, -20%, 20%) !default;
-$pd-picker-border-bottom: dark-light-diff($secondary, $primary, -30%, 30%) !default;
+$pd-picker-border: $primary-low !default;
+$pd-picker-border-bottom: $primary-low !default;
 $pd-picker-shadow: rgba(0,0,0,.5) !default;
-$pd-th-color: dark-light-diff($primary, $secondary, -20%, 20%) !default;
-$pd-day-color: dark-light-diff($primary, $secondary, -30%, 30%) !default;
-$pd-day-bg: dark-light-diff($primary, $secondary, 90%, -90%) !default;
-$pd-day-hover-color: $secondary !default;
-$pd-day-hover-bg: dark-light-diff($tertiary, $secondary, 30%, -30%) !default;
+$pd-th-color: $primary !default;
+$pd-day-color: $primary !default;
+$pd-day-bg: $secondary !default;
+$pd-day-hover-color: $primary !default;
+$pd-day-hover-bg: $tertiary-low !default;
 $pd-day-today-color: $tertiary !default;
 $pd-day-selected-color: $secondary !default;
 $pd-day-selected-bg: $tertiary !default;
-$pd-day-selected-shadow: dark-light-diff($tertiary, $secondary, 50%, -50%) !default;
-$pd-day-disabled-color: dark-light-diff($primary, $secondary, -20%, 20%) !default;
-$pd-week-color: dark-light-diff($primary, $secondary, -20%, 20%) !default;
+$pd-day-selected-shadow: $tertiary-low !default;
+$pd-day-disabled-color: $primary !default;
+$pd-week-color: $primary !default;
 
 // Font
 $pd-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 245478866a..922f5afe5d 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -224,11 +224,11 @@ body.wizard {
       background-color: #ccc;
     }
 
-    i.fa-chevron-right {
+    .d-icon-chevron-right {
       margin-left: 0.25em;
       font-size: 0.8em;
     }
-    i.fa-chevron-left {
+    .d-icon-chevron-left {
       margin-right: 0.25em;
       font-size: 0.8em;
     }
@@ -287,7 +287,7 @@ body.wizard {
     .wizard-btn.next {
       min-width: 70px;
 
-      i.fa-chevron-right {
+      .d-icon-chevron-right {
         margin-left: 0.25em;
         font-size: 0.8em;
       }
diff --git a/app/controllers/admin/badges_controller.rb b/app/controllers/admin/badges_controller.rb
index e33a476586..6fcdc7e7df 100644
--- a/app/controllers/admin/badges_controller.rb
+++ b/app/controllers/admin/badges_controller.rb
@@ -5,9 +5,9 @@ class Admin::BadgesController < Admin::AdminController
       badge_types: BadgeType.all.order(:id).to_a,
       badge_groupings: BadgeGrouping.all.order(:position).to_a,
       badges: Badge.includes(:badge_grouping)
-                    .includes(:badge_type)
-                    .references(:badge_grouping)
-                    .order('badge_groupings.position, badge_type_id, badges.name').to_a,
+        .includes(:badge_type)
+        .references(:badge_grouping)
+        .order('badge_groupings.position, badge_type_id, badges.name').to_a,
       protected_system_fields: Badge.protected_system_fields,
       triggers: Badge.trigger_hash
     }
@@ -43,9 +43,9 @@ class Admin::BadgesController < Admin::AdminController
     badge_groupings = BadgeGrouping.all.order(:position).to_a
     ids = params[:ids].map(&:to_i)
 
-    params[:names].each_with_index do |name,index|
+    params[:names].each_with_index do |name, index|
       id = ids[index].to_i
-      group = badge_groupings.find{|b| b.id == id} || BadgeGrouping.new()
+      group = badge_groupings.find { |b| b.id == id } || BadgeGrouping.new()
       group.name = name
       group.position = index
       group.save
@@ -95,7 +95,7 @@ class Admin::BadgesController < Admin::AdminController
 
     # Options:
     #   :new - reset the badge id to nil before saving
-    def update_badge_from_params(badge, opts={})
+    def update_badge_from_params(badge, opts = {})
       errors = []
       Badge.transaction do
         allowed  = Badge.column_names.map(&:to_sym)
@@ -112,7 +112,7 @@ class Admin::BadgesController < Admin::AdminController
         # Badge query contract checks
         begin
           if SiteSetting.enable_badge_sql
-            BadgeGranter.contract_checks!(badge.query, { target_posts: badge.target_posts, trigger: badge.trigger })
+            BadgeGranter.contract_checks!(badge.query, target_posts: badge.target_posts, trigger: badge.trigger)
           end
         rescue => e
           errors << e.message
diff --git a/app/controllers/admin/color_schemes_controller.rb b/app/controllers/admin/color_schemes_controller.rb
index dda6c9f07c..a070f2324d 100644
--- a/app/controllers/admin/color_schemes_controller.rb
+++ b/app/controllers/admin/color_schemes_controller.rb
@@ -29,7 +29,6 @@ class Admin::ColorSchemesController < Admin::AdminController
     render json: success_json
   end
 
-
   private
 
   def fetch_color_scheme
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index d7250ca826..ed021d9158 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -2,13 +2,13 @@ require 'disk_space'
 class Admin::DashboardController < Admin::AdminController
   def index
     dashboard_data = AdminDashboardData.fetch_cached_stats || Jobs::DashboardStats.new.execute({})
-    dashboard_data.merge!({version_check: DiscourseUpdates.check_version.as_json}) if SiteSetting.version_checks?
+    dashboard_data.merge!(version_check: DiscourseUpdates.check_version.as_json) if SiteSetting.version_checks?
 
     dashboard_data[:disk_space] = DiskSpace.cached_stats
     render json: dashboard_data
   end
 
   def problems
-    render_json_dump({problems: AdminDashboardData.fetch_problems})
+    render_json_dump(problems: AdminDashboardData.fetch_problems)
   end
 end
diff --git a/app/controllers/admin/diagnostics_controller.rb b/app/controllers/admin/diagnostics_controller.rb
index ba889837a3..8411e85484 100644
--- a/app/controllers/admin/diagnostics_controller.rb
+++ b/app/controllers/admin/diagnostics_controller.rb
@@ -42,8 +42,8 @@ class Admin::DiagnosticsController < Admin::AdminController
       GC.start(full_mark: true)
       require 'objspace'
 
-      io = File.open("discourse-heap-#{SecureRandom.hex(3)}.json",'w')
-      ObjectSpace.dump_all(:output => io)
+      io = File.open("discourse-heap-#{SecureRandom.hex(3)}.json", 'w')
+      ObjectSpace.dump_all(output: io)
       io.close
 
       render plain: "HEAP DUMP:\n#{io.path}"
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index 455a22151e..a5030d06dd 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -13,7 +13,7 @@ class Admin::EmailController < Admin::AdminController
       Jobs::TestEmail.new.execute(to_address: params[:email_address])
       render nothing: true
     rescue => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
@@ -55,17 +55,17 @@ class Admin::EmailController < Admin::AdminController
     params.require(:username)
     params.require(:email)
     user = User.find_by_username(params[:username])
-    message, skip_reason = UserNotifications.send(:digest, user, {since: params[:last_seen_at]})
+    message, skip_reason = UserNotifications.send(:digest, user, since: params[:last_seen_at])
     if message
       message.to = params[:email]
       begin
         Email::Sender.new(message, :digest).send
         render json: success_json
       rescue => e
-        render json: {errors: [e.message]}, status: 422
+        render json: { errors: [e.message] }, status: 422
       end
     else
-      render json: {errors: skip_reason}
+      render json: { errors: skip_reason }
     end
   end
 
@@ -73,7 +73,7 @@ class Admin::EmailController < Admin::AdminController
     params.require(:from)
     params.require(:to)
     # These strings aren't localized; they are sent to an anonymous SMTP user.
-    if !User.exists?(email: Email.downcase(params[:from])) && !SiteSetting.enable_staged_users
+    if !User.with_email(Email.downcase(params[:from])).exists? && !SiteSetting.enable_staged_users
       render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" }
     elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil?
       render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" }
@@ -131,18 +131,18 @@ class Admin::EmailController < Admin::AdminController
       serializer = IncomingEmailDetailsSerializer.new(incoming_email, root: false)
       render_json_dump(serializer)
     rescue => e
-      render json: {errors: [e.message]}, status: 404
+      render json: { errors: [e.message] }, status: 404
     end
   end
 
   private
 
   def filter_email_logs(email_logs, params)
-    email_logs = email_logs.includes(:user, { post: :topic })
-                           .references(:user)
-                           .order(created_at: :desc)
-                           .offset(params[:offset] || 0)
-                           .limit(50)
+    email_logs = email_logs.includes(:user, post: :topic)
+      .references(:user)
+      .order(created_at: :desc)
+      .offset(params[:offset] || 0)
+      .limit(50)
 
     email_logs = email_logs.where("users.username ILIKE ?", "%#{params[:user]}%") if params[:user].present?
     email_logs = email_logs.where("email_logs.to_address ILIKE ?", "%#{params[:address]}%") if params[:address].present?
@@ -154,10 +154,10 @@ class Admin::EmailController < Admin::AdminController
   end
 
   def filter_incoming_emails(incoming_emails, params)
-    incoming_emails = incoming_emails.includes(:user, { post: :topic })
-                                     .order(created_at: :desc)
-                                     .offset(params[:offset] || 0)
-                                     .limit(50)
+    incoming_emails = incoming_emails.includes(:user, post: :topic)
+      .order(created_at: :desc)
+      .offset(params[:offset] || 0)
+      .limit(50)
 
     incoming_emails = incoming_emails.where("from_address ILIKE ?", "%#{params[:from]}%") if params[:from].present?
     incoming_emails = incoming_emails.where("to_addresses ILIKE :to OR cc_addresses ILIKE :to", to: "%#{params[:to]}%") if params[:to].present?
@@ -170,7 +170,7 @@ class Admin::EmailController < Admin::AdminController
   def delivery_settings
     action_mailer_settings
       .reject { |k, _| k == :password }
-      .map    { |k, v| { name: k, value: v }}
+      .map    { |k, v| { name: k, value: v } }
   end
 
   def delivery_method
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rb
index d3d1e96328..b6fd3b631c 100644
--- a/app/controllers/admin/email_templates_controller.rb
+++ b/app/controllers/admin/email_templates_controller.rb
@@ -15,6 +15,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "system_messages.email_reject_reply_key", "system_messages.email_reject_topic_closed",
                      "system_messages.email_reject_topic_not_found",
                      "system_messages.email_reject_screened_email",
+                     "system_messages.email_reject_unrecognized_error",
                      "system_messages.pending_users_reminder", "system_messages.post_hidden",
                      "system_messages.restore_failed", "system_messages.restore_succeeded",
                      "system_messages.spam_post_blocked", "system_messages.too_many_spam_flags",
@@ -26,6 +27,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
                      "user_notifications.set_password", "user_notifications.signup",
                      "user_notifications.signup_after_approval",
                      "user_notifications.user_invited_to_private_message_pm",
+                     "user_notifications.user_invited_to_private_message_pm_group",
                      "user_notifications.user_invited_to_topic", "user_notifications.user_mentioned",
                      "user_notifications.user_posted", "user_notifications.user_posted_pm",
                      "user_notifications.user_quoted", "user_notifications.user_replied",
diff --git a/app/controllers/admin/emojis_controller.rb b/app/controllers/admin/emojis_controller.rb
index 8bd3f36ede..47b78e83b4 100644
--- a/app/controllers/admin/emojis_controller.rb
+++ b/app/controllers/admin/emojis_controller.rb
@@ -13,8 +13,8 @@ class Admin::EmojisController < Admin::AdminController
     Scheduler::Defer.later("Upload Emoji") do
       # fix the name
       name = name.gsub(/[^a-z0-9]+/i, '_')
-                 .gsub(/_{2,}/, '_')
-                 .downcase
+        .gsub(/_{2,}/, '_')
+        .downcase
 
       upload = UploadCreator.new(
         file.tempfile,
@@ -61,4 +61,3 @@ class Admin::EmojisController < Admin::AdminController
   end
 
 end
-
diff --git a/app/controllers/admin/flags_controller.rb b/app/controllers/admin/flags_controller.rb
index 1385f958d5..f986ecd43e 100644
--- a/app/controllers/admin/flags_controller.rb
+++ b/app/controllers/admin/flags_controller.rb
@@ -10,11 +10,11 @@ class Admin::FlagsController < Admin::AdminController
     if posts.blank?
       render json: { posts: [], topics: [], users: [] }
     else
-      render json: MultiJson.dump({
+      render json: MultiJson.dump(
         posts: posts,
         topics: serialize_data(topics, FlaggedTopicSerializer),
         users: serialize_data(users, FlaggedUserSerializer)
-      })
+      )
     end
   end
 
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 90045704ff..1ad9367aa8 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,19 +1,4 @@
 class Admin::GroupsController < Admin::AdminController
-
-  def index
-    groups = Group.order(:name).where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
-
-    if search = params[:search].to_s
-      groups = groups.where("name ILIKE ?", "%#{search}%")
-    end
-
-    if params[:ignore_automatic].to_s == "true"
-      groups = groups.where(automatic: false)
-    end
-
-    render_serialized(groups, BasicGroupSerializer)
-  end
-
   def show
     render nothing: true
   end
@@ -26,10 +11,14 @@ class Admin::GroupsController < Admin::AdminController
     group = Group.find(params[:group_id].to_i)
     users_added = 0
     if group.present?
-      users = (params[:users] || []).map {|u| u.downcase}
+      users = (params[:users] || []).map { |u| u.downcase }
       valid_emails = {}
       valid_usernames = {}
-      valid_users = User.where("username_lower IN (:users) OR email IN (:users)", users: users).pluck(:id, :username_lower, :email)
+
+      valid_users = User.joins(:user_emails)
+        .where("username_lower IN (:users) OR user_emails.email IN (:users)", users: users)
+        .pluck(:id, :username_lower, :"user_emails.email")
+
       valid_users.map! do |id, username_lower, email|
         valid_emails[email] = valid_usernames[username_lower] = id
         id
@@ -43,10 +32,7 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def create
-    group = Group.new
-
-    group.name = (group_params[:name] || '').strip
-    save_group(group)
+    save_group(Group.new)
   end
 
   def update
@@ -58,6 +44,7 @@ class Admin::GroupsController < Admin::AdminController
   end
 
   def save_group(group)
+    group.name = group_params[:name] if group_params[:name].present? && !group.automatic
     group.alias_level = group_params[:alias_level].to_i if group_params[:alias_level].present?
 
     if group_params[:visibility_level]
@@ -80,7 +67,13 @@ class Admin::GroupsController < Admin::AdminController
     group.flair_url      = group_params[:flair_url].presence
     group.flair_bg_color = group_params[:flair_bg_color].presence
     group.flair_color    = group_params[:flair_color].presence
-    group.public = group_params[:public] if group_params[:public]
+
+    %i{public_admission public_exit}.each do |key|
+      if group_params[key]
+        group.public_send("#{key}=", group_params[key])
+      end
+    end
+
     group.bio_raw = group_params[:bio_raw] if group_params[:bio_raw]
     group.full_name = group_params[:full_name] if group_params[:full_name]
 
@@ -92,8 +85,27 @@ class Admin::GroupsController < Admin::AdminController
       group.allow_membership_requests = group_params[:allow_membership_requests]
     end
 
+    if group_params[:owner_usernames].present?
+      owner_ids = User.where(
+        username: group_params[:owner_usernames].split(",")
+      ).pluck(:id)
+
+      owner_ids.each do |user_id|
+        group.group_users.build(user_id: user_id, owner: true)
+      end
+    end
+
+    if group_params[:usernames].present?
+      user_ids = User.where(username: group_params[:usernames].split(",")).pluck(:id)
+      user_ids -= owner_ids if owner_ids
+
+      user_ids.each do |user_id|
+        group.group_users.build(user_id: user_id)
+      end
+    end
+
     if group.save
-      Group.reset_counters(group.id, :group_users)
+      group.restore_user_count!
 
       yield(group) if block_given?
 
@@ -122,8 +134,7 @@ class Admin::GroupsController < Admin::AdminController
   def add_owners
     group = Group.find(params.require(:id))
     return can_not_modify_automatic if group.automatic
-
-    users = User.where(username: params[:usernames].split(","))
+    users = User.where(username: group_params[:usernames].split(","))
 
     users.each do |user|
       group_action_logger = GroupActionLogger.new(current_user, group)
@@ -136,7 +147,7 @@ class Admin::GroupsController < Admin::AdminController
       group_action_logger.log_make_user_group_owner(user)
     end
 
-    Group.reset_counters(group.id, :group_users)
+    group.restore_user_count!
 
     render json: success_json
   end
@@ -157,18 +168,33 @@ class Admin::GroupsController < Admin::AdminController
   protected
 
   def can_not_modify_automatic
-    render json: {errors: I18n.t('groups.errors.can_not_modify_automatic')}, status: 422
+    render json: { errors: I18n.t('groups.errors.can_not_modify_automatic') }, status: 422
   end
 
   private
 
   def group_params
     params.require(:group).permit(
-      :name, :alias_level, :visibility_level, :automatic_membership_email_domains,
-      :automatic_membership_retroactive, :title, :primary_group,
-      :grant_trust_level, :incoming_email, :flair_url, :flair_bg_color,
-      :flair_color, :bio_raw, :public, :allow_membership_requests, :full_name,
-      :default_notification_level
+      :name,
+      :alias_level,
+      :visibility_level,
+      :automatic_membership_email_domains,
+      :automatic_membership_retroactive,
+      :title,
+      :primary_group,
+      :grant_trust_level,
+      :incoming_email,
+      :flair_url,
+      :flair_bg_color,
+      :flair_color,
+      :bio_raw,
+      :public_admission,
+      :public_exit,
+      :allow_membership_requests,
+      :full_name,
+      :default_notification_level,
+      :usernames,
+      :owner_usernames
     )
   end
 end
diff --git a/app/controllers/admin/screened_ip_addresses_controller.rb b/app/controllers/admin/screened_ip_addresses_controller.rb
index 31df2a6b8e..1f4bc31565 100644
--- a/app/controllers/admin/screened_ip_addresses_controller.rb
+++ b/app/controllers/admin/screened_ip_addresses_controller.rb
@@ -46,7 +46,7 @@ class Admin::ScreenedIpAddressesController < Admin::AdminController
 
   def roll_up
     subnets = ScreenedIpAddress.roll_up(current_user)
-    render json: success_json.merge!({ subnets: subnets })
+    render json: success_json.merge!(subnets: subnets)
   end
 
   private
diff --git a/app/controllers/admin/site_settings_controller.rb b/app/controllers/admin/site_settings_controller.rb
index 7f20c5d88e..87478597a1 100644
--- a/app/controllers/admin/site_settings_controller.rb
+++ b/app/controllers/admin/site_settings_controller.rb
@@ -17,7 +17,7 @@ class Admin::SiteSettingsController < Admin::AdminController
       SiteSetting.set_and_log(id, value, current_user)
       render nothing: true
     rescue Discourse::InvalidParameters => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
diff --git a/app/controllers/admin/site_texts_controller.rb b/app/controllers/admin/site_texts_controller.rb
index 33c7b716fc..8cdb0d9b19 100644
--- a/app/controllers/admin/site_texts_controller.rb
+++ b/app/controllers/admin/site_texts_controller.rb
@@ -14,7 +14,7 @@ class Admin::SiteTextsController < Admin::AdminController
     query = params[:q] || ""
     if query.blank? && !overridden
       extras[:recommended] = true
-      results = self.class.preferred_keys.map {|k| record_for(k) }
+      results = self.class.preferred_keys.map { |k| record_for(k) }
     else
       results = []
       translations = I18n.search(query, overridden: overridden)
@@ -69,14 +69,14 @@ class Admin::SiteTextsController < Admin::AdminController
 
   protected
 
-    def record_for(k, value=nil)
+    def record_for(k, value = nil)
       if k.ends_with?("_MF")
         ovr = TranslationOverride.where(translation_key: k).pluck(:value)
         value = ovr[0] if ovr.present?
       end
 
       value ||= I18n.t(k)
-      {id: k, value: value}
+      { id: k, value: value }
     end
 
     def find_site_text
diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb
index 242cc4f402..2e72e2b86f 100644
--- a/app/controllers/admin/staff_action_logs_controller.rb
+++ b/app/controllers/admin/staff_action_logs_controller.rb
@@ -6,7 +6,7 @@ class Admin::StaffActionLogsController < Admin::AdminController
     staff_action_logs = UserHistory.staff_action_records(current_user, filters).to_a
     render json: StaffActionLogsSerializer.new({
       staff_action_logs: staff_action_logs,
-      user_history_actions: UserHistory.staff_actions.sort.map{|name| {id: UserHistory.actions[name], name: name}}
+      user_history_actions: UserHistory.staff_actions.sort.map { |name| { id: UserHistory.actions[name], name: name } }
     }, root: false)
   end
 
@@ -46,20 +46,18 @@ class Admin::StaffActionLogsController < Admin::AdminController
       cur: child_themes(cur)
     }
 
-
     load_diff(diff_fields, :cur, cur)
     load_diff(diff_fields, :prev, prev)
 
-    diff_fields.delete_if{|k,v| v[:cur] == v[:prev]}
+    diff_fields.delete_if { |k, v| v[:cur] == v[:prev] }
 
-
-    diff_fields.each do |k,v|
+    diff_fields.each do |k, v|
       output << "<h3>#{k}</h3><p></p>"
       diff = DiscourseDiff.new(v[:prev] || "", v[:cur] || "")
       output << diff.side_by_side_markdown
     end
 
-    render json: {side_by_side: output}
+    render json: { side_by_side: output }
   end
 
   protected
@@ -67,11 +65,11 @@ class Admin::StaffActionLogsController < Admin::AdminController
   def child_themes(theme)
     return "" unless children = theme["child_themes"]
 
-    children.map{|row| row["name"]}.join(" ").to_s
+    children.map { |row| row["name"] }.join(" ").to_s
   end
 
   def load_diff(hash, key, val)
-    if f=val["theme_fields"]
+    if f = val["theme_fields"]
       f.each do |row|
         entry = hash[row["target"] + " " + row["name"]] ||= {}
         entry[key] = row["value"]
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
index d6adf20741..4b8a8c5835 100644
--- a/app/controllers/admin/themes_controller.rb
+++ b/app/controllers/admin/themes_controller.rb
@@ -62,7 +62,7 @@ class Admin::ThemesController < Admin::AdminController
     }
 
     respond_to do |format|
-      format.json { render json: payload}
+      format.json { render json: payload }
     end
   end
 
@@ -77,7 +77,7 @@ class Admin::ThemesController < Admin::AdminController
       if @theme.save
         update_default_theme
         log_theme_change(nil, @theme)
-        format.json { render json: @theme, status: :created}
+        format.json { render json: @theme, status: :created }
       else
         format.json { render json: @theme.errors, status: :unprocessable_entity }
       end
@@ -100,7 +100,7 @@ class Admin::ThemesController < Admin::AdminController
 
       @theme.child_theme_relation.to_a.each do |child|
         if expected.include?(child.child_theme_id)
-          expected.reject!{|id| id == child.child_theme_id}
+          expected.reject! { |id| id == child.child_theme_id }
         else
           child.destroy
         end
@@ -133,12 +133,12 @@ class Admin::ThemesController < Admin::AdminController
         update_default_theme
 
         log_theme_change(original_json, @theme)
-        format.json { render json: @theme, status: :created}
+        format.json { render json: @theme, status: :created }
       else
         format.json {
 
           error = @theme.errors[:color_scheme] ? I18n.t("themes.bad_color_scheme") : I18n.t("themes.other_error")
-          render json: {errors: [ error ]}, status: :unprocessable_entity
+          render json: { errors: [ error ] }, status: :unprocessable_entity
         }
       end
     end
@@ -192,13 +192,14 @@ class Admin::ThemesController < Admin::AdminController
         begin
           # deep munge is a train wreck, work around it for now
           params[:theme][:child_theme_ids] ||= [] if params[:theme].key?(:child_theme_ids)
-          params.require(:theme)
-            .permit(:name,
-                    :color_scheme_id,
-                    :default,
-                    :user_selectable,
-                    theme_fields: [:name, :target, :value, :upload_id, :type_id],
-                    child_theme_ids: [])
+          params.require(:theme).permit(
+            :name,
+            :color_scheme_id,
+            :default,
+            :user_selectable,
+            theme_fields: [:name, :target, :value, :upload_id, :type_id],
+            child_theme_ids: []
+          )
         end
     end
 
diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb
index 596b53e4ee..2af8832e33 100644
--- a/app/controllers/admin/user_fields_controller.rb
+++ b/app/controllers/admin/user_fields_controller.rb
@@ -51,8 +51,7 @@ class Admin::UserFieldsController < Admin::AdminController
       options = params[:user_field][:options]
       if options.present?
         UserFieldOption.where(user_field_id: field.id).delete_all
-        field.user_field_options_attributes = options.map {|o| {value: o} }.uniq
+        field.user_field_options_attributes = options.map { |o| { value: o } }.uniq
       end
     end
 end
-
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 5db8236745..36dab7149f 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -77,7 +77,7 @@ class Admin::UsersController < Admin::AdminController
       @user.logged_out
       render json: success_json
     else
-      render json: {error: I18n.t('admin_js.admin.users.id_not_found')}, status: 404
+      render json: { error: I18n.t('admin_js.admin.users.id_not_found') }, status: 404
     end
   end
 
@@ -154,8 +154,7 @@ class Admin::UsersController < Admin::AdminController
     guardian.ensure_can_change_trust_level!(@user)
     level = params[:level].to_i
 
-
-    if !@user.trust_level_locked && [0,1,2].include?(level) && Promotion.send("tl#{level+1}_met?", @user)
+    if !@user.trust_level_locked && [0, 1, 2].include?(level) && Promotion.send("tl#{level + 1}_met?", @user)
       @user.trust_level_locked = true
       @user.save
     end
@@ -187,7 +186,7 @@ class Admin::UsersController < Admin::AdminController
 
     unless @user.trust_level_locked
       p = Promotion.new(@user)
-      2.times{ p.review }
+      2.times { p.review }
       p.review_tl2
       if @user.trust_level == 3 && Promotion.tl3_lost?(@user)
         @user.change_trust_level!(2, log_action_for: current_user)
@@ -212,6 +211,8 @@ class Admin::UsersController < Admin::AdminController
 
   def activate
     guardian.ensure_can_activate!(@user)
+    # ensure there is an active email token
+    @user.email_tokens.create(email: @user.email) unless @user.email_tokens.active.exists?
     @user.activate
     StaffActionLogger.new(current_user).log_user_activate(@user, I18n.t('user.activated_by_staff'))
     render json: success_json
@@ -242,7 +243,7 @@ class Admin::UsersController < Admin::AdminController
     d = UserDestroyer.new(current_user)
 
     User.where(id: params[:users]).each do |u|
-      success_count += 1 if guardian.can_delete_user?(u) and d.destroy(u, params.slice(:context)) rescue UserDestroyer::PostsExistError
+      success_count += 1 if guardian.can_delete_user?(u) && d.destroy(u, params.slice(:context)) rescue UserDestroyer::PostsExistError
     end
 
     render json: {
@@ -339,12 +340,12 @@ class Admin::UsersController < Admin::AdminController
     user.save!
     user.grant_admin!
     user.change_trust_level!(4)
-    user.email_tokens.update_all  confirmed: true
+    user.email_tokens.update_all confirmed: true
 
     email_token = user.email_tokens.create(email: user.email)
 
     unless params[:send_email] == '0' || params[:send_email] == 'false'
-      Jobs.enqueue( :critical_user_email,
+      Jobs.enqueue(:critical_user_email,
                     type: :account_created,
                     user_id: user.id,
                     email_token: email_token.token)
diff --git a/app/controllers/admin/watched_words_controller.rb b/app/controllers/admin/watched_words_controller.rb
new file mode 100644
index 0000000000..119562dc4e
--- /dev/null
+++ b/app/controllers/admin/watched_words_controller.rb
@@ -0,0 +1,47 @@
+class Admin::WatchedWordsController < Admin::AdminController
+
+  def index
+    render_json_dump WatchedWordListSerializer.new(WatchedWord.by_action, scope: guardian, root: false)
+  end
+
+  def create
+    watched_word = WatchedWord.create_or_update_word(watched_words_params)
+    if watched_word.valid?
+      render json: watched_word, root: false
+    else
+      render_json_error(watched_word)
+    end
+  end
+
+  def destroy
+    watched_word = WatchedWord.find(params[:id])
+    watched_word.destroy
+    render json: success_json
+  end
+
+  def upload
+    file = params[:file] || params[:files].first
+    action_key = params[:action_key].to_sym
+
+    Scheduler::Defer.later("Upload watched words") do
+      begin
+        File.open(file.tempfile, encoding: "ISO-8859-1").each_line do |line|
+          WatchedWord.create_or_update_word(word: line, action_key: action_key) unless line.empty?
+        end
+        data = { url: '/ok' }
+      rescue => e
+        data = failed_json.merge(errors: [e.message])
+      end
+      MessageBus.publish("/uploads/csv", data.as_json, client_ids: [params[:client_id]])
+    end
+
+    render json: success_json
+  end
+
+  private
+
+  def watched_words_params
+    params.permit(:id, :word, :action_key)
+  end
+
+end
diff --git a/app/controllers/admin/web_hooks_controller.rb b/app/controllers/admin/web_hooks_controller.rb
index 4deb554c8b..c3b2cfe9ef 100644
--- a/app/controllers/admin/web_hooks_controller.rb
+++ b/app/controllers/admin/web_hooks_controller.rb
@@ -6,10 +6,10 @@ class Admin::WebHooksController < Admin::AdminController
     offset = params[:offset].to_i
 
     web_hooks = WebHook.limit(limit)
-                       .offset(offset)
-                       .includes(:web_hook_event_types)
-                       .includes(:categories)
-                       .includes(:groups)
+      .offset(offset)
+      .includes(:web_hook_event_types)
+      .includes(:categories)
+      .includes(:groups)
 
     json = {
       web_hooks: serialize_data(web_hooks, AdminWebHookSerializer),
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7527f4a9ba..1484df2603 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -147,7 +147,7 @@ class ApplicationController < ActionController::Base
     render_json_error I18n.t('read_only_mode_enabled'), type: :read_only, status: 503
   end
 
-  def rescue_discourse_actions(type, status_code, include_ember=false)
+  def rescue_discourse_actions(type, status_code, include_ember = false)
 
     show_json_errors = (request.format && request.format.json?) ||
                        (request.xhr?) ||
@@ -175,7 +175,7 @@ class ApplicationController < ActionController::Base
 
   def set_current_user_for_logs
     if current_user
-      Logster.add_to_env(request.env,"username",current_user.username)
+      Logster.add_to_env(request.env, "username", current_user.username)
       response.headers["X-Discourse-Username"] = current_user.username
     end
     response.headers["X-Discourse-Route"] = "#{controller_name}/#{action_name}"
@@ -298,9 +298,9 @@ class ApplicationController < ActionController::Base
     current_user ? SiteSetting.homepage : SiteSetting.anonymous_homepage
   end
 
-  def serialize_data(obj, serializer, opts=nil)
+  def serialize_data(obj, serializer, opts = nil)
     # If it's an array, apply the serializer as an each_serializer to the elements
-    serializer_opts = {scope: guardian}.merge!(opts || {})
+    serializer_opts = { scope: guardian }.merge!(opts || {})
     if obj.respond_to?(:to_ary)
       serializer_opts[:each_serializer] = serializer
       ActiveModel::ArraySerializer.new(obj.to_ary, serializer_opts).as_json
@@ -313,11 +313,11 @@ class ApplicationController < ActionController::Base
   # 20% slower than calling MultiJSON.dump ourselves. I'm not sure why
   # Rails doesn't call MultiJson.dump when you pass it json: obj but
   # it seems we don't need whatever Rails is doing.
-  def render_serialized(obj, serializer, opts=nil)
+  def render_serialized(obj, serializer, opts = nil)
     render_json_dump(serialize_data(obj, serializer, opts), opts)
   end
 
-  def render_json_dump(obj, opts=nil)
+  def render_json_dump(obj, opts = nil)
     opts ||= {}
     if opts[:rest_serializer]
       obj['__rest_serializer'] = "1"
@@ -341,7 +341,7 @@ class ApplicationController < ActionController::Base
     Middleware::AnonymousCache.anon_cache(request.env, time_length)
   end
 
-  def fetch_user_from_params(opts=nil, eager_load = [])
+  def fetch_user_from_params(opts = nil, eager_load = [])
     opts ||= {}
     user = if params[:username]
       username_lower = params[:username].downcase.chomp('.json')
@@ -361,9 +361,9 @@ class ApplicationController < ActionController::Base
   end
 
   def post_ids_including_replies
-    post_ids = params[:post_ids].map {|p| p.to_i}
+    post_ids = params[:post_ids].map { |p| p.to_i }
     if params[:reply_post_ids]
-      post_ids |= PostReply.where(post_id: params[:reply_post_ids].map {|p| p.to_i}).pluck(:reply_id)
+      post_ids |= PostReply.where(post_id: params[:reply_post_ids].map { |p| p.to_i }).pluck(:reply_id)
     end
     post_ids
   end
@@ -394,7 +394,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-
   def secure_session
     SecureSession.new(session["secure_session_id"] ||= SecureRandom.hex)
   end
@@ -433,14 +432,16 @@ class ApplicationController < ActionController::Base
 
     def custom_html_json
       target = view_context.mobile_view? ? :mobile : :desktop
-      data = if @theme_key
-               {
-                top: Theme.lookup_field(@theme_key, target, "after_header"),
-                footer: Theme.lookup_field(@theme_key, target, "footer")
-               }
-             else
-                {}
-             end
+
+      data =
+        if @theme_key
+          {
+           top: Theme.lookup_field(@theme_key, target, "after_header"),
+           footer: Theme.lookup_field(@theme_key, target, "footer")
+          }
+        else
+          {}
+        end
 
       if DiscoursePluginRegistry.custom_html
         data.merge! DiscoursePluginRegistry.custom_html
@@ -480,7 +481,7 @@ class ApplicationController < ActionController::Base
     # opts:
     #   type   - a machine-readable description of the error
     #   status - HTTP status code to return
-    def render_json_error(obj, opts={})
+    def render_json_error(obj, opts = {})
       opts = { status: opts } if opts.is_a?(Integer)
       render json: MultiJson.dump(create_errors_json(obj, opts[:type])), status: opts[:status] || 422
     end
@@ -493,7 +494,7 @@ class ApplicationController < ActionController::Base
       { failed: 'FAILED' }
     end
 
-    def json_result(obj, opts={})
+    def json_result(obj, opts = {})
       if yield(obj)
         json = success_json
 
@@ -574,21 +575,20 @@ class ApplicationController < ActionController::Base
       raise Discourse::ReadOnly.new if !(request.get? || request.head?) && Discourse.readonly_mode?
     end
 
-    def build_not_found_page(status=404, layout=false)
+    def build_not_found_page(status = 404, layout = false)
       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)
+      @top_viewed = TopicQuery.new(nil, except_topic_ids: category_topic_ids).list_top_for("monthly").topics.first(10)
       @recent = Topic.where.not(id: category_topic_ids).recent(10)
       @slug =  params[:slug].class == String ? params[:slug] : ''
       @slug =  (params[:id].class == String ? params[:id] : '') if @slug.blank?
-      @slug.tr!('-',' ')
+      @slug.tr!('-', ' ')
       render_to_string status: status, layout: layout, formats: [:html], template: '/exceptions/not_found'
     end
 
-
   protected
 
-    def render_post_json(post, add_raw=true)
+    def render_post_json(post, add_raw = true)
       post_serializer = PostSerializer.new(post, scope: guardian, root: false)
       post_serializer.add_raw = add_raw
 
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 432489a3d4..6447558bef 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -14,7 +14,7 @@ class BadgesController < ApplicationController
     if (params[:only_listable] == "true") || !request.xhr?
       # NOTE: this is sorted client side if needed
       badges = badges.includes(:badge_grouping)
-                     .where(enabled: true, listable: true)
+        .where(enabled: true, listable: true)
 
     end
 
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index c2da87bac4..51e8e08852 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -218,7 +218,7 @@ class CategoriesController < ApplicationController
         end
 
         if p = params[:permissions]
-          p.each do |k,v|
+          p.each do |k, v|
             p[k] = v.to_i
           end
         end
@@ -250,10 +250,10 @@ class CategoriesController < ApplicationController
                         :default_view,
                         :subcategory_list_style,
                         :default_top_period,
-                        :custom_fields => [params[:custom_fields].try(:keys)],
-                        :permissions => [*p.try(:keys)],
-                        :allowed_tags => [],
-                        :allowed_tag_groups => [])
+                        custom_fields: [params[:custom_fields].try(:keys)],
+                        permissions: [*p.try(:keys)],
+                        allowed_tags: [],
+                        allowed_tag_groups: [])
       end
     end
 
@@ -265,7 +265,7 @@ class CategoriesController < ApplicationController
       @staff_action_logger = StaffActionLogger.new(current_user)
     end
 
-    def include_topics(parent_category=nil)
+    def include_topics(parent_category = nil)
       view_context.mobile_view? ||
       params[:include_topics] ||
       (parent_category && parent_category.subcategory_list_includes_topics?) ||
diff --git a/app/controllers/clicks_controller.rb b/app/controllers/clicks_controller.rb
index 4d7e186b0e..23b1684f2b 100644
--- a/app/controllers/clicks_controller.rb
+++ b/app/controllers/clicks_controller.rb
@@ -8,7 +8,7 @@ class ClicksController < ApplicationController
     params = track_params.merge(ip: request.remote_ip)
 
     if params[:topic_id].present? || params[:post_id].present?
-      params.merge!({ user_id: current_user.id }) if current_user.present?
+      params.merge!(user_id: current_user.id) if current_user.present?
       @redirect_url = TopicLinkClick.create_from(params)
     end
 
diff --git a/app/controllers/composer_messages_controller.rb b/app/controllers/composer_messages_controller.rb
index ff1a51d2bd..62f86b0583 100644
--- a/app/controllers/composer_messages_controller.rb
+++ b/app/controllers/composer_messages_controller.rb
@@ -11,7 +11,7 @@ class ComposerMessagesController < ApplicationController
     if params[:topic_id].present?
       topic = Topic.where(id: params[:topic_id]).first
       if guardian.can_see?(topic)
-        json[:extras] = {duplicate_lookup: TopicLink.duplicate_lookup(topic)}
+        json[:extras] = { duplicate_lookup: TopicLink.duplicate_lookup(topic) }
       end
     end
 
diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 6158534b40..22c723c1e7 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -53,7 +53,7 @@ class DirectoryItemsController < ApplicationController
     # Put yourself at the top of the first page
     if result.present? && current_user.present? && page == 0
 
-      position = result.index {|r| r.user_id == current_user.id }
+      position = result.index { |r| r.user_id == current_user.id }
 
       # Don't show the record unless you're not in the top positions already
       if (position || 10) >= 10
diff --git a/app/controllers/draft_controller.rb b/app/controllers/draft_controller.rb
index 7af211db56..4e7a043747 100644
--- a/app/controllers/draft_controller.rb
+++ b/app/controllers/draft_controller.rb
@@ -5,7 +5,7 @@ class DraftController < ApplicationController
 
   def show
     seq = params[:sequence] || DraftSequence.current(current_user, params[:draft_key])
-    render json: {draft: Draft.get(current_user, params[:draft_key], seq), draft_sequence: seq}
+    render json: { draft: Draft.get(current_user, params[:draft_key], seq), draft_sequence: seq }
   end
 
   def update
diff --git a/app/controllers/email_controller.rb b/app/controllers/email_controller.rb
index 76861025c3..771e6e1b37 100644
--- a/app/controllers/email_controller.rb
+++ b/app/controllers/email_controller.rb
@@ -9,51 +9,42 @@ class EmailController < ApplicationController
   end
 
   def unsubscribe
-    key = UnsubscribeKey.find_by(key: params[:key])
+    @not_found = true
+    @watched_count = nil
 
-    if key
-      @user = key.user
-      post = key.post
-      @topic = (post && post.topic) || key.topic
-      @type = key.unsubscribe_key_type
+    if key = UnsubscribeKey.find_by(key: params[:key])
+      if @user = key.user
+        post = key.post
+        @topic = post&.topic || key.topic
+        @type = key.unsubscribe_key_type
+        @not_found = false
 
-      if current_user.present? && (@user != current_user)
-        @different_user = @user.name
-        @return_url = request.original_url
-      end
+        if current_user.present? && (@user != current_user)
+          @different_user = @user.name
+          @return_url = request.original_url
+        end
 
-      @watching_topic = @topic && TopicUser.exists?(user_id: @user.id,
-                                                    notification_level: TopicUser.notification_levels[:watching],
-                                                    topic_id: @topic.id)
+        watching = TopicUser.notification_levels[:watching]
 
-      @watched_count = nil
-      if @topic && @topic.category_id
-        if CategoryUser.exists?(user_id: @user.id,
-                                notification_level: CategoryUser.watching_levels,
-                                category_id: @topic.category_id)
-          @watched_count = TopicUser.joins(:topic)
-                                    .where(:user => @user,
-                                           :notification_level => TopicUser.notification_levels[:watching],
-                                           "topics.category_id" => @topic.category_id
-                                          ).count
+        if @topic
+          @watching_topic = TopicUser.exists?(user_id: @user.id, notification_level: watching, topic_id: @topic.id)
+          if @topic.category_id
+            if CategoryUser.exists?(user_id: @user.id, notification_level: CategoryUser.watching_levels, category_id: @topic.category_id)
+              @watched_count = TopicUser.joins(:topic)
+                .where(user: @user, notification_level: watching, "topics.category_id" => @topic.category_id)
+                .count
+            end
+          end
         end
       end
     end
-
-    if @user.blank?
-      @not_found = true
-    end
-
   end
 
   def perform_unsubscribe
-
     key = UnsubscribeKey.find_by(key: params[:key])
-    unless key && key.user
-      raise Discourse::NotFound
-    end
+    raise Discourse::NotFound unless key && key.user
 
-    topic = (key.post && key.post.topic) || key.topic
+    topic = key&.post&.topic || key.topic
     user = key.user
 
     updated = false
@@ -61,28 +52,28 @@ class EmailController < ApplicationController
     if topic
       if params["unwatch_topic"]
         TopicUser.where(topic_id: topic.id, user_id: user.id)
-                 .update_all(notification_level: TopicUser.notification_levels[:tracking])
+          .update_all(notification_level: TopicUser.notification_levels[:tracking])
         updated = true
       end
 
       if params["unwatch_category"] && topic.category_id
         TopicUser.joins(:topic)
-                 .where(:user => user,
-                       :notification_level => TopicUser.notification_levels[:watching],
-                       "topics.category_id" => topic.category_id)
-                 .update_all(notification_level: TopicUser.notification_levels[:tracking])
+          .where(:user => user,
+                 :notification_level => TopicUser.notification_levels[:watching],
+                 "topics.category_id" => topic.category_id)
+          .update_all(notification_level: TopicUser.notification_levels[:tracking])
 
         CategoryUser.where(user_id: user.id,
-                          category_id: topic.category_id,
-                          notification_level: CategoryUser.watching_levels
+                           category_id: topic.category_id,
+                           notification_level: CategoryUser.watching_levels
                          )
-                 .destroy_all
+          .destroy_all
         updated = true
       end
 
       if params["mute_topic"]
         TopicUser.where(topic_id: topic.id, user_id: user.id)
-                 .update_all(notification_level: TopicUser.notification_levels[:muted])
+          .update_all(notification_level: TopicUser.notification_levels[:muted])
         updated = true
       end
     end
@@ -99,9 +90,9 @@ class EmailController < ApplicationController
 
     if params["unsubscribe_all"]
       user.user_option.update_columns(email_always: false,
-                                     email_digests: false,
-                                     email_direct: false,
-                                     email_private_messages: false)
+                                      email_digests: false,
+                                      email_direct: false,
+                                      email_private_messages: false)
       updated = true
     end
 
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index f64cc8035c..d7da707d98 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -74,7 +74,7 @@ class EmbedController < ApplicationController
     by_url = {}
 
     if embed_urls.present?
-      urls = embed_urls.map {|u| u.sub(/#discourse-comments$/, '').sub(/\/$/, '') }
+      urls = embed_urls.map { |u| u.sub(/#discourse-comments$/, '').sub(/\/$/, '') }
       topic_embeds = TopicEmbed.where(embed_url: urls).includes(:topic).references(:topic)
 
       topic_embeds.each do |te|
@@ -88,7 +88,7 @@ class EmbedController < ApplicationController
       end
     end
 
-    render json: {counts: by_url}, callback: params[:callback]
+    render json: { counts: by_url }, callback: params[:callback]
   end
 
   private
@@ -96,7 +96,7 @@ class EmbedController < ApplicationController
     def get_embeddable_css_class
       @embeddable_css_class = ""
       embeddable_host = EmbeddableHost.record_for_url(request.referer)
-      @embeddable_css_class = " class=\"#{embeddable_host.class_name}\"" if embeddable_host.present? and embeddable_host.class_name.present?
+      @embeddable_css_class = " class=\"#{embeddable_host.class_name}\"" if embeddable_host.present? && embeddable_host.class_name.present?
     end
 
     def ensure_api_request
@@ -114,5 +114,4 @@ class EmbedController < ApplicationController
       raise Discourse::InvalidAccess.new('invalid referer host')
     end
 
-
 end
diff --git a/app/controllers/finish_installation_controller.rb b/app/controllers/finish_installation_controller.rb
index c9a30724d4..4e73594d8a 100644
--- a/app/controllers/finish_installation_controller.rb
+++ b/app/controllers/finish_installation_controller.rb
@@ -15,7 +15,7 @@ class FinishInstallationController < ApplicationController
       email = params[:email].strip
       raise Discourse::InvalidParameters.new unless @allowed_emails.include?(email)
 
-      return redirect_confirm(email) if User.where(email: email).exists?
+      return redirect_confirm(email) if UserEmail.exists?(email: email)
 
       @user.email = email
       @user.username = params[:username]
@@ -37,7 +37,7 @@ class FinishInstallationController < ApplicationController
 
   def resend_email
     @email = session[:registered_email]
-    @user = User.where(email: @email).first
+    @user = User.find_by_email(@email)
     if @user.present?
       @email_token = @user.email_tokens.unconfirmed.active.first
       if @email_token.present?
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 74b7ad0f66..d73b87e4d6 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -6,7 +6,8 @@ class GroupsController < ApplicationController
     :update,
     :messages,
     :histories,
-    :request_membership
+    :request_membership,
+    :search
   ]
 
   skip_before_filter :preload_json, :check_xhr, only: [:posts_feed, :mentions_feed]
@@ -123,13 +124,13 @@ class GroupsController < ApplicationController
     members = group.users
       .order('NOT group_users.owner')
       .order(order)
-      .order(:username_lower => dir)
+      .order(username_lower: dir)
       .limit(limit)
       .offset(offset)
 
     owners = group.users
       .order(order)
-      .order(:username_lower => dir)
+      .order(username_lower: dir)
       .where('group_users.owner')
 
     render json: {
@@ -145,7 +146,7 @@ class GroupsController < ApplicationController
 
   def add_members
     group = Group.find(params[:id])
-    group.public ? ensure_logged_in : guardian.ensure_can_edit!(group)
+    group.public_admission ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
     users =
       if params[:usernames].present?
@@ -153,7 +154,7 @@ class GroupsController < ApplicationController
       elsif params[:user_ids].present?
         User.find(params[:user_ids].split(","))
       elsif params[:user_emails].present?
-        User.where(email: params[:user_emails].split(","))
+        User.with_email(params[:user_emails].split(","))
       else
         raise Discourse::InvalidParameters.new(
           'user_ids or usernames or user_emails must be present'
@@ -162,7 +163,7 @@ class GroupsController < ApplicationController
 
     raise Discourse::NotFound if users.blank?
 
-    if group.public
+    if group.public_admission
       if !guardian.can_log_group_changes?(group) && current_user != users.first
         raise Discourse::InvalidAccess
       end
@@ -200,7 +201,7 @@ class GroupsController < ApplicationController
 
   def remove_member
     group = Group.find(params[:id])
-    group.public ? ensure_logged_in : guardian.ensure_can_edit!(group)
+    group.public_exit ? ensure_logged_in : guardian.ensure_can_edit!(group)
 
     user =
       if params[:user_id].present?
@@ -215,7 +216,7 @@ class GroupsController < ApplicationController
 
     raise Discourse::NotFound unless user
 
-    if group.public
+    if group.public_exit
       if !guardian.can_log_group_changes?(group) && current_user != user
         raise Discourse::InvalidAccess
       end
@@ -273,8 +274,8 @@ class GroupsController < ApplicationController
     end
 
     GroupUser.where(group_id: group.id)
-             .where(user_id: user_id)
-             .update_all(notification_level: notification_level)
+      .where(user_id: user_id)
+      .update_all(notification_level: notification_level)
 
     render json: success_json
   end
@@ -296,6 +297,22 @@ class GroupsController < ApplicationController
     )
   end
 
+  def search
+    groups = Group.visible_groups(current_user)
+      .where("groups.id <> ?", Group::AUTO_GROUPS[:everyone])
+      .order(:name)
+
+    if term = params[:term].to_s
+      groups = groups.where("name ILIKE :term OR full_name ILIKE :term", term: "%#{term}%")
+    end
+
+    if params[:ignore_automatic].to_s == "true"
+      groups = groups.where(automatic: false)
+    end
+
+    render_serialized(groups, BasicGroupSerializer)
+  end
+
   private
 
   def group_params
@@ -305,7 +322,8 @@ class GroupsController < ApplicationController
       :flair_color,
       :bio_raw,
       :full_name,
-      :public,
+      :public_admission,
+      :public_exit,
       :allow_membership_requests
     )
   end
diff --git a/app/controllers/highlight_js_controller.rb b/app/controllers/highlight_js_controller.rb
index 86137be56e..19a83c4a76 100644
--- a/app/controllers/highlight_js_controller.rb
+++ b/app/controllers/highlight_js_controller.rb
@@ -26,4 +26,3 @@ class HighlightJsController < ApplicationController
     end
   end
 end
-
diff --git a/app/controllers/inline_onebox_controller.rb b/app/controllers/inline_onebox_controller.rb
new file mode 100644
index 0000000000..67afcf01b2
--- /dev/null
+++ b/app/controllers/inline_onebox_controller.rb
@@ -0,0 +1,10 @@
+require_dependency 'inline_oneboxer'
+
+class InlineOneboxController < ApplicationController
+  before_filter :ensure_logged_in
+
+  def show
+    oneboxes = InlineOneboxer.new(params[:urls]).process
+    render json: { "inline-oneboxes" => oneboxes }
+  end
+end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 4da902a8e4..a892c50cfc 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -16,11 +16,12 @@ class InvitesController < ApplicationController
     invite = Invite.find_by(invite_key: params[:id])
 
     if invite.present?
-      store_preloaded("invite_info", MultiJson.dump({
+      store_preloaded("invite_info", MultiJson.dump(
         invited_by: UserNameSerializer.new(invite.invited_by, scope: guardian, root: false),
         email: invite.email,
-        username: UserNameSuggester.suggest(invite.email)
-      }))
+        username: UserNameSuggester.suggest(invite.email))
+      )
+
       render layout: 'application'
     else
       flash.now[:error] = I18n.t('invite.not_found')
@@ -61,9 +62,13 @@ class InvitesController < ApplicationController
   def create
     params.require(:email)
 
-    group_ids = Group.lookup_group_ids(params)
+    groups = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    )
 
-    guardian.ensure_can_invite_to_forum!(group_ids)
+    guardian.ensure_can_invite_to_forum!(groups)
+    group_ids = groups.map(&:id)
 
     invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
     if invite_exists && !guardian.can_send_multiple_invites?(current_user)
@@ -71,21 +76,27 @@ class InvitesController < ApplicationController
     end
 
     begin
-      if Invite.invite_by_email(params[:email], current_user, _topic=nil,  group_ids, params[:custom_message])
+      if Invite.invite_by_email(params[:email], current_user, nil, group_ids, params[:custom_message])
         render json: success_json
       else
         render json: failed_json, status: 422
       end
     rescue Invite::UserExists, ActiveRecord::RecordInvalid => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
   def create_invite_link
     params.require(:email)
-    group_ids = Group.lookup_group_ids(params)
+
+    groups = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    )
+
+    guardian.ensure_can_invite_to_forum!(groups)
     topic = Topic.find_by(id: params[:topic_id])
-    guardian.ensure_can_invite_to_forum!(group_ids)
+    group_ids = groups.map(&:id)
 
     invite_exists = Invite.where(email: params[:email], invited_by_id: current_user.id).first
     if invite_exists && !guardian.can_send_multiple_invites?(current_user)
@@ -100,7 +111,7 @@ class InvitesController < ApplicationController
         render json: failed_json, status: 422
       end
     rescue => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
@@ -153,7 +164,7 @@ class InvitesController < ApplicationController
         data = if extension.downcase == ".csv"
           path = Invite.create_csv(file, name)
           Jobs.enqueue(:bulk_invite, filename: "#{name}#{extension}", current_user_id: current_user.id)
-          {url: path}
+          { url: path }
         else
           failed_json.merge(errors: [I18n.t("bulk_invite.file_should_be_csv")])
         end
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 66e59247f9..65635e5429 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -205,7 +205,7 @@ class ListController < ApplicationController
     render 'list', formats: [:rss]
   end
 
-  def top(options=nil)
+  def top(options = nil)
     options ||= {}
     period = ListController.best_period_for(current_user.try(:previous_visit_at), options[:category])
     send("top_#{period}", options)
@@ -308,7 +308,7 @@ class ListController < ApplicationController
     parent_category_id = nil
     if parent_slug_or_id.present?
       parent_category_id = Category.query_parent_category(parent_slug_or_id)
-      permalink_redirect_or_not_found and return if parent_category_id.blank? && !id
+      permalink_redirect_or_not_found && (return) if parent_category_id.blank? && !id
     end
 
     @category = Category.query_category(slug_or_id, parent_category_id)
@@ -319,7 +319,7 @@ class ListController < ApplicationController
       (redirect_to category.url, status: 301) && return if category
     end
 
-    permalink_redirect_or_not_found and return if !@category
+    permalink_redirect_or_not_found && (return) if !@category
 
     @description_meta = @category.description_text
     raise Discourse::NotFound unless guardian.can_see?(@category)
@@ -362,23 +362,23 @@ class ListController < ApplicationController
     else # :next
       public_send(method, opts.merge(next_page_params(opts)))
     end
-    url.sub('.json?','?')
+    url.sub('.json?', '?')
   end
 
-  def get_excluded_category_ids(current_category=nil)
+  def get_excluded_category_ids(current_category = nil)
     exclude_category_ids = Category.where(suppress_from_homepage: true)
     exclude_category_ids = exclude_category_ids.where.not(id: current_category) if current_category
     exclude_category_ids.pluck(:id)
   end
 
-  def self.best_period_for(previous_visit_at, category_id=nil)
+  def self.best_period_for(previous_visit_at, category_id = nil)
     default_period = ((category_id && Category.where(id: category_id).pluck(:default_top_period).first) ||
           SiteSetting.top_page_default_timeframe).to_sym
 
     best_period_with_topics_for(previous_visit_at, category_id, default_period) || default_period
   end
 
-  def self.best_period_with_topics_for(previous_visit_at, category_id=nil, default_period=SiteSetting.top_page_default_timeframe)
+  def self.best_period_with_topics_for(previous_visit_at, category_id = nil, default_period = SiteSetting.top_page_default_timeframe)
     best_periods_for(previous_visit_at, default_period.to_sym).each do |period|
       top_topics = TopTopic.where("#{period}_score > 0")
       top_topics = top_topics.joins(:topic).where("topics.category_id = ?", category_id) if category_id
@@ -389,12 +389,12 @@ class ListController < ApplicationController
     false
   end
 
-  def self.best_periods_for(date, default_period=:all)
+  def self.best_periods_for(date, default_period = :all)
     date ||= 1.year.ago
     periods = []
     periods << default_period if :all     != default_period
-    periods << :daily         if :daily   != default_period && date >   8.days.ago
-    periods << :weekly        if :weekly  != default_period && date >  35.days.ago
+    periods << :daily         if :daily   != default_period && date > 8.days.ago
+    periods << :weekly        if :weekly  != default_period && date > 35.days.ago
     periods << :monthly       if :monthly != default_period && date > 180.days.ago
     periods << :yearly        if :yearly  != default_period
     periods
diff --git a/app/controllers/metadata_controller.rb b/app/controllers/metadata_controller.rb
index 04a5eaafd4..c297ed18bd 100644
--- a/app/controllers/metadata_controller.rb
+++ b/app/controllers/metadata_controller.rb
@@ -31,7 +31,7 @@ class MetadataController < ApplicationController
     }
 
     if SiteSetting.native_app_install_banner
-      manifest = manifest.merge({
+      manifest = manifest.merge(
         prefer_related_applications: true,
         related_applications: [
           {
@@ -39,7 +39,7 @@ class MetadataController < ApplicationController
             id: "com.discourse"
           }
         ]
-      })
+      )
     end
 
     manifest
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 1415f78f57..7f6b95ca53 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -37,9 +37,9 @@ class NotificationsController < ApplicationController
       offset = params[:offset].to_i
 
       notifications = Notification.where(user_id: user.id)
-                                  .visible
-                                  .includes(:topic)
-                                  .order(created_at: :desc)
+        .visible
+        .includes(:topic)
+        .order(created_at: :desc)
 
       total_rows = notifications.dup.count
       notifications = notifications.offset(offset).limit(60)
diff --git a/app/controllers/post_action_users_controller.rb b/app/controllers/post_action_users_controller.rb
index e9e6c05480..46b6328d61 100644
--- a/app/controllers/post_action_users_controller.rb
+++ b/app/controllers/post_action_users_controller.rb
@@ -12,10 +12,9 @@ class PostActionUsersController < ApplicationController
     post = finder.first
     guardian.ensure_can_see!(post)
 
-
     post_actions = post.post_actions.where(post_action_type_id: post_action_type_id)
-                       .includes(:user)
-                       .order('post_actions.created_at asc')
+      .includes(:user)
+      .order('post_actions.created_at asc')
 
     if !guardian.can_see_post_actors?(post.topic, post_action_type_id)
       if !current_user
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 5e18b57520..1794ddded0 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -41,23 +41,23 @@ class PostsController < ApplicationController
     if params[:id] == "private_posts"
       raise Discourse::NotFound if current_user.nil?
       posts = Post.private_posts
-                  .order(created_at: :desc)
-                  .where('posts.id <= ?', last_post_id)
-                  .where('posts.id > ?', last_post_id - 50)
-                  .includes(topic: :category)
-                  .includes(user: :primary_group)
-                  .includes(:reply_to_user)
-                  .limit(50)
+        .order(created_at: :desc)
+        .where('posts.id <= ?', last_post_id)
+        .where('posts.id > ?', last_post_id - 50)
+        .includes(topic: :category)
+        .includes(user: :primary_group)
+        .includes(:reply_to_user)
+        .limit(50)
       rss_description = I18n.t("rss_description.private_posts")
     else
       posts = Post.public_posts
-                  .order(created_at: :desc)
-                  .where('posts.id <= ?', last_post_id)
-                  .where('posts.id > ?', last_post_id - 50)
-                  .includes(topic: :category)
-                  .includes(user: :primary_group)
-                  .includes(:reply_to_user)
-                  .limit(50)
+        .order(created_at: :desc)
+        .where('posts.id <= ?', last_post_id)
+        .where('posts.id > ?', last_post_id - 50)
+        .includes(topic: :category)
+        .includes(user: :primary_group)
+        .includes(:reply_to_user)
+        .limit(50)
       rss_description = I18n.t("rss_description.posts")
     end
 
@@ -92,12 +92,12 @@ class PostsController < ApplicationController
     user = fetch_user_from_params
 
     posts = Post.public_posts
-                .where(user_id: user.id)
-                .where(post_type: Post.types[:regular])
-                .order(created_at: :desc)
-                .includes(:user)
-                .includes(topic: :category)
-                .limit(50)
+      .where(user_id: user.id)
+      .where(post_type: Post.types[:regular])
+      .order(created_at: :desc)
+      .includes(:user)
+      .includes(topic: :category)
+      .limit(50)
 
     posts = posts.reject { |post| !guardian.can_see?(post) || post.topic.blank? }
 
@@ -230,20 +230,20 @@ class PostsController < ApplicationController
     RateLimiter.new(current_user, "delete_post", 3, 1.minute).performed! unless current_user.staff?
 
     if too_late_to(:delete_post, post)
-      render json: {errors: [I18n.t('too_late_to_edit')]}, status: 422
+      render json: { errors: [I18n.t('too_late_to_edit')] }, status: 422
       return
     end
 
     guardian.ensure_can_delete!(post)
 
-    destroyer = PostDestroyer.new(current_user, post, { context: params[:context] })
+    destroyer = PostDestroyer.new(current_user, post, context: params[:context])
     destroyer.destroy
 
     render nothing: true
   end
 
   def expand_embed
-    render json: {cooked: TopicEmbed.expanded_for(find_post_from_params) }
+    render json: { cooked: TopicEmbed.expanded_for(find_post_from_params) }
   rescue
     render_json_error I18n.t('errors.embed.load_from_remote')
   end
@@ -266,10 +266,10 @@ class PostsController < ApplicationController
     raise Discourse::InvalidParameters.new(:post_ids) if posts.blank?
 
     # Make sure we can delete the posts
-    posts.each {|p| guardian.ensure_can_delete!(p) }
+    posts.each { |p| guardian.ensure_can_delete!(p) }
 
     Post.transaction do
-      posts.each {|p| PostDestroyer.new(current_user, p).destroy }
+      posts.each { |p| PostDestroyer.new(current_user, p).destroy }
     end
 
     render nothing: true
@@ -399,7 +399,7 @@ class PostsController < ApplicationController
     post = find_post_from_params
     guardian.ensure_can_wiki!(post)
 
-    post.revise(current_user, { wiki: params[:wiki] })
+    post.revise(current_user, wiki: params[:wiki])
 
     render nothing: true
   end
@@ -408,7 +408,7 @@ class PostsController < ApplicationController
     guardian.ensure_can_change_post_type!
 
     post = find_post_from_params
-    post.revise(current_user, { post_type: params[:post_type].to_i })
+    post.revise(current_user, post_type: params[:post_type].to_i)
 
     render nothing: true
   end
@@ -441,7 +441,7 @@ class PostsController < ApplicationController
     limit = [(params[:limit] || 60).to_i, 100].min
 
     posts = user_posts(guardian, user.id, offset: offset, limit: limit)
-              .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
+      .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
                                    .where(disagreed_at: nil)
                                    .select(:post_id))
 
@@ -479,7 +479,6 @@ class PostsController < ApplicationController
     render json: json_obj, status: (!!success) ? 200 : 422
   end
 
-
   def find_post_revision_from_params
     post_id = params[:id] || params[:post_id]
     revision = params[:revision].to_i
@@ -529,9 +528,9 @@ class PostsController < ApplicationController
 
   def user_posts(guardian, user_id, opts)
     posts = Post.includes(:user, :topic, :deleted_by, :user_actions)
-                .where(user_id: user_id)
-                .with_deleted
-                .order(created_at: :desc)
+      .where(user_id: user_id)
+      .with_deleted
+      .order(created_at: :desc)
 
     if guardian.user.moderator?
 
@@ -545,7 +544,7 @@ class PostsController < ApplicationController
     end
 
     posts.offset(opts[:offset])
-         .limit(opts[:limit])
+      .limit(opts[:limit])
   end
 
   def create_params
@@ -622,7 +621,7 @@ class PostsController < ApplicationController
     "post##" << Digest::SHA1.hexdigest(args
       .to_a
       .concat([["user", current_user.id]])
-      .sort{|x,y| x[0] <=> y[0]}.join do |x,y|
+      .sort { |x, y| x[0] <=> y[0] }.join do |x, y|
         "#{x}:#{y}"
       end)
   end
diff --git a/app/controllers/queued_posts_controller.rb b/app/controllers/queued_posts_controller.rb
index 6b225b5e65..888ef0ddc2 100644
--- a/app/controllers/queued_posts_controller.rb
+++ b/app/controllers/queued_posts_controller.rb
@@ -41,18 +41,17 @@ class QueuedPostsController < ApplicationController
     render_serialized(qp, QueuedPostSerializer, root: :queued_posts)
   end
 
-
   private
 
     def user_deletion_opts
       base = {
-        context:           I18n.t('queue.delete_reason', {performed_by: current_user.username}),
+        context:           I18n.t('queue.delete_reason', performed_by: current_user.username),
         delete_posts:      true,
         delete_as_spammer: true
       }
 
       if Rails.env.production? && ENV["Staging"].nil?
-        base.merge!({block_email: true, block_ip: true})
+        base.merge!(block_email: true, block_ip: true)
       end
 
       base
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a88f578093..a07df59f57 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -13,7 +13,10 @@ class SearchController < ApplicationController
       type_filter: 'topic',
       guardian: guardian,
       include_blurbs: true,
-      blurb_length: 300
+      blurb_length: 300,
+      page: if params[:page].to_i <= 10
+              [params[:page].to_i, 1].max
+            end
     }
 
     context, type = lookup_search_context
@@ -22,6 +25,10 @@ class SearchController < ApplicationController
       search_args[:type_filter] = type if type
     end
 
+    search_args[:search_type] = :full_page
+    search_args[:ip_address] = request.remote_ip
+    search_args[:user_id] = current_user.id if current_user.present?
+
     search = Search.new(params[:q], search_args)
     result = search.execute
 
@@ -37,7 +44,6 @@ class SearchController < ApplicationController
         render_json_dump(serializer)
       end
     end
-
   end
 
   def query
@@ -49,17 +55,43 @@ class SearchController < ApplicationController
     search_args[:include_blurbs] = params[:include_blurbs] == "true" if params[:include_blurbs].present?
     search_args[:search_for_id] = true                               if params[:search_for_id].present?
 
-    context,type = lookup_search_context
+    context, type = lookup_search_context
+
     if context
       search_args[:search_context] = context
       search_args[:type_filter] = type if type
     end
 
-    search = Search.new(params[:term], search_args.symbolize_keys)
+    search_args[:search_type] = :header
+    search_args[:ip_address] = request.remote_ip
+    search_args[:user_id] = current_user.id if current_user.present?
+
+    search = Search.new(params[:term], search_args)
     result = search.execute
     render_serialized(result, GroupedSearchResultSerializer, result: result)
   end
 
+  def click
+    params.require(:search_log_id)
+    params.require(:search_result_type)
+    params.require(:search_result_id)
+
+    if params[:search_result_type] == 'topic'
+      where = { id: params[:search_log_id] }
+      if current_user.present?
+        where[:user_id] = current_user.id
+      else
+        where[:ip_address] = request.remote_ip
+      end
+
+      SearchLog.where(where).update_all(
+        clicked_topic_id: params[:search_result_id]
+      )
+    end
+
+    render json: success_json
+  end
+
   protected
 
   def lookup_search_context
@@ -69,7 +101,7 @@ class SearchController < ApplicationController
     search_context = params[:search_context]
     unless search_context
       if (context = params[:context]) && (id = params[:context_id])
-        search_context = {type: context, id: id}
+        search_context = { type: context, id: id }
       end
     end
 
@@ -79,7 +111,7 @@ class SearchController < ApplicationController
 
       # A user is found by username
       context_obj = nil
-      if ['user','private_messages'].include? search_context[:type]
+      if ['user', 'private_messages'].include? search_context[:type]
         context_obj = User.find_by(username_lower: search_context[:id].downcase)
       elsif 'category' == search_context[:type]
         context_obj = Category.find_by(id: search_context[:id].to_i)
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 96259d430d..60d3069151 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -9,7 +9,7 @@ class SessionController < ApplicationController
   ACTIVATE_USER_KEY = "activate_user"
 
   def csrf
-    render json: {csrf: form_authenticity_token }
+    render json: { csrf: form_authenticity_token }
   end
 
   def sso
@@ -35,7 +35,7 @@ class SessionController < ApplicationController
     end
   end
 
-  def sso_provider(payload=nil)
+  def sso_provider(payload = nil)
     payload ||= request.query_string
     if SiteSetting.enable_sso_provider
       sso = SingleSignOn.parse(payload, SiteSetting.sso_secret)
@@ -112,7 +112,7 @@ class SessionController < ApplicationController
           activation = UserActivator.new(user, request, session, cookies)
           activation.finish
           session["user_created_message"] = activation.message
-          redirect_to users_account_created_path and return
+          redirect_to(users_account_created_path) && (return)
         else
           if SiteSetting.verbose_sso_logging
             Rails.logger.warn("Verbose SSO log: User was logged on #{user.username}\n\n#{sso.diagnostics}")
@@ -292,11 +292,11 @@ class SessionController < ApplicationController
   end
 
   def invalid_credentials
-    render json: {error: I18n.t("login.incorrect_username_email_or_password")}
+    render json: { error: I18n.t("login.incorrect_username_email_or_password") }
   end
 
   def login_not_approved
-    render json: {error: I18n.t("login.not_approved")}
+    render json: { error: I18n.t("login.not_approved") }
   end
 
   def not_activated(user)
@@ -310,19 +310,19 @@ class SessionController < ApplicationController
   end
 
   def not_allowed_from_ip_address(user)
-    render json: {error: I18n.t("login.not_allowed_from_ip_address", username: user.username)}
+    render json: { error: I18n.t("login.not_allowed_from_ip_address", username: user.username) }
   end
 
   def admin_not_allowed_from_ip_address(user)
-    render json: {error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username)}
+    render json: { error: I18n.t("login.admin_not_allowed_from_ip_address", username: user.username) }
   end
 
   def failed_to_login(user)
     message = user.suspend_reason ? "login.suspended_with_reason" : "login.suspended"
 
     render json: {
-      error: I18n.t(message, { date: I18n.l(user.suspended_till, format: :date_only),
-                               reason: Rack::Utils.escape_html(user.suspend_reason) }),
+      error: I18n.t(message, date: I18n.l(user.suspended_till, format: :date_only),
+                             reason: Rack::Utils.escape_html(user.suspend_reason)),
       reason: 'suspended'
     }
   end
@@ -337,7 +337,6 @@ class SessionController < ApplicationController
     render_serialized(user, UserSerializer)
   end
 
-
   def render_sso_error(status:, text:)
     @sso_error = text
     render status: status, layout: 'no_ember'
diff --git a/app/controllers/similar_topics_controller.rb b/app/controllers/similar_topics_controller.rb
index 1f0a84d84f..8070697e57 100644
--- a/app/controllers/similar_topics_controller.rb
+++ b/app/controllers/similar_topics_controller.rb
@@ -26,7 +26,7 @@ class SimilarTopicsController < ApplicationController
     return render json: [] if invalid_length || !Topic.count_exceeds_minimum?
 
     topics = Topic.similar_to(title, raw, current_user).to_a
-    topics.map! {|t| SimilarTopic.new(t) }
+    topics.map! { |t| SimilarTopic.new(t) }
     render_serialized(topics, SimilarTopicSerializer, root: :similar_topics, rest_serializer: true)
   end
 
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 30c140304e..b524b0dd8e 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -13,9 +13,9 @@ class StaticController < ApplicationController
     return redirect_to path('/login') if SiteSetting.login_required? && current_user.nil? && (params[:id] == 'faq' || params[:id] == 'guidelines')
 
     map = {
-      "faq" => {redirect: "faq_url", topic_id: "guidelines_topic_id"},
-      "tos" => {redirect: "tos_url", topic_id: "tos_topic_id"},
-      "privacy" => {redirect: "privacy_policy_url", topic_id: "privacy_topic_id"}
+      "faq" => { redirect: "faq_url", topic_id: "guidelines_topic_id" },
+      "tos" => { redirect: "tos_url", topic_id: "tos_topic_id" },
+      "privacy" => { redirect: "privacy_policy_url", topic_id: "privacy_topic_id" }
     }
 
     @page = params[:id]
@@ -100,7 +100,7 @@ class StaticController < ApplicationController
   # a huge expiry, we also cache these assets in nginx so it bypassed if needed
   def favicon
 
-    data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60*30) do
+    data = DistributedMemoizer.memoize('favicon' + SiteSetting.favicon_url, 60 * 30) do
       begin
         file = FileHelper.download(
           SiteSetting.favicon_url,
@@ -137,21 +137,19 @@ class StaticController < ApplicationController
     end
   end
 
-
   def cdn_asset
     serve_asset
   end
 
   protected
 
-  def serve_asset(suffix=nil)
+  def serve_asset(suffix = nil)
 
     path = File.expand_path(Rails.root + "public/assets/#{params[:path]}#{suffix}")
 
     # SECURITY what if path has /../
     raise Discourse::NotFound unless path.start_with?(Rails.root.to_s + "/public/assets")
 
-
     response.headers["Expires"] = 1.year.from_now.httpdate
     response.headers["Access-Control-Allow-Origin"] = params[:origin] if params[:origin]
 
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 005d2d7d78..c80bdffd2f 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -20,7 +20,7 @@ class StepsController < ApplicationController
     else
       errors = []
       updater.errors.messages.each do |field, msg|
-        errors << {field: field, description: msg.join }
+        errors << { field: field, description: msg.join }
       end
       render json: { errors: errors }, status: 422
     end
diff --git a/app/controllers/stylesheets_controller.rb b/app/controllers/stylesheets_controller.rb
index dea3d5d34c..d174f28faa 100644
--- a/app/controllers/stylesheets_controller.rb
+++ b/app/controllers/stylesheets_controller.rb
@@ -19,17 +19,17 @@ class StylesheetsController < ApplicationController
 
     no_cookies
 
-    target,digest = params[:name].split(/_([a-f0-9]{40})/)
+    target, digest = params[:name].split(/_([a-f0-9]{40})/)
 
-    if Rails.env == "development"
+    if !Rails.env.production?
       # TODO add theme
       # calling this method ensures we have a cache for said target
       # we hold of re-compilation till someone asks for asset
       if target.include?("theme")
-        split_target,theme_id = target.split(/_(-?[0-9]+)/)
+        split_target, theme_id = target.split(/_(-?[0-9]+)/)
         theme = Theme.find(theme_id) if theme_id
       else
-        split_target,color_scheme_id = target.split(/_(-?[0-9]+)/)
+        split_target, color_scheme_id = target.split(/_(-?[0-9]+)/)
         theme = Theme.find_by(color_scheme_id: color_scheme_id)
       end
       Stylesheet::Manager.stylesheet_link_tag(split_target, nil, theme&.key)
@@ -59,7 +59,6 @@ class StylesheetsController < ApplicationController
       return render nothing: true, status: 304
     end
 
-
     unless File.exist?(location)
       if current = query.limit(1).pluck(source_map ? :source_map : :content).first
         File.write(location, current)
@@ -90,4 +89,3 @@ class StylesheetsController < ApplicationController
   end
 
 end
-
diff --git a/app/controllers/tag_groups_controller.rb b/app/controllers/tag_groups_controller.rb
index 783839fd4d..d29d3ba8d7 100644
--- a/app/controllers/tag_groups_controller.rb
+++ b/app/controllers/tag_groups_controller.rb
@@ -69,7 +69,7 @@ class TagGroupsController < ApplicationController
     end
 
     def tag_groups_params
-      result = params.permit(:id, :name, :one_per_topic, :tag_names => [], :parent_tag_name => [])
+      result = params.permit(:id, :name, :one_per_topic, tag_names: [], parent_tag_name: [])
       result[:tag_names] ||= []
       result[:parent_tag_name] ||= []
       result[:one_per_topic] = (params[:one_per_topic] == "true")
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 0af8be70a6..e65e849425 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -14,18 +14,18 @@ class TagsController < ::ApplicationController
     :tag_feed,
     :search,
     :check_hashtag,
-    Discourse.anonymous_filters.map { |f| :"show_#{f}"}
+    Discourse.anonymous_filters.map { |f| :"show_#{f}" }
   ].flatten
   before_filter :set_category_from_params, except: [:index, :update, :destroy, :tag_feed, :search, :notifications, :update_notifications]
 
   def index
     categories = Category.where("id in (select category_id from category_tags)")
-                         .where("id in (?)", guardian.allowed_category_ids)
-                         .preload(:tags)
+      .where("id in (?)", guardian.allowed_category_ids)
+      .preload(:tags)
     category_tag_counts = categories.map do |c|
       h = Tag.category_tags_by_count_query(c, limit: 300).count(Tag::COUNT_ARG)
-      h.merge!(c.tags.where.not(name: h.keys).inject({}) { |sum,t| sum[t.name] = 0; sum }) # unused tags
-      {id: c.id, tags: self.class.tag_counts_json(h)}
+      h.merge!(c.tags.where.not(name: h.keys).inject({}) { |sum, t| sum[t.name] = 0; sum }) # unused tags
+      { id: c.id, tags: self.class.tag_counts_json(h) }
     end
 
     tag_counts = self.class.tags_by_count(guardian, limit: 300).count(Tag::COUNT_ARG)
@@ -49,8 +49,8 @@ class TagsController < ::ApplicationController
 
   Discourse.filters.each do |filter|
     define_method("show_#{filter}") do
-      @tag_id = params[:tag_id]
-      @additional_tags = params[:additional_tag_ids].to_s.split('/')
+      @tag_id = params[:tag_id].force_encoding("UTF-8")
+      @additional_tags = params[:additional_tag_ids].to_s.split('/').map { |t| t.force_encoding("UTF-8") }
 
       list_opts = build_topic_list_options
 
@@ -67,7 +67,7 @@ class TagsController < ::ApplicationController
       @title = @description_meta
 
       path_name = url_method(params.slice(:category, :parent_category))
-      canonical_url "#{Discourse.base_url_no_prefix}#{public_send(path_name, *(params.slice(:parent_category, :category, :tag_id).values))}"
+      canonical_url "#{Discourse.base_url_no_prefix}#{public_send(path_name, *(params.slice(:parent_category, :category, :tag_id).values.map { |t| t.force_encoding("UTF-8") }))}"
 
       if @list.topics.size == 0 && params[:tag_id] != 'none' && !Tag.where(name: @tag_id).exists?
         permalink_redirect_or_not_found
@@ -91,7 +91,7 @@ class TagsController < ::ApplicationController
     tag.name = new_tag_name
     if tag.save
       StaffActionLogger.new(current_user).log_custom('renamed_tag', previous_value: params[:tag_id], new_value: new_tag_name)
-      render json: { tag: { id: new_tag_name }}
+      render json: { tag: { id: new_tag_name } }
     else
       render_json_error tag.errors.full_messages
     end
@@ -116,7 +116,7 @@ class TagsController < ::ApplicationController
     @title = "#{SiteSetting.title} - #{@description}"
     @atom_link = "#{Discourse.base_url}/tags/#{tag_id}.rss"
 
-    query = TopicQuery.new(current_user, {tags: [tag_id]})
+    query = TopicQuery.new(current_user, tags: [tag_id])
     latest_results = query.latest_results
     @topic_list = query.create_list(:by_tag, {}, latest_results)
 
@@ -129,15 +129,13 @@ class TagsController < ::ApplicationController
     tags_with_counts = DiscourseTagging.filter_allowed_tags(
       Tag.tags_by_count_query(params.slice(:limit)),
       guardian,
-      {
-        for_input: params[:filterForInput],
-        term: params[:q],
-        category: category,
-        selected_tags: params[:selected_tags]
-      }
+      for_input: params[:filterForInput],
+      term: params[:q],
+      category: category,
+      selected_tags: params[:selected_tags]
     )
 
-    tags = tags_with_counts.count(Tag::COUNT_ARG).map {|t, c| { id: t, text: t, count: c } }
+    tags = tags_with_counts.count(Tag::COUNT_ARG).map { |t, c| { id: t, text: t, count: c } }
 
     json_response = { results: tags }
 
@@ -153,7 +151,7 @@ class TagsController < ::ApplicationController
     tag = Tag.find_by_name(params[:tag_id])
     raise Discourse::NotFound unless tag
     level = tag.tag_users.where(user: current_user).first.try(:notification_level) || TagUser.notification_levels[:regular]
-    render json: { tag_notification: { id: params[:tag_id], notification_level: level.to_i } }
+    render json: { tag_notification: { id: tag.name, notification_level: level.to_i } }
   end
 
   def update_notifications
@@ -161,7 +159,7 @@ class TagsController < ::ApplicationController
     raise Discourse::NotFound unless tag
     level = params[:tag_notification][:notification_level].to_i
     TagUser.change(current_user.id, tag.id, level)
-    render json: {notification_level: level}
+    render json: { notification_level: level }
   end
 
   def check_hashtag
@@ -180,12 +178,12 @@ class TagsController < ::ApplicationController
       raise Discourse::NotFound unless SiteSetting.tagging_enabled?
     end
 
-    def self.tags_by_count(guardian, opts={})
+    def self.tags_by_count(guardian, opts = {})
       guardian.filter_allowed_categories(Tag.tags_by_count_query(opts))
     end
 
     def self.tag_counts_json(tag_counts)
-      tag_counts.map {|t, c| { id: t, text: t, count: c } }
+      tag_counts.map { |t, c| { id: t, text: t, count: c } }
     end
 
     def set_category_from_params
@@ -201,13 +199,13 @@ class TagsController < ::ApplicationController
         parent_category_id = nil
         if parent_slug_or_id.present?
           parent_category_id = Category.query_parent_category(parent_slug_or_id)
-          category_redirect_or_not_found and return if parent_category_id.blank?
+          category_redirect_or_not_found && (return) if parent_category_id.blank?
         end
 
         @filter_on_category = Category.query_category(slug_or_id, parent_category_id)
       end
 
-      category_redirect_or_not_found and return if !@filter_on_category
+      category_redirect_or_not_found && (return) if !@filter_on_category
 
       guardian.ensure_can_see!(@filter_on_category)
     end
@@ -236,7 +234,7 @@ class TagsController < ::ApplicationController
       end
     end
 
-    def url_method(opts={})
+    def url_method(opts = {})
       if opts[:parent_category] && opts[:category]
         "tag_parent_category_category_#{action_name}_path"
       elsif opts[:category]
@@ -254,7 +252,7 @@ class TagsController < ::ApplicationController
       else # :next
         public_send(method, opts.merge(next_page_params(opts)))
       end
-      url.sub('.json?','?')
+      url.sub('.json?', '?')
     end
 
     def build_topic_list_options
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index c593060603..27279d2dc3 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -40,7 +40,7 @@ class TopicsController < ApplicationController
     topic = Topic.find_by(slug: params[:slug].downcase)
     guardian.ensure_can_see!(topic)
     raise Discourse::NotFound unless topic
-    render json: {slug: topic.slug, topic_id: topic.id, url: topic.url}
+    render json: { slug: topic.slug, topic_id: topic.id, url: topic.url }
   end
 
   def show
@@ -155,7 +155,6 @@ class TopicsController < ApplicationController
       TopicUser.change(current_user.id, params[:topic_id].to_i, notification_level: TopicUser.notification_levels[:muted])
     end
 
-
     perform_show_response
   end
 
@@ -164,7 +163,8 @@ class TopicsController < ApplicationController
     params.require(:topic_id)
     params.permit(:min_trust_level, :min_score, :min_replies, :bypass_trust_level_score, :only_moderator_liked)
 
-    opts = { best: params[:best].to_i,
+    opts = {
+      best: params[:best].to_i,
       min_trust_level: params[:min_trust_level] ? params[:min_trust_level].to_i : 1,
       min_score: params[:min_score].to_i,
       min_replies: params[:min_replies].to_i,
@@ -206,17 +206,16 @@ class TopicsController < ApplicationController
     guardian.ensure_can_see!(@topic)
 
     @posts = Post.where(hidden: false, deleted_at: nil, topic_id: @topic.id)
-        .where('posts.id in (?)', post_ids)
-        .joins("LEFT JOIN users u on u.id = posts.user_id")
-        .pluck(:id, :cooked, :username)
-        .map do |post_id, cooked, username|
-          {
-            post_id: post_id,
-            username: username,
-            excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
-          }
-         end
-
+      .where('posts.id in (?)', post_ids)
+      .joins("LEFT JOIN users u on u.id = posts.user_id")
+      .pluck(:id, :cooked, :username)
+      .map do |post_id, cooked, username|
+        {
+          post_id: post_id,
+          username: username,
+          excerpt: PrettyText.excerpt(cooked, 800, keep_emoji_images: true)
+        }
+      end
 
     render json: @posts.to_json
   end
@@ -266,7 +265,7 @@ class TopicsController < ApplicationController
     params.require(:enabled)
     params.permit(:until)
 
-    status  = params[:status]
+    status = params[:status]
     topic_id = params[:topic_id].to_i
     enabled = params[:enabled] == 'true'
 
@@ -319,13 +318,13 @@ class TopicsController < ApplicationController
     )
 
     if topic.save
-      render json: success_json.merge!({
+      render json: success_json.merge!(
         execute_at: topic_status_update&.execute_at,
         duration: topic_status_update&.duration,
         based_on_last_post: topic_status_update&.based_on_last_post,
         closed: topic.closed,
         category_id: topic_status_update&.category_id
-      })
+      )
     else
       render_json_error(topic)
     end
@@ -353,8 +352,8 @@ class TopicsController < ApplicationController
     topic = Topic.find(params[:topic_id].to_i)
 
     PostAction.joins(:post)
-              .where(user_id: current_user.id)
-              .where('topic_id = ?', topic.id).each do |pa|
+      .where(user_id: current_user.id)
+      .where('topic_id = ?', topic.id).each do |pa|
 
       PostAction.remove_act(current_user, pa.post, PostActionType.types[:bookmark])
     end
@@ -378,7 +377,7 @@ class TopicsController < ApplicationController
     group_ids = current_user.groups.pluck(:id)
     if group_ids.present?
       allowed_groups = topic.allowed_groups
-                          .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
+        .where('topic_allowed_groups.group_id IN (?)', group_ids).pluck(:id)
       allowed_groups.each do |id|
         if archive
           GroupArchivedMessage.archive!(id, topic.id)
@@ -421,7 +420,7 @@ class TopicsController < ApplicationController
     guardian.ensure_can_delete!(topic)
 
     first_post = topic.ordered_posts.first
-    PostDestroyer.new(current_user, first_post, { context: params[:context] }).destroy
+    PostDestroyer.new(current_user, first_post, context: params[:context]).destroy
 
     render nothing: true
   end
@@ -484,8 +483,13 @@ class TopicsController < ApplicationController
 
     topic = Topic.find_by(id: params[:topic_id])
 
-    group_ids = Group.lookup_group_ids(params)
-    guardian.ensure_can_invite_to!(topic,group_ids)
+    groups = Group.lookup_groups(
+      group_ids: params[:group_ids],
+      group_names: params[:group_names]
+    )
+
+    guardian.ensure_can_invite_to!(topic, groups)
+    group_ids = groups.map(&:id)
 
     begin
       if topic.invite(current_user, username_or_email, group_ids, params[:custom_message])
@@ -499,7 +503,7 @@ class TopicsController < ApplicationController
         render json: failed_json, status: 422
       end
     rescue Topic::UserExists => e
-      render json: {errors: [e.message]}, status: 422
+      render json: { errors: [e.message] }, status: 422
     end
   end
 
@@ -541,10 +545,10 @@ class TopicsController < ApplicationController
     guardian.ensure_can_change_post_owner!
 
     begin
-      PostOwnerChanger.new( post_ids: params[:post_ids].to_a,
-                            topic_id: params[:topic_id].to_i,
-                            new_owner: User.find_by(username: params[:username]),
-                            acting_user: current_user ).change_owner!
+      PostOwnerChanger.new(post_ids: params[:post_ids].to_a,
+                           topic_id: params[:topic_id].to_i,
+                           new_owner: User.find_by(username: params[:username]),
+                           acting_user: current_user).change_owner!
       render json: success_json
     rescue ArgumentError
       render json: failed_json, status: 422
@@ -588,8 +592,8 @@ class TopicsController < ApplicationController
       current_user,
       params[:topic_id].to_i,
       params[:topic_time].to_i,
-      (params[:timings] || []).map{|post_number, t| [post_number.to_i, t.to_i]},
-      {mobile: view_context.mobile_view?}
+      (params[:timings] || []).map { |post_number, t| [post_number.to_i, t.to_i] },
+      mobile: view_context.mobile_view?
     )
     render nothing: true
   end
@@ -602,7 +606,7 @@ class TopicsController < ApplicationController
 
   def bulk
     if params[:topic_ids].present?
-      topic_ids = params[:topic_ids].map {|t| t.to_i}
+      topic_ids = params[:topic_ids].map { |t| t.to_i }
     elsif params[:filter] == 'unread'
       tq = TopicQuery.new(current_user)
       topics = TopicQuery.unread_filter(tq.joined_topic_user, current_user.id, staff: guardian.is_staff?).listable_topics
@@ -658,7 +662,7 @@ class TopicsController < ApplicationController
     params[:slug] && @topic_view.topic.slug != params[:slug]
   end
 
-  def redirect_to_correct_topic(topic, post_number=nil)
+  def redirect_to_correct_topic(topic, post_number = nil)
     url = topic.relative_url
     url << "/#{post_number}" if post_number.to_i > 0
     url << ".json" if request.format.json?
@@ -722,9 +726,9 @@ class TopicsController < ApplicationController
 
   def render_topic_changes(dest_topic)
     if dest_topic.present?
-      render json: {success: true, url: dest_topic.relative_url}
+      render json: { success: true, url: dest_topic.relative_url }
     else
-      render json: {success: false}
+      render json: { success: false }
     end
   end
 
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index 8d11d46c1e..6fff6655c8 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -40,7 +40,7 @@ class UserApiKeysController < ApplicationController
     @client_id = params[:client_id]
     @auth_redirect = params[:auth_redirect]
     @push_url = params[:push_url]
-    @localized_scopes = params[:scopes].split(",").map{|s| I18n.t("user_api_key.scopes.#{s}")}
+    @localized_scopes = params[:scopes].split(",").map { |s| I18n.t("user_api_key.scopes.#{s}") }
     @scopes = params[:scopes]
 
   rescue Discourse::InvalidAccess
@@ -52,10 +52,10 @@ class UserApiKeysController < ApplicationController
     require_params
 
     unless SiteSetting.allowed_user_api_auth_redirects
-                      .split('|')
-                      .any?{|u| params[:auth_redirect] == u}
+        .split('|')
+        .any? { |u| params[:auth_redirect] == u }
 
-        raise Discourse::InvalidAccess
+      raise Discourse::InvalidAccess
     end
 
     raise Discourse::InvalidAccess unless meets_tl?
@@ -126,7 +126,7 @@ class UserApiKeysController < ApplicationController
      :client_id,
      :auth_redirect,
      :application_name
-    ].each{|p| params.require(p)}
+    ].each { |p| params.require(p) }
   end
 
   def validate_params
diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb
index 30a3709c60..119266fd35 100644
--- a/app/controllers/user_avatars_controller.rb
+++ b/app/controllers/user_avatars_controller.rb
@@ -89,7 +89,7 @@ class UserAvatarsController < ApplicationController
     return render_blank if size < 8 || size > 1000
 
     if !Discourse.avatar_sizes.include?(size) && Discourse.store.external?
-      closest = Discourse.avatar_sizes.to_a.min { |a,b| (size-a).abs <=> (size-b).abs }
+      closest = Discourse.avatar_sizes.to_a.min { |a, b| (size - a).abs <=> (size - b).abs }
       avatar_url = UserAvatar.local_avatar_url(hostname, user.username_lower, upload_id, closest)
       return redirect_to cdn_path(avatar_url)
     end
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index 7c9cfb0bee..d8f44a41ea 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -33,12 +33,12 @@ class UserBadgesController < ApplicationController
 
     if params[:grouped]
       user_badges = user_badges.group(:badge_id)
-                               .select(UserBadge.attribute_names.map {|x| "MAX(#{x}) AS #{x}" }, 'COUNT(*) AS "count"')
+        .select(UserBadge.attribute_names.map { |x| "MAX(#{x}) AS #{x}" }, 'COUNT(*) AS "count"')
     end
 
     user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type])
-                             .includes(post: :topic)
-                             .includes(:granted_by)
+      .includes(post: :topic)
+      .includes(:granted_by)
 
     render_serialized(user_badges, DetailedUserBadgeSerializer, root: :user_badges)
   end
@@ -104,6 +104,6 @@ class UserBadgesController < ApplicationController
 
     def can_assign_badge_to_user?(user)
       master_api_call = current_user.nil? && is_api?
-      master_api_call or guardian.can_grant_badges?(user)
+      master_api_call || guardian.can_grant_badges?(user)
     end
 end
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 6b0409e2a4..4908b527bb 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -36,7 +36,7 @@ class Users::OmniauthCallbacksController < ApplicationController
     auth[:session] = session
 
     authenticator = self.class.find_authenticator(params[:provider])
-    provider = Discourse.auth_providers && Discourse.auth_providers.find{|p| p.name == params[:provider]}
+    provider = Discourse.auth_providers && Discourse.auth_providers.find { |p| p.name == params[:provider] }
 
     @auth_result = authenticator.after_authenticate(auth)
 
@@ -83,7 +83,6 @@ class Users::OmniauthCallbacksController < ApplicationController
     render layout: 'no_ember'
   end
 
-
   def self.find_authenticator(name)
     BUILTIN_AUTH.each do |authenticator|
       if authenticator.name == name
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fb510fa4eb..6c416f4d93 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -50,7 +50,7 @@ class UsersController < ApplicationController
 
     topic_id = params[:include_post_count_for].to_i
     if topic_id != 0
-      user_serializer.topic_post_count = {topic_id => Post.where(topic_id: topic_id, user_id: @user.id).count }
+      user_serializer.topic_post_count = { topic_id => Post.where(topic_id: topic_id, user_id: @user.id).count }
     end
 
     if !params[:skip_track_visit] && (@user != current_user)
@@ -59,7 +59,7 @@ class UsersController < ApplicationController
 
     # This is a hack to get around a Rails issue where values with periods aren't handled correctly
     # when used as part of a route.
-    if params[:external_id] and params[:external_id].ends_with? '.json'
+    if params[:external_id] && params[:external_id].ends_with?('.json')
       return render_json_dump(user_serializer)
     end
 
@@ -224,8 +224,8 @@ class UsersController < ApplicationController
     pending_count = Invite.find_pending_invites_count(inviter)
     redeemed_count = Invite.find_redeemed_invites_count(inviter)
 
-    render json: {counts: { pending: pending_count, redeemed: redeemed_count,
-                            total: (pending_count.to_i + redeemed_count.to_i) } }
+    render json: { counts: { pending: pending_count, redeemed: redeemed_count,
+                             total: (pending_count.to_i + redeemed_count.to_i) } }
   end
 
   def is_local_username
@@ -238,7 +238,7 @@ class UsersController < ApplicationController
         Group.mentionable(current_user)
           .where(name: usernames)
           .pluck(:name, :user_count)
-          .map{ |name,user_count| {name: name, user_count: user_count} }
+          .map { |name, user_count| { name: name, user_count: user_count } }
       end
 
     usernames -= groups
@@ -250,14 +250,14 @@ class UsersController < ApplicationController
     topic_id = params[:topic_id]
     unless topic_id.blank?
       topic = Topic.find_by(id: topic_id)
-      usernames.each{ |username| cannot_see.push(username) unless Guardian.new(User.find_by_username(username)).can_see?(topic) }
+      usernames.each { |username| cannot_see.push(username) unless Guardian.new(User.find_by_username(username)).can_see?(topic) }
     end
 
     result = User.where(staged: false)
-                 .where(username_lower: usernames)
-                 .pluck(:username_lower)
+      .where(username_lower: usernames)
+      .pluck(:username_lower)
 
-    render json: {valid: result, valid_groups: groups, mentionable_groups: mentionable_groups, cannot_see: cannot_see}
+    render json: { valid: result, valid_groups: groups, mentionable_groups: mentionable_groups, cannot_see: cannot_see }
   end
 
   def render_available_true
@@ -265,7 +265,7 @@ class UsersController < ApplicationController
   end
 
   def changing_case_of_own_username(target_user, username)
-    target_user and username.downcase == target_user.username.downcase
+    target_user && username.downcase == (target_user.username.downcase)
   end
 
   # Used for checking availability of a username and will return suggestions
@@ -311,7 +311,7 @@ class UsersController < ApplicationController
       return fail_with("login.reserved_username")
     end
 
-    if user = User.find_by(staged: true, email: params[:email].strip.downcase)
+    if user = User.where(staged: true).with_email(params[:email].strip.downcase).first
       user_params.each { |k, v| user.send("#{k}=", v) }
       user.staged = false
     else
@@ -385,7 +385,7 @@ class UsersController < ApplicationController
   end
 
   def get_honeypot_value
-    render json: {value: honeypot_value, challenge: challenge_value}
+    render json: { value: honeypot_value, challenge: challenge_value }
   end
 
   def password_reset
@@ -433,7 +433,7 @@ class UsersController < ApplicationController
         if @error
           render layout: 'no_ember'
         else
-          store_preloaded("password_reset", MultiJson.dump({ is_developer: UsernameCheckerService.is_developer?(@user.email) }))
+          store_preloaded("password_reset", MultiJson.dump(is_developer: UsernameCheckerService.is_developer?(@user.email)))
         end
         return redirect_to(wizard_path) if request.put? && Wizard.user_requires_completion?(@user)
       end
@@ -456,7 +456,7 @@ class UsersController < ApplicationController
             }
           end
         else
-          render json: {is_developer: UsernameCheckerService.is_developer?(@user.email)}
+          render json: { is_developer: UsernameCheckerService.is_developer?(@user.email) }
         end
       end
     end
@@ -469,14 +469,15 @@ class UsersController < ApplicationController
   end
 
   def logon_after_password_reset
-    message = if Guardian.new(@user).can_access_forum?
-                # Log in the user
-                log_on_user(@user)
-                'password_reset.success'
-              else
-                @requires_approval = true
-                'password_reset.success_unapproved'
-              end
+    message =
+      if Guardian.new(@user).can_access_forum?
+        # Log in the user
+        log_on_user(@user)
+        'password_reset.success'
+      else
+        @requires_approval = true
+        'password_reset.success_unapproved'
+      end
 
     @success = I18n.t(message)
   end
@@ -490,7 +491,7 @@ class UsersController < ApplicationController
       RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed!
       RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed!
 
-      user = User.where(email: params[:email], admin: true).human_users.first
+      user = User.with_email(params[:email]).where(admin: true).human_users.first
       if user
         email_token = user.email_tokens.create(email: user.email)
         Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token)
@@ -606,6 +607,7 @@ class UsersController < ApplicationController
 
     User.transaction do
       @user.email = params[:email]
+
       if @user.save
         @user.email_tokens.create(email: @user.email)
         enqueue_activation_email
@@ -648,7 +650,7 @@ class UsersController < ApplicationController
 
   def enqueue_activation_email
     @email_token ||= @user.email_tokens.create(email: @user.email)
-    Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
+    Jobs.enqueue(:critical_user_email, type: :signup, user_id: @user.id, email_token: @email_token.token, to_address: @user.email)
   end
 
   def search_users
@@ -661,7 +663,6 @@ class UsersController < ApplicationController
       @group = Group.find_by(name: params[:group])
     end
 
-
     results = UserSearch.new(term,
                              topic_id: topic_id,
                              topic_allowed_users: topic_allowed_users,
@@ -682,8 +683,8 @@ class UsersController < ApplicationController
 
     if params[:include_mentionable_groups] == "true" && current_user
       to_render[:groups] = Group.mentionable(current_user)
-                                .where("name ILIKE :term_like", term_like: "#{term}%")
-                                .map do |m|
+        .where("name ILIKE :term_like", term_like: "#{term}%")
+        .map do |m|
         { name: m.name, full_name: m.full_name }
       end
     end
@@ -751,7 +752,7 @@ class UsersController < ApplicationController
     @user = fetch_user_from_params
     guardian.ensure_can_delete_user!(@user)
 
-    UserDestroyer.new(current_user).destroy(@user, { delete_posts: true, context: params[:context] })
+    UserDestroyer.new(current_user).destroy(@user, delete_posts: true, context: params[:context])
 
     render json: success_json
   end
@@ -796,14 +797,14 @@ class UsersController < ApplicationController
   private
 
     def honeypot_value
-      Digest::SHA1::hexdigest("#{Discourse.current_hostname}:#{GlobalSetting.safe_secret_key_base}")[0,15]
+      Digest::SHA1::hexdigest("#{Discourse.current_hostname}:#{GlobalSetting.safe_secret_key_base}")[0, 15]
     end
 
     def challenge_value
       challenge = $redis.get('SECRET_CHALLENGE')
-      unless challenge && challenge.length == 16*2
+      unless challenge && challenge.length == 16 * 2
         challenge = SecureRandom.hex(16)
-        $redis.set('SECRET_CHALLENGE',challenge)
+        $redis.set('SECRET_CHALLENGE', challenge)
       end
 
       challenge
@@ -832,9 +833,9 @@ class UsersController < ApplicationController
 
     def user_params
       result = params.permit(:name, :email, :password, :username, :date_of_birth)
-                     .merge(ip_address: request.remote_ip,
-                            registration_ip_address: request.remote_ip,
-                            locale: user_locale)
+        .merge(ip_address: request.remote_ip,
+               registration_ip_address: request.remote_ip,
+               locale: user_locale)
 
       if !UsernameCheckerService.is_developer?(result['email']) &&
           is_api? &&
@@ -844,7 +845,6 @@ class UsersController < ApplicationController
         result.merge!(params.permit(:active, :staged))
       end
 
-
       result
     end
 
diff --git a/app/controllers/wizard_controller.rb b/app/controllers/wizard_controller.rb
index 4b7bc82faa..88edb7af8d 100644
--- a/app/controllers/wizard_controller.rb
+++ b/app/controllers/wizard_controller.rb
@@ -3,8 +3,8 @@ require_dependency 'wizard/builder'
 
 class WizardController < ApplicationController
   before_filter :ensure_wizard_enabled, only: [:index]
-  before_filter :ensure_logged_in
-  before_filter :ensure_admin
+  before_filter :ensure_logged_in, except: [:qunit]
+  before_filter :ensure_admin, except: [:qunit]
 
   skip_before_filter :check_xhr, :preload_json
 
@@ -21,6 +21,7 @@ class WizardController < ApplicationController
   end
 
   def qunit
+    raise Discourse::InvalidAccess.new if Rails.env.production?
   end
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4a4ab33218..1d837bbf0b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -15,7 +15,7 @@ module ApplicationHelper
   include ConfigurableUrls
   include GlobalPath
 
-  def google_universal_analytics_json(ua_domain_name=nil)
+  def google_universal_analytics_json(ua_domain_name = nil)
     result = {}
     if ua_domain_name
       result[:cookieDomain] = ua_domain_name.gsub(/^http(s)?:\/\//, '')
@@ -23,6 +23,9 @@ module ApplicationHelper
     if current_user.present?
       result[:userId] = current_user.id
     end
+    if SiteSetting.ga_universal_auto_link_domains.present?
+      result[:allowLinker] = true
+    end
     result.to_json.html_safe
   end
 
@@ -52,7 +55,7 @@ module ApplicationHelper
         GlobalSetting.cdn_url.start_with?("https") &&
         ENV["COMPRESS_BROTLI"] == "1" &&
         request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
-        path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
+      path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
     end
 "<link rel='preload' href='#{path}' as='script'/>
 <script src='#{path}'></script>".html_safe
@@ -155,7 +158,7 @@ module ApplicationHelper
   end
 
   # Creates open graph and twitter card meta data
-  def crawlable_meta_data(opts=nil)
+  def crawlable_meta_data(opts = nil)
     opts ||= {}
     opts[:url] ||= "#{Discourse.base_url_no_prefix}#{request.fullpath}"
 
@@ -227,9 +230,7 @@ module ApplicationHelper
   end
 
   def gsub_emoji_to_unicode(str)
-    if str
-      str.gsub(/:([\w\-+]*(?::t\d)?):/) { |name| Emoji.lookup_unicode($1) || name }
-    end
+    Emoji.gsub_emoji_to_unicode(str)
   end
 
   def application_logo_url
@@ -241,7 +242,7 @@ module ApplicationHelper
   end
 
   def mobile_view?
-    MobileDetection.resolve_mobile_view!(request.user_agent,params,session)
+    MobileDetection.resolve_mobile_view!(request.user_agent, params, session)
   end
 
   def crawler_layout?
@@ -282,7 +283,7 @@ module ApplicationHelper
     controller.class.name.split("::").first == "Admin"
   end
 
-  def category_badge(category, opts=nil)
+  def category_badge(category, opts = nil)
     CategoryBadge.html_for(category, opts).html_safe
   end
 
@@ -296,11 +297,11 @@ module ApplicationHelper
     return "" if Rails.env.test?
 
     matcher = Regexp.new("/connectors/#{name}/.*\.html\.erb$")
-    erbs = ApplicationHelper.all_connectors.select {|c| c =~ matcher }
+    erbs = ApplicationHelper.all_connectors.select { |c| c =~ matcher }
     return "" if erbs.blank?
 
     result = ""
-    erbs.each {|erb| result << render(file: erb) }
+    erbs.each { |erb| result << render(file: erb) }
     result.html_safe
   end
 
@@ -334,7 +335,7 @@ module ApplicationHelper
     lookup.html_safe if lookup
   end
 
-  def discourse_stylesheet_link_tag(name, opts={})
+  def discourse_stylesheet_link_tag(name, opts = {})
     if opts.key?(:theme_key)
       key = opts[:theme_key] unless customization_disabled?
     else
diff --git a/app/helpers/list_helper.rb b/app/helpers/list_helper.rb
index a7cf7766ac..9839401f9e 100644
--- a/app/helpers/list_helper.rb
+++ b/app/helpers/list_helper.rb
@@ -6,7 +6,7 @@ module ListHelper
 
     return if total_pages < 2
 
-    page = [total_pages - (max_pages+1), 2].max
+    page = [total_pages - (max_pages + 1), 2].max
 
     result = "("
     while page <= total_pages
diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb
index ad96e94177..b50b923bb8 100644
--- a/app/helpers/topics_helper.rb
+++ b/app/helpers/topics_helper.rb
@@ -2,7 +2,7 @@ module TopicsHelper
   include ApplicationHelper
 
   def render_topic_title(topic)
-    link_to(gsub_emoji_to_unicode(topic.title),topic.relative_url)
+    link_to(Emoji.gsub_emoji_to_unicode(topic.title), topic.relative_url)
   end
 
   def categories_breadcrumb(topic)
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index 044b4eb312..2e18c702ee 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -1,6 +1,6 @@
 module UserNotificationsHelper
 
-  def indent(text, by=2)
+  def indent(text, by = 2)
     spacer = " " * by
     result = ""
     text.each_line do |line|
@@ -48,9 +48,9 @@ module UserNotificationsHelper
     doc.css('div').first
   end
 
-  def email_excerpt(html_arg, posts_count=nil)
+  def email_excerpt(html_arg, posts_count = nil)
     # only include 1st paragraph when more than 1 posts
-    html = (posts_count.nil? || posts_count > 1) ? (first_paragraph_from(html_arg)||html_arg).to_s : html_arg
+    html = (posts_count.nil? || posts_count > 1) ? (first_paragraph_from(html_arg) || html_arg).to_s : html_arg
     PrettyText.format_for_email(html).html_safe
   end
 
diff --git a/app/jobs/base.rb b/app/jobs/base.rb
index 4445c78aa9..9ce3b6e076 100644
--- a/app/jobs/base.rb
+++ b/app/jobs/base.rb
@@ -71,11 +71,11 @@ module Jobs
       ctx
     end
 
-    def self.delayed_perform(opts={})
+    def self.delayed_perform(opts = {})
       self.new.perform(opts)
     end
 
-    def execute(opts={})
+    def execute(opts = {})
       raise "Overwrite me!"
     end
 
@@ -114,7 +114,6 @@ module Jobs
         end
       end
 
-
       dbs =
         if opts[:current_site_id]
           [opts[:current_site_id]]
@@ -203,7 +202,7 @@ module Jobs
     end
   end
 
-  def self.enqueue(job_name, opts={})
+  def self.enqueue(job_name, opts = {})
     klass = "Jobs::#{job_name.to_s.camelcase}".constantize
 
     # Unless we want to work on all sites
@@ -227,20 +226,20 @@ module Jobs
 
   end
 
-  def self.enqueue_in(secs, job_name, opts={})
+  def self.enqueue_in(secs, job_name, opts = {})
     enqueue(job_name, opts.merge!(delay_for: secs))
   end
 
-  def self.enqueue_at(datetime, job_name, opts={})
+  def self.enqueue_at(datetime, job_name, opts = {})
     secs = [(datetime - Time.zone.now).to_i, 0].max
     enqueue_in(secs, job_name, opts)
   end
 
-  def self.cancel_scheduled_job(job_name, opts={})
+  def self.cancel_scheduled_job(job_name, opts = {})
     scheduled_for(job_name, opts).each(&:delete)
   end
 
-  def self.scheduled_for(job_name, opts={})
+  def self.scheduled_for(job_name, opts = {})
     opts = opts.with_indifferent_access
     unless opts.delete(:all_sites)
       opts[:current_site_id] ||= RailsMultisite::ConnectionManagement.current_db
@@ -265,6 +264,6 @@ module Jobs
   end
 end
 
-Dir["#{Rails.root}/app/jobs/onceoff/*.rb"].each {|file| require_dependency file }
-Dir["#{Rails.root}/app/jobs/regular/*.rb"].each {|file| require_dependency file }
-Dir["#{Rails.root}/app/jobs/scheduled/*.rb"].each {|file| require_dependency file }
+Dir["#{Rails.root}/app/jobs/onceoff/*.rb"].each { |file| require_dependency file }
+Dir["#{Rails.root}/app/jobs/regular/*.rb"].each { |file| require_dependency file }
+Dir["#{Rails.root}/app/jobs/scheduled/*.rb"].each { |file| require_dependency file }
diff --git a/app/jobs/onceoff/grant_emoji.rb b/app/jobs/onceoff/grant_emoji.rb
index 696fd1f952..39d9ececf8 100644
--- a/app/jobs/onceoff/grant_emoji.rb
+++ b/app/jobs/onceoff/grant_emoji.rb
@@ -6,11 +6,11 @@ module Jobs
       to_award = {}
 
       Post.secured(Guardian.new)
-          .select(:id, :created_at, :cooked, :user_id)
-          .visible
-          .public_posts
-          .where("cooked LIKE '%emoji%'")
-          .find_in_batches do |group|
+        .select(:id, :created_at, :cooked, :user_id)
+        .visible
+        .public_posts
+        .where("cooked LIKE '%emoji%'")
+        .find_in_batches do |group|
         group.each do |p|
           doc = Nokogiri::HTML::fragment(p.cooked)
           if (doc.css("img.emoji") - doc.css(".quote img")).size > 0
diff --git a/app/jobs/onceoff/grant_first_reply_by_email.rb b/app/jobs/onceoff/grant_first_reply_by_email.rb
index ae769f681c..ef8bcc6469 100644
--- a/app/jobs/onceoff/grant_first_reply_by_email.rb
+++ b/app/jobs/onceoff/grant_first_reply_by_email.rb
@@ -7,12 +7,12 @@ module Jobs
       to_award = {}
 
       Post.select(:id, :created_at, :user_id)
-          .secured(Guardian.new)
-          .visible
-          .public_posts
-          .where(via_email: true)
-          .where("post_number > 1")
-          .find_in_batches do |group|
+        .secured(Guardian.new)
+        .visible
+        .public_posts
+        .where(via_email: true)
+        .where("post_number > 1")
+        .find_in_batches do |group|
         group.each do |p|
           to_award[p.user_id] ||= { post_id: p.id, created_at: p.created_at }
         end
diff --git a/app/jobs/onceoff/grant_onebox.rb b/app/jobs/onceoff/grant_onebox.rb
index 0c63e6b7b8..259dfe9702 100644
--- a/app/jobs/onceoff/grant_onebox.rb
+++ b/app/jobs/onceoff/grant_onebox.rb
@@ -8,11 +8,11 @@ module Jobs
       to_award = {}
 
       Post.secured(Guardian.new)
-          .select(:id, :created_at, :raw, :user_id)
-          .visible
-          .public_posts
-          .where("raw LIKE '%http%'")
-          .find_in_batches do |group|
+        .select(:id, :created_at, :raw, :user_id)
+        .visible
+        .public_posts
+        .where("raw LIKE '%http%'")
+        .find_in_batches do |group|
         group.each do |p|
           begin
             # Note we can't use `p.cooked` here because oneboxes have been cooked out
diff --git a/app/jobs/onceoff/migrate_censored_words.rb b/app/jobs/onceoff/migrate_censored_words.rb
new file mode 100644
index 0000000000..03ce4b358c
--- /dev/null
+++ b/app/jobs/onceoff/migrate_censored_words.rb
@@ -0,0 +1,12 @@
+module Jobs
+  class MigrateCensoredWords < Jobs::Onceoff
+    def execute_onceoff(args)
+      row = WatchedWord.exec_sql("SELECT value FROM site_settings WHERE name = 'censored_words'")
+      if row.count > 0
+        row.first["value"].split('|').each do |word|
+          WatchedWord.create(word: word, action: WatchedWord.actions[:censor])
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/migrate_tagging_plugin.rb b/app/jobs/onceoff/migrate_tagging_plugin.rb
index f0bb91e7e4..9d94b8e88f 100644
--- a/app/jobs/onceoff/migrate_tagging_plugin.rb
+++ b/app/jobs/onceoff/migrate_tagging_plugin.rb
@@ -4,7 +4,7 @@ module Jobs
 
     def execute_onceoff(args)
       all_tags = TopicCustomField.where(name: "tags").select('DISTINCT value').all.map(&:value)
-      tag_id_lookup = Tag.create(all_tags.map { |tag_name| {name: tag_name} }).inject({}) { |h,v| h[v.name] = v.id; h }
+      tag_id_lookup = Tag.create(all_tags.map { |tag_name| { name: tag_name } }).inject({}) { |h, v| h[v.name] = v.id; h }
 
       TopicCustomField.where(name: "tags").find_each do |tcf|
         TopicTag.create(topic_id: tcf.topic_id, tag_id: tag_id_lookup[tcf.value] || Tag.find_by_name(tcf.value).try(:id))
diff --git a/app/jobs/onceoff/migrate_upload_extensions.rb b/app/jobs/onceoff/migrate_upload_extensions.rb
new file mode 100644
index 0000000000..38bcd3a1ea
--- /dev/null
+++ b/app/jobs/onceoff/migrate_upload_extensions.rb
@@ -0,0 +1,11 @@
+module Jobs
+
+  class MigrateUploadExtensions < Jobs::Onceoff
+    def execute_onceoff(args)
+      Upload.find_each do |upload|
+        upload.extension = File.extname(upload.original_filename)[1..10]
+        upload.save
+      end
+    end
+  end
+end
diff --git a/app/jobs/onceoff/retro_grant_anniversary.rb b/app/jobs/onceoff/retro_grant_anniversary.rb
index 2b338e6dcd..9cbdddd810 100644
--- a/app/jobs/onceoff/retro_grant_anniversary.rb
+++ b/app/jobs/onceoff/retro_grant_anniversary.rb
@@ -14,4 +14,3 @@ module Jobs
   end
 
 end
-
diff --git a/app/jobs/regular/automatic_group_membership.rb b/app/jobs/regular/automatic_group_membership.rb
index 91a417927a..4e688d8400 100644
--- a/app/jobs/regular/automatic_group_membership.rb
+++ b/app/jobs/regular/automatic_group_membership.rb
@@ -13,11 +13,12 @@ module Jobs
 
       domains = group.automatic_membership_email_domains.gsub('.', '\.')
 
-      User.where("email ~* '@(#{domains})$'")
-          .where("users.id NOT IN (SELECT user_id FROM group_users WHERE group_users.group_id = ?)", group_id)
-          .activated
-          .where(staged: false)
-          .find_each do |user|
+      User.joins(:user_emails)
+        .where("user_emails.email ~* '@(#{domains})$'")
+        .where("users.id NOT IN (SELECT user_id FROM group_users WHERE group_users.group_id = ?)", group_id)
+        .activated
+        .where(staged: false)
+        .find_each do |user|
         next unless user.email_confirmed?
         group.add(user)
         GroupActionLogger.new(Discourse.system_user, group).log_add_user_to_group(user)
diff --git a/app/jobs/regular/crawl_topic_link.rb b/app/jobs/regular/crawl_topic_link.rb
index c13a6e7b03..b5077aff85 100644
--- a/app/jobs/regular/crawl_topic_link.rb
+++ b/app/jobs/regular/crawl_topic_link.rb
@@ -1,50 +1,11 @@
 require 'open-uri'
 require 'nokogiri'
 require 'excon'
-require 'final_destination'
+require_dependency 'retrieve_title'
 
 module Jobs
   class CrawlTopicLink < Jobs::Base
 
-    class ReadEnough < StandardError; end
-
-    def self.max_chunk_size(uri)
-      # Amazon leaves the title until very late. Normally it's a bad idea to make an exception for
-      # one host but amazon is a big one.
-      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
-
-      # Default is 10k
-      10
-    end
-
-    # Fetch the beginning of a HTML document at a url
-    def self.fetch_beginning(url)
-      # Never crawl in test mode
-      return if Rails.env.test?
-
-      fd = FinalDestination.new(url)
-      uri = fd.resolve
-      return "" unless uri
-
-      result = ""
-      streamer = lambda do |chunk, _, _|
-        result << chunk
-
-        # Using exceptions for flow control is really bad, but there really seems to
-        # be no sane way to get a stream to stop reading in Excon (or Net::HTTP for
-        # that matter!)
-        raise ReadEnough.new if result.size > (CrawlTopicLink.max_chunk_size(uri) * 1024)
-      end
-      Excon.get(uri.to_s, response_block: streamer, read_timeout: 20, headers: fd.request_headers)
-      result
-
-    rescue Excon::Errors::SocketError => ex
-      return result if ex.socket_error.is_a?(ReadEnough)
-      raise
-    rescue ReadEnough
-      result
-    end
-
     def execute(args)
       raise Discourse::InvalidParameters.new(:topic_link_id) unless args[:topic_link_id].present?
 
@@ -72,18 +33,9 @@ module Jobs
 
         unless crawled
           # Fetch the beginning of the document to find the title
-          result = CrawlTopicLink.fetch_beginning(topic_link.url)
-          doc = Nokogiri::HTML(result)
-          if doc
-            title = doc.at('title').try(:inner_text)
-            if title.present?
-              title.gsub!(/\n/, ' ')
-              title.gsub!(/ +/, ' ')
-              title.strip!
-              if title.present?
-                crawled = (TopicLink.where(id: topic_link.id).update_all(['title = ?, crawled_at = CURRENT_TIMESTAMP', title[0..254]]) == 1)
-              end
-            end
+          title = RetrieveTitle.crawl(topic_link.url)
+          if title.present?
+            crawled = (TopicLink.where(id: topic_link.id).update_all(['title = ?, crawled_at = CURRENT_TIMESTAMP', title[0..254]]) == 1)
           end
         end
       rescue Exception
diff --git a/app/jobs/regular/delete_topic.rb b/app/jobs/regular/delete_topic.rb
index e50cd9c2da..bfb23f568c 100644
--- a/app/jobs/regular/delete_topic.rb
+++ b/app/jobs/regular/delete_topic.rb
@@ -12,7 +12,7 @@ module Jobs
 
       if Guardian.new(topic_timer.user).can_delete?(topic)
         first_post = topic.ordered_posts.first
-        PostDestroyer.new(topic_timer.user, first_post, { context: I18n.t("topic_statuses.auto_deleted_by_timer") }).destroy
+        PostDestroyer.new(topic_timer.user, first_post, context: I18n.t("topic_statuses.auto_deleted_by_timer")).destroy
         topic_timer.trash!(Discourse.system_user)
       end
     end
diff --git a/app/jobs/regular/emit_web_hook_event.rb b/app/jobs/regular/emit_web_hook_event.rb
index 46ce3f43bd..341702904a 100644
--- a/app/jobs/regular/emit_web_hook_event.rb
+++ b/app/jobs/regular/emit_web_hook_event.rb
@@ -83,12 +83,13 @@ module Jobs
       web_hook_event = WebHookEvent.create!(web_hook_id: web_hook.id)
 
       begin
-        content_type = case web_hook.content_type
-                       when WebHook.content_types['application/x-www-form-urlencoded']
-                         'application/x-www-form-urlencoded'
-                       else
-                         'application/json'
-                       end
+        content_type =
+          case web_hook.content_type
+          when WebHook.content_types['application/x-www-form-urlencoded']
+            'application/x-www-form-urlencoded'
+          else
+            'application/json'
+          end
 
         headers = {
           'Accept' => '*/*',
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 336c0bfdcc..69eeec72d4 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -8,18 +8,18 @@ module Jobs
 
     sidekiq_options retry: false
 
-    HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new({
-      user_archive:   ['topic_title','category','sub_category','is_pm','post','like_count','reply_count','url','created_at'],
-      user_list:      ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address'],
-      user_stats:     ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received'],
-      user_profile:   ['location','website','views'],
-      user_sso:       ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url'],
-      staff_action:   ['staff_user','action','subject','created_at','details', 'context'],
-      screened_email: ['email','action','match_count','last_match_at','created_at','ip_address'],
-      screened_ip:    ['ip_address','action','match_count','last_match_at','created_at'],
-      screened_url:   ['domain','action','match_count','last_match_at','created_at'],
-      report:         ['date', 'value'],
-    })
+    HEADER_ATTRS_FOR ||= HashWithIndifferentAccess.new(
+      user_archive:   ['topic_title', 'category', 'sub_category', 'is_pm', 'post', 'like_count', 'reply_count', 'url', 'created_at'],
+      user_list:      ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'blocked', 'active', 'admin', 'moderator', 'ip_address'],
+      user_stats:     ['topics_entered', 'posts_read_count', 'time_read', 'topic_count', 'post_count', 'likes_given', 'likes_received'],
+      user_profile:   ['location', 'website', 'views'],
+      user_sso:       ['external_id', 'external_email', 'external_username', 'external_name', 'external_avatar_url'],
+      staff_action:   ['staff_user', 'action', 'subject', 'created_at', 'details', 'context'],
+      screened_email: ['email', 'action', 'match_count', 'last_match_at', 'created_at', 'ip_address'],
+      screened_ip:    ['ip_address', 'action', 'match_count', 'last_match_at', 'created_at'],
+      screened_url:   ['domain', 'action', 'match_count', 'last_match_at', 'created_at'],
+      report:         ['date', 'value']
+    )
 
     def execute(args)
       @entity = args[:entity]
@@ -58,11 +58,11 @@ module Jobs
       return enum_for(:user_archive_export) unless block_given?
 
       Post.includes(topic: :category)
-          .where(user_id: @current_user.id)
-          .select(:topic_id, :post_number, :raw, :like_count, :reply_count, :created_at)
-          .order(:created_at)
-          .with_deleted
-          .each do |user_archive|
+        .where(user_id: @current_user.id)
+        .select(:topic_id, :post_number, :raw, :like_count, :reply_count, :created_at)
+        .order(:created_at)
+        .with_deleted
+        .each do |user_archive|
         yield get_user_archive_fields(user_archive)
       end
     end
@@ -132,9 +132,9 @@ module Jobs
       return enum_for(:screened_url_export) unless block_given?
 
       ScreenedUrl.select("domain, sum(match_count) as match_count, max(last_match_at) as last_match_at, min(created_at) as created_at")
-                 .group(:domain)
-                 .order('last_match_at DESC')
-                 .each do |screened_url|
+        .group(:domain)
+        .order('last_match_at DESC')
+        .each do |screened_url|
         yield get_screened_url_fields(screened_url)
       end
     end
@@ -181,14 +181,14 @@ module Jobs
 
       def get_base_user_array(user)
         user_array = []
-        user_array.push(user.id,escape_comma(user.name),user.username,user.email,escape_comma(user.title),user.created_at,user.last_seen_at,user.last_posted_at,user.last_emailed_at,user.trust_level,user.approved,user.suspended_at,user.suspended_till,user.blocked,user.active,user.admin,user.moderator,user.ip_address,user.user_stat.topics_entered,user.user_stat.posts_read_count,user.user_stat.time_read,user.user_stat.topic_count,user.user_stat.post_count,user.user_stat.likes_given,user.user_stat.likes_received,escape_comma(user.user_profile.location),user.user_profile.website,user.user_profile.views)
+        user_array.push(user.id, escape_comma(user.name), user.username, user.email, escape_comma(user.title), user.created_at, user.last_seen_at, user.last_posted_at, user.last_emailed_at, user.trust_level, user.approved, user.suspended_at, user.suspended_till, user.blocked, user.active, user.admin, user.moderator, user.ip_address, user.user_stat.topics_entered, user.user_stat.posts_read_count, user.user_stat.time_read, user.user_stat.topic_count, user.user_stat.post_count, user.user_stat.likes_given, user.user_stat.likes_received, escape_comma(user.user_profile.location), user.user_profile.website, user.user_profile.views)
       end
 
       def add_single_sign_on(user, user_info_array)
         if user.single_sign_on_record
-          user_info_array.push(user.single_sign_on_record.external_id,user.single_sign_on_record.external_email,user.single_sign_on_record.external_username,escape_comma(user.single_sign_on_record.external_name),user.single_sign_on_record.external_avatar_url)
+          user_info_array.push(user.single_sign_on_record.external_id, user.single_sign_on_record.external_email, user.single_sign_on_record.external_username, escape_comma(user.single_sign_on_record.external_name), user.single_sign_on_record.external_avatar_url)
         else
-          user_info_array.push(nil,nil,nil,nil,nil)
+          user_info_array.push(nil, nil, nil, nil, nil)
         end
         user_info_array
       end
@@ -233,7 +233,7 @@ module Jobs
         is_pm = topic_data.archetype == "private_message" ? I18n.t("csv_export.boolean_yes") : I18n.t("csv_export.boolean_no")
         url = "#{Discourse.base_url}/t/#{topic_data.slug}/#{topic_data.id}/#{user_archive['post_number']}"
 
-        topic_hash = {"post" => user_archive['raw'], "topic_title" => topic_data.title, "category" => category_name, "sub_category" => sub_category, "is_pm" => is_pm, "url" => url}
+        topic_hash = { "post" => user_archive['raw'], "topic_title" => topic_data.title, "category" => category_name, "sub_category" => sub_category, "is_pm" => is_pm, "url" => url }
         user_archive.merge!(topic_hash)
 
         HEADER_ATTRS_FOR['user_archive'].each do |attr|
diff --git a/app/jobs/regular/notify_mailing_list_subscribers.rb b/app/jobs/regular/notify_mailing_list_subscribers.rb
index 393b324dc1..6b8647a36b 100644
--- a/app/jobs/regular/notify_mailing_list_subscribers.rb
+++ b/app/jobs/regular/notify_mailing_list_subscribers.rb
@@ -14,24 +14,25 @@ module Jobs
 
       users =
           User.activated.not_blocked.not_suspended.real
-          .joins(:user_option)
-          .where('user_options.mailing_list_mode AND user_options.mailing_list_mode_frequency > 0')
-          .where('NOT EXISTS (
+            .joins(:user_option)
+            .where('user_options.mailing_list_mode AND user_options.mailing_list_mode_frequency > 0')
+            .where('NOT EXISTS (
                       SELECT 1
                       FROM muted_users mu
                       WHERE mu.muted_user_id = ? AND mu.user_id = users.id
                   )', post.user_id)
-          .where('NOT EXISTS (
+            .where('NOT EXISTS (
                       SELECT 1
                       FROM topic_users tu
                       WHERE tu.topic_id = ? AND tu.user_id = users.id AND tu.notification_level = ?
                   )', post.topic_id, TopicUser.notification_levels[:muted])
-          .where('NOT EXISTS (
+            .where('NOT EXISTS (
                      SELECT 1
                      FROM category_users cu
                      WHERE cu.category_id = ? AND cu.user_id = users.id AND cu.notification_level = ?
                   )', post.topic.category_id, CategoryUser.notification_levels[:muted])
 
+      DiscourseEvent.trigger(:notify_mailing_list_subscribers, users, post)
       users.find_each do |user|
         if Guardian.new(user).can_see?(post)
           if EmailLog.reached_max_emails?(user)
@@ -56,7 +57,7 @@ module Jobs
               end
             end
           rescue => e
-            Discourse.handle_job_exception(e, error_context(args, "Sending post to mailing list subscribers", { user_id: user.id, user_email: user.email }))
+            Discourse.handle_job_exception(e, error_context(args, "Sending post to mailing list subscribers", user_id: user.id, user_email: user.email))
           end
         end
       end
diff --git a/app/jobs/regular/notify_moved_posts.rb b/app/jobs/regular/notify_moved_posts.rb
index da1300e86c..9916bab8e7 100644
--- a/app/jobs/regular/notify_moved_posts.rb
+++ b/app/jobs/regular/notify_moved_posts.rb
@@ -17,8 +17,8 @@ module Jobs
             p.user.notifications.create(notification_type: Notification.types[:moved_post],
                                         topic_id: p.topic_id,
                                         post_number: p.post_number,
-                                        data: {topic_title: p.topic.title,
-                                               display_username: moved_by.username}.to_json)
+                                        data: { topic_title: p.topic.title,
+                                                display_username: moved_by.username }.to_json)
             users_notified << p.user_id
           end
         end
diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index ddfb0ff3d5..1230dbc752 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -37,6 +37,14 @@ module Jobs
           post.publish_change_to_clients! :revised
         end
       end
+
+      if !post.user.staff? && !post.user.staged
+        s = post.cooked
+        s << " #{post.topic.title}" if post.post_number == 1
+        if WordWatcher.new(s).should_flag?
+          PostAction.act(Discourse.system_user, post, PostActionType.types[:inappropriate]) rescue PostAction::AlreadyActed
+        end
+      end
     end
 
     # onebox may have added some links, so extract them now
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index ed158bef13..c38d9a55e2 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -58,7 +58,7 @@ module Jobs
                   log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - Image is bigger than #{@max_size}")
                 end
               else
-                log(:error, "There was an error while downloading '#{src}' locally for post: #{post_id}")
+                log(:info, "There was an error while downloading '#{src}' locally for post: #{post_id}")
               end
             end
             # have we successfully downloaded that file?
diff --git a/app/jobs/regular/push_notification.rb b/app/jobs/regular/push_notification.rb
index e07e5d5920..965acb963b 100644
--- a/app/jobs/regular/push_notification.rb
+++ b/app/jobs/regular/push_notification.rb
@@ -13,11 +13,9 @@ module Jobs
       }
 
       clients = args["clients"]
-      clients.group_by{|r| r[1]}.each do |push_url, group|
+      clients.group_by { |r| r[1] }.each do |push_url, group|
         notifications = group.map do |client_id, _|
-          notification.merge({
-            client_id: client_id
-          })
+          notification.merge(client_id: client_id)
         end
 
         result = Excon.post(push_url,
diff --git a/app/jobs/regular/retrieve_topic.rb b/app/jobs/regular/retrieve_topic.rb
index 2820f05e31..9d5d4e248c 100644
--- a/app/jobs/regular/retrieve_topic.rb
+++ b/app/jobs/regular/retrieve_topic.rb
@@ -19,5 +19,3 @@ module Jobs
   end
 
 end
-
-
diff --git a/app/jobs/regular/user_email.rb b/app/jobs/regular/user_email.rb
index f9def1f451..f28019b74c 100644
--- a/app/jobs/regular/user_email.rb
+++ b/app/jobs/regular/user_email.rb
@@ -56,7 +56,7 @@ module Jobs
       quoted
     }
 
-    def message_for_email(user, post, type, notification, notification_type=nil, notification_data_hash=nil, email_token=nil, to_address=nil)
+    def message_for_email(user, post, type, notification, notification_type = nil, notification_data_hash = nil, email_token = nil, to_address = nil)
       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?
@@ -90,8 +90,8 @@ module Jobs
            user.user_option.mailing_list_mode_frequency > 0 && # don't catch notifications for users on daily mailing list mode
            (!post.try(:topic).try(:private_message?)) &&
            NOTIFICATIONS_SENT_BY_MAILING_LIST.include?(email_args[:notification_type])
-           # no need to log a reason when the mail was already sent via the mailing list job
-           return [nil, nil]
+          # no need to log a reason when the mail was already sent via the mailing list job
+          return [nil, nil]
         end
 
         unless user.user_option.email_always?
@@ -141,7 +141,7 @@ module Jobs
 
     # extracted from sidekiq
     def self.seconds_to_delay(count)
-      (count ** 4) + 15 + (rand(30) * (count + 1))
+      (count**4) + 15 + (rand(30) * (count + 1))
     end
 
     private
diff --git a/app/jobs/scheduled/badge_grant.rb b/app/jobs/scheduled/badge_grant.rb
index dc5def0684..a9d9b915a7 100644
--- a/app/jobs/scheduled/badge_grant.rb
+++ b/app/jobs/scheduled/badge_grant.rb
@@ -15,7 +15,7 @@ module Jobs
           BadgeGranter.backfill(b)
         rescue => ex
           # TODO - expose errors in UI
-          Discourse.handle_job_exception(ex, error_context({}, code_desc: 'Exception granting badges', extra: {badge_id: b.id}))
+          Discourse.handle_job_exception(ex, error_context({}, code_desc: 'Exception granting badges', extra: { badge_id: b.id }))
         end
       end
 
diff --git a/app/jobs/scheduled/clean_up_email_logs.rb b/app/jobs/scheduled/clean_up_email_logs.rb
index 30305c4d9a..48421c1cfa 100644
--- a/app/jobs/scheduled/clean_up_email_logs.rb
+++ b/app/jobs/scheduled/clean_up_email_logs.rb
@@ -9,8 +9,8 @@ module Jobs
       threshold = SiteSetting.delete_email_logs_after_days.days.ago
 
       EmailLog.where(reply_key: nil)
-              .where("created_at < ?", threshold)
-              .delete_all
+        .where("created_at < ?", threshold)
+        .delete_all
     end
 
   end
diff --git a/app/jobs/scheduled/clean_up_search_logs.rb b/app/jobs/scheduled/clean_up_search_logs.rb
new file mode 100644
index 0000000000..bd3bc2e04a
--- /dev/null
+++ b/app/jobs/scheduled/clean_up_search_logs.rb
@@ -0,0 +1,9 @@
+module Jobs
+  class CleanUpSearchLogs < Jobs::Scheduled
+    every 1.week
+
+    def execute(args)
+      SearchLog.clean_up
+    end
+  end
+end
diff --git a/app/jobs/scheduled/clean_up_unmatched_emails.rb b/app/jobs/scheduled/clean_up_unmatched_emails.rb
index 6ce62f3f23..4fff997ef8 100644
--- a/app/jobs/scheduled/clean_up_unmatched_emails.rb
+++ b/app/jobs/scheduled/clean_up_unmatched_emails.rb
@@ -7,8 +7,8 @@ module Jobs
       last_match_threshold = SiteSetting.max_age_unmatched_emails.days.ago
 
       ScreenedEmail.where(action_type: ScreenedEmail.actions[:block])
-                   .where("last_match_at < ?", last_match_threshold)
-                   .destroy_all
+        .where("last_match_at < ?", last_match_threshold)
+        .destroy_all
     end
 
   end
diff --git a/app/jobs/scheduled/clean_up_unmatched_ips.rb b/app/jobs/scheduled/clean_up_unmatched_ips.rb
index abd3cdc442..a9b4e4d5d3 100644
--- a/app/jobs/scheduled/clean_up_unmatched_ips.rb
+++ b/app/jobs/scheduled/clean_up_unmatched_ips.rb
@@ -11,8 +11,8 @@ module Jobs
 
       # remove old unmatched IP addresses
       ScreenedIpAddress.where(action_type: ScreenedIpAddress.actions[:block])
-                       .where("last_match_at < ? OR (last_match_at IS NULL AND created_at < ?)", last_match_threshold, last_match_threshold)
-                       .destroy_all
+        .where("last_match_at < ? OR (last_match_at IS NULL AND created_at < ?)", last_match_threshold, last_match_threshold)
+        .destroy_all
     end
 
   end
diff --git a/app/jobs/scheduled/clean_up_unsubscribe_keys.rb b/app/jobs/scheduled/clean_up_unsubscribe_keys.rb
index 0535866671..606a13390b 100644
--- a/app/jobs/scheduled/clean_up_unsubscribe_keys.rb
+++ b/app/jobs/scheduled/clean_up_unsubscribe_keys.rb
@@ -10,4 +10,3 @@ module Jobs
   end
 
 end
-
diff --git a/app/jobs/scheduled/create_missing_avatars.rb b/app/jobs/scheduled/create_missing_avatars.rb
index 2d4befe245..d973e9a0be 100644
--- a/app/jobs/scheduled/create_missing_avatars.rb
+++ b/app/jobs/scheduled/create_missing_avatars.rb
@@ -5,11 +5,11 @@ module Jobs
     def execute(args)
       # backfill in batches of 5000 an hour
       UserAvatar.includes(:user)
-                .joins(:user)
-                .where(last_gravatar_download_attempt: nil)
-                .order("users.last_posted_at DESC")
-                .limit(5000)
-                .each do |u|
+        .joins(:user)
+        .where(last_gravatar_download_attempt: nil)
+        .order("users.last_posted_at DESC")
+        .limit(5000)
+        .each do |u|
         u.user.refresh_avatar
       end
     end
diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb
index 2b35fc4380..75977e7acb 100644
--- a/app/jobs/scheduled/dashboard_stats.rb
+++ b/app/jobs/scheduled/dashboard_stats.rb
@@ -7,7 +7,7 @@ module Jobs
       if problems_started_at && problems_started_at < 2.days.ago
         # If there have been problems reported on the dashboard for a while,
         # send a message to admins no more often than once per week.
-        GroupMessage.create(Group[:admins].name, :dashboard_problems, {limit_once_per: 7.days.to_i})
+        GroupMessage.create(Group[:admins].name, :dashboard_problems, limit_once_per: 7.days.to_i)
       end
 
       AdminDashboardData.refresh_stats
diff --git a/app/jobs/scheduled/directory_refresh_older.rb b/app/jobs/scheduled/directory_refresh_older.rb
index 3c25c8151f..93147d6c88 100644
--- a/app/jobs/scheduled/directory_refresh_older.rb
+++ b/app/jobs/scheduled/directory_refresh_older.rb
@@ -4,7 +4,7 @@ module Jobs
 
     def execute(args)
       periods = DirectoryItem.period_types.keys - [:daily]
-      periods.each {|p| DirectoryItem.refresh_period!(p)}
+      periods.each { |p| DirectoryItem.refresh_period!(p) }
     end
   end
 end
diff --git a/app/jobs/scheduled/enqueue_digest_emails.rb b/app/jobs/scheduled/enqueue_digest_emails.rb
index 1bd4ed4fdf..23db70d4e5 100644
--- a/app/jobs/scheduled/enqueue_digest_emails.rb
+++ b/app/jobs/scheduled/enqueue_digest_emails.rb
@@ -14,15 +14,15 @@ module Jobs
     def target_user_ids
       # Users who want to receive digest email within their chosen digest email frequency
       query = User.real
-                  .not_suspended
-                  .activated
-                  .where(staged: false)
-                  .joins(:user_option, :user_stat)
-                  .where("user_options.email_digests")
-                  .where("user_stats.bounce_score < #{SiteSetting.bounce_score_threshold}")
-                  .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
-                  .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
-                  .where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
+        .not_suspended
+        .activated
+        .where(staged: false)
+        .joins(:user_option, :user_stat)
+        .where("user_options.email_digests")
+        .where("user_stats.bounce_score < #{SiteSetting.bounce_score_threshold}")
+        .where("COALESCE(last_emailed_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
+        .where("COALESCE(last_seen_at, '2010-01-01') <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * user_options.digest_after_minutes)")
+        .where("COALESCE(last_seen_at, '2010-01-01') >= CURRENT_TIMESTAMP - ('1 DAY'::INTERVAL * #{SiteSetting.suppress_digest_email_after_days})")
 
       # If the site requires approval, make sure the user is approved
       query = query.where("approved OR moderator OR admin") if SiteSetting.must_approve_users?
diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
index c2190d1605..83e5b5cc72 100644
--- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -8,7 +8,7 @@ module Jobs
 
     def execute(args)
       badge = Badge.find(Badge::NewUserOfTheMonth)
-      return unless SiteSetting.enable_badges? and badge.enabled?
+      return unless SiteSetting.enable_badges? && badge.enabled?
 
       # Don't award it if a month hasn't gone by
       return if UserBadge.where("badge_id = ? AND granted_at >= ?",
@@ -22,9 +22,7 @@ module Jobs
           user = User.find(user_id)
           if user.badges.where(id: Badge::NewUserOfTheMonth).blank?
             BadgeGranter.grant(badge, user)
-            SystemMessage.new(user).create('new_user_of_the_month', {
-              month_year: Time.now.strftime("%B %Y")
-            })
+            SystemMessage.new(user).create('new_user_of_the_month',               month_year: Time.now.strftime("%B %Y"))
           end
         end
       end
@@ -75,10 +73,8 @@ module Jobs
         LIMIT :max_awarded
       SQL
 
-      User.exec_sql(sql, {
-        like: PostActionType.types[:like],
-        max_awarded: MAX_AWARDED
-      }).each do |row|
+      User.exec_sql(sql,         like: PostActionType.types[:like],
+                                 max_awarded: MAX_AWARDED).each do |row|
         scores[row['id'].to_i] = row['score'].to_f
       end
       scores
diff --git a/app/jobs/scheduled/migrate_upload_scheme.rb b/app/jobs/scheduled/migrate_upload_scheme.rb
index a5e21f3e0d..6be51da699 100644
--- a/app/jobs/scheduled/migrate_upload_scheme.rb
+++ b/app/jobs/scheduled/migrate_upload_scheme.rb
@@ -9,8 +9,8 @@ module Jobs
 
       # clean up failed uploads
       Upload.where("created_at < ?", 1.hour.ago)
-            .where("LENGTH(COALESCE(url, '')) = 0")
-            .destroy_all
+        .where("LENGTH(COALESCE(url, '')) = 0")
+        .destroy_all
 
       # migrate uploads to new scheme
       problems = Upload.migrate_to_new_scheme(50)
diff --git a/app/jobs/scheduled/pending_flags_reminder.rb b/app/jobs/scheduled/pending_flags_reminder.rb
index 2a33c51785..128a52187c 100644
--- a/app/jobs/scheduled/pending_flags_reminder.rb
+++ b/app/jobs/scheduled/pending_flags_reminder.rb
@@ -25,8 +25,8 @@ module Jobs
             target_group_names: Group[:moderators].name,
             archetype: Archetype.private_message,
             subtype: TopicSubtype.system_message,
-            title: I18n.t('flags_reminder.subject_template', { count: flagged_posts_count }),
-            raw: mentions + I18n.t('flags_reminder.flags_were_submitted', { count: SiteSetting.notify_about_flags_after })
+            title: I18n.t('flags_reminder.subject_template', count: flagged_posts_count),
+            raw: mentions + I18n.t('flags_reminder.flags_were_submitted', count: SiteSetting.notify_about_flags_after)
           )
 
           self.last_notified_id = flag_ids.max
@@ -54,10 +54,10 @@ module Jobs
 
     def active_moderator_usernames
       User.where(moderator: true)
-          .human_users
-          .order('last_seen_at DESC')
-          .limit(3)
-          .pluck(:username)
+        .human_users
+        .order('last_seen_at DESC')
+        .limit(3)
+        .pluck(:username)
     end
 
   end
diff --git a/app/jobs/scheduled/pending_users_reminder.rb b/app/jobs/scheduled/pending_users_reminder.rb
index c2e392d65a..5c682bb4e3 100644
--- a/app/jobs/scheduled/pending_users_reminder.rb
+++ b/app/jobs/scheduled/pending_users_reminder.rb
@@ -7,7 +7,7 @@ module Jobs
 
     def execute(args)
       if SiteSetting.must_approve_users && SiteSetting.pending_users_reminder_delay >= 0
-        query = AdminUserIndexQuery.new({query: 'pending', stats: false}).find_users_query # default order is: users.created_at DESC
+        query = AdminUserIndexQuery.new(query: 'pending', stats: false).find_users_query # default order is: users.created_at DESC
         if SiteSetting.pending_users_reminder_delay > 0
           query = query.where('users.created_at < ?', SiteSetting.pending_users_reminder_delay.hours.ago)
         end
@@ -21,10 +21,10 @@ module Jobs
         if count > 0
           target_usernames = Group[:moderators].users.map do |u|
             u.id > 0 && u.notifications.joins(:topic)
-                                       .where("notifications.id > ?", u.seen_notification_id)
-                                       .where("notifications.read = false")
-                                       .where("topics.subtype = '#{TopicSubtype.pending_users_reminder}'")
-                                       .count == 0 ? u.username : nil
+              .where("notifications.id > ?", u.seen_notification_id)
+              .where("notifications.read = false")
+              .where("topics.subtype = '#{TopicSubtype.pending_users_reminder}'")
+              .count == 0 ? u.username : nil
           end.compact
 
           unless target_usernames.empty?
@@ -33,8 +33,8 @@ module Jobs
               target_usernames: target_usernames,
               archetype: Archetype.private_message,
               subtype: TopicSubtype.pending_users_reminder,
-              title: I18n.t("system_messages.pending_users_reminder.subject_template", {count: count}),
-              raw: I18n.t("system_messages.pending_users_reminder.text_body_template", {count: count, base_url: Discourse.base_url})
+              title: I18n.t("system_messages.pending_users_reminder.subject_template", count: count),
+              raw: I18n.t("system_messages.pending_users_reminder.text_body_template", count: count, base_url: Discourse.base_url)
             )
 
             self.previous_newest_username = newest_username
diff --git a/app/jobs/scheduled/periodical_updates.rb b/app/jobs/scheduled/periodical_updates.rb
index 98751dffc3..a122343482 100644
--- a/app/jobs/scheduled/periodical_updates.rb
+++ b/app/jobs/scheduled/periodical_updates.rb
@@ -20,7 +20,7 @@ module Jobs
       CategoryFeaturedTopic.feature_topics
 
       # Update the scores of posts
-      args = {min_topic_age: 1.day.ago}
+      args = { min_topic_age: 1.day.ago }
       args[:max_topic_length] = 500 unless self.class.should_update_long_topics?
       ScoreCalculator.new.calculate(args)
 
diff --git a/app/jobs/scheduled/purge_inactive.rb b/app/jobs/scheduled/purge_inactive.rb
index a6615f5fe2..21417bef21 100644
--- a/app/jobs/scheduled/purge_inactive.rb
+++ b/app/jobs/scheduled/purge_inactive.rb
@@ -7,4 +7,3 @@ module Jobs
     end
   end
 end
-
diff --git a/app/jobs/scheduled/tl3_promotions.rb b/app/jobs/scheduled/tl3_promotions.rb
index 37acfcec15..a816d471c5 100644
--- a/app/jobs/scheduled/tl3_promotions.rb
+++ b/app/jobs/scheduled/tl3_promotions.rb
@@ -19,7 +19,7 @@ module Jobs
       # Promotions
       User.real.where(trust_level: TrustLevel[2],
                       trust_level_locked: false)
-               .where.not(id: demoted_user_ids).find_each do |u|
+        .where.not(id: demoted_user_ids).find_each do |u|
         Promotion.new(u).review_tl2
       end
     end
diff --git a/app/jobs/scheduled/version_check.rb b/app/jobs/scheduled/version_check.rb
index 9fb39252ee..51b08d379d 100644
--- a/app/jobs/scheduled/version_check.rb
+++ b/app/jobs/scheduled/version_check.rb
@@ -6,7 +6,7 @@ module Jobs
     every 1.day
 
     def execute(args)
-      if SiteSetting.version_checks? and (DiscourseUpdates.updated_at.nil? or DiscourseUpdates.updated_at < 1.minute.ago)
+      if SiteSetting.version_checks? && (DiscourseUpdates.updated_at.nil? || DiscourseUpdates.updated_at < (1.minute.ago))
         begin
           prev_missing_versions_count = DiscourseUpdates.missing_versions_count || 0
 
@@ -18,10 +18,10 @@ module Jobs
           DiscourseUpdates.updated_at = Time.zone.now
           DiscourseUpdates.missing_versions = json['versions']
 
-          if  GlobalSetting.new_version_emails and
-              SiteSetting.new_version_emails and
-              json['missingVersionsCount'] > 0 and
-              prev_missing_versions_count < json['missingVersionsCount'].to_i
+          if  GlobalSetting.new_version_emails &&
+              SiteSetting.new_version_emails &&
+              json['missingVersionsCount'] > (0) &&
+              prev_missing_versions_count < (json['missingVersionsCount'].to_i)
 
             message = VersionMailer.send_notice
             Email::Sender.new(message, :new_version).send
diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb
index ea4d444ad8..dc2d7df41d 100644
--- a/app/mailers/admin_confirmation_mailer.rb
+++ b/app/mailers/admin_confirmation_mailer.rb
@@ -12,4 +12,3 @@ class AdminConfirmationMailer < ActionMailer::Base
     )
   end
 end
-
diff --git a/app/mailers/pending_flags_mailer.rb b/app/mailers/pending_flags_mailer.rb
index c0f67d2bf2..39fbbb0fd1 100644
--- a/app/mailers/pending_flags_mailer.rb
+++ b/app/mailers/pending_flags_mailer.rb
@@ -23,14 +23,14 @@ class PendingFlagsMailer < ActionMailer::Base
 
     @hours = SiteSetting.notify_about_flags_after
 
-    subject = "[#{SiteSetting.title}] " + I18n.t('flags_reminder.subject_template', { count: PostAction.flagged_posts_count })
+    subject = "[#{SiteSetting.title}] " + I18n.t('flags_reminder.subject_template', count: PostAction.flagged_posts_count)
     build_email(SiteSetting.contact_email, subject: subject)
   end
 
   private
 
   def flag_reason_counts(post)
-    post[:post_actions].inject({}) do |h,v|
+    post[:post_actions].inject({}) do |h, v|
       h[v[:name_key]] ||= 0
       h[v[:name_key]] += 1
       h
diff --git a/app/mailers/pending_queued_posts_mailer.rb b/app/mailers/pending_queued_posts_mailer.rb
index fec7c3ba72..525454b7d2 100644
--- a/app/mailers/pending_queued_posts_mailer.rb
+++ b/app/mailers/pending_queued_posts_mailer.rb
@@ -3,7 +3,7 @@ require_dependency 'email/message_builder'
 class PendingQueuedPostsMailer < ActionMailer::Base
   include Email::BuildEmailHelper
 
-  def notify(opts={})
+  def notify(opts = {})
     return unless SiteSetting.contact_email
     build_email(SiteSetting.contact_email, template: 'queued_posts_reminder', count: opts[:count])
   end
diff --git a/app/mailers/subscription_mailer.rb b/app/mailers/subscription_mailer.rb
index 51a66797a6..d8ea40d2fb 100644
--- a/app/mailers/subscription_mailer.rb
+++ b/app/mailers/subscription_mailer.rb
@@ -3,7 +3,7 @@ require_dependency 'email/message_builder'
 class SubscriptionMailer < ActionMailer::Base
   include Email::BuildEmailHelper
 
-  def confirm_unsubscribe(user, opts={})
+  def confirm_unsubscribe(user, opts = {})
     unsubscribe_key = UnsubscribeKey.create_key_for(user, "all")
     build_email user.email,
                 template: "unsubscribe_mailer",
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 3fa3f96a70..049e665827 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -11,14 +11,14 @@ class UserNotifications < ActionMailer::Base
 
   include Email::BuildEmailHelper
 
-  def signup(user, opts={})
+  def signup(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.signup",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def signup_after_approval(user, opts={})
+  def signup_after_approval(user, opts = {})
     build_email(user.email,
                 template: 'user_notifications.signup_after_approval',
                 locale: user_locale(user),
@@ -26,42 +26,42 @@ class UserNotifications < ActionMailer::Base
                 new_user_tips: I18n.t('system_messages.usage_tips.text_body_template', base_url: Discourse.base_url, locale: locale))
   end
 
-  def notify_old_email(user, opts={})
+  def notify_old_email(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.notify_old_email",
                 locale: user_locale(user),
                 new_email: opts[:new_email])
   end
 
-  def confirm_old_email(user, opts={})
+  def confirm_old_email(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.confirm_old_email",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def confirm_new_email(user, opts={})
+  def confirm_new_email(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.confirm_new_email",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def forgot_password(user, opts={})
+  def forgot_password(user, opts = {})
     build_email(user.email,
                 template: user.has_password? ? "user_notifications.forgot_password" : "user_notifications.set_password",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def admin_login(user, opts={})
+  def admin_login(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.admin_login",
                 locale: user_locale(user),
                 email_token: opts[:email_token])
   end
 
-  def account_created(user, opts={})
+  def account_created(user, opts = {})
     build_email(user.email,
                 template: "user_notifications.account_created",
                 locale: user_locale(user),
@@ -76,30 +76,30 @@ class UserNotifications < ActionMailer::Base
     end
   end
 
-  def digest(user, opts={})
+  def digest(user, opts = {})
     build_summary_for(user)
     min_date = opts[:since] || user.last_emailed_at || user.last_seen_at || 1.month.ago
 
     # Fetch some topics and posts to show
-    digest_opts = {limit: SiteSetting.digest_topics + SiteSetting.digest_other_topics, top_order: true}
+    digest_opts = { limit: SiteSetting.digest_topics + SiteSetting.digest_other_topics, top_order: true }
     topics_for_digest = Topic.for_digest(user, min_date, digest_opts).to_a
     if topics_for_digest.empty? && !user.user_option.try(:include_tl0_in_digests)
       # Find some topics from new users that are at least 24 hours old
       topics_for_digest = Topic.for_digest(user, min_date, digest_opts.merge(include_tl0: true)).where('topics.created_at < ?', 24.hours.ago).to_a
     end
 
-    @popular_topics = topics_for_digest[0,SiteSetting.digest_topics]
+    @popular_topics = topics_for_digest[0, SiteSetting.digest_topics]
 
     if @popular_topics.present?
       @other_new_for_you = topics_for_digest.size > SiteSetting.digest_topics ? topics_for_digest[SiteSetting.digest_topics..-1] : []
 
       @popular_posts = if SiteSetting.digest_posts > 0
         Post.order("posts.score DESC")
-            .for_mailing_list(user, min_date)
-            .where('posts.post_type = ?', Post.types[:regular])
-            .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
-            .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
-            .limit(SiteSetting.digest_posts)
+          .for_mailing_list(user, min_date)
+          .where('posts.post_type = ?', Post.types[:regular])
+          .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false')
+          .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0)
+          .limit(SiteSetting.digest_posts)
       else
         []
       end
@@ -117,19 +117,19 @@ class UserNotifications < ActionMailer::Base
         # We used topics from new users instead, so count should match
         new_topics_count = topics_for_digest.size
       end
-      @counts = [{label_key: 'user_notifications.digest.new_topics',
-                  value: new_topics_count,
-                  href: "#{Discourse.base_url}/new"}]
+      @counts = [{ label_key: 'user_notifications.digest.new_topics',
+                   value: new_topics_count,
+                   href: "#{Discourse.base_url}/new" }]
 
       value = user.unread_notifications
-      @counts << {label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications"} if value > 0
+      @counts << { label_key: 'user_notifications.digest.unread_notifications', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
 
       value = user.unread_private_messages
-      @counts << {label_key: 'user_notifications.digest.unread_messages', value: value, href: "#{Discourse.base_url}/my/messages"} if value > 0
+      @counts << { label_key: 'user_notifications.digest.unread_messages', value: value, href: "#{Discourse.base_url}/my/messages" } if value > 0
 
       if @counts.size < 3
         value = user.unread_notifications_of_type(Notification.types[:liked])
-        @counts << {label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications"} if value > 0
+        @counts << { label_key: 'user_notifications.digest.liked_received', value: value, href: "#{Discourse.base_url}/my/notifications" } if value > 0
       end
 
       if @counts.size < 3
@@ -157,7 +157,6 @@ class UserNotifications < ActionMailer::Base
     end
   end
 
-
   def user_replied(user, opts)
     opts[:allow_reply_by_email] = true
     opts[:use_site_subject] = true
@@ -252,7 +251,7 @@ class UserNotifications < ActionMailer::Base
     (user.locale.present? && I18n.available_locales.include?(user.locale.to_sym)) ? user.locale : nil
   end
 
-  def email_post_markdown(post, add_posted_by=false)
+  def email_post_markdown(post, add_posted_by = false)
     result = "#{post.raw}\n\n"
     if add_posted_by
       result << "#{I18n.t('user_notifications.posted_by', username: post.username, post_date: post.created_at.strftime("%m/%d/%Y"))}\n\n"
@@ -275,12 +274,12 @@ class UserNotifications < ActionMailer::Base
     allowed_post_types << Post.types[:whisper] if topic_user.try(:user).try(:staff?)
 
     context_posts = Post.where(topic_id: post.topic_id)
-                        .where("post_number < ?", post.post_number)
-                        .where(user_deleted: false)
-                        .where(hidden: false)
-                        .where(post_type: allowed_post_types)
-                        .order('created_at desc')
-                        .limit(SiteSetting.email_posts_context)
+      .where("post_number < ?", post.post_number)
+      .where(user_deleted: false)
+      .where(hidden: false)
+      .where(post_type: allowed_post_types)
+      .order('created_at desc')
+      .limit(SiteSetting.email_posts_context)
 
     if topic_user && topic_user.last_emailed_post_number && user.user_option.email_previous_replies == UserOption.previous_replies_type[:unless_emailed]
       context_posts = context_posts.where("post_number > ?", topic_user.last_emailed_post_number)
@@ -311,7 +310,7 @@ class UserNotifications < ActionMailer::Base
     allow_reply_by_email = opts[:allow_reply_by_email] unless user.suspended?
     original_username = notification_data[:original_username] || notification_data[:display_username]
 
-    send_notification_email(
+    email_options = {
       title: notification_data[:topic_title],
       post: post,
       username: original_username,
@@ -323,7 +322,13 @@ class UserNotifications < ActionMailer::Base
       notification_type: notification_type,
       use_invite_template: opts[:use_invite_template],
       user: user
-    )
+    }
+
+    if group_id = notification_data[:group_id]
+      email_options[:group_name] = Group.find_by(id: group_id)&.name
+    end
+
+    send_notification_email(email_options)
   end
 
   def send_notification_email(opts)
@@ -337,12 +342,18 @@ class UserNotifications < ActionMailer::Base
     from_alias = opts[:from_alias]
     notification_type = opts[:notification_type]
     user = opts[:user]
+    group_name = opts[:group_name]
     locale = user_locale(user)
 
     template = "user_notifications.user_#{notification_type}"
     if post.topic.private_message?
       template << "_pm"
-      template << "_staged" if user.staged?
+
+      if group_name
+        template << "_group"
+      elsif user.staged
+        template << "_staged"
+      end
     end
 
     # category name
@@ -376,17 +387,33 @@ class UserNotifications < ActionMailer::Base
       end
     end
 
-    translation_override_exists = TranslationOverride.where(locale: SiteSetting.default_locale, translation_key: "#{template}.text_body_template").exists?
+    translation_override_exists = TranslationOverride.where(
+      locale: SiteSetting.default_locale,
+      translation_key: "#{template}.text_body_template"
+    ).exists?
 
     if opts[:use_invite_template]
-      if post.topic.private_message?
-        invite_template = "user_notifications.invited_to_private_message_body"
-      else
-        invite_template = "user_notifications.invited_to_topic_body"
-      end
+      invite_template = "user_notifications.invited"
+      invite_template << "_group" if group_name
+
+      invite_template <<
+        if post.topic.private_message?
+          "_to_private_message_body"
+        else
+          "_to_topic_body"
+        end
+
       topic_excerpt = post.excerpt.tr("\n", " ") if post.is_first_post? && post.excerpt
       topic_excerpt = "" if SiteSetting.private_email?
-      message = I18n.t(invite_template, username: username, topic_title: gsub_emoji_to_unicode(title), topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description)
+
+      message = I18n.t(invite_template,
+        username: username,
+        group_name: group_name,
+        topic_title: gsub_emoji_to_unicode(title),
+        topic_excerpt: topic_excerpt,
+        site_title: SiteSetting.title,
+        site_description: SiteSetting.site_description
+      )
 
       unless translation_override_exists
         html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
@@ -401,7 +428,7 @@ class UserNotifications < ActionMailer::Base
       reached_limit = SiteSetting.max_emails_per_day_per_user > 0
       reached_limit &&= (EmailLog.where(user_id: user.id, skipped: false)
                               .where('created_at > ?', 1.day.ago)
-                              .count) >= (SiteSetting.max_emails_per_day_per_user-1)
+                              .count) >= (SiteSetting.max_emails_per_day_per_user - 1)
 
       in_reply_to_post = post.reply_to_post if user.user_option.email_in_reply_to
       if SiteSetting.private_email?
@@ -410,7 +437,6 @@ class UserNotifications < ActionMailer::Base
         message = email_post_markdown(post) + (reached_limit ? "\n\n#{I18n.t "user_notifications.reached_limit", count: SiteSetting.max_emails_per_day_per_user}" : "");
       end
 
-
       unless translation_override_exists
         html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render(
           template: 'email/notification',
@@ -426,7 +452,7 @@ class UserNotifications < ActionMailer::Base
     end
 
     email_opts = {
-      topic_title: gsub_emoji_to_unicode(title),
+      topic_title: Emoji.gsub_emoji_to_unicode(title),
       topic_title_url_encoded: title ? URI.encode(title) : title,
       message: message,
       url: post.url(without_slug: SiteSetting.private_email?),
@@ -434,6 +460,7 @@ class UserNotifications < ActionMailer::Base
       topic_id: post.topic_id,
       context: context,
       username: username,
+      group_name: group_name,
       add_unsubscribe_link: !user.staged,
       mailing_list_mode: user.user_option.mailing_list_mode,
       unsubscribe_url: post.unsubscribe_url(user),
diff --git a/app/mailers/version_mailer.rb b/app/mailers/version_mailer.rb
index b39136933c..dad4dbd448 100644
--- a/app/mailers/version_mailer.rb
+++ b/app/mailers/version_mailer.rb
@@ -6,17 +6,17 @@ class VersionMailer < ActionMailer::Base
   def send_notice
     if SiteSetting.contact_email.present?
       missing_versions = DiscourseUpdates.missing_versions
-      if missing_versions.present? and missing_versions.first['notes'].present?
-        build_email( SiteSetting.contact_email,
+      if missing_versions.present? && missing_versions.first['notes'].present?
+        build_email(SiteSetting.contact_email,
                      template: 'new_version_mailer_with_notes',
                      notes: missing_versions.first['notes'],
                      new_version: DiscourseUpdates.latest_version,
-                     installed_version: Discourse::VERSION::STRING )
+                     installed_version: Discourse::VERSION::STRING)
       else
-        build_email( SiteSetting.contact_email,
+        build_email(SiteSetting.contact_email,
                      template: 'new_version_mailer',
                      new_version: DiscourseUpdates.latest_version,
-                     installed_version: Discourse::VERSION::STRING )
+                     installed_version: Discourse::VERSION::STRING)
       end
     end
   end
diff --git a/app/models/about.rb b/app/models/about.rb
index 0d670183ba..8392df3c48 100644
--- a/app/models/about.rb
+++ b/app/models/about.rb
@@ -35,8 +35,8 @@ class About
 
   def moderators
     @moderators ||= User.where(moderator: true, admin: false)
-                        .human_users
-                        .order(:username_lower)
+      .human_users
+      .order(:username_lower)
   end
 
   def admins
diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index b4113d609e..20550a9fd0 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -31,7 +31,7 @@ class AdminDashboardData
 
   USER_REPORTS ||= ['users_by_trust_level']
 
-  MOBILE_REPORTS ||= ['mobile_visits'] + ApplicationRequest.req_types.keys.select {|r| r =~ /mobile/}.map { |r| r + "_reqs" }
+  MOBILE_REPORTS ||= ['mobile_visits'] + ApplicationRequest.req_types.keys.select { |r| r =~ /mobile/ }.map { |r| r + "_reqs" }
 
   def self.add_problem_check(*syms, &blk)
     @problem_syms.push(*syms) if syms
@@ -120,7 +120,7 @@ class AdminDashboardData
     $redis.get(problem_message_key(i18n_key)) ? I18n.t(i18n_key) : nil
   end
 
-  def self.add_problem_message(i18n_key, expire_seconds=nil)
+  def self.add_problem_message(i18n_key, expire_seconds = nil)
     if expire_seconds.to_i > 0
       $redis.setex problem_message_key(i18n_key), expire_seconds.to_i, 1
     else
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index 9145ce4372..a617902d41 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -2,6 +2,7 @@ class ApiKey < ActiveRecord::Base
   belongs_to :user
   belongs_to :created_by, class_name: User
 
+  validates :user_id, uniqueness: true
   validates_presence_of :key
 
   def regenerate!(updated_by)
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index 8f146f10fd..1f1f758d95 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -19,7 +19,7 @@ class ApplicationRequest < ActiveRecord::Base
   self.autoflush_seconds = 5.minutes
   self.last_flush = Time.now.utc
 
-  def self.increment!(type, opts=nil)
+  def self.increment!(type, opts = nil)
     key = redis_key(type)
     val = $redis.incr(key).to_i
     # 3.days, see: https://github.com/rails/rails/issues/21296
@@ -36,7 +36,7 @@ class ApplicationRequest < ActiveRecord::Base
     end
   end
 
-  def self.write_cache!(date=nil)
+  def self.write_cache!(date = nil)
     if date.nil?
       write_cache!(Time.now.utc)
       write_cache!(Time.now.utc.yesterday)
@@ -49,8 +49,8 @@ class ApplicationRequest < ActiveRecord::Base
 
     # this may seem a bit fancy but in so it allows
     # for concurrent calls without double counting
-    req_types.each do |req_type,_|
-      key = redis_key(req_type,date)
+    req_types.each do |req_type, _|
+      key = redis_key(req_type, date)
       val = $redis.get(key).to_i
 
       next if val == 0
@@ -63,28 +63,28 @@ class ApplicationRequest < ActiveRecord::Base
         next
       end
 
-      id = req_id(date,req_type)
+      id = req_id(date, req_type)
 
       where(id: id).update_all(["count = count + ?", val])
     end
   end
 
-  def self.clear_cache!(date=nil)
+  def self.clear_cache!(date = nil)
     if date.nil?
       clear_cache!(Time.now.utc)
       clear_cache!(Time.now.utc.yesterday)
       return
     end
 
-    req_types.each do |req_type,_|
-      key = redis_key(req_type,date)
+    req_types.each do |req_type, _|
+      key = redis_key(req_type, date)
       $redis.del key
     end
   end
 
   protected
 
-  def self.req_id(date,req_type,retries=0)
+  def self.req_id(date, req_type, retries = 0)
 
     req_type_id = req_types[req_type]
 
@@ -94,13 +94,13 @@ class ApplicationRequest < ActiveRecord::Base
 
   rescue # primary key violation
     if retries == 0
-      req_id(date,req_type,1)
+      req_id(date, req_type, 1)
     else
       raise
     end
   end
 
-  def self.redis_key(req_type, time=Time.now.utc)
+  def self.redis_key(req_type, time = Time.now.utc)
     "app_req_#{req_type}#{time.strftime('%Y%m%d')}"
   end
 
diff --git a/app/models/backup.rb b/app/models/backup.rb
index d23d459d00..72a619a06c 100644
--- a/app/models/backup.rb
+++ b/app/models/backup.rb
@@ -10,9 +10,9 @@ class Backup
 
   def self.all
     Dir.glob(File.join(Backup.base_directory, "*.{gz,tgz}"))
-       .sort_by { |file| File.mtime(file) }
-       .reverse
-       .map { |backup| Backup.create_from_filename(File.basename(backup)) }
+      .sort_by { |file| File.mtime(file) }
+      .reverse
+      .map { |backup| Backup.create_from_filename(File.basename(backup)) }
   end
 
   def self.[](filename)
diff --git a/app/models/badge.rb b/app/models/badge.rb
index ac1b3a4d49..46502613f5 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -63,7 +63,7 @@ class Badge < ActiveRecord::Base
 
   def self.trigger_hash
     Hash[*(
-      Badge::Trigger.constants.map{|k|
+      Badge::Trigger.constants.map { |k|
         [k.to_s.underscore, Badge::Trigger.const_get(k)]
       }.flatten
     )]
@@ -100,7 +100,7 @@ class Badge < ActiveRecord::Base
   validates :allow_title, inclusion: [true, false]
   validates :multiple_grant, inclusion: [true, false]
 
-  scope :enabled, ->{ where(enabled: true) }
+  scope :enabled, -> { where(enabled: true) }
 
   before_create :ensure_not_system
 
@@ -208,7 +208,6 @@ class Badge < ActiveRecord::Base
     val
   end
 
-
   def slug
     Slug.for(self.display_name, '-')
   end
diff --git a/app/models/badge_type.rb b/app/models/badge_type.rb
index 11d4a4b655..b1d6e91edd 100644
--- a/app/models/badge_type.rb
+++ b/app/models/badge_type.rb
@@ -3,7 +3,6 @@ class BadgeType < ActiveRecord::Base
   Silver = 2
   Bronze = 3
 
-
   has_many :badges
   validates :name, presence: true, uniqueness: true
 end
diff --git a/app/models/category.rb b/app/models/category.rb
index 02956b4eef..7939103cd0 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -72,7 +72,6 @@ class Category < ActiveRecord::Base
   has_many :category_tag_groups, dependent: :destroy
   has_many :tag_groups, through: :category_tag_groups
 
-
   scope :latest, -> { order('topic_count DESC') }
 
   scope :secured, -> (guardian = nil) {
@@ -141,10 +140,10 @@ class Category < ActiveRecord::Base
 
   def self.update_stats
     topics_with_post_count = Topic
-                              .select("topics.category_id, COUNT(*) topic_count, SUM(topics.posts_count) post_count")
-                              .where("topics.id NOT IN (select cc.topic_id from categories cc WHERE topic_id IS NOT NULL)")
-                              .group("topics.category_id")
-                              .visible.to_sql
+      .select("topics.category_id, COUNT(*) topic_count, SUM(topics.posts_count) post_count")
+      .where("topics.id NOT IN (select cc.topic_id from categories cc WHERE topic_id IS NOT NULL)")
+      .group("topics.category_id")
+      .visible.to_sql
 
     Category.exec_sql <<-SQL
     UPDATE categories c
@@ -183,13 +182,12 @@ SQL
     end
   end
 
-
   def visible_posts
     query = Post.joins(:topic)
-                .where(['topics.category_id = ?', self.id])
-                .where('topics.visible = true')
-                .where('posts.deleted_at IS NULL')
-                .where('posts.user_deleted = false')
+      .where(['topics.category_id = ?', self.id])
+      .where('topics.visible = true')
+      .where('posts.deleted_at IS NULL')
+      .where('posts.user_deleted = false')
     self.topic_id ? query.where(['topics.id <> ?', self.topic_id]) : query
   end
 
@@ -256,11 +254,11 @@ SQL
 
   def publish_category
     group_ids = self.groups.pluck(:id) if self.read_restricted
-    MessageBus.publish('/categories', {categories: ActiveModel::ArraySerializer.new([self]).as_json}, group_ids: group_ids)
+    MessageBus.publish('/categories', { categories: ActiveModel::ArraySerializer.new([self]).as_json }, group_ids: group_ids)
   end
 
   def publish_category_deletion
-    MessageBus.publish('/categories', {deleted_categories: [self.id]})
+    MessageBus.publish('/categories', deleted_categories: [self.id])
   end
 
   def parent_category_validator
@@ -321,7 +319,7 @@ SQL
   end
 
   def allowed_tags=(tag_names_arg)
-    DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, {unlimited: true})
+    DiscourseTagging.add_or_create_tags_by_name(self, tag_names_arg, unlimited: true)
   end
 
   def allowed_tag_groups=(group_names)
@@ -359,21 +357,21 @@ SQL
 
   def update_latest
     latest_post_id = Post
-                        .order("posts.created_at desc")
-                        .where("NOT hidden")
-                        .joins("join topics on topics.id = topic_id")
-                        .where("topics.category_id = :id", id: self.id)
-                        .limit(1)
-                        .pluck("posts.id")
-                        .first
+      .order("posts.created_at desc")
+      .where("NOT hidden")
+      .joins("join topics on topics.id = topic_id")
+      .where("topics.category_id = :id", id: self.id)
+      .limit(1)
+      .pluck("posts.id")
+      .first
 
     latest_topic_id = Topic
-                        .order("topics.created_at desc")
-                        .where("visible")
-                        .where("topics.category_id = :id", id: self.id)
-                        .limit(1)
-                        .pluck("topics.id")
-                        .first
+      .order("topics.created_at desc")
+      .where("visible")
+      .where("topics.category_id = :id", id: self.id)
+      .limit(1)
+      .pluck("topics.id")
+      .first
 
     self.update_attributes(latest_topic_id: latest_topic_id, latest_post_id: latest_post_id)
   end
@@ -384,7 +382,7 @@ SQL
     everyone = Group::AUTO_GROUPS[:everyone]
     full = CategoryGroup.permission_types[:full]
 
-    mapped = permissions.map do |group,permission|
+    mapped = permissions.map do |group, permission|
       group = group.id if group.is_a?(Group)
 
       # subtle, using Group[] ensures the group exists in the DB
@@ -498,7 +496,7 @@ SQL
     SearchIndexer.index(self)
   end
 
-  def self.find_by_slug(category_slug, parent_category_slug=nil)
+  def self.find_by_slug(category_slug, parent_category_slug = nil)
     if parent_category_slug
       parent_category_id = self.where(slug: parent_category_slug, parent_category_id: nil).pluck(:id).first
       self.where(slug: category_slug, parent_category_id: parent_category_id).first
diff --git a/app/models/category_featured_topic.rb b/app/models/category_featured_topic.rb
index 78331574db..22d948dd59 100644
--- a/app/models/category_featured_topic.rb
+++ b/app/models/category_featured_topic.rb
@@ -13,7 +13,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
     end
   end
 
-  def self.feature_topics_for(c, existing=nil)
+  def self.feature_topics_for(c, existing = nil)
     return if c.blank?
 
     query_opts = {
@@ -28,7 +28,7 @@ class CategoryFeaturedTopic < ActiveRecord::Base
     results = query.list_category_topic_ids(c).uniq
 
     # Add some topics that are visible to everyone:
-    anon_query = TopicQuery.new(nil, query_opts.merge({except_topic_ids: [c.topic_id] + results}))
+    anon_query = TopicQuery.new(nil, query_opts.merge(except_topic_ids: [c.topic_id] + results))
     results += anon_query.list_category_topic_ids(c).uniq
 
     return if results == existing
diff --git a/app/models/category_featured_user.rb b/app/models/category_featured_user.rb
index fb75cca87b..73ac6b1516 100644
--- a/app/models/category_featured_user.rb
+++ b/app/models/category_featured_user.rb
@@ -30,7 +30,7 @@ class CategoryFeaturedUser < ActiveRecord::Base
       LIMIT :max_featured_users;
     ", category_id: category_id, max_featured_users: max_featured_users
 
-    user_ids = most_recent_user_ids.map{|uc| uc['user_id'].to_i}
+    user_ids = most_recent_user_ids.map { |uc| uc['user_id'].to_i }
     current = CategoryFeaturedUser.where(category_id: category_id).order(:id).pluck(:user_id)
 
     return if current == user_ids
diff --git a/app/models/category_list.rb b/app/models/category_list.rb
index 39507a2a8a..f3ae8a1d00 100644
--- a/app/models/category_list.rb
+++ b/app/models/category_list.rb
@@ -3,13 +3,16 @@ require_dependency 'pinned_check'
 class CategoryList
   include ActiveModel::Serialization
 
+  cattr_accessor :preloaded_topic_custom_fields
+  self.preloaded_topic_custom_fields = Set.new
+
   attr_accessor :categories,
                 :uncategorized,
                 :draft,
                 :draft_key,
                 :draft_sequence
 
-  def initialize(guardian=nil, options={})
+  def initialize(guardian = nil, options = {})
     @guardian = guardian || Guardian.new
     @options = options
 
@@ -20,6 +23,19 @@ class CategoryList
     find_user_data
     sort_unpinned
     trim_results
+
+    if preloaded_topic_custom_fields.present?
+      displayable_topics = @categories.map(&:displayable_topics)
+      displayable_topics.flatten!
+      displayable_topics.compact!
+
+      if displayable_topics.present?
+        Topic.preload_custom_fields(
+          displayable_topics,
+          preloaded_topic_custom_fields
+        )
+      end
+    end
   end
 
   def preload_key
@@ -63,9 +79,9 @@ class CategoryList
         @categories = @categories.order(:position, :id)
       else
         @categories = @categories.order('COALESCE(categories.posts_week, 0) DESC')
-                                 .order('COALESCE(categories.posts_month, 0) DESC')
-                                 .order('COALESCE(categories.posts_year, 0) DESC')
-                                 .order('id ASC')
+          .order('COALESCE(categories.posts_month, 0) DESC')
+          .order('COALESCE(categories.posts_year, 0) DESC')
+          .order('id ASC')
       end
 
       @categories = @categories.to_a
diff --git a/app/models/category_user.rb b/app/models/category_user.rb
index 1cb6f502b3..8d0cf15912 100644
--- a/app/models/category_user.rb
+++ b/app/models/category_user.rb
@@ -62,7 +62,7 @@ class CategoryUser < ActiveRecord::Base
     auto_track(user_id: user.id)
   end
 
-  def self.auto_track(opts={})
+  def self.auto_track(opts = {})
 
     builder = SqlBuilder.new <<SQL
     UPDATE topic_users tu
@@ -95,7 +95,7 @@ SQL
                  auto_track_category:  TopicUser.notification_reasons[:auto_track_category])
   end
 
-  def self.auto_watch(opts={})
+  def self.auto_watch(opts = {})
 
     builder = SqlBuilder.new <<SQL
     UPDATE topic_users tu
@@ -154,7 +154,6 @@ SQL
 
   end
 
-
   def self.ensure_consistency!
     exec_sql <<SQL
     DELETE FROM category_users
diff --git a/app/models/color_scheme.rb b/app/models/color_scheme.rb
index 3713d5299c..c0a01cc5d5 100644
--- a/app/models/color_scheme.rb
+++ b/app/models/color_scheme.rb
@@ -27,8 +27,8 @@ class ColorScheme < ActiveRecord::Base
       { id: 'default', colors: base_with_hash }
     ]
 
-    CUSTOM_SCHEMES.each do |k,v|
-      list.push({id: k.to_s, colors: v})
+    CUSTOM_SCHEMES.each do |k, v|
+      list.push(id: k.to_s, colors: v)
     end
     list
   end
@@ -75,7 +75,7 @@ class ColorScheme < ActiveRecord::Base
   def self.base_color_schemes
     base_color_scheme_colors.map do |hash|
       scheme = new(name: I18n.t("color_schemes.#{hash[:id]}"), base_scheme_id: hash[:id])
-      scheme.colors = hash[:colors].map{|k,v| {name: k.to_s, hex: v.sub("#","")}}
+      scheme.colors = hash[:colors].map { |k, v| { name: k.to_s, hex: v.sub("#", "") } }
       scheme.is_base = true
       scheme
     end
@@ -84,7 +84,7 @@ class ColorScheme < ActiveRecord::Base
   def self.base
     return @base_color_scheme if @base_color_scheme
     @base_color_scheme = new(name: I18n.t('color_schemes.base_theme_name'))
-    @base_color_scheme.colors = base_colors.map { |name, hex| {name: name, hex: hex} }
+    @base_color_scheme.colors = base_colors.map { |name, hex| { name: name, hex: hex } }
     @base_color_scheme.is_base = true
     @base_color_scheme
   end
@@ -96,13 +96,13 @@ class ColorScheme < ActiveRecord::Base
     new_color_scheme.base_scheme_id = params[:base_scheme_id]
 
     colors = CUSTOM_SCHEMES[params[:base_scheme_id].to_sym]&.map do |name, hex|
-      {name: name, hex: hex}
+      { name: name, hex: hex }
     end if params[:base_scheme_id]
     colors ||= base.colors_hashes
 
     # Override base values
     params[:colors].each do |name, hex|
-      c = colors.find {|x| x[:name].to_s == name.to_s}
+      c = colors.find { |x| x[:name].to_s == name.to_s }
       c[:hex] = hex
     end if params[:colors]
 
@@ -113,7 +113,7 @@ class ColorScheme < ActiveRecord::Base
 
   def self.lookup_hex_for_name(name)
     enabled_color_scheme = Theme.where(key: SiteSetting.default_theme_key).first&.color_scheme
-    (enabled_color_scheme || base).colors.find {|c| c.name == name }.try(:hex) || :nil
+    (enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || :nil
   end
 
   def self.hex_for_name(name)
@@ -124,12 +124,12 @@ class ColorScheme < ActiveRecord::Base
   def colors=(arr)
     @colors_by_name = nil
     arr.each do |c|
-      self.color_scheme_colors << ColorSchemeColor.new( name: c[:name], hex: c[:hex] )
+      self.color_scheme_colors << ColorSchemeColor.new(name: c[:name], hex: c[:hex])
     end
   end
 
   def colors_by_name
-    @colors_by_name ||= self.colors.inject({}) { |sum,c| sum[c.name] = c; sum; }
+    @colors_by_name ||= self.colors.inject({}) { |sum, c| sum[c.name] = c; sum; }
   end
   def clear_colors_cache
     @colors_by_name = nil
@@ -137,7 +137,7 @@ class ColorScheme < ActiveRecord::Base
 
   def colors_hashes
     color_scheme_colors.map do |c|
-      {name: c.name, hex: c.hex}
+      { name: c.name, hex: c.hex }
     end
   end
 
diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index f1c3ec2863..139b598e28 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -18,8 +18,8 @@ module HasCustomFields
       return unless types
 
       sorted_types = types.keys.select { |k| k.end_with?("*") }
-                               .sort_by(&:length)
-                               .reverse
+        .sort_by(&:length)
+        .reverse
 
       sorted_types.each do |t|
         return types[t] if key =~ /^#{t}/i
@@ -32,9 +32,9 @@ module HasCustomFields
       return value unless type = get_custom_field_type(types, key)
 
       case type
-        when :boolean then !!CUSTOM_FIELD_TRUE.include?(value)
-        when :integer then value.to_i
-        when :json    then ::JSON.parse(value)
+      when :boolean then !!CUSTOM_FIELD_TRUE.include?(value)
+      when :integer then value.to_i
+      when :json    then ::JSON.parse(value)
       else
         value
       end
@@ -42,7 +42,7 @@ module HasCustomFields
   end
 
   included do
-    has_many :_custom_fields, dependent: :destroy, :class_name => "#{name}CustomField"
+    has_many :_custom_fields, dependent: :destroy, class_name: "#{name}CustomField"
     after_save :save_custom_fields
 
     attr_accessor :preloaded_custom_fields
@@ -58,7 +58,7 @@ module HasCustomFields
       return result if whitelisted_fields.blank?
 
       klass.where(foreign_key => ids, :name => whitelisted_fields)
-           .pluck(foreign_key, :name, :value).each do |cf|
+        .pluck(foreign_key, :name, :value).each do |cf|
         result[cf[0]] ||= {}
         append_custom_field(result[cf[0]], cf[1], cf[2])
       end
@@ -96,7 +96,7 @@ module HasCustomFields
           .where("name in (?)", fields)
           .pluck(fk, :name, :value).each do |id, name, value|
 
-            preloaded = map[id].preloaded_custom_fields
+          preloaded = map[id].preloaded_custom_fields
 
             if preloaded[name].nil?
               preloaded.delete(name)
@@ -156,7 +156,7 @@ module HasCustomFields
     !@custom_fields || @custom_fields_orig == @custom_fields
   end
 
-  def save_custom_fields(force=false)
+  def save_custom_fields(force = false)
     if force || !custom_fields_clean?
       dup = @custom_fields.dup
 
@@ -194,7 +194,7 @@ module HasCustomFields
         end
       end
 
-      dup.each do |k,v|
+      dup.each do |k, v|
         if v.is_a? Array
           v.each { |subv| _custom_fields.create(name: k, value: subv) }
         elsif v.is_a? Hash
@@ -212,7 +212,7 @@ module HasCustomFields
 
   def refresh_custom_fields_from_db
     target = Hash.new
-    _custom_fields.pluck(:name,:value).each do |key, value|
+    _custom_fields.pluck(:name, :value).each do |key, value|
       self.class.append_custom_field(target, key, value)
     end
     @custom_fields_orig = target
diff --git a/app/models/concerns/positionable.rb b/app/models/concerns/positionable.rb
index 335b8ce0ac..68e71f1b14 100644
--- a/app/models/concerns/positionable.rb
+++ b/app/models/concerns/positionable.rb
@@ -11,18 +11,18 @@ module Positionable
 
     position = [[position_arg, 0].max, self.class.count - 1].min
 
-    if self.position.nil? or position > self.position
+    if self.position.nil? || position > (self.position)
       self.exec_sql "
       UPDATE #{self.class.table_name}
       SET position = position - 1
       WHERE position > :current_position and position <= :new_position",
-      {current_position: self.position, new_position: position}
+      current_position: self.position, new_position: position
     elsif position < self.position
       self.exec_sql "
       UPDATE #{self.class.table_name}
       SET position = position + 1
       WHERE position >= :new_position and position < :current_position",
-      {current_position: self.position, new_position: position}
+      current_position: self.position, new_position: position
     else
       # Not moving to a new position
       return
@@ -31,6 +31,6 @@ module Positionable
     self.exec_sql "
     UPDATE #{self.class.table_name}
     SET position = :position
-    WHERE id = :id", {id: id, position: position}
+    WHERE id = :id", id: id, position: position
   end
 end
diff --git a/app/models/concerns/trashable.rb b/app/models/concerns/trashable.rb
index 9325f6849e..b758df0027 100644
--- a/app/models/concerns/trashable.rb
+++ b/app/models/concerns/trashable.rb
@@ -8,7 +8,6 @@ module Trashable
     belongs_to :deleted_by, class_name: 'User'
   end
 
-
   module ClassMethods
     def with_deleted
       # lifted from acts_as_paranoid, works around https://github.com/rails/rails/issues/4306
@@ -30,7 +29,7 @@ module Trashable
     deleted_at.present?
   end
 
-  def trash!(trashed_by=nil)
+  def trash!(trashed_by = nil)
     # note, an argument could be made that the column should probably called trashed_at
     # however, deleted_at is the terminology used in the UI
     #
@@ -44,7 +43,6 @@ module Trashable
     trash_update(nil, nil)
   end
 
-
   private
 
     def trash_update(deleted_at, deleted_by_id)
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index 9bdcdf50ac..b877705d70 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -22,7 +22,7 @@ class DirectoryItem < ActiveRecord::Base
   end
 
   def self.refresh!
-    period_types.each_key {|p| refresh_period!(p)}
+    period_types.each_key { |p| refresh_period!(p) }
   end
 
   def self.refresh_period!(period_type)
@@ -30,14 +30,15 @@ class DirectoryItem < ActiveRecord::Base
     # Don't calculate it if the user directory is disabled
     return unless SiteSetting.enable_user_directory?
 
-    since = case period_type
-            when :daily then 1.day.ago
-            when :weekly then 1.week.ago
-            when :monthly then 1.month.ago
-            when :quarterly then 3.months.ago
-            when :yearly then 1.year.ago
-            else 1000.years.ago
-            end
+    since =
+      case period_type
+      when :daily then 1.day.ago
+      when :weekly then 1.week.ago
+      when :monthly then 1.month.ago
+      when :quarterly then 3.months.ago
+      when :yearly then 1.year.ago
+      else 1000.years.ago
+      end
 
     ActiveRecord::Base.transaction do
       exec_sql "DELETE FROM directory_items
@@ -47,7 +48,6 @@ class DirectoryItem < ActiveRecord::Base
                       u.id IS NULL AND
                       di.period_type = :period_type", period_type: period_types[period_type]
 
-
       exec_sql "INSERT INTO directory_items(period_type, user_id, likes_received, likes_given, topics_entered, days_visited, posts_read, topic_count, post_count)
                 SELECT
                     :period_type,
@@ -117,7 +117,6 @@ class DirectoryItem < ActiveRecord::Base
                   reply_type: UserAction::REPLY,
                   regular_post_type: Post.types[:regular]
 
-
       if period_type == :all
         exec_sql <<SQL
         UPDATE user_stats s
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 267ef98141..2050587981 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -10,7 +10,7 @@ class DiscourseSingleSignOn < SingleSignOn
     SiteSetting.sso_secret
   end
 
-  def self.generate_sso(return_path="/")
+  def self.generate_sso(return_path = "/")
     sso = new
     sso.nonce = SecureRandom.hex
     sso.register_nonce(return_path)
@@ -18,7 +18,7 @@ class DiscourseSingleSignOn < SingleSignOn
     sso
   end
 
-  def self.generate_url(return_path="/")
+  def self.generate_url(return_path = "/")
     generate_sso(return_path).to_url
   end
 
@@ -46,7 +46,7 @@ class DiscourseSingleSignOn < SingleSignOn
     "SSO_NONCE_#{nonce}"
   end
 
-  def lookup_or_create_user(ip_address=nil)
+  def lookup_or_create_user(ip_address = nil)
     sso_record = SingleSignOnRecord.find_by(external_id: external_id)
 
     if sso_record && (user = sso_record.user)
@@ -71,7 +71,7 @@ class DiscourseSingleSignOn < SingleSignOn
       user.set_automatic_groups
     end
 
-    custom_fields.each do |k,v|
+    custom_fields.each do |k, v|
       user.custom_fields[k] = v
     end
 
@@ -122,9 +122,9 @@ class DiscourseSingleSignOn < SingleSignOn
       split = remove_groups.split(",")
       if split.length > 0
         GroupUser
-            .where(user_id: user.id)
-            .where('group_id IN (SELECT id FROM groups WHERE name in (?))',split)
-            .destroy_all
+          .where(user_id: user.id)
+          .where('group_id IN (SELECT id FROM groups WHERE name in (?))', split)
+          .destroy_all
       end
     end
   end
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 437ad298fe..be412cc72a 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -4,7 +4,7 @@ class Draft < ActiveRecord::Base
   EXISTING_TOPIC = 'topic_'
 
   def self.set(user, key, sequence, data)
-    d = find_draft(user,key)
+    d = find_draft(user, key)
     if d
       return if d.sequence > sequence
       exec_sql("UPDATE drafts
@@ -18,14 +18,14 @@ class Draft < ActiveRecord::Base
   end
 
   def self.get(user, key, sequence)
-    d = find_draft(user,key)
+    d = find_draft(user, key)
     if d && d.sequence == sequence
       d.data
     end
   end
 
   def self.clear(user, key, sequence)
-    d = find_draft(user,key)
+    d = find_draft(user, key)
     if d && d.sequence <= sequence
       d.destroy
     end
diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb
index af4eb647c9..2e8eeb98c8 100644
--- a/app/models/draft_sequence.rb
+++ b/app/models/draft_sequence.rb
@@ -1,5 +1,5 @@
 class DraftSequence < ActiveRecord::Base
-  def self.next!(user,key)
+  def self.next!(user, key)
     user_id = user
     user_id = user.id unless user.is_a?(Integer)
 
diff --git a/app/models/email_log.rb b/app/models/email_log.rb
index d17ec8c3a6..3add7e1c35 100644
--- a/app/models/email_log.rb
+++ b/app/models/email_log.rb
@@ -39,21 +39,21 @@ class EmailLog < ActiveRecord::Base
     end
   end
 
-  def self.reached_max_emails?(user, email_type=nil)
+  def self.reached_max_emails?(user, email_type = nil)
     return false if SiteSetting.max_emails_per_day_per_user == 0 || CRITICAL_EMAIL_TYPES.include?(email_type)
 
     count = sent.where('created_at > ?', 1.day.ago)
-                .where(user_id: user.id)
-                .count
+      .where(user_id: user.id)
+      .count
 
     count >= SiteSetting.max_emails_per_day_per_user
   end
 
   def self.count_per_day(start_date, end_date)
     sent.where("created_at BETWEEN ? AND ?", start_date, end_date)
-        .group("DATE(created_at)")
-        .order("DATE(created_at)")
-        .count
+      .group("DATE(created_at)")
+      .order("DATE(created_at)")
+      .count
   end
 
   def self.for(reply_key)
@@ -62,9 +62,9 @@ class EmailLog < ActiveRecord::Base
 
   def self.last_sent_email_address
     self.where(email_type: "signup")
-        .order(created_at: :desc)
-        .first
-        .try(:to_address)
+      .order(created_at: :desc)
+      .first
+      .try(:to_address)
   end
 
 end
diff --git a/app/models/email_token.rb b/app/models/email_token.rb
index 225e083b54..2a10dd4e23 100644
--- a/app/models/email_token.rb
+++ b/app/models/email_token.rb
@@ -11,8 +11,8 @@ class EmailToken < ActiveRecord::Base
   after_create do
     # Expire the previous tokens
     EmailToken.where(user_id: self.user_id)
-              .where("id != ?", self.id)
-              .update_all(expired: true)
+      .where("id != ?", self.id)
+      .update_all(expired: true)
   end
 
   def self.token_length
@@ -36,7 +36,7 @@ class EmailToken < ActiveRecord::Base
   end
 
   def self.valid_token_format?(token)
-    token.present? && token =~ /\h{#{token.length/2}}/i
+    token.present? && token =~ /\h{#{token.length / 2}}/i
   end
 
   def self.atomic_confirm(token)
@@ -71,7 +71,7 @@ class EmailToken < ActiveRecord::Base
       end
 
       if user
-        return User.find_by(email: Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present?
+        return User.find_by_email(user.email) if Invite.redeem_from_email(user.email).present?
         user
       end
     end
@@ -81,10 +81,10 @@ class EmailToken < ActiveRecord::Base
 
   def self.confirmable(token)
     EmailToken.where(token: token)
-              .where(expired: false, confirmed: false)
-              .where("created_at >= ?", EmailToken.valid_after)
-              .includes(:user)
-              .first
+      .where(expired: false, confirmed: false)
+      .where("created_at >= ?", EmailToken.valid_after)
+      .includes(:user)
+      .first
   end
 end
 
diff --git a/app/models/embedding.rb b/app/models/embedding.rb
index f11de96f4f..a0be5ceea8 100644
--- a/app/models/embedding.rb
+++ b/app/models/embedding.rb
@@ -38,7 +38,7 @@ class Embedding < OpenStruct
   def self.find
     embedding_args = { id: 'default' }
 
-    Embedding.settings.each {|s| embedding_args[s] = SiteSetting.send(s) }
+    Embedding.settings.each { |s| embedding_args[s] = SiteSetting.send(s) }
     Embedding.new(embedding_args)
   end
 end
diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index 0e81f2aa0f..c6f2e490cf 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 = "v5"
+  EMOJI_VERSION = "5"
 
   FITZPATRICK_SCALE ||= [ "1f3fb", "1f3fc", "1f3fd", "1f3fe", "1f3ff" ]
 
@@ -46,15 +46,19 @@ class Emoji
 
   def self.create_from_db_item(emoji)
     name = emoji["name"]
-    filename = "#{emoji['filename'] || name}.png"
+    filename = emoji['filename'] || name
     Emoji.new.tap do |e|
       e.name = name
-      e.url = "#{Discourse.base_uri}/images/emoji/#{SiteSetting.emoji_set}/#{filename}"
+      e.url = Emoji.url_for(filename)
     end
   end
 
+  def self.url_for(name)
+    "#{Discourse.base_uri}/images/emoji/#{SiteSetting.emoji_set}/#{name}.png?v=#{EMOJI_VERSION}"
+  end
+
   def self.cache_key(name)
-    "#{name}:#{EMOJI_VERSION}:#{Plugin::CustomEmoji.cache_key}"
+    "#{name}:v#{EMOJI_VERSION}:#{Plugin::CustomEmoji.cache_key}"
   end
 
   def self.clear_cache
@@ -74,7 +78,7 @@ class Emoji
   end
 
   def self.load_standard
-    db['emojis'].map {|e| Emoji.create_from_db_item(e) }
+    db['emojis'].map { |e| Emoji.create_from_db_item(e) }
   end
 
   def self.load_custom
@@ -131,7 +135,7 @@ class Emoji
       if is_tonable_emojis.include?(name)
         fitzpatrick_scales.each_with_index do |scale, index|
           toned_code = code.codepoints.insert(1, scale).pack("U*".freeze)
-          @unicode_replacements[toned_code] = "#{name}:t#{index+2}"
+          @unicode_replacements[toned_code] = "#{name}:t#{index + 2}"
         end
       end
     end
@@ -155,6 +159,12 @@ class Emoji
     end.join
   end
 
+  def self.gsub_emoji_to_unicode(str)
+    if str
+      str.gsub(/:([\w\-+]*(?::t\d)?):/) { |name| Emoji.lookup_unicode($1) || name }
+    end
+  end
+
   def self.lookup_unicode(name)
     @reverse_map ||= begin
       map = {}
@@ -170,7 +180,7 @@ class Emoji
         if is_tonable_emojis.include?(e['name'])
           FITZPATRICK_SCALE.each_with_index do |scale, index|
             toned_code = (code.codepoints.insert(1, scale.to_i(16))).pack("U*")
-            map["#{e['name']}:t#{index+2}"] = toned_code
+            map["#{e['name']}:t#{index + 2}"] = toned_code
           end
         end
       end
diff --git a/app/models/given_daily_like.rb b/app/models/given_daily_like.rb
index 87da419453..ccc2974237 100644
--- a/app/models/given_daily_like.rb
+++ b/app/models/given_daily_like.rb
@@ -16,8 +16,8 @@ class GivenDailyLike < ActiveRecord::Base
       create(user_id: user_id, given_date: given_date, likes_given: 1)
     else
       find_for(user_id, given_date)
-              .where('limit_reached = false AND likes_given >= :limit', limit: SiteSetting.max_likes_per_day)
-              .update_all(limit_reached: true)
+        .where('limit_reached = false AND likes_given >= :limit', limit: SiteSetting.max_likes_per_day)
+        .update_all(limit_reached: true)
     end
   end
 
@@ -28,8 +28,8 @@ class GivenDailyLike < ActiveRecord::Base
 
     find_for(user_id, given_date).update_all('likes_given = likes_given - 1')
     find_for(user_id, given_date)
-            .where('limit_reached = true AND likes_given < :limit', limit: SiteSetting.max_likes_per_day)
-            .update_all(limit_reached: false)
+      .where('limit_reached = true AND likes_given < :limit', limit: SiteSetting.max_likes_per_day)
+      .update_all(limit_reached: false)
   end
 end
 
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 2ee90b7bc1..84750ecc69 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -40,7 +40,7 @@ class GlobalSetting
         token = $redis.without_namespace.get(REDIS_SECRET_KEY)
         unless token && token =~ VALID_SECRET_KEY
           token = SecureRandom.hex(64)
-          $redis.without_namespace.set(REDIS_SECRET_KEY,token)
+          $redis.without_namespace.set(REDIS_SECRET_KEY, token)
         end
       end
       if !secret_key_base.blank? && token != secret_key_base
@@ -74,7 +74,7 @@ class GlobalSetting
   end
 
   def self.database_config
-    hash = {"adapter" => "postgresql"}
+    hash = { "adapter" => "postgresql" }
     %w{pool timeout socket host port username password replica_host replica_port}.each do |s|
       if val = self.send("db_#{s}")
         hash[s] = val
@@ -91,7 +91,7 @@ class GlobalSetting
 
     hash["prepared_statements"] = !!self.db_prepared_statements
 
-    {"production" => hash}
+    { "production" => hash }
   end
 
   # For testing purposes
@@ -118,8 +118,8 @@ class GlobalSetting
 
         if redis_sentinels.present?
           c[:sentinels] = redis_sentinels.split(",").map do |address|
-            host,port = address.split(":")
-            {host: host, port: port}
+            host, port = address.split(":")
+            { host: host, port: port }
           end.to_a
         end
 
@@ -134,7 +134,6 @@ class GlobalSetting
       setting
     end
 
-
     def resolve(current, default)
       BaseProvider.coerce(
         if current.present?
@@ -167,8 +166,7 @@ class GlobalSetting
       end
     end
 
-
-    def lookup(key,default)
+    def lookup(key, default)
       var = @data[key]
       resolve(var, var.nil? ? default : "")
     end
@@ -193,7 +191,7 @@ class GlobalSetting
     end
 
     def keys
-      ENV.keys.select{|k| k =~ /^DISCOURSE_/}.map{|k| k[10..-1].downcase.to_sym}
+      ENV.keys.select { |k| k =~ /^DISCOURSE_/ }.map { |k| k[10..-1].downcase.to_sym }
     end
   end
 
@@ -207,7 +205,6 @@ class GlobalSetting
     end
   end
 
-
   class << self
     attr_accessor :provider
   end
diff --git a/app/models/group.rb b/app/models/group.rb
index 423b535b6a..f137ec8931 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -37,33 +37,33 @@ class Group < ActiveRecord::Base
   end
 
   validate :name_format_validator
-  validates_uniqueness_of :name, case_sensitive: false
+  validates :name, presence: true, uniqueness: { case_sensitive: false }
   validate :automatic_membership_email_domains_format_validator
   validate :incoming_email_validator
-  validate :can_allow_membership_requests
-  validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url[0,3] != 'fa-' }
+  validate :can_allow_membership_requests, if: :allow_membership_requests
+  validates :flair_url, url: true, if: Proc.new { |g| g.flair_url && g.flair_url[0, 3] != 'fa-' }
 
   AUTO_GROUPS = {
-    :everyone => 0,
-    :admins => 1,
-    :moderators => 2,
-    :staff => 3,
-    :trust_level_0 => 10,
-    :trust_level_1 => 11,
-    :trust_level_2 => 12,
-    :trust_level_3 => 13,
-    :trust_level_4 => 14
+    everyone: 0,
+    admins: 1,
+    moderators: 2,
+    staff: 3,
+    trust_level_0: 10,
+    trust_level_1: 11,
+    trust_level_2: 12,
+    trust_level_3: 13,
+    trust_level_4: 14
   }
 
   AUTO_GROUP_IDS = Hash[*AUTO_GROUPS.to_a.flatten.reverse]
   STAFF_GROUPS = [:admins, :moderators, :staff]
 
   ALIAS_LEVELS = {
-    :nobody => 0,
-    :only_admins => 1,
-    :mods_and_admins => 2,
-    :members_mods_and_admins => 3,
-    :everyone => 99
+    nobody: 0,
+    only_admins: 1,
+    mods_and_admins: 2,
+    members_mods_and_admins: 3,
+    everyone: 99
   }
 
   def self.visibility_levels
@@ -75,13 +75,13 @@ class Group < ActiveRecord::Base
     )
   end
 
-  validates :alias_level, inclusion: { in: ALIAS_LEVELS.values}
+  validates :alias_level, inclusion: { in: ALIAS_LEVELS.values }
 
   scope :visible_groups, ->(user) {
     groups = Group.order(name: :asc).where("groups.id > 0")
 
     unless user&.admin
-      sql =  <<~SQL
+      sql = <<~SQL
         groups.id IN (
           SELECT g.id FROM groups g WHERE g.visibility_level = :public
 
@@ -121,7 +121,7 @@ class Group < ActiveRecord::Base
     groups
   }
 
-  scope :mentionable, lambda {|user|
+  scope :mentionable, lambda { |user|
 
     levels = [ALIAS_LEVELS[:everyone]]
 
@@ -140,7 +140,7 @@ class Group < ActiveRecord::Base
           (
             alias_level = #{ALIAS_LEVELS[:members_mods_and_admins]} AND id in (
             SELECT group_id FROM group_users WHERE user_id = :user_id)
-          )", levels: levels, user_id: user && user.id )
+          )", levels: levels, user_id: user && user.id)
   }
 
   def downcase_incoming_email
@@ -168,38 +168,38 @@ class Group < ActiveRecord::Base
     end
   end
 
-  def posts_for(guardian, before_post_id=nil)
+  def posts_for(guardian, before_post_id = nil)
     user_ids = group_users.map { |gu| gu.user_id }
     result = Post.includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where(user_id: user_ids)
-                 .where('topics.archetype <> ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
+      .references(:posts, :topics, :category)
+      .where(user_id: user_ids)
+      .where('topics.archetype <> ?', Archetype.private_message)
+      .where(post_type: Post.types[:regular])
 
     result = guardian.filter_allowed_categories(result)
     result = result.where('posts.id < ?', before_post_id) if before_post_id
     result.order('posts.created_at desc')
   end
 
-  def messages_for(guardian, before_post_id=nil)
+  def messages_for(guardian, before_post_id = nil)
     result = Post.includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where('topics.archetype = ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
-                 .where('topics.id IN (SELECT topic_id FROM topic_allowed_groups WHERE group_id = ?)', self.id)
+      .references(:posts, :topics, :category)
+      .where('topics.archetype = ?', Archetype.private_message)
+      .where(post_type: Post.types[:regular])
+      .where('topics.id IN (SELECT topic_id FROM topic_allowed_groups WHERE group_id = ?)', self.id)
 
     result = guardian.filter_allowed_categories(result)
     result = result.where('posts.id < ?', before_post_id) if before_post_id
     result.order('posts.created_at desc')
   end
 
-  def mentioned_posts_for(guardian, before_post_id=nil)
+  def mentioned_posts_for(guardian, before_post_id = nil)
     result = Post.joins(:group_mentions)
-                 .includes(:user, :topic, topic: :category)
-                 .references(:posts, :topics, :category)
-                 .where('topics.archetype <> ?', Archetype.private_message)
-                 .where(post_type: Post.types[:regular])
-                 .where('group_mentions.group_id = ?', self.id)
+      .includes(:user, :topic, topic: :category)
+      .references(:posts, :topics, :category)
+      .where('topics.archetype <> ?', Archetype.private_message)
+      .where(post_type: Post.types[:regular])
+      .where('group_mentions.group_id = ?', self.id)
 
     result = guardian.filter_allowed_categories(result)
     result = result.where('posts.id < ?', before_post_id) if before_post_id
@@ -224,12 +224,9 @@ class Group < ActiveRecord::Base
     localized_name = I18n.t("groups.default_names.#{name}").downcase
     validator = UsernameValidator.new(localized_name)
 
-    group.name =
-      if !Group.where("LOWER(name) = ?", localized_name).exists? && validator.valid_format?
-        localized_name
-      else
-        name
-      end
+    if !Group.where("LOWER(name) = ?", localized_name).exists? && validator.valid_format?
+      group.name = localized_name
+    end
 
     # the everyone group is special, it can include non-users so there is no
     # way to have the membership in a table
@@ -240,16 +237,17 @@ class Group < ActiveRecord::Base
     end
 
     # Remove people from groups they don't belong in.
-    remove_subquery = case name
-                      when :admins
-                        "SELECT id FROM users WHERE NOT admin"
-                      when :moderators
-                        "SELECT id FROM users WHERE NOT moderator"
-                      when :staff
-                        "SELECT id FROM users WHERE NOT admin AND NOT moderator"
-                      when :trust_level_0, :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
-                        "SELECT id FROM users WHERE trust_level < #{id - 10}"
-                      end
+    remove_subquery =
+      case name
+      when :admins
+        "SELECT id FROM users WHERE NOT admin"
+      when :moderators
+        "SELECT id FROM users WHERE NOT moderator"
+      when :staff
+        "SELECT id FROM users WHERE NOT admin AND NOT moderator"
+      when :trust_level_0, :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
+        "SELECT id FROM users WHERE trust_level < #{id - 10}"
+      end
 
     exec_sql <<-SQL
       DELETE FROM group_users
@@ -259,18 +257,19 @@ class Group < ActiveRecord::Base
     SQL
 
     # Add people to groups
-    insert_subquery = case name
-                      when :admins
-                        "SELECT id FROM users WHERE admin"
-                      when :moderators
-                        "SELECT id FROM users WHERE moderator"
-                      when :staff
-                        "SELECT id FROM users WHERE moderator OR admin"
-                      when :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
-                        "SELECT id FROM users WHERE trust_level >= #{id - 10}"
-                      when :trust_level_0
-                        "SELECT id FROM users"
-                      end
+    insert_subquery =
+      case name
+      when :admins
+        "SELECT id FROM users WHERE admin"
+      when :moderators
+        "SELECT id FROM users WHERE moderator"
+      when :staff
+        "SELECT id FROM users WHERE moderator OR admin"
+      when :trust_level_1, :trust_level_2, :trust_level_3, :trust_level_4
+        "SELECT id FROM users WHERE trust_level >= #{id - 10}"
+      when :trust_level_0
+        "SELECT id FROM users"
+      end
 
     exec_sql <<-SQL
       INSERT INTO group_users (group_id, user_id, created_at, updated_at)
@@ -341,22 +340,19 @@ class Group < ActiveRecord::Base
     end
   end
 
-  def self.lookup_group_ids(opts)
-    if group_ids = opts[:group_ids]
-      group_ids = group_ids.split(",").map(&:to_i)
-      group_ids = Group.where(id: group_ids).pluck(:id)
+  def self.lookup_groups(group_ids: [], group_names: [])
+    if group_ids.present?
+      group_ids = group_ids.split(",")
+      group_ids.map!(&:to_i)
+      groups = Group.where(id: group_ids) if group_ids.present?
     end
 
-    group_ids ||= []
-
-    if group_names = opts[:group_names]
+    if group_names.present?
       group_names = group_names.split(",")
-      if group_names.present?
-        group_ids += Group.where(name: group_names).pluck(:id)
-      end
+      groups = (groups || Group).where(name: group_names) if group_names.present?
     end
 
-    group_ids
+    groups || []
   end
 
   def self.desired_trust_level_groups(trust_level)
@@ -394,11 +390,11 @@ class Group < ActiveRecord::Base
     additions = expected - current
     deletions = current - expected
 
-    map = Hash[*User.where(username: additions+deletions)
-                 .select('id,username')
-                 .map{|u| [u.username,u.id]}.flatten]
+    map = Hash[*User.where(username: additions + deletions)
+      .select('id,username')
+      .map { |u| [u.username, u.id] }.flatten]
 
-    deletions = Set.new(deletions.map{|d| map[d]})
+    deletions = Set.new(deletions.map { |d| map[d] })
 
     @deletions = []
     group_users.each do |gu|
@@ -432,9 +428,9 @@ class Group < ActiveRecord::Base
 
   def add_owner(user)
     if group_user = self.group_users.find_by(user: user)
-      group_user.update_attributes!(owner: true) if !group_user.owner
+      group_user.update!(owner: true) if !group_user.owner
     else
-      GroupUser.create!(user: user, group: self, owner: true)
+      self.group_users.create!(user: user, owner: true)
     end
   end
 
@@ -443,32 +439,51 @@ class Group < ActiveRecord::Base
   end
 
   def bulk_add(user_ids)
-    if user_ids.present?
-      Group.exec_sql("INSERT INTO group_users
-                                  (group_id, user_id, created_at, updated_at)
-                     SELECT #{self.id},
-                            u.id,
-                            CURRENT_TIMESTAMP,
-                            CURRENT_TIMESTAMP
-                     FROM users AS u
-                     WHERE u.id IN (#{user_ids.join(', ')})
-                       AND NOT EXISTS(SELECT 1 FROM group_users AS gu
-                                      WHERE gu.user_id = u.id AND
-                                            gu.group_id = #{self.id})")
+    return unless user_ids.present?
+
+    Group.transaction do
+      sql = <<~SQL
+      INSERT INTO group_users
+        (group_id, user_id, created_at, updated_at)
+      SELECT
+        #{self.id},
+        u.id,
+        CURRENT_TIMESTAMP,
+        CURRENT_TIMESTAMP
+      FROM users AS u
+      WHERE u.id IN (:user_ids)
+      AND NOT EXISTS (
+        SELECT 1 FROM group_users AS gu
+        WHERE gu.user_id = u.id AND
+        gu.group_id = :group_id
+      )
+      SQL
+
+      Group.exec_sql(sql, group_id: self.id, user_ids: user_ids)
+
+      user_attributes = {}
 
       if self.primary_group?
-        User.where(id: user_ids).update_all(primary_group_id: self.id)
+        user_attributes[:primary_group_id] = self.id
       end
 
       if self.title.present?
-        User.where(id: user_ids).update_all(title: self.title)
+        user_attributes[:title] = self.title
       end
 
-      if self.grant_trust_level.present?
-        Jobs.enqueue(:bulk_grant_trust_level, user_ids: user_ids, trust_level: self.grant_trust_level)
+      if user_attributes.present?
+        User.where(id: user_ids).update_all(user_attributes)
       end
     end
-    true
+
+    if self.grant_trust_level.present?
+      Jobs.enqueue(:bulk_grant_trust_level,
+        user_ids: user_ids,
+        trust_level: self.grant_trust_level
+      )
+    end
+
+    self
   end
 
   def staff?
@@ -478,6 +493,7 @@ class Group < ActiveRecord::Base
   protected
 
     def name_format_validator
+      self.name.strip!
       UsernameValidator.perform_validation(self, 'name')
     end
 
@@ -558,7 +574,16 @@ class Group < ActiveRecord::Base
   private
 
     def can_allow_membership_requests
-      if self.allow_membership_requests && !self.group_users.where(owner: true).exists?
+      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
@@ -594,11 +619,12 @@ end
 #  flair_color                        :string
 #  bio_raw                            :text
 #  bio_cooked                         :text
-#  public                             :boolean          default(FALSE), not null
+#  public_admission                   :boolean          default(FALSE), not null
 #  allow_membership_requests          :boolean          default(FALSE), not null
 #  full_name                          :string
 #  default_notification_level         :integer          default(3), not null
-#  visibility_level                   :integer          default(0)
+#  visibility_level                   :integer          default(0), not null
+#  public_exit                        :boolean          default(FALSE), not null
 #
 # Indexes
 #
diff --git a/app/models/group_archived_message.rb b/app/models/group_archived_message.rb
index 190dce298c..91d2062cae 100644
--- a/app/models/group_archived_message.rb
+++ b/app/models/group_archived_message.rb
@@ -5,22 +5,21 @@ class GroupArchivedMessage < ActiveRecord::Base
   def self.move_to_inbox!(group_id, topic_id)
     GroupArchivedMessage.where(group_id: group_id, topic_id: topic_id).destroy_all
     trigger(:move_to_inbox, group_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "move_to_inbox"}, group_ids: [group_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, group_ids: [group_id])
   end
 
   def self.archive!(group_id, topic_id)
     GroupArchivedMessage.where(group_id: group_id, topic_id: topic_id).destroy_all
     GroupArchivedMessage.create!(group_id: group_id, topic_id: topic_id)
     trigger(:archive_message, group_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "archived"}, group_ids: [group_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, group_ids: [group_id])
   end
 
-
   def self.trigger(event, group_id, topic_id)
     group = Group.find_by(id: group_id)
     topic = Topic.find_by(id: topic_id)
     if group && topic
-      DiscourseEvent.trigger(event, {group: group, topic: topic})
+      DiscourseEvent.trigger(event, group: group, topic: topic)
     end
   end
 
diff --git a/app/models/group_user.rb b/app/models/group_user.rb
index b559580390..3c40b07928 100644
--- a/app/models/group_user.rb
+++ b/app/models/group_user.rb
@@ -25,36 +25,41 @@ class GroupUser < ActiveRecord::Base
 
   def set_primary_group
     if group.primary_group
-        self.class.exec_sql("UPDATE users
-                             SET primary_group_id = :id
-                             WHERE id = :user_id",
-                          id: group.id, user_id: user_id)
+      self.class.exec_sql("
+        UPDATE users
+        SET primary_group_id = :id
+        WHERE id = :user_id",
+        id: group.id, user_id: user_id
+      )
     end
   end
 
   def remove_primary_group
-      self.class.exec_sql("UPDATE users
-                           SET primary_group_id = NULL
-                           WHERE id = :user_id AND primary_group_id = :id",
-                        id: group.id, user_id: user_id)
-
+    self.class.exec_sql("
+      UPDATE users
+      SET primary_group_id = NULL
+      WHERE id = :user_id AND primary_group_id = :id",
+      id: group.id, user_id: user_id
+    )
   end
 
   def remove_title
     if group.title.present?
-        self.class.exec_sql("UPDATE users SET title = NULL
-                          WHERE title = :title AND id = :id",
-                          id: user_id,
-                          title: group.title)
+      self.class.exec_sql("
+        UPDATE users SET title = NULL
+        WHERE title = :title AND id = :id",
+        id: user_id, title: group.title
+      )
     end
   end
 
   def update_title
     if group.title.present?
-      self.class.exec_sql("UPDATE users SET title = :title
-                          WHERE (title IS NULL OR title = '') AND id = :id",
-                          id: user_id,
-                          title: group.title)
+      self.class.exec_sql("
+        UPDATE users SET title = :title
+        WHERE (title IS NULL OR title = '') AND id = :id",
+        id: user_id, title: group.title
+      )
     end
   end
 
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index fd3e9e8e8d..e7992e2c72 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -35,11 +35,10 @@ class IncomingLink < ActiveRecord::Base
       post_id = opts[:post_id]
       post_id ||= Post.where(topic_id: opts[:topic_id],
                              post_number: opts[:post_number] || 1)
-                            .pluck(:id).first
+        .pluck(:id).first
 
       cid = current_user ? (current_user.id) : (nil)
 
-
       unless cid && cid == user_id
 
         create(referer: referer,
@@ -53,7 +52,6 @@ class IncomingLink < ActiveRecord::Base
 
   end
 
-
   def referer=(referer)
     self.incoming_referer_id = nil
 
@@ -87,7 +85,6 @@ class IncomingLink < ActiveRecord::Base
     end
   end
 
-
   # Internal: Update appropriate link counts.
   def update_link_counts
     exec_sql("UPDATE topics
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index 388ea57cc9..cf28011b8d 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -30,24 +30,24 @@ class IncomingLinksReport
 
   # Return top 10 users who brought traffic to the site within the last 30 days
   def self.report_top_referrers(report)
-    report.y_titles[:num_clicks]  = I18n.t("reports.#{report.type}.num_clicks")
+    report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
 
-    num_clicks  = link_count_per_user
+    num_clicks = link_count_per_user
     num_topics = topic_count_per_user
-    user_id_lookup = User.where(username: num_clicks.keys).select(:id, :username).inject({}) {|sum,v| sum[v.username] = v.id; sum;}
+    user_id_lookup = User.where(username: num_clicks.keys).select(:id, :username).inject({}) { |sum, v| sum[v.username] = v.id; sum; }
     report.data = []
     num_clicks.each_key do |username|
-      report.data << {username: username, user_id: user_id_lookup[username], num_clicks: num_clicks[username], num_topics: num_topics[username]}
+      report.data << { username: username, user_id: user_id_lookup[username], num_clicks: num_clicks[username], num_topics: num_topics[username] }
     end
-    report.data = report.data.sort_by {|x| x[:num_clicks]}.reverse[0,10]
+    report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
   def self.per_user
     @per_user_query ||= IncomingLink
-        .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', 30.days.ago)
-        .joins(:user)
-        .group('users.username')
+      .where('incoming_links.created_at > ? AND incoming_links.user_id IS NOT NULL', 30.days.ago)
+      .joins(:user)
+      .group('users.username')
   end
 
   def self.link_count_per_user
@@ -58,35 +58,34 @@ class IncomingLinksReport
     per_user.joins(:post).count("DISTINCT posts.topic_id")
   end
 
-
   # Return top 10 domains that brought traffic to the site within the last 30 days
   def self.report_top_traffic_sources(report)
-    report.y_titles[:num_clicks]  = I18n.t("reports.#{report.type}.num_clicks")
+    report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
     report.y_titles[:num_topics] = I18n.t("reports.#{report.type}.num_topics")
     report.y_titles[:num_users] = I18n.t("reports.#{report.type}.num_users")
 
-    num_clicks  = link_count_per_domain
+    num_clicks = link_count_per_domain
     num_topics = topic_count_per_domain(num_clicks.keys)
     report.data = []
     num_clicks.each_key do |domain|
-      report.data << {domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain]}
+      report.data << { domain: domain, num_clicks: num_clicks[domain], num_topics: num_topics[domain] }
     end
-    report.data = report.data.sort_by {|x| x[:num_clicks]}.reverse[0,10]
+    report.data = report.data.sort_by { |x| x[:num_clicks] }.reverse[0, 10]
   end
 
-  def self.link_count_per_domain(limit=10)
+  def self.link_count_per_domain(limit = 10)
     IncomingLink.where('incoming_links.created_at > ?', 30.days.ago)
-                .joins(:incoming_referer => :incoming_domain)
-                .group('incoming_domains.name')
-                .order('count_all DESC')
-                .limit(limit).count
+      .joins(incoming_referer: :incoming_domain)
+      .group('incoming_domains.name')
+      .order('count_all DESC')
+      .limit(limit).count
   end
 
   def self.per_domain(domains)
     IncomingLink
-        .joins(:incoming_referer => :incoming_domain)
-        .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
-        .group('incoming_domains.name')
+      .joins(incoming_referer: :incoming_domain)
+      .where('incoming_links.created_at > ? AND incoming_domains.name IN (?)', 30.days.ago, domains)
+      .group('incoming_domains.name')
   end
 
   def self.topic_count_per_domain(domains)
@@ -94,17 +93,16 @@ class IncomingLinksReport
     per_domain(domains).joins(:post).count("DISTINCT posts.topic_id")
   end
 
-
   def self.report_top_referred_topics(report)
-    report.y_titles[:num_clicks]  = I18n.t("reports.#{report.type}.num_clicks")
-    num_clicks  = link_count_per_topic
-    num_clicks = num_clicks.to_a.sort_by {|x| x[1]}.last(10).reverse # take the top 10
+    report.y_titles[:num_clicks] = I18n.t("reports.#{report.type}.num_clicks")
+    num_clicks = link_count_per_topic
+    num_clicks = num_clicks.to_a.sort_by { |x| x[1] }.last(10).reverse # take the top 10
     report.data = []
-    topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map {|z| z[0]})
+    topics = Topic.select('id, slug, title').where('id in (?)', num_clicks.map { |z| z[0] })
     num_clicks.each do |topic_id, num_clicks_element|
-      topic = topics.find {|t| t.id == topic_id}
+      topic = topics.find { |t| t.id == topic_id }
       if topic
-        report.data << {topic_id: topic_id, topic_title: topic.title, topic_slug: topic.slug, num_clicks: num_clicks_element}
+        report.data << { topic_id: topic_id, topic_title: topic.title, topic_slug: topic.slug, num_clicks: num_clicks_element }
       end
     end
     report.data
@@ -112,8 +110,8 @@ class IncomingLinksReport
 
   def self.link_count_per_topic
     IncomingLink.joins(:post)
-                .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', 30.days.ago)
-                .group('topic_id')
-                .count
+      .where('incoming_links.created_at > ? AND topic_id IS NOT NULL', 30.days.ago)
+      .group('topic_id')
+      .count
   end
 end
diff --git a/app/models/invite.rb b/app/models/invite.rb
index 9925b335b3..1955654c2d 100644
--- a/app/models/invite.rb
+++ b/app/models/invite.rb
@@ -32,8 +32,9 @@ class Invite < ActiveRecord::Base
   def user_doesnt_already_exist
     @email_already_exists = false
     return if email.blank?
-    u = User.find_by("email = ?", Email.downcase(email))
-    if u && u.id != self.user_id
+    user = User.find_by_email(email)
+
+    if user && user.id != self.user_id
       @email_already_exists = true
       errors.add(:email)
     end
@@ -69,48 +70,47 @@ class Invite < ActiveRecord::Base
     end
   end
 
-  def self.invite_by_email(email, invited_by, topic=nil, group_ids=nil, custom_message=nil)
-    create_invite_by_email(email, invited_by, {
+  def self.invite_by_email(email, invited_by, topic = nil, group_ids = nil, custom_message = nil)
+    create_invite_by_email(email, invited_by,
       topic: topic,
       group_ids: group_ids,
       custom_message: custom_message,
       send_email: true
-    })
+    )
   end
 
   # generate invite link
-  def self.generate_invite_link(email, invited_by, topic=nil, group_ids=nil)
-    invite = create_invite_by_email(email, invited_by, {
+  def self.generate_invite_link(email, invited_by, topic = nil, group_ids = nil)
+    invite = create_invite_by_email(email, invited_by,
       topic: topic,
       group_ids: group_ids,
       send_email: false
-    })
-    return "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite
+    )
+
+    "#{Discourse.base_url}/invites/#{invite.invite_key}" if invite
   end
 
   # Create an invite for a user, supplying an optional topic
   #
   # Return the previously existing invite if already exists. Returns nil if the invite can't be created.
-  def self.create_invite_by_email(email, invited_by, opts=nil)
+  def self.create_invite_by_email(email, invited_by, opts = nil)
     opts ||= {}
 
     topic = opts[:topic]
     group_ids = opts[:group_ids]
     send_email = opts[:send_email].nil? ? true : opts[:send_email]
     custom_message = opts[:custom_message]
-
     lower_email = Email.downcase(email)
-    user = User.find_by(email: lower_email)
 
-    if user
+    if user = User.find_by_email(lower_email)
       extend_permissions(topic, user, invited_by) if topic
       raise UserExists.new I18n.t("invite.user_exists", email: lower_email, username: user.username)
     end
 
     invite = Invite.with_deleted
-                   .where(email: lower_email, invited_by_id: invited_by.id)
-                   .order('created_at DESC')
-                   .first
+      .where(email: lower_email, invited_by_id: invited_by.id)
+      .order('created_at DESC')
+      .first
 
     if invite && (invite.expired? || invite.deleted_at)
       invite.destroy
@@ -162,23 +162,23 @@ class Invite < ActiveRecord::Base
     group_ids
   end
 
-  def self.find_all_invites_from(inviter, offset=0, limit=SiteSetting.invites_per_page)
+  def self.find_all_invites_from(inviter, offset = 0, limit = SiteSetting.invites_per_page)
     Invite.where(invited_by_id: inviter.id)
-          .where('invites.email IS NOT NULL')
-          .includes(:user => :user_stat)
-          .order('CASE WHEN invites.user_id IS NOT NULL THEN 0 ELSE 1 END',
+      .where('invites.email IS NOT NULL')
+      .includes(user: :user_stat)
+      .order('CASE WHEN invites.user_id IS NOT NULL THEN 0 ELSE 1 END',
                  'user_stats.time_read DESC',
                  'invites.redeemed_at DESC')
-          .limit(limit)
-          .offset(offset)
-          .references('user_stats')
+      .limit(limit)
+      .offset(offset)
+      .references('user_stats')
   end
 
-  def self.find_pending_invites_from(inviter, offset=0)
+  def self.find_pending_invites_from(inviter, offset = 0)
     find_all_invites_from(inviter, offset).where('invites.user_id IS NULL').order('invites.created_at DESC')
   end
 
-  def self.find_redeemed_invites_from(inviter, offset=0)
+  def self.find_redeemed_invites_from(inviter, offset = 0)
     find_all_invites_from(inviter, offset).where('invites.user_id IS NOT NULL').order('invites.redeemed_at DESC')
   end
 
@@ -218,16 +218,6 @@ class Invite < ActiveRecord::Base
     invite
   end
 
-  def self.redeem_from_token(token, email, username=nil, name=nil, topic_id=nil)
-    invite = Invite.find_by(invite_key: token)
-    if invite
-      invite.update_column(:email, email)
-      invite.topic_invites.create!(invite_id: invite.id, topic_id: topic_id) if topic_id && Topic.find_by_id(topic_id) && !invite.topic_invites.pluck(:topic_id).include?(topic_id)
-      user = InviteRedeemer.new(invite, username, name).redeem
-    end
-    user
-  end
-
   def resend_invite
     self.update_columns(created_at: Time.zone.now, updated_at: Time.zone.now)
     Jobs.enqueue(:invite_email, invite_id: self.id)
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index df748bf32b..9b68b8b03a 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -18,10 +18,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   # extracted from User cause it is very specific to invites
-  def self.create_user_from_invite(invite, username, name, password=nil, user_custom_fields=nil)
-    user_exists = User.where(admin: false).find_by_email(invite.email)
-    return user if user_exists
-
+  def self.create_user_from_invite(invite, username, name, password = nil, user_custom_fields = nil)
     if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
       available_username = username
     else
@@ -94,10 +91,9 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def get_existing_user
-    User.find_by(email: invite.email)
+    User.where(admin: false).find_by_email(invite.email)
   end
 
-
   def add_to_private_topics_if_invited
     invite.topics.private_messages.each do |t|
       t.topic_allowed_users.create(user_id: invited_user.id)
@@ -105,7 +101,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
   end
 
   def add_user_to_invited_topics
-    Invite.where('invites.email = ? and invites.id != ?', invite.email, invite.id).includes(:topics).where(topics: {archetype: Archetype::private_message}).each do |i|
+    Invite.where('invites.email = ? and invites.id != ?', invite.email, invite.id).includes(:topics).where(topics: { archetype: Archetype::private_message }).each do |i|
       i.topics.each do |t|
         t.topic_allowed_users.create(user_id: invited_user.id)
       end
@@ -133,8 +129,8 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
   def notify_invitee
     if inviter = invite.invited_by
-        inviter.notifications.create(notification_type: Notification.types[:invitee_accepted],
-                                     data: {display_username: invited_user.username}.to_json)
+      inviter.notifications.create(notification_type: Notification.types[:invitee_accepted],
+                                   data: { display_username: invited_user.username }.to_json)
     end
   end
 
diff --git a/app/models/locale_site_setting.rb b/app/models/locale_site_setting.rb
index 1cd9246418..607a8e7cdd 100644
--- a/app/models/locale_site_setting.rb
+++ b/app/models/locale_site_setting.rb
@@ -9,7 +9,7 @@ class LocaleSiteSetting < EnumSiteSetting
   def self.values
     supported_locales.map do |l|
       lang = language_names[l] || language_names[l[0..1]]
-      {name: lang ? lang['nativeName'] : l, value: l}
+      { name: lang ? lang['nativeName'] : l, value: l }
     end
   end
 
@@ -25,7 +25,7 @@ class LocaleSiteSetting < EnumSiteSetting
 
   def self.supported_locales
     @lock.synchronize do
-      @supported_locales ||= Dir.glob( File.join(Rails.root, 'config', 'locales', 'client.*.yml') ).map {|x| x.split('.')[-2]}.sort
+      @supported_locales ||= Dir.glob(File.join(Rails.root, 'config', 'locales', 'client.*.yml')).map { |x| x.split('.')[-2] }.sort
     end
   end
 
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 7db7a5b8bd..e238bd1f6e 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -8,9 +8,9 @@ class Notification < ActiveRecord::Base
   validates_presence_of :notification_type
 
   scope :unread, lambda { where(read: false) }
-  scope :recent, lambda { |n=nil| n ||= 10; order('notifications.created_at desc').limit(n) }
+  scope :recent, lambda { |n = nil| n ||= 10; order('notifications.created_at desc').limit(n) }
   scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id')
-                            .where('topics.id IS NULL OR topics.deleted_at IS NULL') }
+    .where('topics.id IS NULL OR topics.deleted_at IS NULL') }
 
   attr_accessor :skip_send_email
 
@@ -76,20 +76,20 @@ class Notification < ActiveRecord::Base
 
   def self.read(user, notification_ids)
     count = Notification.where(user_id: user.id)
-                        .where(id: notification_ids)
-                        .where(read: false)
-                        .update_all(read: true)
+      .where(id: notification_ids)
+      .where(read: false)
+      .update_all(read: true)
 
     user.publish_notifications_state if count > 0
   end
 
   def self.interesting_after(min_date)
-    result =  where("created_at > ?", min_date)
-              .includes(:topic)
-              .visible
-              .unread
-              .limit(20)
-              .order("CASE WHEN notification_type = #{Notification.types[:replied]} THEN 1
+    result = where("created_at > ?", min_date)
+      .includes(:topic)
+      .visible
+      .unread
+      .limit(20)
+      .order("CASE WHEN notification_type = #{Notification.types[:replied]} THEN 1
                            WHEN notification_type = #{Notification.types[:mentioned]} THEN 2
                            ELSE 3
                       END, created_at DESC").to_a
@@ -107,7 +107,7 @@ class Notification < ActiveRecord::Base
           seen[r.notification_type] << r.topic_id
         end
       end
-      result.reject! {|r| to_remove.include?(r.id) }
+      result.reject! { |r| to_remove.include?(r.id) }
     end
 
     result
@@ -145,9 +145,9 @@ class Notification < ActiveRecord::Base
 
     count ||= 10
     notifications = user.notifications
-                        .visible
-                        .recent(count)
-                        .includes(:topic)
+      .visible
+      .recent(count)
+      .includes(:topic)
 
     if user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never]
       notifications = notifications.where('notification_type <> ?', Notification.types[:liked])
@@ -165,7 +165,7 @@ class Notification < ActiveRecord::Base
            NOT read
         ORDER BY n.id ASC
         LIMIT #{count.to_i}
-      ").values.map do |x,_|
+      ").values.map do |x, _|
         x.to_i
       end
 
@@ -178,7 +178,7 @@ class Notification < ActiveRecord::Base
           .limit(count)
       end
 
-      notifications.uniq(&:id).sort do |x,y|
+      notifications.uniq(&:id).sort do |x, y|
         if x.unread_pm? && !y.unread_pm?
           -1
         elsif y.unread_pm? && !x.unread_pm?
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index 52c79698ec..c290f93aca 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -9,7 +9,7 @@ class OptimizedImage < ActiveRecord::Base
   # BUMP UP if optimized image algorithm changes
   VERSION = 1
 
-  def self.create_for(upload, width, height, opts={})
+  def self.create_for(upload, width, height, opts = {})
     return unless width > 0 && height > 0
     return if upload.try(:sha1).blank?
 
@@ -90,7 +90,7 @@ class OptimizedImage < ActiveRecord::Base
   end
 
   def local?
-   !(url =~ /^(https?:)?\/\//)
+    !(url =~ /^(https?:)?\/\//)
   end
 
   def self.safe_path?(path)
@@ -107,8 +107,11 @@ class OptimizedImage < ActiveRecord::Base
     end
   end
 
+  def self.thumbnail_or_resize
+    SiteSetting.strip_image_metadata ? "thumbnail" : "resize"
+  end
 
-  def self.resize_instructions(from, to, dimensions, opts={})
+  def self.resize_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     # NOTE: ORDER is important!
@@ -118,7 +121,7 @@ class OptimizedImage < ActiveRecord::Base
       -auto-orient
       -gravity center
       -background transparent
-      -thumbnail #{dimensions}^
+      -#{thumbnail_or_resize} #{dimensions}^
       -extent #{dimensions}
       -interpolate bicubic
       -unsharp 2x0.5+0.7+0
@@ -129,7 +132,7 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.resize_instructions_animated(from, to, dimensions, opts={})
+  def self.resize_instructions_animated(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -142,7 +145,7 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.crop_instructions(from, to, dimensions, opts={})
+  def self.crop_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -151,7 +154,7 @@ class OptimizedImage < ActiveRecord::Base
       -auto-orient
       -gravity north
       -background transparent
-      -thumbnail #{opts[:width]}
+      -#{thumbnail_or_resize} #{opts[:width]}
       -crop #{dimensions}+0+0
       -unsharp 2x0.5+0.7+0
       -interlace none
@@ -161,7 +164,7 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.crop_instructions_animated(from, to, dimensions, opts={})
+  def self.crop_instructions_animated(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -174,7 +177,7 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.downsize_instructions(from, to, dimensions, opts={})
+  def self.downsize_instructions(from, to, dimensions, opts = {})
     ensure_safe_paths!(from, to)
 
     %W{
@@ -190,24 +193,24 @@ class OptimizedImage < ActiveRecord::Base
     }
   end
 
-  def self.downsize_instructions_animated(from, to, dimensions, opts={})
+  def self.downsize_instructions_animated(from, to, dimensions, opts = {})
     resize_instructions_animated(from, to, dimensions, opts)
   end
 
-  def self.resize(from, to, width, height, opts={})
+  def self.resize(from, to, width, height, opts = {})
     optimize("resize", from, to, "#{width}x#{height}", opts)
   end
 
-  def self.crop(from, to, width, height, opts={})
+  def self.crop(from, to, width, height, opts = {})
     opts[:width] = width
     optimize("crop", from, to, "#{width}x#{height}", opts)
   end
 
-  def self.downsize(from, to, dimensions, opts={})
+  def self.downsize(from, to, dimensions, opts = {})
     optimize("downsize", from, to, dimensions, opts)
   end
 
-  def self.optimize(operation, from, to, dimensions, opts={})
+  def self.optimize(operation, from, to, dimensions, opts = {})
     method_name = "#{operation}_instructions"
     if !!opts[:allow_animation] && (from =~ /\.GIF$/i || opts[:filename] =~ /\.GIF$/i)
       method_name += "_animated"
@@ -223,14 +226,14 @@ class OptimizedImage < ActiveRecord::Base
       return false
     end
 
-    ImageOptim.new.optimize_image!(to)
+    FileHelper.optimize_image!(to)
     true
   rescue
     Rails.logger.error("Could not optimize image: #{to}")
     false
   end
 
-  def self.migrate_to_new_scheme(limit=nil)
+  def self.migrate_to_new_scheme(limit = nil)
     problems = []
 
     if SiteSetting.migrate_to_new_scheme
@@ -268,7 +271,7 @@ class OptimizedImage < ActiveRecord::Base
             optimized_image.sha1 = Upload.generate_digest(path)
           end
           # optimize if image
-          ImageOptim.new.optimize_image!(path)
+          FileHelper.optimize_image!(path)
           # store to new location & update the filesize
           File.open(path) do |f|
             optimized_image.url = Discourse.store.store_optimized_image(f, optimized_image)
diff --git a/app/models/permalink.rb b/app/models/permalink.rb
index e7427d20ba..4bfaa5a9cd 100644
--- a/app/models/permalink.rb
+++ b/app/models/permalink.rb
@@ -44,8 +44,8 @@ class Permalink < ActiveRecord::Base
 
     def normalize(url)
       return url unless @rules
-      @rules.each do |(regex,sub)|
-        url = url.sub(regex,sub)
+      @rules.each do |(regex, sub)|
+        url = url.sub(regex, sub)
       end
 
       url
@@ -56,10 +56,10 @@ class Permalink < ActiveRecord::Base
   def self.normalize_url(url)
     if url
       url = url.strip
-      url = url[1..-1] if url[0,1] == '/'
+      url = url[1..-1] if url[0, 1] == '/'
     end
 
-    normalizations =  SiteSetting.permalink_normalizations
+    normalizations = SiteSetting.permalink_normalizations
 
     @normalizer = Normalizer.new(normalizations) unless @normalizer && @normalizer.source == normalizations
     @normalizer.normalize(url)
@@ -81,10 +81,10 @@ class Permalink < ActiveRecord::Base
     nil
   end
 
-  def self.filter_by(url=nil)
+  def self.filter_by(url = nil)
     permalinks = Permalink
-                  .includes(:topic, :post, :category)
-                  .order('permalinks.created_at desc')
+      .includes(:topic, :post, :category)
+      .order('permalinks.created_at desc')
 
     permalinks.where!('url ILIKE :url OR external_url ILIKE :url', url: "%#{url}%") if url.present?
     permalinks.limit!(100)
diff --git a/app/models/plugin_store.rb b/app/models/plugin_store.rb
index 5a7675344e..aebf7f3217 100644
--- a/app/models/plugin_store.rb
+++ b/app/models/plugin_store.rb
@@ -7,7 +7,7 @@ class PluginStore
   end
 
   def self.set(plugin_name, key, value)
-    hash = {plugin_name: plugin_name, key: key}
+    hash = { plugin_name: plugin_name, key: key }
     row = PluginStoreRow.find_by(hash) || PluginStoreRow.new(hash)
 
     row.type_name = determine_type(value)
@@ -34,7 +34,7 @@ class PluginStore
     if item.is_a? Hash
       ActiveSupport::HashWithIndifferentAccess.new item
     elsif item.is_a? Array
-      item.map { |subitem| map_json subitem}
+      item.map { |subitem| map_json subitem }
     else
       item
     end
diff --git a/app/models/post.rb b/app/models/post.rb
index ad2b98e2f4..a4df5df778 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -79,7 +79,7 @@ class Post < ActiveRecord::Base
   scope :private_posts, -> { joins(:topic).where('topics.archetype = ?', Archetype.private_message) }
   scope :with_topic_subtype, ->(subtype) { joins(:topic).where('topics.subtype = ?', subtype) }
   scope :visible, -> { joins(:topic).where('topics.visible = true').where(hidden: false) }
-  scope :secured, lambda { |guardian| where('posts.post_type in (?)', Topic.visible_post_types(guardian && guardian.user))}
+  scope :secured, lambda { |guardian| where('posts.post_type in (?)', Topic.visible_post_types(guardian && guardian.user)) }
   scope :for_mailing_list, ->(user, since) {
     q = created_since(since)
       .joins(:topic)
@@ -154,7 +154,7 @@ class Post < ActiveRecord::Base
     end
   end
 
-  def trash!(trashed_by=nil)
+  def trash!(trashed_by = nil)
     self.topic_links.each(&:destroy)
     super(trashed_by)
   end
@@ -182,7 +182,7 @@ class Post < ActiveRecord::Base
 
   def matches_recent_post?
     post_id = $redis.get(unique_post_key)
-    post_id != nil and post_id.to_i != id
+    post_id != (nil) && post_id.to_i != (id)
   end
 
   def raw_hash
@@ -218,24 +218,24 @@ class Post < ActiveRecord::Base
     # case we can skip the rendering pipeline.
     return raw if cook_method == Post.cook_methods[:raw_html]
 
-    cooked = nil
-    if cook_method == Post.cook_methods[:email]
-      cooked = EmailCook.new(raw).cook
-    else
-      cloned = args.dup
-      cloned[1] ||= {}
+    cooked =
+      if cook_method == Post.cook_methods[:email]
+        EmailCook.new(raw).cook
+      else
+        cloned = args.dup
+        cloned[1] ||= {}
 
-      post_user = self.user
-      cloned[1][:user_id] = post_user.id if post_user
+        post_user = self.user
+        cloned[1][:user_id] = post_user.id if post_user
 
-      cooked = if add_nofollow?
-                 post_analyzer.cook(*args)
-               else
-                 # At trust level 3, we don't apply nofollow to links
-                 cloned[1][:omit_nofollow] = true
-                 post_analyzer.cook(*cloned)
-               end
-    end
+        if add_nofollow?
+          post_analyzer.cook(*args)
+        else
+          # At trust level 3, we don't apply nofollow to links
+          cloned[1][:omit_nofollow] = true
+          post_analyzer.cook(*cloned)
+        end
+      end
 
     new_cooked = Plugin::Filter.apply(:after_post_cook, self, cooked)
 
@@ -267,10 +267,10 @@ class Post < ActiveRecord::Base
 
   def whitelisted_spam_hosts
     hosts = SiteSetting
-              .white_listed_spam_host_domains
-              .split('|')
-              .map{|h| h.strip}
-              .reject{|h| !h.include?('.')}
+      .white_listed_spam_host_domains
+      .split('|')
+      .map { |h| h.strip }
+      .reject { |h| !h.include?('.') }
 
     hosts << GlobalSetting.hostname
     hosts << RailsMultisite::ConnectionManagement.current_hostname
@@ -290,9 +290,9 @@ class Post < ActiveRecord::Base
     return hosts if hosts.length == 0
 
     TopicLink.where(domain: hosts.keys, user_id: acting_user.id)
-             .group(:domain, :post_id)
-             .count
-             .each_key do |tuple|
+      .group(:domain, :post_id)
+      .count
+      .each_key do |tuple|
       domain = tuple[0]
       hosts[domain] = (hosts[domain] || 0) + 1
     end
@@ -319,7 +319,7 @@ class Post < ActiveRecord::Base
     order('sort_order desc, post_number desc')
   end
 
-  def self.summary(topic_id=nil)
+  def self.summary(topic_id = nil)
     # PERF: if you pass in nil it is WAY slower
     #  pg chokes getting a reasonable plan
     topic_id = topic_id ? topic_id.to_i : "posts.topic_id"
@@ -410,7 +410,7 @@ class Post < ActiveRecord::Base
     "#{Discourse.base_url}#{url}"
   end
 
-  def url(opts=nil)
+  def url(opts = nil)
     opts ||= {}
 
     if topic
@@ -424,7 +424,7 @@ class Post < ActiveRecord::Base
     "#{Discourse.base_url}/email/unsubscribe/#{UnsubscribeKey.create_key_for(user, self)}"
   end
 
-  def self.url(slug, topic_id, post_number, opts=nil)
+  def self.url(slug, topic_id, post_number, opts = nil)
     opts ||= {}
 
     result = "/t/"
@@ -434,12 +434,12 @@ class Post < ActiveRecord::Base
   end
 
   def self.urls(post_ids)
-    ids = post_ids.map{|u| u}
+    ids = post_ids.map { |u| u }
     if ids.length > 0
       urls = {}
       Topic.joins(:posts).where('posts.id' => ids).
-        select(['posts.id as post_id','post_number', 'topics.slug', 'topics.title', 'topics.id']).
-      each do |t|
+        select(['posts.id as post_id', 'post_number', 'topics.slug', 'topics.title', 'topics.id']).
+        each do |t|
         urls[t.post_id.to_i] = url(t.slug, t.id, t.post_number)
       end
       urls
@@ -448,24 +448,24 @@ class Post < ActiveRecord::Base
     end
   end
 
-  def revise(updated_by, changes={}, opts={})
+  def revise(updated_by, changes = {}, opts = {})
     PostRevisor.new(self).revise!(updated_by, changes, opts)
   end
 
   def self.rebake_old(limit)
     problems = []
     Post.where('baked_version IS NULL OR baked_version < ?', BAKED_VERSION)
-        .limit(limit).each do |p|
+      .limit(limit).each do |p|
       begin
         p.rebake!
       rescue => e
-        problems << {post: p, ex: e}
+        problems << { post: p, ex: e }
       end
     end
     problems
   end
 
-  def rebake!(opts=nil)
+  def rebake!(opts = nil)
     opts ||= {}
 
     new_cooked = cook(raw, topic_id: topic_id, invalidate_oneboxes: opts.fetch(:invalidate_oneboxes, false))
@@ -485,14 +485,14 @@ class Post < ActiveRecord::Base
     new_cooked != old_cooked
   end
 
-  def set_owner(new_user, actor, skip_revision=false)
+  def set_owner(new_user, actor, skip_revision = false)
     return if user_id == new_user.id
 
     edit_reason = I18n.t('change_owner.post_revision_text',
       old_user: (self.user.username_lower rescue nil) || I18n.t('change_owner.deleted_user'),
       new_user: new_user.username_lower
     )
-    revise(actor, {raw: self.raw, user_id: new_user.id, edit_reason: edit_reason}, {bypass_bump: true, skip_revision: skip_revision})
+    revise(actor, { raw: self.raw, user_id: new_user.id, edit_reason: edit_reason }, bypass_bump: true, skip_revision: skip_revision)
 
     if post_number == topic.highest_post_number
       topic.update_columns(last_post_user_id: new_user.id)
@@ -516,7 +516,7 @@ class Post < ActiveRecord::Base
 
   # This calculates the geometric mean of the post timings and stores it along with
   # each post.
-  def self.calculate_avg_time(min_topic_age=nil)
+  def self.calculate_avg_time(min_topic_age = nil)
     retry_lock_error do
       builder = SqlBuilder.new("UPDATE posts
                 SET avg_time = (x.gmean / 1000)
@@ -577,7 +577,6 @@ class Post < ActiveRecord::Base
     self.quote_count = temp_collector.size
   end
 
-
   def save_reply_relationships
     add_to_quoted_post_numbers(reply_to_post_number)
     return if self.quoted_post_numbers.blank?
@@ -602,7 +601,7 @@ class Post < ActiveRecord::Base
     DiscourseEvent.trigger(:after_trigger_post_process, self)
   end
 
-  def self.public_posts_count_per_day(start_date, end_date, category_id=nil)
+  def self.public_posts_count_per_day(start_date, end_date, category_id = nil)
     result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date)
     result = result.where('topics.category_id = ?', category_id) if category_id
     result.group('date(posts.created_at)').order('date(posts.created_at)').count
@@ -612,7 +611,7 @@ class Post < ActiveRecord::Base
     private_posts.with_topic_subtype(topic_subtype).where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date).group('date(posts.created_at)').order('date(posts.created_at)').count
   end
 
-  def reply_history(max_replies=100, guardian=nil)
+  def reply_history(max_replies = 100, guardian = nil)
     post_ids = Post.exec_sql("WITH RECURSIVE breadcrumb(id, reply_to_post_number) AS (
                               SELECT p.id, p.reply_to_post_number FROM posts AS p
                                 WHERE p.id = :post_id
@@ -622,11 +621,11 @@ class Post < ActiveRecord::Base
                                      AND p.topic_id = :topic_id
                             ) SELECT id from breadcrumb ORDER by id", post_id: id, topic_id: topic_id).to_a
 
-    post_ids.map! {|r| r['id'].to_i }
-            .reject! {|post_id| post_id == id}
+    post_ids.map! { |r| r['id'].to_i }
+      .reject! { |post_id| post_id == id }
 
     # [1,2,3][-10,-1] => nil
-    post_ids = (post_ids[(0-max_replies)..-1] || post_ids)
+    post_ids = (post_ids[(0 - max_replies)..-1] || post_ids)
 
     Post.secured(guardian).where(id: post_ids).includes(:user, :topic).order(:id).to_a
   end
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 73fcf5ed37..73a7e583ff 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -42,27 +42,27 @@ class PostAction < ActiveRecord::Base
     nil
   end
 
-  def self.flag_count_by_date(start_date, end_date, category_id=nil)
+  def self.flag_count_by_date(start_date, end_date, category_id = nil)
     result = where('post_actions.created_at >= ? AND post_actions.created_at <= ?', start_date, end_date)
     result = result.where(post_action_type_id: PostActionType.flag_types.values)
     result = result.joins(post: :topic).where("topics.category_id = ?", category_id) if category_id
     result.group('date(post_actions.created_at)')
-          .order('date(post_actions.created_at)')
-          .count
+      .order('date(post_actions.created_at)')
+      .count
   end
 
   def self.update_flagged_posts_count
     posts_flagged_count = PostAction.active
-                                    .flags
-                                    .joins(post: :topic)
-                                    .where('posts.deleted_at' => nil)
-                                    .where('topics.deleted_at' => nil)
-                                    .where('posts.user_id > 0')
-                                    .count('DISTINCT posts.id')
+      .flags
+      .joins(post: :topic)
+      .where('posts.deleted_at' => nil)
+      .where('topics.deleted_at' => nil)
+      .where('posts.user_id > 0')
+      .count('DISTINCT posts.id')
 
     $redis.set('posts_flagged_count', posts_flagged_count)
     user_ids = User.staff.pluck(:id)
-    MessageBus.publish('/flagged_counts', { total: posts_flagged_count }, { user_ids: user_ids })
+    MessageBus.publish('/flagged_counts', { total: posts_flagged_count }, user_ids: user_ids)
   end
 
   def self.flagged_posts_count
@@ -107,7 +107,6 @@ SQL
       (map[row.topic_id] ||= []) << row.post_number
     end
 
-
     map
   end
 
@@ -128,21 +127,21 @@ SQL
     user_actions
   end
 
-  def self.count_per_day_for_type(post_action_type, opts=nil)
+  def self.count_per_day_for_type(post_action_type, opts = nil)
     opts ||= {}
     result = unscoped.where(post_action_type_id: post_action_type)
     result = result.where('post_actions.created_at >= ?', opts[:start_date] || (opts[:since_days_ago] || 30).days.ago)
     result = result.where('post_actions.created_at <= ?', opts[:end_date]) if opts[:end_date]
     result = result.joins(post: :topic).where('topics.category_id = ?', opts[:category_id]) if opts[:category_id]
     result.group('date(post_actions.created_at)')
-          .order('date(post_actions.created_at)')
-          .count
+      .order('date(post_actions.created_at)')
+      .count
   end
 
-  def self.agree_flags!(post, moderator, delete_post=false)
+  def self.agree_flags!(post, moderator, delete_post = false)
     actions = PostAction.active
-                        .where(post_id: post.id)
-                        .where(post_action_type_id: PostActionType.flag_types.values)
+      .where(post_id: post.id)
+      .where(post_action_type_id: PostActionType.flag_types.values)
 
     trigger_spam = false
     actions.each do |action|
@@ -169,7 +168,7 @@ SQL
       end
 
     actions = PostAction.where(post_id: post.id)
-                        .where(post_action_type_id: action_type_ids)
+      .where(post_action_type_id: action_type_ids)
 
     actions.each do |action|
       action.disagreed_at = Time.zone.now
@@ -186,10 +185,10 @@ SQL
     update_flagged_posts_count
   end
 
-  def self.defer_flags!(post, moderator, delete_post=false)
+  def self.defer_flags!(post, moderator, delete_post = false)
     actions = PostAction.active
-                        .where(post_id: post.id)
-                        .where(post_action_type_id: PostActionType.flag_types.values)
+      .where(post_id: post.id)
+      .where(post_action_type_id: PostActionType.flag_types.values)
 
     actions.each do |action|
       action.deferred_at = Time.zone.now
@@ -202,7 +201,7 @@ SQL
     update_flagged_posts_count
   end
 
-  def add_moderator_post_if_needed(moderator, disposition, delete_post=false)
+  def add_moderator_post_if_needed(moderator, disposition, delete_post = false)
     return if !SiteSetting.auto_respond_to_flag_actions
     return if related_post.nil? || related_post.topic.nil?
     return if staff_already_replied?(related_post.topic)
@@ -237,33 +236,35 @@ SQL
       opts[:target_group_names] = target_moderators
     else
       opts[:subtype] = TopicSubtype.notify_user
-      opts[:target_usernames] = if post_action_type == :notify_user
-                                  post.user.username
-                                elsif post_action_type != :notify_moderators
-                                  # this is a hack to allow a PM with no recipients, we should think through
-                                  # a cleaner technique, a PM with myself is valid for flagging
-                                  'x'
-                                end
+
+      opts[:target_usernames] =
+        if post_action_type == :notify_user
+          post.user.username
+        elsif post_action_type != :notify_moderators
+          # this is a hack to allow a PM with no recipients, we should think through
+          # a cleaner technique, a PM with myself is valid for flagging
+          'x'
+        end
     end
 
     PostCreator.new(user, opts).create.try(:id)
   end
 
-  def self.limit_action!(user,post,post_action_type_id)
+  def self.limit_action!(user, post, post_action_type_id)
     RateLimiter.new(user, "post_action-#{post.id}_#{post_action_type_id}", 4, 1.minute).performed!
   end
 
   def self.act(user, post, post_action_type_id, opts = {})
 
-    limit_action!(user,post,post_action_type_id)
+    limit_action!(user, post, post_action_type_id)
 
     related_post_id = create_message_for_post_action(user, post, post_action_type_id, opts)
     staff_took_action = opts[:take_action] || false
 
-    targets_topic = if opts[:flag_topic] && post.topic
-                      post.topic.reload
-                      post.topic.posts_count != 1
-                    end
+    targets_topic =
+      if opts[:flag_topic] && post.topic
+        post.topic.reload.posts_count != 1
+      end
 
     where_attrs = {
       post_id: post.id,
@@ -279,9 +280,9 @@ SQL
 
     # First try to revive a trashed record
     post_action = PostAction.where(where_attrs)
-                            .with_deleted
-                            .where("deleted_at IS NOT NULL")
-                            .first
+      .with_deleted
+      .where("deleted_at IS NOT NULL")
+      .first
 
     if post_action
       post_action.recover!
@@ -324,7 +325,7 @@ SQL
 
   def self.remove_act(user, post, post_action_type_id)
 
-    limit_action!(user,post,post_action_type_id)
+    limit_action!(user, post, post_action_type_id)
 
     finder = PostAction.where(post_id: post.id, user_id: user.id, post_action_type_id: post_action_type_id)
     finder = finder.with_deleted.includes(:post) if user.try(:staff?)
@@ -374,10 +375,10 @@ SQL
           multiplier = SiteSetting.send("tl#{user.trust_level}_additional_likes_per_day_multiplier").to_f
           multiplier = 1.0 if multiplier < 1.0
 
-          limit = (limit * multiplier ).to_i
+          limit = (limit * multiplier).to_i
         end
 
-        @rate_limiter = RateLimiter.new(user, "create_#{type}",limit, 1.day.to_i)
+        @rate_limiter = RateLimiter.new(user, "create_#{type}", limit, 1.day.to_i)
         return @rate_limiter
       end
     end
@@ -386,12 +387,12 @@ SQL
   before_create do
     post_action_type_ids = is_flag? ? PostActionType.flag_types.values : post_action_type_id
     raise AlreadyActed if PostAction.where(user_id: user_id)
-                                    .where(post_id: post_id)
-                                    .where(post_action_type_id: post_action_type_ids)
-                                    .where(deleted_at: nil)
-                                    .where(disagreed_at: nil)
-                                    .where(targets_topic: targets_topic)
-                                    .exists?
+        .where(post_id: post_id)
+        .where(post_action_type_id: post_action_type_ids)
+        .where(deleted_at: nil)
+        .where(disagreed_at: nil)
+        .where(targets_topic: targets_topic)
+        .exists?
   end
 
   # Returns the flag counts for a post, taking into account that some users
@@ -427,8 +428,8 @@ SQL
     # Update denormalized counts
     column = "#{post_action_type_key}_count"
     count = PostAction.where(post_id: post_id)
-                      .where(post_action_type_id: post_action_type_id)
-                      .count
+      .where(post_action_type_id: post_action_type_id)
+      .count
 
     # We probably want to refactor this method to something cleaner.
     case post_action_type_key
@@ -438,18 +439,17 @@ SQL
     when :like
       # 'like_score' is weighted higher for staff accounts
       score = PostAction.joins(:user)
-                        .where(post_id: post_id)
-                        .sum("CASE WHEN users.moderator OR users.admin THEN #{SiteSetting.staff_like_weight} ELSE 1 END")
+        .where(post_id: post_id)
+        .sum("CASE WHEN users.moderator OR users.admin THEN #{SiteSetting.staff_like_weight} ELSE 1 END")
       Post.where(id: post_id).update_all ["like_count = :count, like_score = :score", count: count, score: score]
     else
       Post.where(id: post_id).update_all ["#{column} = ?", count]
     end
 
-
     topic_id = Post.with_deleted.where(id: post_id).pluck(:topic_id).first
 
     # topic_user
-    if [:like,:bookmark].include? post_action_type_key
+    if [:like, :bookmark].include? post_action_type_key
       TopicUser.update_post_action_cache(user_id: user_id,
                                          topic_id: topic_id,
                                          post_action_type: post_action_type_key)
@@ -501,12 +501,12 @@ SQL
     return if topic.nil? || topic.closed?
 
     flags = PostAction.active
-                      .flags
-                      .joins(:post)
-                      .where("posts.topic_id = ?", topic.id)
-                      .where("post_actions.user_id > 0")
-                      .group("post_actions.user_id")
-                      .pluck("post_actions.user_id, COUNT(post_id)")
+      .flags
+      .joins(:post)
+      .where("posts.topic_id = ?", topic.id)
+      .where("post_actions.user_id > 0")
+      .group("post_actions.user_id")
+      .pluck("post_actions.user_id, COUNT(post_id)")
 
     # we need a minimum number of unique flaggers
     return if flags.count < SiteSetting.num_flaggers_to_close_topic
@@ -535,7 +535,7 @@ SQL
        acting_user.has_trust_level?(TrustLevel[3]) &&
        post.user.trust_level == TrustLevel[0]
 
-       hide_post!(post, post_action_type, Post.hidden_reasons[:flagged_by_tl3_user])
+      hide_post!(post, post_action_type, Post.hidden_reasons[:flagged_by_tl3_user])
 
     elsif PostActionType.auto_action_flag_types.include?(post_action_type) &&
           SiteSetting.flags_required_to_hide_post > 0
@@ -548,7 +548,7 @@ SQL
     end
   end
 
-  def self.hide_post!(post, post_action_type, reason=nil)
+  def self.hide_post!(post, post_action_type, reason = nil)
     return if post.hidden
 
     unless reason
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 53296c8e59..e0105cce4e 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -3,7 +3,7 @@ require_dependency 'oneboxer'
 class PostAnalyzer
 
   def initialize(raw, topic_id)
-    @raw  = raw
+    @raw = raw
     @topic_id = topic_id
     @found_oneboxes = false
   end
@@ -51,11 +51,11 @@ class PostAnalyzer
     return @raw_mentions if @raw_mentions.present?
 
     raw_mentions = cooked_stripped.css('.mention, .mention-group').map do |e|
-       if name = e.inner_text
-         name = name[1..-1]
-         name.downcase! if name
-         name
-       end
+      if name = e.inner_text
+        name = name[1..-1]
+        name.downcase! if name
+        name
+      end
     end
 
     raw_mentions.compact!
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 1d70519eaf..06ac7b5ebc 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -19,7 +19,7 @@ class PostMover
     end
   end
 
-  def to_new_topic(title, category_id=nil)
+  def to_new_topic(title, category_id = nil)
     @move_type = PostMover.move_types[:new_topic]
 
     post = Post.find_by(id: post_ids.first)
diff --git a/app/models/post_timing.rb b/app/models/post_timing.rb
index 8f68209020..c006d29508 100644
--- a/app/models/post_timing.rb
+++ b/app/models/post_timing.rb
@@ -5,7 +5,6 @@ class PostTiming < ActiveRecord::Base
   validates_presence_of :post_number
   validates_presence_of :msecs
 
-
   def self.pretend_read(topic_id, actual_read_post_number, pretend_read_post_number)
     # This is done in SQL cause the logic is quite tricky and we want to do this in one db hit
     #
@@ -39,9 +38,9 @@ class PostTiming < ActiveRecord::Base
                                   AND post_number = :post_number)",
              args)
     rescue PG::UniqueViolation
-       # concurrency is hard, we are not running serialized so this can possibly
-       # still happen, if it happens we just don't care, its an invalid record anyway
-       return
+      # concurrency is hard, we are not running serialized so this can possibly
+      # still happen, if it happens we just don't care, its an invalid record anyway
+      return
     end
 
     Post.where(['topic_id = :topic_id and post_number = :post_number', args]).update_all 'reads = reads + 1'
@@ -60,7 +59,6 @@ class PostTiming < ActiveRecord::Base
     record_new_timing(args) if rows == 0
   end
 
-
   def self.destroy_for(user_id, topic_ids)
     PostTiming.transaction do
       PostTiming.delete_all(['user_id = ? and topic_id in (?)', user_id, topic_ids])
@@ -68,9 +66,9 @@ class PostTiming < ActiveRecord::Base
     end
   end
 
-  MAX_READ_TIME_PER_BATCH = 60*1000.0
+  MAX_READ_TIME_PER_BATCH = 60 * 1000.0
 
-  def self.process_timings(current_user, topic_id, topic_time, timings, opts={})
+  def self.process_timings(current_user, topic_id, topic_time, timings, opts = {})
     current_user.user_stat.update_time_read!
 
     max_time_per_post = ((Time.now - current_user.created_at) * 1000.0)
@@ -89,9 +87,8 @@ class PostTiming < ActiveRecord::Base
 
     timings.each_with_index do |(post_number, time), index|
 
-        join_table << "SELECT #{topic_id.to_i} topic_id, #{post_number.to_i} post_number,
-                       #{current_user.id.to_i} user_id, #{time.to_i} msecs, #{index} idx"
-
+      join_table << "SELECT #{topic_id.to_i} topic_id, #{post_number.to_i} post_number,
+                     #{current_user.id.to_i} user_id, #{time.to_i} msecs, #{index} idx"
 
         highest_seen = post_number.to_i > highest_seen ?
                        post_number.to_i : highest_seen
@@ -113,19 +110,19 @@ SQL
       result.type_map = SqlBuilder.pg_type_map
       existing = Set.new(result.column_values(0))
 
-      timings.each_with_index do |(post_number, time),index|
+      timings.each_with_index do |(post_number, time), index|
         unless existing.include?(index)
           PostTiming.record_new_timing(topic_id: topic_id,
-                                 post_number: post_number,
-                                 user_id: current_user.id,
-                                 msecs: time)
+                                       post_number: post_number,
+                                       user_id: current_user.id,
+                                       msecs: time)
         end
       end
     end
 
     total_changed = 0
     if timings.length > 0
-      total_changed = Notification.mark_posts_read(current_user, topic_id, timings.map{|t| t[0]})
+      total_changed = Notification.mark_posts_read(current_user, topic_id, timings.map { |t| t[0] })
     end
 
     topic_time = max_time_per_post if topic_time > max_time_per_post
diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb
index e1736c8548..f7b3147e8b 100644
--- a/app/models/queued_post.rb
+++ b/app/models/queued_post.rb
@@ -51,7 +51,7 @@ class QueuedPost < ActiveRecord::Base
   end
 
   def create_options
-    opts = {raw: raw}
+    opts = { raw: raw }
     opts.merge!(post_options.symbolize_keys)
 
     opts[:cooking_options].symbolize_keys! if opts[:cooking_options]
@@ -102,7 +102,7 @@ class QueuedPost < ActiveRecord::Base
       end
 
       # Update the record in memory too, and clear the dirty flag
-      updates.each {|k, v| send("#{k}=", v) }
+      updates.each { |k, v| send("#{k}=", v) }
       changes_applied
 
       QueuedPost.broadcast_new! if visible?
diff --git a/app/models/quoted_post.rb b/app/models/quoted_post.rb
index 2bd06fce81..ecfe19e73d 100644
--- a/app/models/quoted_post.rb
+++ b/app/models/quoted_post.rb
@@ -17,8 +17,8 @@ class QuotedPost < ActiveRecord::Base
       post_number = a['data-post'].to_i
 
       next if topic_id == 0 || post_number == 0
-      next if uniq[[topic_id,post_number]]
-      uniq[[topic_id,post_number]] = true
+      next if uniq[[topic_id, post_number]]
+      uniq[[topic_id, post_number]] = true
 
       begin
         # It would be so much nicer if we used post_id in quotes
diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb
index b426030dbe..3030b4aa22 100644
--- a/app/models/remote_theme.rb
+++ b/app/models/remote_theme.rb
@@ -7,7 +7,7 @@ class RemoteTheme < ActiveRecord::Base
 
   has_one :theme
 
-  def self.import_theme(url, user=Discourse.system_user)
+  def self.import_theme(url, user = Discourse.system_user)
     importer = GitImporter.new(url)
     importer.import!
 
@@ -37,7 +37,7 @@ class RemoteTheme < ActiveRecord::Base
     self.remote_version, self.commits_behind = importer.commits_since(remote_version)
   end
 
-  def update_from_remote(importer=nil)
+  def update_from_remote(importer = nil)
     return unless remote_url
     cleanup = false
 
@@ -70,9 +70,9 @@ class RemoteTheme < ActiveRecord::Base
       end
 
       theme.set_field(target: info["target"] || :common,
-                        name: name,
-                        value: info["value"],
-                        type: info["type"] || :theme_var)
+                      name: name,
+                      value: info["value"],
+                      type: info["type"] || :theme_var)
     end
 
     Theme.targets.keys.each do |target|
diff --git a/app/models/report.rb b/app/models/report.rb
index 76c162ffb1..8144df648b 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -14,7 +14,7 @@ class Report
     @end_date ||= Time.zone.now.end_of_day
   end
 
-  def as_json(options=nil)
+  def as_json(options = nil)
     {
      type: type,
      title: I18n.t("reports.#{type}.title"),
@@ -34,7 +34,7 @@ class Report
     singleton_class.instance_eval { define_method("report_#{name}", &block) }
   end
 
-  def self.find(type, opts=nil)
+  def self.find(type, opts = nil)
     opts ||= {}
 
     # Load the report
@@ -56,11 +56,11 @@ class Report
     report
   end
 
-  def self.req_report(report, filter=nil)
+  def self.req_report(report, filter = nil)
     data =
       if filter == :page_view_total
         ApplicationRequest.where(req_type: [
-          ApplicationRequest.req_types.reject{|k,v| k =~ /mobile/}.map{|k,v| v if k =~ /page_view/}.compact
+          ApplicationRequest.req_types.reject { |k, v| k =~ /mobile/ }.map { |k, v| v if k =~ /page_view/ }.compact
         ].flatten)
       else
         ApplicationRequest.where(req_type:  ApplicationRequest.req_types[filter])
@@ -68,18 +68,18 @@ class Report
 
     report.data = []
     data.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date)
-                    .order(date: :asc)
-                    .group(:date)
-                    .sum(:count)
-                    .each do |date, count|
+      .order(date: :asc)
+      .group(:date)
+      .sum(:count)
+      .each do |date, count|
       report.data << { x: date, y: count }
     end
 
     report.total      = data.sum(:count)
     report.prev30Days = data.where('date >= ? AND date <= ?',
                                                (report.start_date - 31.days).to_date,
-                                               (report.end_date - 31.days).to_date )
-                                        .sum(:count)
+                                               (report.end_date - 31.days).to_date)
+      .sum(:count)
   end
 
   def self.report_visits(report)
@@ -128,7 +128,7 @@ class Report
 
   def self.report_time_to_first_response(report)
     report.data = []
-    Topic.time_to_first_response_per_day(report.start_date, report.end_date, {category_id: report.category_id}).each do |r|
+    Topic.time_to_first_response_per_day(report.start_date, report.end_date, category_id: report.category_id).each do |r|
       report.data << { x: Date.parse(r["date"]), y: r["hours"].to_f.round(2) }
     end
     report.total = Topic.time_to_first_response_total(category_id: report.category_id)
diff --git a/app/models/screened_email.rb b/app/models/screened_email.rb
index ee8b005728..a0dec7f12f 100644
--- a/app/models/screened_email.rb
+++ b/app/models/screened_email.rb
@@ -18,8 +18,8 @@ class ScreenedEmail < ActiveRecord::Base
     self.email = email.downcase
   end
 
-  def self.block(email, opts={})
-    find_by_email(Email.downcase(email)) || create(opts.slice(:action_type, :ip_address).merge({email: email}))
+  def self.block(email, opts = {})
+    find_by_email(Email.downcase(email)) || create(opts.slice(:action_type, :ip_address).merge(email: email))
   end
 
   def self.should_block?(email)
@@ -30,8 +30,8 @@ class ScreenedEmail < ActiveRecord::Base
 
     max_distance = SiteSetting.levenshtein_distance_spammer_emails
     screened_email = screened_emails.select { |se| distances[se.email] <= max_distance }
-                                    .sort   { |se| distances[se.email] }
-                                    .first
+      .sort   { |se| distances[se.email] }
+      .first
 
     screened_email.record_match! if screened_email
 
@@ -46,13 +46,13 @@ class ScreenedEmail < ActiveRecord::Base
 
     (1..second.length).each do |i|
       (1..first.length).each do |j|
-        if first[j-1] == second[i-1]
-          matrix[i][j] = matrix[i-1][j-1]
+        if first[j - 1] == second[i - 1]
+          matrix[i][j] = matrix[i - 1][j - 1]
         else
           matrix[i][j] = [
-            matrix[i-1][j],
-            matrix[i][j-1],
-            matrix[i-1][j-1],
+            matrix[i - 1][j],
+            matrix[i][j - 1],
+            matrix[i - 1][j - 1],
           ].min + 1
         end
       end
diff --git a/app/models/screened_ip_address.rb b/app/models/screened_ip_address.rb
index 248ad97703..f0e51ab045 100644
--- a/app/models/screened_ip_address.rb
+++ b/app/models/screened_ip_address.rb
@@ -11,7 +11,7 @@ class ScreenedIpAddress < ActiveRecord::Base
 
   validates :ip_address, ip_address_format: true, presence: true
 
-  def self.watch(ip_address, opts={})
+  def self.watch(ip_address, opts = {})
     match_for_ip_address(ip_address) || create(opts.slice(:action_type).merge(ip_address: ip_address))
   end
 
@@ -67,10 +67,10 @@ class ScreenedIpAddress < ActiveRecord::Base
     exists_for_ip_address_and_action?(ip_address, actions[:do_nothing])
   end
 
-  def self.exists_for_ip_address_and_action?(ip_address, action_type, opts={})
+  def self.exists_for_ip_address_and_action?(ip_address, action_type, opts = {})
     b = match_for_ip_address(ip_address)
-    found = (!!b and b.action_type == action_type)
-    b.record_match! if found and opts[:record_match] != false
+    found = (!!b && b.action_type == (action_type))
+    b.record_match! if found && opts[:record_match] != (false)
     found
   end
 
@@ -125,7 +125,7 @@ class ScreenedIpAddress < ActiveRecord::Base
     ScreenedIpAddress.exec_sql(star_star_subnets_query, min_count: 10, roll_up_weight: weight).values.flatten
   end
 
-  def self.roll_up(current_user=Discourse.system_user)
+  def self.roll_up(current_user = Discourse.system_user)
     # 1 - retrieve all subnets that needs roll up
     subnets = [star_subnets, star_star_subnets].flatten
 
@@ -158,9 +158,9 @@ class ScreenedIpAddress < ActiveRecord::Base
 
       # 5 - remove old matches
       ScreenedIpAddress.where(action_type: ScreenedIpAddress.actions[:block])
-                       .where("family(ip_address) = 4")
-                       .where("ip_address << ?", subnet)
-                       .delete_all
+        .where("family(ip_address) = 4")
+        .where("ip_address << ?", subnet)
+        .delete_all
     end
 
     # return the subnets
diff --git a/app/models/screened_url.rb b/app/models/screened_url.rb
index 3bd7cc1b89..47e6e949db 100644
--- a/app/models/screened_url.rb
+++ b/app/models/screened_url.rb
@@ -21,7 +21,7 @@ class ScreenedUrl < ActiveRecord::Base
     self.domain = self.domain.downcase.sub(/^www\./, '') if self.domain
   end
 
-  def self.watch(url, domain, opts={})
+  def self.watch(url, domain, opts = {})
     find_match(url) || create(opts.slice(:action_type, :ip_address).merge(url: url, domain: domain))
   end
 
diff --git a/app/models/search_log.rb b/app/models/search_log.rb
new file mode 100644
index 0000000000..acaf269c56
--- /dev/null
+++ b/app/models/search_log.rb
@@ -0,0 +1,70 @@
+require_dependency 'enum'
+
+class SearchLog < ActiveRecord::Base
+  validates_presence_of :term, :ip_address
+
+  def self.search_types
+    @search_types ||= Enum.new(
+      header: 1,
+      full_page: 2
+    )
+  end
+
+  def self.log(term:, search_type:, ip_address:, user_id: nil)
+
+    search_type = search_types[search_type]
+    return [:error] unless search_type.present? && ip_address.present?
+
+    update_sql = <<~SQL
+      UPDATE search_logs
+      SET term = :term,
+        created_at = :created_at
+      WHERE created_at > :timeframe AND
+        position(term IN :term) = 1 AND
+        ((:user_id IS NULL AND ip_address = :ip_address) OR
+          (user_id = :user_id))
+      RETURNING id
+    SQL
+
+    rows = exec_sql(
+      update_sql,
+      term: term,
+      created_at: Time.zone.now,
+      timeframe: 5.seconds.ago,
+      user_id: user_id,
+      ip_address: ip_address
+    )
+
+    if rows.cmd_tuples == 0
+      result = create(
+        term: term,
+        search_type: search_type,
+        ip_address: ip_address,
+        user_id: user_id
+      )
+      [:created, result.id]
+    else
+      [:updated, rows[0]['id'].to_i]
+    end
+  end
+
+  def self.clean_up
+    search_id = SearchLog.order(:id).offset(SiteSetting.search_query_log_max_size).limit(1).pluck(:id)
+    if search_id.present?
+      SearchLog.where('id < ?', search_id[0]).delete_all
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: search_logs
+#
+#  id               :integer          not null, primary key
+#  term             :string           not null
+#  user_id          :integer
+#  ip_address       :inet             not null
+#  clicked_topic_id :integer
+#  search_type      :integer          not null
+#  created_at       :datetime         not null
+#
diff --git a/app/models/site.rb b/app/models/site.rb
index 37312625ba..9d90b2c1bc 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -121,7 +121,7 @@ class Site
   def self.clear_anon_cache!
     # publishing forces the sequence up
     # the cache is validated based on the sequence
-    MessageBus.publish('/site_json','')
+    MessageBus.publish('/site_json', '')
   end
 
 end
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index ef88e14516..2e4fa838f3 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -34,7 +34,7 @@ class SiteSetting < ActiveRecord::Base
   client_settings << :available_locales
 
   def self.available_locales
-    LocaleSiteSetting.values.map{ |e| e[:value] }.join('|')
+    LocaleSiteSetting.values.map { |e| e[:value] }.join('|')
   end
 
   def self.topic_title_length
@@ -71,8 +71,8 @@ class SiteSetting < ActiveRecord::Base
 
   def self.anonymous_homepage
     top_menu_items.map { |item| item.name }
-                  .select { |item| anonymous_menu_items.include?(item) }
-                  .first
+      .select { |item| anonymous_menu_items.include?(item) }
+      .first
   end
 
   def self.should_download_images?(src)
diff --git a/app/models/slug_setting.rb b/app/models/slug_setting.rb
index b2be27fcbd..86dc666d91 100644
--- a/app/models/slug_setting.rb
+++ b/app/models/slug_setting.rb
@@ -10,7 +10,7 @@ class SlugSetting < EnumSiteSetting
 
   def self.values
     VALUES.map do |l|
-      {name: l, value: l}
+      { name: l, value: l }
     end
   end
 
diff --git a/app/models/stylesheet_cache.rb b/app/models/stylesheet_cache.rb
index 2c568072cb..b421c0df7a 100644
--- a/app/models/stylesheet_cache.rb
+++ b/app/models/stylesheet_cache.rb
@@ -3,7 +3,7 @@ class StylesheetCache < ActiveRecord::Base
 
   MAX_TO_KEEP = 50
 
-  def self.add(target,digest,content,source_map)
+  def self.add(target, digest, content, source_map)
 
     return false if where(target: target, digest: digest).exists?
 
@@ -13,11 +13,11 @@ class StylesheetCache < ActiveRecord::Base
     if count > MAX_TO_KEEP
 
       remove_lower = StylesheetCache
-                     .where(target: target)
-                     .limit(MAX_TO_KEEP)
-                     .order('id desc')
-                     .pluck(:id)
-                     .last
+        .where(target: target)
+        .limit(MAX_TO_KEEP)
+        .order('id desc')
+        .pluck(:id)
+        .last
 
       exec_sql("DELETE FROM stylesheet_cache where id < :id", id: remove_lower)
     end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 95a944776c..a9223b670a 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -18,23 +18,23 @@ class Tag < ActiveRecord::Base
   # fetch the result with .count(Tag::COUNT_ARG).
   #
   # e.g., Tag.tags_by_count_query.where("topics.category_id = ?", category.id).count(Tag::COUNT_ARG)
-  def self.tags_by_count_query(opts={})
+  def self.tags_by_count_query(opts = {})
     q = Tag.joins("LEFT JOIN topic_tags ON tags.id = topic_tags.tag_id")
-           .joins("LEFT JOIN topics ON topics.id = topic_tags.topic_id")
-           .group("tags.id, tags.name")
-           .order('count_topic_tags_id DESC')
+      .joins("LEFT JOIN topics ON topics.id = topic_tags.topic_id")
+      .group("tags.id, tags.name")
+      .order('count_topic_tags_id DESC')
     q = q.limit(opts[:limit]) if opts[:limit]
     q
   end
 
-  def self.category_tags_by_count_query(category, opts={})
+  def self.category_tags_by_count_query(category, opts = {})
     tags_by_count_query(opts).where("tags.id in (select tag_id from category_tags where category_id = ?)", category.id)
-                             .where("topics.category_id = ?", category.id)
+      .where("topics.category_id = ?", category.id)
   end
 
   def self.top_tags(limit_arg: nil, category: nil, guardian: nil)
     limit = limit_arg || SiteSetting.max_tags_in_filter_list
-    scope_category_ids = (guardian||Guardian.new).allowed_category_ids
+    scope_category_ids = (guardian || Guardian.new).allowed_category_ids
 
     if category
       scope_category_ids &= ([category.id] + category.subcategories.pluck(:id))
@@ -46,7 +46,7 @@ class Tag < ActiveRecord::Base
       category: category
     )
 
-    tags.count(COUNT_ARG).map {|name, _| name}
+    tags.count(COUNT_ARG).map { |name, _| name }
   end
 
   def self.include_tags?
diff --git a/app/models/theme.rb b/app/models/theme.rb
index ab1fceb91f..f38668e1fa 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -50,7 +50,7 @@ class Theme < ActiveRecord::Base
       ColorScheme
         .where(theme_id: self.id)
         .where("id NOT IN (SELECT color_scheme_id FROM themes where color_scheme_id IS NOT NULL)")
-               .destroy_all
+        .destroy_all
 
       ColorScheme
         .where(theme_id: self.id)
@@ -114,7 +114,7 @@ class Theme < ActiveRecord::Base
     (@cache[cache_key] = val || "").html_safe
   end
 
-  def self.remove_from_cache!(themes=nil)
+  def self.remove_from_cache!(themes = nil)
     clear_cache!
   end
 
@@ -122,13 +122,11 @@ class Theme < ActiveRecord::Base
     @cache.clear
   end
 
-
   def self.targets
     @targets ||= Enum.new(common: 0, desktop: 1, mobile: 2)
   end
 
-
-  def notify_scheme_change(clear_manager_cache=true)
+  def notify_scheme_change(clear_manager_cache = true)
     Stylesheet::Manager.cache.clear if clear_manager_cache
     message = refresh_message_for_targets(["desktop", "mobile", "admin"], self)
     MessageBus.publish('/file-change', message)
@@ -140,7 +138,7 @@ class Theme < ActiveRecord::Base
     themes = [self] + dependant_themes
 
     message = themes.map do |theme|
-      refresh_message_for_targets([:mobile_theme,:desktop_theme], theme)
+      refresh_message_for_targets([:mobile_theme, :desktop_theme], theme)
     end.compact.flatten
     MessageBus.publish('/file-change', message)
   end
@@ -168,7 +166,7 @@ class Theme < ActiveRecord::Base
 
   def resolve_dependant_themes(direction)
 
-    select_field,where_field=nil
+    select_field, where_field = nil
 
     if direction == :up
       select_field = "parent_theme_id"
@@ -212,7 +210,7 @@ class Theme < ActiveRecord::Base
   end
 
   def resolve_baked_field(target, name)
-    list_baked_fields(target,name).map{|f| f.value_baked || f.value}.join("\n")
+    list_baked_fields(target, name).map { |f| f.value_baked || f.value }.join("\n")
   end
 
   def list_baked_fields(target, name)
@@ -221,12 +219,15 @@ class Theme < ActiveRecord::Base
 
     theme_ids = [self.id] + (included_themes.map(&:id) || [])
     fields = ThemeField.where(target_id: [Theme.targets[target], Theme.targets[:common]])
-                       .where(name: name.to_s)
-                       .includes(:theme)
-                       .joins("JOIN (
-                             SELECT #{theme_ids.map.with_index{|id,idx| "#{id} AS theme_id, #{idx} AS sort_column"}.join(" UNION ALL SELECT ")}
-                            ) as X ON X.theme_id = theme_fields.theme_id")
-                       .order('sort_column, target_id')
+      .where(name: name.to_s)
+      .includes(:theme)
+      .joins("
+        JOIN (
+          SELECT #{theme_ids.map.with_index { |id, idx| "#{id} AS theme_id, #{idx} AS sort_column" }.join(" UNION ALL SELECT ")}
+        ) as X ON X.theme_id = theme_fields.theme_id"
+      )
+      .order('sort_column, target_id')
+
     fields.each(&:ensure_baked!)
     fields
   end
@@ -254,7 +255,7 @@ class Theme < ActiveRecord::Base
 
     value ||= ""
 
-    field = theme_fields.find{|f| f.name==name && f.target_id == target_id && f.type_id == type_id}
+    field = theme_fields.find { |f| f.name == name && f.target_id == target_id && f.type_id == type_id }
     if field
       if value.blank? && !upload_id
         theme_fields.delete field.destroy
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 34d09eb189..26e67329ee 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -11,7 +11,7 @@ class ThemeField < ActiveRecord::Base
   end
 
   def self.theme_var_type_ids
-    @theme_var_type_ids ||= [2,3,4]
+    @theme_var_type_ids ||= [2, 3, 4]
   end
 
   COMPILER_VERSION = 5
@@ -19,7 +19,7 @@ class ThemeField < ActiveRecord::Base
   belongs_to :theme
 
   def transpile(es6_source, version)
-    template  = Tilt::ES6ModuleTranspilerTemplate.new {}
+    template = Tilt::ES6ModuleTranspilerTemplate.new {}
     wrapped = <<PLUGIN_API_JS
 Discourse._registerPluginCode('#{version}', api => {
   #{es6_source}
@@ -90,7 +90,6 @@ COMPILED
     @scss_fields ||= %w(scss embedded_scss)
   end
 
-
   def ensure_baked!
     if ThemeField.html_fields.include?(self.name)
       if !self.value_baked || compiler_version != COMPILER_VERSION
diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb
index 6172f7cf0a..709148167c 100644
--- a/app/models/top_topic.rb
+++ b/app/models/top_topic.rb
@@ -16,7 +16,7 @@ class TopTopic < ActiveRecord::Base
 
   # We don't have to refresh these as often
   def self.refresh_older!
-    older_periods = periods - [:daily,:all]
+    older_periods = periods - [:daily, :all]
 
     transaction do
       older_periods.each do |period|
@@ -32,7 +32,6 @@ class TopTopic < ActiveRecord::Base
     refresh_older!
   end
 
-
   def self.periods
     @@periods ||= [:all, :yearly, :quarterly, :monthly, :weekly, :daily].freeze
   end
@@ -203,11 +202,11 @@ class TopTopic < ActiveRecord::Base
 
   def self.start_of(period)
     case period
-      when :yearly    then 1.year.ago
-      when :monthly   then 1.month.ago
-      when :quarterly then 3.months.ago
-      when :weekly    then 1.week.ago
-      when :daily     then 1.day.ago
+    when :yearly    then 1.year.ago
+    when :monthly   then 1.month.ago
+    when :quarterly then 3.months.ago
+    when :weekly    then 1.week.ago
+    when :daily     then 1.day.ago
     end
   end
 
diff --git a/app/models/topic.rb b/app/models/topic.rb
index f9fcfadf52..b076191a8d 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -30,14 +30,14 @@ class Topic < ActiveRecord::Base
   attr_accessor :allowed_user_ids, :tags_changed
 
   def self.max_sort_order
-    @max_sort_order ||= (2 ** 31) - 1
+    @max_sort_order ||= (2**31) - 1
   end
 
   def featured_users
     @featured_users ||= TopicFeaturedUsers.new(self)
   end
 
-  def trash!(trashed_by=nil)
+  def trash!(trashed_by = nil)
     update_category_topic_count_by(-1) if deleted_at.nil?
     super(trashed_by)
     update_flagged_posts_count
@@ -57,27 +57,27 @@ class Topic < ActiveRecord::Base
   rate_limit :limit_topics_per_day
   rate_limit :limit_private_messages_per_day
 
-  validates :title, :if => Proc.new { |t| t.new_record? || t.title_changed? },
-                    :presence => true,
-                    :topic_title_length => true,
-                    :censored_words => true,
-                    :quality_title => { :unless => :private_message? },
-                    :unique_among  => { :unless => Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
-                                        :message => :has_already_been_used,
-                                        :allow_blank => true,
-                                        :case_sensitive => false,
-                                        :collection => Proc.new{ Topic.listable_topics } }
+  validates :title, if: Proc.new { |t| t.new_record? || t.title_changed? },
+                    presence: true,
+                    topic_title_length: true,
+                    censored_words: true,
+                    quality_title: { unless: :private_message? },
+                    unique_among: { unless: Proc.new { |t| (SiteSetting.allow_duplicate_topic_titles? || t.private_message?) },
+                                    message: :has_already_been_used,
+                                    allow_blank: true,
+                                    case_sensitive: false,
+                                    collection: Proc.new { Topic.listable_topics } }
 
   validates :category_id,
-            :presence => true,
-            :exclusion => {
-              :in => Proc.new{[SiteSetting.uncategorized_category_id]}
+            presence: true,
+            exclusion: {
+              in: Proc.new { [SiteSetting.uncategorized_category_id] }
             },
-            :if => Proc.new { |t|
-                   (t.new_record? || t.category_id_changed?) &&
-                   !SiteSetting.allow_uncategorized_topics &&
-                   (t.archetype.nil? || t.archetype == Archetype.default) &&
-                   (!t.user_id || !t.user.staff?)
+            if: Proc.new { |t|
+              (t.new_record? || t.category_id_changed?) &&
+              !SiteSetting.allow_uncategorized_topics &&
+              (t.archetype.nil? || t.archetype == Archetype.default) &&
+              (!t.user_id || !t.user.staff?)
             }
 
   validates :featured_link, allow_nil: true, format: URI::regexp(%w(http https))
@@ -124,7 +124,7 @@ class Topic < ActiveRecord::Base
   has_many :topic_timers, dependent: :destroy
 
   has_one :user_warning
-  has_one :first_post, -> {where post_number: 1}, class_name: Post
+  has_one :first_post, -> { where post_number: 1 }, class_name: Post
 
   has_one :topic_embed, dependent: :destroy
 
@@ -152,7 +152,7 @@ class Topic < ActiveRecord::Base
 
   scope :created_since, lambda { |time_ago| where('topics.created_at > ?', time_ago) }
 
-  scope :secured, lambda { |guardian=nil|
+  scope :secured, lambda { |guardian = nil|
     ids = guardian.secure_category_ids if guardian
 
     # Query conditions
@@ -242,7 +242,7 @@ class Topic < ActiveRecord::Base
     end
   end
 
-  def self.visible_post_types(viewed_by=nil)
+  def self.visible_post_types(viewed_by = nil)
     types = Post.types
     result = [types[:regular], types[:moderator_action], types[:small_action]]
     result << types[:whisper] if viewed_by.try(:staff?)
@@ -267,8 +267,8 @@ class Topic < ActiveRecord::Base
 
   def has_flags?
     FlagQuery.flagged_post_actions("active")
-             .where("topics.id" => id)
-             .exists?
+      .where("topics.id" => id)
+      .exists?
   end
 
   def is_official_warning?
@@ -324,21 +324,21 @@ class Topic < ActiveRecord::Base
   end
 
   # Returns hot topics since a date for display in email digest.
-  def self.for_digest(user, since, opts=nil)
+  def self.for_digest(user, since, opts = nil)
     opts = opts || {}
     score = "#{ListController.best_period_for(since)}_score"
 
     topics = Topic
-              .visible
-              .secured(Guardian.new(user))
-              .joins("LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}")
-              .joins("LEFT OUTER JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id.to_i}")
-              .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
-              .where(closed: false, archived: false)
-              .where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
-              .created_since(since)
-              .listable_topics
-              .includes(:category)
+      .visible
+      .secured(Guardian.new(user))
+      .joins("LEFT OUTER JOIN topic_users ON topic_users.topic_id = topics.id AND topic_users.user_id = #{user.id.to_i}")
+      .joins("LEFT OUTER JOIN category_users ON category_users.category_id = topics.category_id AND category_users.user_id = #{user.id.to_i}")
+      .joins("LEFT OUTER JOIN users ON users.id = topics.user_id")
+      .where(closed: false, archived: false)
+      .where("COALESCE(topic_users.notification_level, 1) <> ?", TopicUser.notification_levels[:muted])
+      .created_since(since)
+      .listable_topics
+      .includes(:category)
 
     unless opts[:include_tl0] || user.user_option.try(:include_tl0_in_digests)
       topics = topics.where("COALESCE(users.trust_level, 0) > 0")
@@ -346,7 +346,7 @@ class Topic < ActiveRecord::Base
 
     if !!opts[:top_order]
       topics = topics.joins("LEFT OUTER JOIN top_topics ON top_topics.topic_id = topics.id")
-                     .order(TopicQuerySQL.order_top_with_notification_levels(score))
+        .order(TopicQuerySQL.order_top_with_notification_levels(score))
     end
 
     if opts[:limit]
@@ -383,7 +383,7 @@ class Topic < ActiveRecord::Base
   end
 
   # Using the digest query, figure out what's  new for a user since last seen
-  def self.new_since_last_seen(user, since, featured_topic_ids=nil)
+  def self.new_since_last_seen(user, since, featured_topic_ids = nil)
     topics = Topic.for_digest(user, since)
     featured_topic_ids ? topics.where("topics.id NOT IN (?)", featured_topic_ids) : topics
   end
@@ -401,7 +401,7 @@ class Topic < ActiveRecord::Base
     save
   end
 
-  def reload(options=nil)
+  def reload(options = nil)
     @post_numbers = nil
     @public_topic_timer = nil
     super(options)
@@ -423,7 +423,7 @@ class Topic < ActiveRecord::Base
     custom_fields[key.to_s]
   end
 
-  def self.listable_count_per_day(start_date, end_date, category_id=nil)
+  def self.listable_count_per_day(start_date, end_date, category_id = nil)
     result = listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date)
     result = result.where(category_id: category_id) if category_id
     result.group('date(created_at)').order('date(created_at)').count
@@ -435,7 +435,7 @@ class Topic < ActiveRecord::Base
 
   MAX_SIMILAR_BODY_LENGTH = 200
   # Search for similar topics
-  def self.similar_to(title, raw, user=nil)
+  def self.similar_to(title, raw, user = nil)
     return [] unless title.present?
     return [] unless raw.present?
 
@@ -445,12 +445,12 @@ class Topic < ActiveRecord::Base
     # Exclude category definitions from similar topic suggestions
 
     candidates = Topic.visible
-       .secured(Guardian.new(user))
-       .listable_topics
-       .joins('JOIN topic_search_data s ON topics.id = s.topic_id')
-       .where("search_data @@ #{ts_query}")
-       .order("ts_rank(search_data, #{ts_query}) DESC")
-       .limit(SiteSetting.max_similar_results * 3)
+      .secured(Guardian.new(user))
+      .listable_topics
+      .joins('JOIN topic_search_data s ON topics.id = s.topic_id')
+      .where("search_data @@ #{ts_query}")
+      .order("ts_rank(search_data, #{ts_query}) DESC")
+      .limit(SiteSetting.max_similar_results * 3)
 
     exclude_topic_ids = Category.pluck(:topic_id).compact!
     if exclude_topic_ids.present?
@@ -462,16 +462,16 @@ class Topic < ActiveRecord::Base
     return [] unless candidate_ids.present?
 
     similar = Topic.select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(topics.title, :raw) AS similarity, p.cooked as blurb", title: title, raw: raw]))
-                     .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1")
-                     .limit(SiteSetting.max_similar_results)
-                     .where("topics.id IN (?)", candidate_ids)
-                     .where("similarity(topics.title, :title) + similarity(topics.title, :raw) > 0.2", raw: raw, title: title)
-                     .order('similarity desc')
+      .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1")
+      .limit(SiteSetting.max_similar_results)
+      .where("topics.id IN (?)", candidate_ids)
+      .where("similarity(topics.title, :title) + similarity(topics.title, :raw) > 0.2", raw: raw, title: title)
+      .order('similarity desc')
 
     similar
   end
 
-  def update_status(status, enabled, user, opts={})
+  def update_status(status, enabled, user, opts = {})
     TopicStatusUpdater.new(self, user).update!(status, enabled, opts)
     DiscourseEvent.trigger(:topic_status_updated, self.id, status, enabled)
   end
@@ -504,7 +504,6 @@ class Topic < ActiveRecord::Base
     end
   end
 
-
   def self.reset_all_highest!
     exec_sql <<SQL
 WITH
@@ -542,7 +541,6 @@ WHERE
 SQL
   end
 
-
   # If a post is deleted we have to update our highest post counters
   def self.reset_highest(topic_id)
     result = exec_sql "UPDATE topics
@@ -592,7 +590,7 @@ SQL
   end
 
   # This calculates the geometric mean of the posts and stores it with the topic
-  def self.calculate_avg_time(min_topic_age=nil)
+  def self.calculate_avg_time(min_topic_age = nil)
     builder = SqlBuilder.new("UPDATE topics
               SET avg_time = x.gmean
               FROM (SELECT topic_id,
@@ -637,13 +635,13 @@ SQL
     true
   end
 
-  def add_small_action(user, action_code, who=nil)
+  def add_small_action(user, action_code, who = nil)
     custom_fields = {}
     custom_fields["action_code_who"] = who if who.present?
     add_moderator_post(user, nil, post_type: Post.types[:small_action], action_code: action_code, custom_fields: custom_fields)
   end
 
-  def add_moderator_post(user, text, opts=nil)
+  def add_moderator_post(user, text, opts = nil)
     opts ||= {}
     new_post = nil
     creator = PostCreator.new(user,
@@ -723,6 +721,8 @@ SQL
       PostAlerter.new.after_save_post(last_post)
       add_small_action(user, "invited_group", group.name)
 
+      group_id = group.id
+
       group.users.where(
         "group_users.notification_level > ?", NotificationLevels.all[:muted]
       ).find_each do |u|
@@ -733,7 +733,8 @@ SQL
           post_number: 1,
           data: {
             topic_title: self.title,
-            display_username: user.username
+            display_username: user.username,
+            group_id: group_id
           }.to_json
         )
       end
@@ -743,10 +744,11 @@ SQL
   end
 
   # Invite a user to the topic by username or email. Returns success/failure
-  def invite(invited_by, username_or_email, group_ids=nil, custom_message=nil)
+  def invite(invited_by, username_or_email, group_ids = nil, custom_message = nil)
+    user = User.find_by_username_or_email(username_or_email)
+
     if private_message?
       # If the user exists, add them to the message.
-      user = User.find_by_username_or_email(username_or_email)
       raise UserExists.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists?
 
       if user && topic_allowed_users.create!(user_id: user.id)
@@ -764,18 +766,27 @@ SQL
     end
 
     if username_or_email =~ /^.+@.+$/ && Guardian.new(invited_by).can_invite_via_email?(self)
-      # rate limit topic invite
       RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed!
 
-      # NOTE callers expect an invite object if an invite was sent via email
-      invite_by_email(invited_by, username_or_email, group_ids, custom_message)
+      if user.present?
+        # add existing users
+        Invite.extend_permissions(self, user, invited_by)
+
+        # Notify the user they've been invited
+        user.notifications.create(notification_type: Notification.types[:invited_to_topic],
+                                  topic_id: id,
+                                  post_number: 1,
+                                  data: { topic_title: title,
+                                          display_username: invited_by.username }.to_json)
+        return true
+      else
+        # NOTE callers expect an invite object if an invite was sent via email
+        invite_by_email(invited_by, username_or_email, group_ids, custom_message)
+      end
     else
-      # invite existing member to a topic
-      user = User.find_by_username(username_or_email)
       raise UserExists.new I18n.t("topic_invite.user_exists") if user.present? && topic_allowed_users.where(user_id: user.id).exists?
 
       if user && topic_allowed_users.create!(user_id: user.id)
-        # rate limit topic invite
         RateLimiter.new(invited_by, "topic-invitations-per-day", SiteSetting.max_topic_invitations_per_day, 1.day.to_i).performed!
 
         # Notify the user they've been invited
@@ -791,16 +802,16 @@ SQL
     end
   end
 
-  def invite_by_email(invited_by, email, group_ids=nil, custom_message=nil)
+  def invite_by_email(invited_by, email, group_ids = nil, custom_message = nil)
     Invite.invite_by_email(email, invited_by, self, group_ids, custom_message)
   end
 
   def email_already_exists_for?(invite)
-    invite.email_already_exists and private_message?
+    invite.email_already_exists && private_message?
   end
 
   def grant_permission_to_user(lower_email)
-    user = User.find_by(email: lower_email)
+    user = User.find_by_email(lower_email)
     topic_allowed_users.create!(user_id: user.id)
   end
 
@@ -895,7 +906,7 @@ SQL
     slug = Slug.for(t.to_s)
     write_attribute(:slug, slug)
     write_attribute(:fancy_title, nil)
-    write_attribute(:title,t)
+    write_attribute(:title, t)
   end
 
   # NOTE: These are probably better off somewhere else.
@@ -904,7 +915,7 @@ SQL
     "#{Discourse.base_uri}/t/#{slug}/#{id}/#{posts_count}"
   end
 
-  def self.url(id, slug, post_number=nil)
+  def self.url(id, slug, post_number = nil)
     url = "#{Discourse.base_url}/t/#{slug}/#{id}"
     url << "/#{post_number}" if post_number.to_i > 1
     url
@@ -914,7 +925,7 @@ SQL
     self.class.url id, slug, post_number
   end
 
-  def self.relative_url(id, slug, post_number=nil)
+  def self.relative_url(id, slug, post_number = nil)
     url = "#{Discourse.base_uri}/t/"
     url << "#{slug}/" if slug.present?
     url << id.to_s
@@ -922,11 +933,11 @@ SQL
     url
   end
 
-  def slugless_url(post_number=nil)
+  def slugless_url(post_number = nil)
     Topic.relative_url(id, nil, post_number)
   end
 
-  def relative_url(post_number=nil)
+  def relative_url(post_number = nil)
     Topic.relative_url(id, slug, post_number)
   end
 
@@ -944,7 +955,7 @@ SQL
     TopicUser.change(user.id, id, cleared_pinned_at: nil)
   end
 
-  def update_pinned(status, global=false, pinned_until=nil)
+  def update_pinned(status, global = false, pinned_until = nil)
     pinned_until = Time.parse(pinned_until) rescue nil
 
     update_columns(
@@ -1123,7 +1134,7 @@ SQL
     ) t
   SQL
 
-  def self.time_to_first_response(sql, opts=nil)
+  def self.time_to_first_response(sql, opts = nil)
     opts ||= {}
     builder = SqlBuilder.new(sql)
     builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date]
@@ -1134,17 +1145,17 @@ SQL
     builder.where("p.deleted_at IS NULL")
     builder.where("p.post_number > 1")
     builder.where("p.user_id != t.user_id")
-    builder.where("p.user_id in (:user_ids)", {user_ids: opts[:user_ids]}) if opts[:user_ids]
+    builder.where("p.user_id in (:user_ids)", user_ids: opts[:user_ids]) if opts[:user_ids]
     builder.where("p.post_type = :post_type", post_type: Post.types[:regular])
     builder.where("EXTRACT(EPOCH FROM p.created_at - t.created_at) > 0")
     builder.exec
   end
 
-  def self.time_to_first_response_per_day(start_date, end_date, opts={})
-    time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge({start_date: start_date, end_date: end_date}))
+  def self.time_to_first_response_per_day(start_date, end_date, opts = {})
+    time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, opts.merge(start_date: start_date, end_date: end_date))
   end
 
-  def self.time_to_first_response_total(opts=nil)
+  def self.time_to_first_response_total(opts = nil)
     total = time_to_first_response(TIME_TO_FIRST_RESPONSE_TOTAL_SQL, opts)
     total.first["hours"].to_f.round(2)
   end
@@ -1163,7 +1174,7 @@ SQL
     ORDER BY tt.created_at
   SQL
 
-  def self.with_no_response_per_day(start_date, end_date, category_id=nil)
+  def self.with_no_response_per_day(start_date, end_date, category_id = nil)
     builder = SqlBuilder.new(WITH_NO_RESPONSE_SQL)
     builder.where("t.created_at >= :start_date", start_date: start_date) if start_date
     builder.where("t.created_at < :end_date", end_date: end_date) if end_date
@@ -1185,7 +1196,7 @@ SQL
     WHERE tt.first_reply IS NULL OR tt.first_reply < 2
   SQL
 
-  def self.with_no_response_total(opts={})
+  def self.with_no_response_total(opts = {})
     builder = SqlBuilder.new(WITH_NO_RESPONSE_TOTAL_SQL)
     builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id]
     builder.where("t.archetype <> '#{Archetype.private_message}'")
@@ -1232,7 +1243,6 @@ SQL
 
 end
 
-
 # == Schema Information
 #
 # Table name: topics
diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb
index dd5bc30559..3ec37b314a 100644
--- a/app/models/topic_converter.rb
+++ b/app/models/topic_converter.rb
@@ -17,7 +17,8 @@ class TopicConverter
         else
           Category.where(read_restricted: false)
             .where.not(id: SiteSetting.uncategorized_category_id)
-            .first.id
+            .order('id asc')
+            .pluck(:id).first
         end
 
       @topic.archetype = Archetype.default
diff --git a/app/models/topic_embed.rb b/app/models/topic_embed.rb
index 0f1cc78f7d..9904b05c98 100644
--- a/app/models/topic_embed.rb
+++ b/app/models/topic_embed.rb
@@ -113,7 +113,7 @@ class TopicEmbed < ActiveRecord::Base
     response.title = title
     doc = Nokogiri::HTML(read_doc.content)
 
-    tags = {'img' => 'src', 'script' => 'src', 'a' => 'href'}
+    tags = { 'img' => 'src', 'script' => 'src', 'a' => 'href' }
     doc.search(tags.keys.join(',')).each do |node|
       url_param = tags[node.name]
       src = node[url_param]
@@ -132,7 +132,7 @@ class TopicEmbed < ActiveRecord::Base
       # only allow classes in the whitelist
       allowed_classes = if embed_classname_whitelist.blank? then [] else embed_classname_whitelist.split(/[ ,]+/i) end
       doc.search('[class]:not([class=""])').each do |classnode|
-        classes = classnode[:class].split(' ').select{ |classname| allowed_classes.include?(classname) }
+        classes = classnode[:class].split(' ').select { |classname| allowed_classes.include?(classname) }
         if classes.length === 0
           classnode.delete('class')
         else
@@ -145,7 +145,7 @@ class TopicEmbed < ActiveRecord::Base
     response
   end
 
-  def self.import_remote(import_user, url, opts=nil)
+  def self.import_remote(import_user, url, opts = nil)
     opts = opts || {}
     response = find_remote(url)
     response.title = opts[:title] if opts[:title].present?
diff --git a/app/models/topic_featured_users.rb b/app/models/topic_featured_users.rb
index f28c555b4c..d3f705149b 100644
--- a/app/models/topic_featured_users.rb
+++ b/app/models/topic_featured_users.rb
@@ -10,7 +10,7 @@ class TopicFeaturedUsers
   end
 
   # Chooses which topic users to feature
-  def choose(args={})
+  def choose(args = {})
     self.class.ensure_consistency!(topic.id.to_i)
     update_participant_count
   end
@@ -22,7 +22,7 @@ class TopicFeaturedUsers
      topic.featured_user4_id].uniq.compact
   end
 
-  def self.ensure_consistency!(topic_id=nil)
+  def self.ensure_consistency!(topic_id = nil)
 
     filter = "#{"AND t.id = #{topic_id.to_i}" if topic_id}"
     filter2 = "#{"AND tt.id = #{topic_id.to_i}" if topic_id}"
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index 12ae7dcaab..4576a0a601 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -57,6 +57,8 @@ SQL
 
     builder.where('ftl.topic_id = :topic_id', topic_id: topic_id)
     builder.where('ft.deleted_at IS NULL')
+    # note that ILIKE means "case insensitive LIKE"
+    builder.where("NOT(ftl.url ILIKE '%.png' OR ftl.url ILIKE '%.jpg' OR ftl.url ILIKE '%.gif')")
     builder.where("COALESCE(ft.archetype, 'regular') <> :archetype", archetype: Archetype.private_message)
 
     builder.secure_category(guardian.secure_category_ids)
@@ -65,7 +67,7 @@ SQL
 
   end
 
-  def self.counts_for(guardian,topic, posts)
+  def self.counts_for(guardian, topic, posts)
     return {} if posts.blank?
 
     # Sam: I don't know how to write this cleanly in AR,
@@ -91,13 +93,13 @@ SQL
     builder.where('l.post_id IN (:post_ids)', post_ids: posts.map(&:id))
     builder.secure_category(guardian.secure_category_ids)
 
-    builder.map_exec(OpenStruct).each_with_object({}) do |l,result|
+    builder.map_exec(OpenStruct).each_with_object({}) do |l, result|
       result[l.post_id] ||= []
-      result[l.post_id] << {url: l.url,
-                            clicks: l.clicks,
-                            title: l.title,
-                            internal: l.internal,
-                            reflection: l.reflection}
+      result[l.post_id] << { url: l.url,
+                             clicks: l.clicks,
+                             title: l.title,
+                             internal: l.internal,
+                             reflection: l.reflection }
     end
   end
 
@@ -122,17 +124,12 @@ SQL
           internal = false
           topic_id = nil
           post_number = nil
-          parsed_path = parsed.path || ""
 
           if Discourse.store.has_been_uploaded?(url)
             internal = Discourse.store.internal?
-          elsif (parsed.host == Discourse.current_hostname && parsed_path.start_with?(Discourse.base_uri)) || !parsed.host
+          elsif route = Discourse.route_for(parsed)
             internal = true
 
-            parsed_path.slice!(Discourse.base_uri)
-
-            route = Rails.application.routes.recognize_path(parsed_path)
-
             # We aren't interested in tracking internal links to users
             next if route[:controller] == 'users'
 
@@ -164,6 +161,7 @@ SQL
           added_urls << url
 
           unless TopicLink.exists?(topic_id: post.topic_id, post_id: post.id, url: url)
+            file_extension = File.extname(parsed.path)[1..10].downcase unless File.extname(parsed.path).empty?
             begin
               TopicLink.create!(post_id: post.id,
                                 user_id: post.user_id,
@@ -173,7 +171,8 @@ SQL
                                 internal: internal,
                                 link_topic_id: topic_id,
                                 link_post_id: reflected_post.try(:id),
-                                quote: link.is_quote)
+                                quote: link.is_quote,
+                                extension: file_extension)
             rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
               # it's fine
             end
@@ -192,14 +191,14 @@ SQL
 
               unless tl
                 tl = TopicLink.create(user_id: post.user_id,
-                                    topic_id: topic_id,
-                                    post_id: reflected_post.try(:id),
-                                    url: reflected_url,
-                                    domain: Discourse.current_hostname,
-                                    reflection: true,
-                                    internal: true,
-                                    link_topic_id: post.topic_id,
-                                    link_post_id: post.id)
+                                      topic_id: topic_id,
+                                      post_id: reflected_post.try(:id),
+                                      url: reflected_url,
+                                      domain: Discourse.current_hostname,
+                                      reflection: true,
+                                      internal: true,
+                                      link_topic_id: post.topic_id,
+                                      link_post_id: post.id)
 
               end
 
@@ -238,11 +237,11 @@ SQL
 
   def self.duplicate_lookup(topic)
     results = TopicLink
-                .includes(:post, :user)
-                .joins(:post, :user)
-                .where("posts.id IS NOT NULL AND users.id IS NOT NULL")
-                .where(topic_id: topic.id, reflection: false)
-                .last(200)
+      .includes(:post, :user)
+      .joins(:post, :user)
+      .where("posts.id IS NOT NULL AND users.id IS NOT NULL")
+      .where(topic_id: topic.id, reflection: false)
+      .last(200)
 
     lookup = {}
     results.each do |tl|
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 6bd932c796..825067384f 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -12,7 +12,7 @@ class TopicLinkClick < ActiveRecord::Base
   WHITELISTED_REDIRECT_HOSTNAMES = Set.new(%W{www.youtube.com youtu.be})
 
   # Create a click from a URL and post_id
-  def self.create_from(args={})
+  def self.create_from(args = {})
     url = args[:url][0...TopicLink.max_url_length]
     return nil if url.blank?
 
@@ -31,7 +31,7 @@ class TopicLinkClick < ActiveRecord::Base
     query = url.index('?')
     unless query.nil?
       endpos = url.index('#') || url.size
-      urls << url[0..query-1] + url[endpos..-1]
+      urls << url[0..query - 1] + url[endpos..-1]
     end
 
     # add a cdn link
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index efa8089202..375659dc5c 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -22,7 +22,7 @@ class TopicList
 
   def self.preload(topics, object)
     if @preload
-      @preload.each{|preload| preload.call(topics, object)}
+      @preload.each { |preload| preload.call(topics, object) }
     end
   end
 
@@ -37,7 +37,7 @@ class TopicList
                 :tags,
                 :current_user
 
-  def initialize(filter, current_user, topics, opts=nil)
+  def initialize(filter, current_user, topics, opts = nil)
     @filter = filter
     @current_user = current_user
     @topics_input = topics
@@ -86,7 +86,7 @@ class TopicList
 
     # Include bookmarks if you have bookmarked topics
     if @current_user && !post_action_type
-      post_action_type = PostActionType.types[:bookmark] if @topic_lookup.any?{|_,tu| tu && tu.bookmarked}
+      post_action_type = PostActionType.types[:bookmark] if @topic_lookup.any? { |_, tu| tu && tu.bookmarked }
     end
 
     # Data for bookmarks or likes
@@ -105,7 +105,7 @@ class TopicList
       ft.user_data = @topic_lookup[ft.id] if @topic_lookup.present?
 
       if ft.user_data && post_action_lookup && actions = post_action_lookup[ft.id]
-        ft.user_data.post_action_data = {post_action_type => actions}
+        ft.user_data.post_action_data = { post_action_type => actions }
       end
 
       ft.posters = ft.posters_summary(
@@ -127,6 +127,6 @@ class TopicList
   end
 
   def attributes
-    {'more_topics_url' => page}
+    { 'more_topics_url' => page }
   end
 end
diff --git a/app/models/topic_notifier.rb b/app/models/topic_notifier.rb
index db30a8e471..46d43c3755 100644
--- a/app/models/topic_notifier.rb
+++ b/app/models/topic_notifier.rb
@@ -3,10 +3,10 @@ class TopicNotifier
     @topic = topic
   end
 
-  { :watch!   => :watching,
-    :track!   => :tracking,
-    :regular! => :regular,
-    :mute!    => :muted }.each_pair do |method_name, level|
+  { watch!: :watching,
+    track!: :tracking,
+    regular!: :regular,
+    mute!: :muted }.each_pair do |method_name, level|
 
     define_method method_name do |user_id|
       change_level user_id, level
@@ -34,8 +34,8 @@ class TopicNotifier
     @notification_levels ||= TopicUser.notification_levels
   end
 
-  def change_level(user_id, level, reason=nil)
-    attrs = {notification_level: levels[level]}
+  def change_level(user_id, level, reason = nil)
+    attrs = { notification_level: levels[level] }
     attrs.merge!(notifications_reason_id: TopicUser.notification_reasons[reason]) if reason
     TopicUser.change(user_id, @topic.id, attrs)
   end
diff --git a/app/models/topic_posters_summary.rb b/app/models/topic_posters_summary.rb
index 7723bf338c..c6cf8255d5 100644
--- a/app/models/topic_posters_summary.rb
+++ b/app/models/topic_posters_summary.rb
@@ -40,7 +40,7 @@ class TopicPostersSummary
 
   def shuffle_last_poster_to_back_in(summary)
     unless last_poster_is_topic_creator?
-      summary.reject!{ |u| u.id == topic.last_post_user_id }
+      summary.reject! { |u| u.id == topic.last_post_user_id }
       summary << avatar_lookup[topic.last_post_user_id]
     end
     summary
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index ff30630353..3c104f4fdb 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -38,7 +38,7 @@ class TopicTrackingState
     publish_read(topic.id, 1, topic.user_id)
   end
 
-  def self.publish_latest(topic, staff_only=false)
+  def self.publish_latest(topic, staff_only = false)
     return unless topic.archetype == "regular"
 
     message = {
@@ -73,9 +73,9 @@ class TopicTrackingState
       end
 
     TopicUser
-        .tracking(post.topic_id)
-        .select([:user_id,:last_read_post_number, :notification_level])
-        .each do |tu|
+      .tracking(post.topic_id)
+      .select([:user_id, :last_read_post_number, :notification_level])
+      .each do |tu|
 
       message = {
         topic_id: post.topic_id,
@@ -125,7 +125,7 @@ class TopicTrackingState
     MessageBus.publish("/delete", message.as_json, group_ids: group_ids)
   end
 
-  def self.publish_read(topic_id, last_read_post_number, user_id, notification_level=nil)
+  def self.publish_read(topic_id, last_read_post_number, user_id, notification_level = nil)
 
     highest_post_number = Topic.where(id: topic_id).pluck(:highest_post_number).first
 
@@ -179,8 +179,7 @@ class TopicTrackingState
 
   end
 
-
-  def self.report_raw_sql(opts=nil)
+  def self.report_raw_sql(opts = nil)
 
     unread =
       if opts && opts[:skip_unread]
@@ -205,7 +204,6 @@ class TopicTrackingState
            c.id AS category_id,
            tu.notification_level"
 
-
     sql = <<SQL
     SELECT #{select}
     FROM topics
diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb
index 924d012bca..3404fc90d4 100644
--- a/app/models/topic_user.rb
+++ b/app/models/topic_user.rb
@@ -9,7 +9,7 @@ class TopicUser < ActiveRecord::Base
 
   scope :tracking, lambda { |topic_id|
     where(topic_id: topic_id)
-   .where("COALESCE(topic_users.notification_level, :regular) >= :tracking",
+      .where("COALESCE(topic_users.notification_level, :regular) >= :tracking",
      regular: TopicUser.notification_levels[:regular],
      tracking: TopicUser.notification_levels[:tracking])
   }
@@ -159,22 +159,22 @@ SQL
 
       unless attrs[:notification_level]
         category_notification_level = CategoryUser.where(user_id: user_id)
-                    .where("category_id IN (SELECT category_id FROM topics WHERE id = :id)", id: topic_id)
-                    .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
+          .where("category_id IN (SELECT category_id FROM topics WHERE id = :id)", id: topic_id)
+          .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
                         CategoryUser.notification_levels[:tracking]])
-                    .order("notification_level DESC")
-                    .limit(1)
-                    .pluck(:notification_level)
-                    .first
+          .order("notification_level DESC")
+          .limit(1)
+          .pluck(:notification_level)
+          .first
 
         tag_notification_level = TagUser.where(user_id: user_id)
-                    .where("tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :id)", id: topic_id)
-                    .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
+          .where("tag_id IN (SELECT tag_id FROM topic_tags WHERE topic_id = :id)", id: topic_id)
+          .where("notification_level IN (:levels)", levels: [CategoryUser.notification_levels[:watching],
                         CategoryUser.notification_levels[:tracking]])
-                    .order("notification_level DESC")
-                    .limit(1)
-                    .pluck(:notification_level)
-                    .first
+          .order("notification_level DESC")
+          .limit(1)
+          .pluck(:notification_level)
+          .first
 
         if category_notification_level && !(tag_notification_level && (tag_notification_level > category_notification_level))
           attrs[:notification_level] = category_notification_level
@@ -191,7 +191,6 @@ SQL
               TopicUser.notification_reasons[:auto_track_tag]
         end
 
-
       end
 
       unless attrs[:notification_level]
@@ -203,7 +202,7 @@ SQL
         end
       end
 
-      TopicUser.create(attrs.merge!(user_id: user_id, topic_id: topic_id, first_visited_at: now ,last_visited_at: now))
+      TopicUser.create(attrs.merge!(user_id: user_id, topic_id: topic_id, first_visited_at: now , last_visited_at: now))
     end
 
     def track_visit!(topic_id, user_id)
@@ -256,7 +255,7 @@ SQL
 
     INSERT_TOPIC_USER_SQL_STAFF = INSERT_TOPIC_USER_SQL.gsub("highest_post_number", "highest_staff_post_number")
 
-    def update_last_read(user, topic_id, post_number, msecs, opts={})
+    def update_last_read(user, topic_id, post_number, msecs, opts = {})
       return if post_number.blank?
       msecs = 0 if msecs.to_i < 0
 
@@ -276,11 +275,12 @@ SQL
       # ... user visited the topic but did not read the posts
       #
       # 86400000 = 1 day
-      rows = if user.staff?
-               exec_sql(UPDATE_TOPIC_USER_SQL_STAFF,args).values
-             else
-               exec_sql(UPDATE_TOPIC_USER_SQL,args).values
-             end
+      rows =
+        if user.staff?
+          exec_sql(UPDATE_TOPIC_USER_SQL_STAFF, args).values
+        else
+          exec_sql(UPDATE_TOPIC_USER_SQL, args).values
+        end
 
       if rows.length == 1
         before = rows[0][1].to_i
@@ -332,7 +332,7 @@ SQL
 
   end
 
-  def self.update_post_action_cache(opts={})
+  def self.update_post_action_cache(opts = {})
     user_id = opts[:user_id]
     post_id = opts[:post_id]
     topic_id = opts[:topic_id]
@@ -412,7 +412,7 @@ SQL
     TopicUser.exec_sql(sql, user_id: user_id, count: count)
   end
 
-  def self.ensure_consistency!(topic_id=nil)
+  def self.ensure_consistency!(topic_id = nil)
     update_post_action_cache(topic_id: topic_id)
 
     # TODO this needs some reworking, when we mark stuff skipped
diff --git a/app/models/topic_view_item.rb b/app/models/topic_view_item.rb
index 2b6fa6b49c..04b231fa9b 100644
--- a/app/models/topic_view_item.rb
+++ b/app/models/topic_view_item.rb
@@ -6,7 +6,7 @@ class TopicViewItem < ActiveRecord::Base
   belongs_to :user
   validates_presence_of :topic_id, :ip_address, :viewed_at
 
-  def self.add(topic_id, ip, user_id=nil, at=nil, skip_redis=false)
+  def self.add(topic_id, ip, user_id = nil, at = nil, skip_redis = false)
     # Only store a view once per day per thing per user per ip
     at ||= Date.today
     redis_key = "view:#{topic_id}:#{at}"
@@ -28,7 +28,6 @@ class TopicViewItem < ActiveRecord::Base
                  /*where*/
                )"
 
-
         builder = SqlBuilder.new(sql)
 
         if !user_id
diff --git a/app/models/translation_override.rb b/app/models/translation_override.rb
index 11aba82a46..3cdff253b5 100644
--- a/app/models/translation_override.rb
+++ b/app/models/translation_override.rb
@@ -30,7 +30,7 @@ class TranslationOverride < ActiveRecord::Base
 
     def self.i18n_changed
       I18n.reload!
-      MessageBus.publish('/i18n-flush', { refresh: true })
+      MessageBus.publish('/i18n-flush', refresh: true)
     end
 
     def check_interpolation_keys
@@ -42,7 +42,6 @@ class TranslationOverride < ActiveRecord::Base
         original_interpolation_keys = I18nInterpolationKeysFinder.find(original_text)
         new_interpolation_keys = I18nInterpolationKeysFinder.find(value)
         missing_keys = (original_interpolation_keys - new_interpolation_keys)
-        invalid_keys = (original_interpolation_keys | new_interpolation_keys) - original_interpolation_keys
 
         if missing_keys.present?
           self.errors.add(:base, I18n.t(
@@ -52,17 +51,6 @@ class TranslationOverride < ActiveRecord::Base
 
           return false
         end
-
-        invalid_keys = (original_interpolation_keys | new_interpolation_keys) - original_interpolation_keys
-
-        if invalid_keys.present?
-          self.errors.add(:base, I18n.t(
-            'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
-            keys: invalid_keys.join(', ')
-          ))
-
-          return false
-        end
       end
     end
 
diff --git a/app/models/trust_level3_requirements.rb b/app/models/trust_level3_requirements.rb
index 2579216f86..448f94e672 100644
--- a/app/models/trust_level3_requirements.rb
+++ b/app/models/trust_level3_requirements.rb
@@ -130,11 +130,11 @@ class TrustLevel3Requirements
 
   def num_flagged_posts
     PostAction.with_deleted
-              .where(post_id: flagged_post_ids)
-              .where.not(user_id: @user.id)
-              .where.not(agreed_at: nil)
-              .pluck(:post_id)
-              .uniq.count
+      .where(post_id: flagged_post_ids)
+      .where.not(user_id: @user.id)
+      .where.not(agreed_at: nil)
+      .pluck(:post_id)
+      .uniq.count
   end
 
   def max_flagged_posts
@@ -143,11 +143,11 @@ class TrustLevel3Requirements
 
   def num_flagged_by_users
     @_num_flagged_by_users ||= PostAction.with_deleted
-                                         .where(post_id: flagged_post_ids)
-                                         .where.not(user_id: @user.id)
-                                         .where.not(agreed_at: nil)
-                                         .pluck(:user_id)
-                                         .uniq.count
+      .where(post_id: flagged_post_ids)
+      .where.not(user_id: @user.id)
+      .where.not(agreed_at: nil)
+      .pluck(:user_id)
+      .uniq.count
   end
 
   def max_flagged_by_users
@@ -194,13 +194,11 @@ class TrustLevel3Requirements
     (min_likes_received.to_f / 4.0).ceil
   end
 
-
   def self.clear_cache
     $redis.del NUM_TOPICS_KEY
     $redis.del NUM_POSTS_KEY
   end
 
-
   CACHE_DURATION = 1.day.seconds - 60
   NUM_TOPICS_KEY = "tl3_num_topics"
   NUM_POSTS_KEY  = "tl3_num_posts"
@@ -223,8 +221,8 @@ class TrustLevel3Requirements
 
   def flagged_post_ids
     @_flagged_post_ids ||= @user.posts
-                                .with_deleted
-                                .where('created_at > ? AND (spam_count > 0 OR inappropriate_count > 0)', time_period.days.ago)
-                                .pluck(:id)
+      .with_deleted
+      .where('created_at > ? AND (spam_count > 0 OR inappropriate_count > 0)', time_period.days.ago)
+      .pluck(:id)
   end
 end
diff --git a/app/models/upload.rb b/app/models/upload.rb
index d40ac15836..f9886d8998 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -30,7 +30,7 @@ class Upload < ActiveRecord::Base
     thumbnail(width, height).present?
   end
 
-  def create_thumbnail!(width, height, crop=false)
+  def create_thumbnail!(width, height, crop = false)
     return unless SiteSetting.create_thumbnails?
 
     opts = {
@@ -53,10 +53,6 @@ class Upload < ActiveRecord::Base
     end
   end
 
-  def extension
-    File.extname(original_filename)
-  end
-
   def self.generate_digest(path)
     Digest::SHA1.file(path).hexdigest
   end
@@ -75,7 +71,7 @@ class Upload < ActiveRecord::Base
     Upload.find_by(url: url)
   end
 
-  def self.migrate_to_new_scheme(limit=nil)
+  def self.migrate_to_new_scheme(limit = nil)
     problems = []
 
     if SiteSetting.migrate_to_new_scheme
@@ -109,9 +105,7 @@ class Upload < ActiveRecord::Base
             upload.sha1 = Upload.generate_digest(path)
           end
           # optimize if image
-          if FileHelper.is_image?(File.basename(path))
-            ImageOptim.new.optimize_image!(path)
-          end
+          FileHelper.optimize_image!(path) if FileHelper.is_image?(File.basename(path))
           # store to new location & update the filesize
           File.open(path) do |f|
             upload.url = Discourse.store.store_upload(f, upload)
diff --git a/app/models/user.rb b/app/models/user.rb
index 38db6852c9..59c7981181 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,7 +42,9 @@ class User < ActiveRecord::Base
   has_many :email_change_requests, dependent: :destroy
   has_many :directory_items, dependent: :delete_all
   has_many :user_auth_tokens, dependent: :destroy
+  has_many :user_emails, dependent: :destroy
 
+  has_one :primary_email, -> { where(primary: true)  }, class_name: 'UserEmail', dependent: :destroy
 
   has_one :user_option, dependent: :destroy
   has_one :user_avatar, dependent: :destroy
@@ -72,18 +74,15 @@ class User < ActiveRecord::Base
   has_many :acting_group_histories, dependent: :destroy, foreign_key: :acting_user_id, class_name: GroupHistory
   has_many :targeted_group_histories, dependent: :destroy, foreign_key: :target_user_id, class_name: GroupHistory
 
-  delegate :last_sent_email_address, :to => :email_logs
-
-  before_validation :strip_downcase_email
+  delegate :last_sent_email_address, to: :email_logs
 
   validates_presence_of :username
   validate :username_validator, if: :username_changed?
-  validates :email, presence: true, uniqueness: true
-  validates :email, format: { with: EmailValidator.email_regex }, if: :email_changed?
-  validates :email, email: true, if: :should_validate_email?
   validate :password_validator
   validates :name, user_full_name: true, if: :name_changed?, length: { maximum: 255 }
-  validates :ip_address, allowed_ip_address: {on: :create, message: :signup_not_allowed}
+  validates :ip_address, allowed_ip_address: { on: :create, message: :signup_not_allowed }
+  validates :primary_email, presence: true
+  validates_associated :primary_email, if: :should_validate_primary_email?
 
   after_initialize :add_trust_level
 
@@ -123,6 +122,8 @@ class User < ActiveRecord::Base
   # set to true to optimize creation and save for imports
   attr_accessor :import_mode
 
+  scope :with_email, ->(email) { joins(:user_emails).where(user_emails: { email: email }) }
+
   scope :human_users, -> { where('users.id > 0') }
 
   # excluding fake users like the system user or anonymous users
@@ -232,20 +233,19 @@ class User < ActiveRecord::Base
   end
 
   def self.find_by_email(email)
-    find_by(email: Email.downcase(email))
+    self.with_email(Email.downcase(email)).first
   end
 
   def self.find_by_username(username)
     find_by(username_lower: username.downcase)
   end
 
-
   def enqueue_welcome_message(message_type)
     return unless SiteSetting.send_welcome_message?
     Jobs.enqueue(:send_system_message, user_id: id, message_type: message_type)
   end
 
-  def change_username(new_username, actor=nil)
+  def change_username(new_username, actor = nil)
     UsernameChanger.change(self, new_username, actor)
   end
 
@@ -267,12 +267,12 @@ class User < ActiveRecord::Base
     used_invite.try(:invited_by)
   end
 
-  def should_validate_email?
-    return !skip_email_validation && !staged? && email_changed?
+  def should_validate_primary_email?
+    !skip_email_validation && !staged?
   end
 
   # Approve this user
-  def approve(approved_by, send_mail=true)
+  def approve(approved_by, send_mail = true)
     self.approved = true
 
     if approved_by.is_a?(Integer)
@@ -317,7 +317,7 @@ class User < ActiveRecord::Base
         n.user_id = :user_id AND
         NOT read"
 
-    User.exec_sql(sql, user_id: id, type: notification_type).getvalue(0,0).to_i
+    User.exec_sql(sql, user_id: id, type: notification_type).getvalue(0, 0).to_i
   end
 
   def unread_private_messages
@@ -341,7 +341,7 @@ class User < ActiveRecord::Base
         User.exec_sql(sql, user_id: id,
                            seen_notification_id: seen_notification_id,
                            pm:  Notification.types[:private_message])
-            .getvalue(0,0).to_i
+          .getvalue(0, 0).to_i
       end
   end
 
@@ -376,7 +376,6 @@ class User < ActiveRecord::Base
     notification = notifications.visible.order('notifications.id desc').first
     json = NotificationSerializer.new(notification).as_json if notification
 
-
     sql = "
        SELECT * FROM (
          SELECT n.id, n.read FROM notifications n
@@ -403,18 +402,18 @@ class User < ActiveRecord::Base
     "
 
     recent = User.exec_sql(sql, user_id: id,
-                       type:  Notification.types[:private_message]).values.map do |id, read|
+                                type:  Notification.types[:private_message]).values.map do |id, read|
       [id.to_i, read == 't'.freeze]
     end
 
     MessageBus.publish("/notification/#{id}",
-                       {unread_notifications: unread_notifications,
-                        unread_private_messages: unread_private_messages,
-                        total_unread_notifications: total_unread_notifications,
-                        read_first_notification: read_first_notification?,
-                        last_notification: json,
-                        recent: recent,
-                        seen_notification_id: seen_notification_id
+                       { unread_notifications: unread_notifications,
+                         unread_private_messages: unread_private_messages,
+                         total_unread_notifications: total_unread_notifications,
+                         read_first_notification: read_first_notification?,
+                         last_notification: json,
+                         recent: recent,
+                         seen_notification_id: seen_notification_id
                        },
                        user_ids: [id] # only publish the notification to this user
     )
@@ -474,7 +473,7 @@ class User < ActiveRecord::Base
     last_seen_at.present?
   end
 
-  def create_visit_record!(date, opts={})
+  def create_visit_record!(date, opts = {})
     user_stat.update_column(:days_visited, user_stat.days_visited + 1)
     user_visits.create!(visited_at: date, posts_read: opts[:posts_read] || 0, mobile: opts[:mobile] || false)
   end
@@ -487,7 +486,7 @@ class User < ActiveRecord::Base
     create_visit_record!(date) unless visit_record_for(date)
   end
 
-  def update_posts_read!(num_posts, opts={})
+  def update_posts_read!(num_posts, opts = {})
     now = opts[:at] || Time.zone.now
     _retry = opts[:retry] || false
 
@@ -501,7 +500,7 @@ class User < ActiveRecord::Base
         create_visit_record!(now.to_date, posts_read: num_posts, mobile: opts.fetch(:mobile, false))
       rescue ActiveRecord::RecordNotUnique
         if !_retry
-          update_posts_read!(num_posts, opts.merge( retry: true ))
+          update_posts_read!(num_posts, opts.merge(retry: true))
         else
           raise
         end
@@ -515,7 +514,7 @@ class User < ActiveRecord::Base
     end
   end
 
-  def update_last_seen!(now=Time.zone.now)
+  def update_last_seen!(now = Time.zone.now)
     now_date = now.to_date
     # Only update last seen once every minute
     redis_key = "user:#{id}:#{now_date}"
@@ -702,7 +701,7 @@ class User < ActiveRecord::Base
     save
   end
 
-  def change_trust_level!(level, opts=nil)
+  def change_trust_level!(level, opts = nil)
     Promotion.new(self).change_trust_level!(level, opts)
   end
 
@@ -715,26 +714,26 @@ class User < ActiveRecord::Base
     user_badges.select('distinct badge_id').count
   end
 
-  def featured_user_badges(limit=3)
+  def featured_user_badges(limit = 3)
     tl_badge_ids = Badge.trust_level_badge_ids
 
     query = user_badges
-              .group(:badge_id)
-              .select(UserBadge.attribute_names.map { |x| "MAX(user_badges.#{x}) AS #{x}" },
+      .group(:badge_id)
+      .select(UserBadge.attribute_names.map { |x| "MAX(user_badges.#{x}) AS #{x}" },
                       'COUNT(*) AS "count"',
                       'MAX(badges.badge_type_id) AS badges_badge_type_id',
                       'MAX(badges.grant_count) AS badges_grant_count')
-              .joins(:badge)
-              .order('badges_badge_type_id ASC, badges_grant_count ASC, badge_id DESC')
-              .includes(:user, :granted_by, { badge: :badge_type }, { post: :topic })
+      .joins(:badge)
+      .order('badges_badge_type_id ASC, badges_grant_count ASC, badge_id DESC')
+      .includes(:user, :granted_by, { badge: :badge_type }, post: :topic)
 
     tl_badge = query.where("user_badges.badge_id IN (:tl_badge_ids)",
                            tl_badge_ids: tl_badge_ids)
-                    .limit(1)
+      .limit(1)
 
     other_badges = query.where("user_badges.badge_id NOT IN (:tl_badge_ids)",
                                tl_badge_ids: tl_badge_ids)
-                        .limit(limit)
+      .limit(limit)
 
     (tl_badge + other_badges).take(limit)
   end
@@ -749,7 +748,6 @@ class User < ActiveRecord::Base
     result.group('date(users.created_at)').order('date(users.created_at)').count
   end
 
-
   def secure_category_ids
     cats = self.admin? ? Category.where(read_restricted: true) : secure_categories.references(:categories)
     cats.pluck('categories.id').sort
@@ -759,16 +757,15 @@ class User < ActiveRecord::Base
     Category.topic_create_allowed(self.id).select(:id)
   end
 
-
   # Flag all posts from a user as spam
   def flag_linked_posts_as_spam
     disagreed_flag_post_ids = PostAction.where(post_action_type_id: PostActionType.types[:spam])
-                                        .where.not(disagreed_at: nil)
-                                        .pluck(:post_id)
+      .where.not(disagreed_at: nil)
+      .pluck(:post_id)
 
     topic_links.includes(:post)
-               .where.not(post_id: disagreed_flag_post_ids)
-               .each do |tl|
+      .where.not(post_id: disagreed_flag_post_ids)
+      .each do |tl|
       begin
         message = I18n.t('flag_reason.spam_hosts', domain: tl.domain)
         PostAction.act(Discourse.system_user, tl.post, PostActionType.types[:spam], message: message)
@@ -811,7 +808,6 @@ class User < ActiveRecord::Base
       .exists?
   end
 
-
   def refresh_avatar
     return if @import_mode
 
@@ -867,25 +863,25 @@ class User < ActiveRecord::Base
 
   def number_of_deleted_posts
     Post.with_deleted
-        .where(user_id: self.id)
-        .where.not(deleted_at: nil)
-        .count
+      .where(user_id: self.id)
+      .where.not(deleted_at: nil)
+      .count
   end
 
   def number_of_flagged_posts
     Post.with_deleted
-        .where(user_id: self.id)
-        .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
+      .where(user_id: self.id)
+      .where(id: PostAction.where(post_action_type_id: PostActionType.notify_flag_type_ids)
                              .where(disagreed_at: nil)
                              .select(:post_id))
-        .count
+      .count
   end
 
   def number_of_flags_given
     PostAction.where(user_id: self.id)
-              .where(disagreed_at: nil)
-              .where(post_action_type_id: PostActionType.notify_flag_type_ids)
-              .count
+      .where(disagreed_at: nil)
+      .where(post_action_type_id: PostActionType.notify_flag_type_ids)
+      .count
   end
 
   def number_of_suspensions
@@ -923,8 +919,8 @@ class User < ActiveRecord::Base
     return unless active && email_confirmed? && !staged
 
     Group.where(automatic: false)
-         .where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
-         .each do |group|
+      .where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
+      .each do |group|
 
       domains = group.automatic_membership_email_domains.gsub('.', '\.')
 
@@ -935,6 +931,18 @@ class User < ActiveRecord::Base
     end
   end
 
+  def email
+    primary_email.email
+  end
+
+  def email=(email)
+    if primary_email
+      self.new_record? ? primary_email.email = email : primary_email.update(email: email)
+    else
+      build_primary_email(email: email)
+    end
+  end
+
   protected
 
   def badge_grant
@@ -1011,13 +1019,6 @@ class User < ActiveRecord::Base
     self.username_lower = username.downcase
   end
 
-  def strip_downcase_email
-    if self.email
-      self.email = self.email.strip
-      self.email = self.email.downcase
-    end
-  end
-
   def username_validator
     username_format_validator || begin
       lower = username.downcase
@@ -1058,10 +1059,10 @@ class User < ActiveRecord::Base
   # Delete unactivated accounts (without verified email) that are over a week old
   def self.purge_unactivated
     to_destroy = User.where(active: false)
-                     .joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
-                     .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
-                     .where('NOT admin AND NOT moderator')
-                     .limit(200)
+      .joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
+      .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
+      .where('NOT admin AND NOT moderator')
+      .limit(200)
 
     destroyer = UserDestroyer.new(Discourse.system_user)
     to_destroy.each do |u|
@@ -1104,7 +1105,7 @@ end
 #  name                    :string
 #  seen_notification_id    :integer          default(0), not null
 #  last_posted_at          :datetime
-#  email                   :string(513)      not null
+#  email                   :string(513)
 #  password_hash           :string(64)
 #  salt                    :string(32)
 #  active                  :boolean          default(FALSE), not null
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 5e3599a381..b65f207af3 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -11,7 +11,7 @@ class UserAction < ActiveRecord::Base
   BOOKMARK = 3
   NEW_TOPIC = 4
   REPLY = 5
-  RESPONSE= 6
+  RESPONSE = 6
   MENTION = 7
   QUOTE = 9
   EDIT = 11
@@ -75,7 +75,7 @@ SQL
     apply_common_filters(builder, user_id, guardian)
 
     results = builder.exec.to_a
-    results.sort! { |a,b| ORDER[a.action_type] <=> ORDER[b.action_type] }
+    results.sort! { |a, b| ORDER[a.action_type] <=> ORDER[b.action_type] }
 
     results
   end
@@ -109,10 +109,10 @@ SQL
        GROUP BY g.name
     SQL
 
-    result = { all: all, mine: mine, unread: unread}
+    result = { all: all, mine: mine, unread: unread }
 
     exec_sql(sql, user_id: user_id).each do |row|
-      (result[:groups] ||= []) << {name: row["name"], count: row["count"].to_i}
+      (result[:groups] ||= []) << { name: row["name"], count: row["count"].to_i }
     end
 
     result
@@ -123,7 +123,7 @@ SQL
     stream(action_id: action_id, guardian: guardian).first
   end
 
-  def self.stream_queued(opts=nil)
+  def self.stream_queued(opts = nil)
     opts ||= {}
 
     offset = opts[:offset] || 0
@@ -156,7 +156,7 @@ SQL
       .map_exec(UserActionRow)
   end
 
-  def self.stream(opts=nil)
+  def self.stream(opts = nil)
     opts ||= {}
 
     action_types = opts[:action_types]
@@ -276,7 +276,7 @@ SQL
     require_parameters(hash, :action_type, :user_id, :acting_user_id, :target_topic_id, :target_post_id)
     if action = UserAction.find_by(hash.except(:created_at))
       action.destroy
-      MessageBus.publish("/user/#{hash[:user_id]}", {user_action_id: action.id, remove: true})
+      MessageBus.publish("/user/#{hash[:user_id]}", user_action_id: action.id, remove: true)
     end
 
     if !Topic.where(id: hash[:target_topic_id], archetype: Archetype.private_message).exists?
@@ -331,7 +331,7 @@ SQL
     end
   end
 
-  def self.apply_common_filters(builder,user_id,guardian,ignore_private_messages=false)
+  def self.apply_common_filters(builder, user_id, guardian, ignore_private_messages = false)
     # We never return deleted topics in activity
     builder.where("t.deleted_at is null")
 
@@ -341,7 +341,7 @@ SQL
 
       current_user_id = -2
       current_user_id = guardian.user.id if guardian.user
-      builder.where("NOT COALESCE(p.hidden, false) OR p.user_id = :current_user_id", current_user_id: current_user_id )
+      builder.where("NOT COALESCE(p.hidden, false) OR p.user_id = :current_user_id", current_user_id: current_user_id)
     end
 
     visible_post_types = Topic.visible_post_types(guardian.user)
@@ -381,7 +381,7 @@ SQL
       if allowed.present?
         builder.where("( c.read_restricted IS NULL OR
                          NOT c.read_restricted OR
-                        (c.read_restricted and c.id in (:cats)) )", cats: guardian.secure_category_ids )
+                        (c.read_restricted and c.id in (:cats)) )", cats: guardian.secure_category_ids)
       else
         builder.where("(c.read_restricted IS NULL OR NOT c.read_restricted)")
       end
diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb
index be0e85b7f8..39f8d4a80f 100644
--- a/app/models/user_api_key.rb
+++ b/app/models/user_api_key.rb
@@ -30,7 +30,7 @@ class UserApiKey < ActiveRecord::Base
     # not a rails route, special handling
     return true if action == "message_bus" && env["PATH_INFO"] =~ /^\/message-bus\/.*\/poll/
 
-    params  = env['action_dispatch.request.path_parameters']
+    params = env['action_dispatch.request.path_parameters']
 
     return false unless params
 
diff --git a/app/models/user_archived_message.rb b/app/models/user_archived_message.rb
index 1cb45c8165..36c3ccd1ac 100644
--- a/app/models/user_archived_message.rb
+++ b/app/models/user_archived_message.rb
@@ -11,21 +11,21 @@ class UserArchivedMessage < ActiveRecord::Base
 
     UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
     trigger(:move_to_inbox, user_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "move_to_inbox"}, user_ids: [user_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "move_to_inbox" }, user_ids: [user_id])
   end
 
   def self.archive!(user_id, topic_id)
     UserArchivedMessage.where(user_id: user_id, topic_id: topic_id).destroy_all
     UserArchivedMessage.create!(user_id: user_id, topic_id: topic_id)
     trigger(:archive_message, user_id, topic_id)
-    MessageBus.publish("/topic/#{topic_id}", {type: "archived"}, user_ids: [user_id])
+    MessageBus.publish("/topic/#{topic_id}", { type: "archived" }, user_ids: [user_id])
   end
 
   def self.trigger(event, user_id, topic_id)
     user = User.find_by(id: user_id)
     topic = Topic.find_by(id: topic_id)
     if user && topic
-      DiscourseEvent.trigger(event, {user: user, topic: topic})
+      DiscourseEvent.trigger(event, user: user, topic: topic)
     end
   end
 end
diff --git a/app/models/user_auth_token.rb b/app/models/user_auth_token.rb
index 7a22ea5931..5597d52367 100644
--- a/app/models/user_auth_token.rb
+++ b/app/models/user_auth_token.rb
@@ -40,7 +40,7 @@ class UserAuthToken < ActiveRecord::Base
     user_auth_token
   end
 
-  def self.lookup(unhashed_token, opts=nil)
+  def self.lookup(unhashed_token, opts = nil)
 
     mark_seen = opts && opts[:seen]
 
@@ -123,7 +123,7 @@ class UserAuthToken < ActiveRecord::Base
 
   end
 
-  def rotate!(info=nil)
+  def rotate!(info = nil)
     user_agent = (info && info[:user_agent] || self.user_agent)
     client_ip = (info && info[:client_ip] || self.client_ip)
 
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 0c49693ddb..8e9de17baf 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -67,7 +67,7 @@ class UserAvatar < ActiveRecord::Base
     "#{upload_id}_#{OptimizedImage::VERSION}"
   end
 
-  def self.import_url_for_user(avatar_url, user, options=nil)
+  def self.import_url_for_user(avatar_url, user, options = nil)
     tempfile = FileHelper.download(
       avatar_url,
       max_file_size: SiteSetting.max_image_size_kb.kilobytes,
diff --git a/app/models/user_badge.rb b/app/models/user_badge.rb
index a50bf1be72..f7b8b55569 100644
--- a/app/models/user_badge.rb
+++ b/app/models/user_badge.rb
@@ -5,7 +5,7 @@ class UserBadge < ActiveRecord::Base
   belongs_to :notification, dependent: :destroy
   belongs_to :post
 
-  validates :badge_id, presence: true, uniqueness: {scope: :user_id}, if: 'badge.single_grant?'
+  validates :badge_id, presence: true, uniqueness: { scope: :user_id }, if: 'badge.single_grant?'
   validates :user_id, presence: true
   validates :granted_at, presence: true
   validates :granted_by, presence: true
diff --git a/app/models/user_badges.rb b/app/models/user_badges.rb
index 187ee1bc9f..bd68c4c037 100644
--- a/app/models/user_badges.rb
+++ b/app/models/user_badges.rb
@@ -4,7 +4,7 @@ class UserBadges
 
   attr_accessor :user_badges, :username, :grant_count
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @user_badges = opts[:user_badges]
     @username = opts[:username]
     @grant_count = opts[:grant_count]
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
new file mode 100644
index 0000000000..b67a6cd3ca
--- /dev/null
+++ b/app/models/user_email.rb
@@ -0,0 +1,45 @@
+require_dependency 'email_validator'
+
+class UserEmail < ActiveRecord::Base
+  belongs_to :user
+
+  before_validation :strip_downcase_email
+
+  validates :email, presence: true, uniqueness: true
+
+  validates :email, email: true, format: { with: EmailValidator.email_regex },
+                    if: :skip_email_validation?
+
+  validates :primary, uniqueness: { scope: [:user_id] }
+
+  private
+
+  def strip_downcase_email
+    if self.email
+      self.email = self.email.strip
+      self.email = self.email.downcase
+    end
+  end
+
+  def skip_email_validation?
+    return true if user && user.skip_email_validation
+    email_changed?
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_emails
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  email      :string(513)      not null
+#  primary    :boolean          default(FALSE), not null
+#  created_at :datetime
+#  updated_at :datetime
+#
+# Indexes
+#
+#  index_user_emails_on_user_id              (user_id)
+#  index_user_emails_on_user_id_and_primary  (user_id,primary) UNIQUE
+#
diff --git a/app/models/user_history.rb b/app/models/user_history.rb
index e177cd8de4..c166587468 100644
--- a/app/models/user_history.rb
+++ b/app/models/user_history.rb
@@ -11,7 +11,7 @@ class UserHistory < ActiveRecord::Base
 
   validates_presence_of :action
 
-  scope :only_staff_actions, ->{ where("action IN (?)", UserHistory.staff_action_ids) }
+  scope :only_staff_actions, -> { where("action IN (?)", UserHistory.staff_action_ids) }
 
   before_save :set_admin_only
 
@@ -121,7 +121,7 @@ class UserHistory < ActiveRecord::Base
     query = query.where(custom_type: filters[:custom_type]) if filters[:custom_type].present?
 
     [:acting_user, :target_user].each do |key|
-      if filters[key] and obj_id = User.where(username_lower: filters[key].downcase).pluck(:id)
+      if filters[key] && (obj_id = User.where(username_lower: filters[key].downcase).pluck(:id))
         query = query.where("#{key}_id = ?", obj_id)
       end
     end
@@ -133,7 +133,7 @@ class UserHistory < ActiveRecord::Base
     self.where(target_user_id: user.id, action: UserHistory.actions[action_type])
   end
 
-  def self.exists_for_user?(user, action_type, opts=nil)
+  def self.exists_for_user?(user, action_type, opts = nil)
     opts = opts || {}
     result = self.where(target_user_id: user.id, action: UserHistory.actions[action_type])
     result = result.where(topic_id: opts[:topic_id]) if opts[:topic_id]
@@ -144,14 +144,13 @@ class UserHistory < ActiveRecord::Base
     [:action_id, :custom_type, :acting_user, :target_user, :subject]
   end
 
-  def self.staff_action_records(viewer, opts=nil)
+  def self.staff_action_records(viewer, opts = nil)
     opts ||= {}
     query = self.with_filters(opts.slice(*staff_filters)).only_staff_actions.limit(200).order('id DESC').includes(:acting_user, :target_user)
     query = query.where(admin_only: false) unless viewer && viewer.admin?
     query
   end
 
-
   def set_admin_only
     self.admin_only = UserHistory.admin_only_action_ids.include?(self.action)
     self
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 551380335d..ee46d5b77e 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -8,7 +8,7 @@ class UserOption < ActiveRecord::Base
   def self.ensure_consistency!
     exec_sql("SELECT u.id FROM users u
               LEFT JOIN user_options o ON o.user_id = u.id
-              WHERE o.user_id IS NULL").values.each do |id,_|
+              WHERE o.user_id IS NULL").values.each do |id, _|
       UserOption.create(user_id: id.to_i)
     end
   end
@@ -94,7 +94,6 @@ class UserOption < ActiveRecord::Base
     # top must be in the top_menu
     return unless SiteSetting.top_menu =~ /(^|\|)top(\||$)/i
 
-
     # not enough topics
     return unless period = SiteSetting.min_redirected_to_top_period(1.days.ago)
 
@@ -118,14 +117,18 @@ class UserOption < ActiveRecord::Base
 
   def treat_as_new_topic_start_date
     duration = new_topic_duration_minutes || SiteSetting.default_other_new_topic_duration_minutes.to_i
-    times = [case duration
+    times = [
+      case duration
       when User::NewTopicDuration::ALWAYS
         user.created_at
       when User::NewTopicDuration::LAST_VISIT
         user.previous_visit_at || user.user_stat.new_since
       else
         duration.minutes.ago
-    end, user.user_stat.new_since, Time.at(SiteSetting.min_new_topics_time).to_datetime]
+      end,
+      user.user_stat.new_since,
+      Time.at(SiteSetting.min_new_topics_time).to_datetime
+    ]
 
     times.max
   end
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index a6ceec4858..8ce2d186d4 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -19,7 +19,7 @@ class UserProfile < ActiveRecord::Base
 
   BAKED_VERSION = 1
 
-  def bio_excerpt(length=350, opts={})
+  def bio_excerpt(length = 350, opts = {})
     excerpt = PrettyText.excerpt(bio_cooked, length, opts).sub(/<br>$/, '')
     return excerpt if excerpt.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
     PrettyText.strip_links(excerpt)
@@ -63,11 +63,11 @@ class UserProfile < ActiveRecord::Base
   def self.rebake_old(limit)
     problems = []
     UserProfile.where('bio_cooked_version IS NULL OR bio_cooked_version < ?', BAKED_VERSION)
-        .limit(limit).each do |p|
+      .limit(limit).each do |p|
       begin
         p.rebake!
       rescue => e
-        problems << {profile: p, ex: e}
+        problems << { profile: p, ex: e }
       end
     end
     problems
diff --git a/app/models/user_profile_view.rb b/app/models/user_profile_view.rb
index efe43cd42e..716b26c07c 100644
--- a/app/models/user_profile_view.rb
+++ b/app/models/user_profile_view.rb
@@ -3,7 +3,7 @@ class UserProfileView < ActiveRecord::Base
 
   belongs_to :user_profile
 
-  def self.add(user_profile_id, ip, user_id=nil, at=nil, skip_redis=false)
+  def self.add(user_profile_id, ip, user_id = nil, at = nil, skip_redis = false)
     at ||= Time.zone.now
     redis_key = "user-profile-view:#{user_profile_id}:#{at.to_date}"
     if user_id
@@ -41,7 +41,7 @@ class UserProfileView < ActiveRecord::Base
     end
   end
 
-  def self.profile_views_by_day(start_date, end_date, group_id=nil)
+  def self.profile_views_by_day(start_date, end_date, group_id = nil)
     profile_views = self.where("viewed_at >= ? AND viewed_at < ?", start_date, end_date + 1.day)
     if group_id
       profile_views = profile_views.joins("INNER JOIN users ON users.id = user_profile_views.user_id")
diff --git a/app/models/user_search.rb b/app/models/user_search.rb
index 9b6c02c6ac..6fe2db9b22 100644
--- a/app/models/user_search.rb
+++ b/app/models/user_search.rb
@@ -3,7 +3,7 @@ require_dependency 'search'
 
 class UserSearch
 
-  def initialize(term, opts={})
+  def initialize(term, opts = {})
     @term = term
     @term_like = "#{term.downcase.gsub("_", "\\_")}%"
     @topic_id = opts[:topic_id]
@@ -34,8 +34,8 @@ class UserSearch
 
       if topic.category && topic.category.read_restricted
         users = users.includes(:secure_categories)
-                     .where("users.admin = TRUE OR categories.id = ?", topic.category.id)
-                     .references(:categories)
+          .where("users.admin = TRUE OR categories.id = ?", topic.category.id)
+          .references(:categories)
       end
     end
 
@@ -50,9 +50,9 @@ class UserSearch
         query = Search.ts_query(@term, "simple")
 
         users = users.includes(:user_search_data)
-                     .references(:user_search_data)
-                     .where("user_search_data.search_data @@ #{query}")
-                     .order(User.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
+          .references(:user_search_data)
+          .where("user_search_data.search_data @@ #{query}")
+          .order(User.sql_fragment("CASE WHEN username_lower LIKE ? THEN 0 ELSE 1 END ASC", @term_like))
 
       else
         users = users.where("username_lower LIKE :term_like", term_like: @term_like)
@@ -68,9 +68,9 @@ class UserSearch
     # 1. exact username matches
     if @term.present?
       scoped_users.where(username_lower: @term.downcase)
-                  .limit(@limit)
-                  .pluck(:id)
-                  .each { |id| users << id }
+        .limit(@limit)
+        .pluck(:id)
+        .each { |id| users << id }
 
     end
 
@@ -79,19 +79,19 @@ class UserSearch
     # 2. in topic
     if @topic_id
       filtered_by_term_users.where('users.id IN (SELECT p.user_id FROM posts p WHERE topic_id = ?)', @topic_id)
-                            .order('last_seen_at DESC')
-                            .limit(@limit - users.length)
-                            .pluck(:id)
-                            .each { |id| users << id }
+        .order('last_seen_at DESC')
+        .limit(@limit - users.length)
+        .pluck(:id)
+        .each { |id| users << id }
     end
 
     return users.to_a if users.length >= @limit
 
     # 3. global matches
     filtered_by_term_users.order('last_seen_at DESC')
-                            .limit(@limit - users.length)
-                            .pluck(:id)
-                            .each { |id| users << id }
+      .limit(@limit - users.length)
+      .pluck(:id)
+      .each { |id| users << id }
 
     users.to_a
   end
@@ -103,7 +103,7 @@ class UserSearch
     User.joins("JOIN (SELECT unnest uid, row_number() OVER () AS rn
       FROM unnest('{#{ids.join(",")}}'::int[])
     ) x on uid = users.id")
-        .order("rn")
+      .order("rn")
   end
 
 end
diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb
index 50761737e3..51ca626c3a 100644
--- a/app/models/user_stat.rb
+++ b/app/models/user_stat.rb
@@ -10,8 +10,8 @@ class UserStat < ActiveRecord::Base
 
   def self.reset_bounce_scores
     UserStat.where("reset_bounce_score_after < now()")
-            .where("bounce_score > 0")
-            .update_all(bounce_score: 0)
+      .where("bounce_score > 0")
+      .update_all(bounce_score: 0)
   end
 
   # Updates the denormalized view counts for all users
@@ -55,14 +55,14 @@ class UserStat < ActiveRecord::Base
   def update_topic_reply_count
     self.topic_reply_count =
         Topic
-        .where(['id in (
+      .where(['id in (
               SELECT topic_id FROM posts p
               JOIN topics t2 ON t2.id = p.topic_id
               WHERE p.deleted_at IS NULL AND
                 t2.user_id <> p.user_id AND
                 p.user_id = ?
               )', self.user_id])
-        .count
+      .count
   end
 
   MAX_TIME_READ_DIFF = 100
diff --git a/app/models/user_summary.rb b/app/models/user_summary.rb
index abfc9b8f51..0cf714cfac 100644
--- a/app/models/user_summary.rb
+++ b/app/models/user_summary.rb
@@ -53,18 +53,18 @@ class UserSummary
   def most_liked_by_users
     likers = {}
     UserAction.joins(:target_topic, :target_post)
-              .merge(Topic.listable_topics.visible.secured(@guardian))
-              .where(user: @user)
-              .where(action_type: UserAction::WAS_LIKED)
-              .group(:acting_user_id)
-              .order('COUNT(*) DESC')
-              .limit(MAX_SUMMARY_RESULTS)
-              .pluck('acting_user_id, COUNT(*)')
-              .each { |l| likers[l[0].to_s] = l[1] }
+      .merge(Topic.listable_topics.visible.secured(@guardian))
+      .where(user: @user)
+      .where(action_type: UserAction::WAS_LIKED)
+      .group(:acting_user_id)
+      .order('COUNT(*) DESC')
+      .limit(MAX_SUMMARY_RESULTS)
+      .pluck('acting_user_id, COUNT(*)')
+      .each { |l| likers[l[0].to_s] = l[1] }
 
     User.where(id: likers.keys)
-        .pluck(:id, :username, :name, :uploaded_avatar_id)
-        .map do |u|
+      .pluck(:id, :username, :name, :uploaded_avatar_id)
+      .map do |u|
       UserWithCount.new(
         id: u[0],
         username: u[1],
@@ -78,18 +78,18 @@ class UserSummary
   def most_liked_users
     liked_users = {}
     UserAction.joins(:target_topic, :target_post)
-              .merge(Topic.listable_topics.visible.secured(@guardian))
-              .where(action_type: UserAction::WAS_LIKED)
-              .where(acting_user_id: @user.id)
-              .group(:user_id)
-              .order('COUNT(*) DESC')
-              .limit(MAX_SUMMARY_RESULTS)
-              .pluck('user_actions.user_id, COUNT(*)')
-              .each { |l| liked_users[l[0].to_s] = l[1] }
+      .merge(Topic.listable_topics.visible.secured(@guardian))
+      .where(action_type: UserAction::WAS_LIKED)
+      .where(acting_user_id: @user.id)
+      .group(:user_id)
+      .order('COUNT(*) DESC')
+      .limit(MAX_SUMMARY_RESULTS)
+      .pluck('user_actions.user_id, COUNT(*)')
+      .each { |l| liked_users[l[0].to_s] = l[1] }
 
     User.where(id: liked_users.keys)
-        .pluck(:id, :username, :name, :uploaded_avatar_id)
-        .map do |u|
+      .pluck(:id, :username, :name, :uploaded_avatar_id)
+      .map do |u|
       UserWithCount.new(
         id: u[0],
         username: u[1],
@@ -120,8 +120,8 @@ class UserSummary
       .each { |r| replied_users[r[0].to_s] = r[1] }
 
     User.where(id: replied_users.keys)
-        .pluck(:id, :username, :name, :uploaded_avatar_id)
-        .map do |u|
+      .pluck(:id, :username, :name, :uploaded_avatar_id)
+      .map do |u|
       UserWithCount.new(
         id: u[0],
         username: u[1],
diff --git a/app/models/user_visit.rb b/app/models/user_visit.rb
index 5ebe059167..63734ef207 100644
--- a/app/models/user_visit.rb
+++ b/app/models/user_visit.rb
@@ -1,6 +1,6 @@
 class UserVisit < ActiveRecord::Base
 
-  def self.counts_by_day_query(start_date, end_date, group_id=nil)
+  def self.counts_by_day_query(start_date, end_date, group_id = nil)
     result = where('visited_at >= ? and visited_at <= ?', start_date.to_date, end_date.to_date)
 
     if group_id
@@ -12,11 +12,11 @@ class UserVisit < ActiveRecord::Base
   end
 
   # A count of visits in a date range by day
-  def self.by_day(start_date, end_date, group_id=nil)
+  def self.by_day(start_date, end_date, group_id = nil)
     counts_by_day_query(start_date, end_date, group_id).count
   end
 
-  def self.mobile_by_day(start_date, end_date, group_id=nil)
+  def self.mobile_by_day(start_date, end_date, group_id = nil)
     counts_by_day_query(start_date, end_date, group_id).where(mobile: true).count
   end
 
diff --git a/app/models/watched_word.rb b/app/models/watched_word.rb
new file mode 100644
index 0000000000..d9af0071de
--- /dev/null
+++ b/app/models/watched_word.rb
@@ -0,0 +1,68 @@
+require_dependency 'enum'
+
+class WatchedWord < ActiveRecord::Base
+
+  def self.actions
+    @actions ||= Enum.new(
+      block: 1,
+      censor: 2,
+      require_approval: 3,
+      flag: 4
+    )
+  end
+
+  MAX_WORDS_PER_ACTION = 1000
+
+  before_validation do
+    self.word = self.class.normalize_word(self.word)
+  end
+
+  validates :word,   presence: true, uniqueness: true, length: { maximum: 50 }
+  validates :action, presence: true
+  validates_each :word do |record, attr, val|
+    if WatchedWord.where(action: record.action).count >= MAX_WORDS_PER_ACTION
+      record.errors.add(:word, :too_many)
+    end
+  end
+
+  after_save    :clear_cache
+  after_destroy :clear_cache
+
+  scope :by_action, -> { order("action ASC, word ASC") }
+
+  def self.normalize_word(w)
+    w.strip.downcase.squeeze('*')
+  end
+
+  def self.create_or_update_word(params)
+    w = find_or_initialize_by(word: normalize_word(params[:word]))
+    w.action_key = params[:action_key] if params[:action_key]
+    w.action = params[:action] if params[:action]
+    w.save
+    w
+  end
+
+  def action_key=(arg)
+    self.action = self.class.actions[arg.to_sym]
+  end
+
+  def clear_cache
+    WordWatcher.clear_cache!
+  end
+
+end
+
+# == Schema Information
+#
+# Table name: watched_words
+#
+#  id         :integer          not null, primary key
+#  word       :string           not null
+#  action     :integer          not null
+#  created_at :datetime
+#  updated_at :datetime
+#
+# Indexes
+#
+#  index_watched_words_on_action_and_word  (action,word) UNIQUE
+#
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 40fed09de6..e3335e0204 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -30,8 +30,8 @@ class WebHook < ActiveRecord::Base
 
   def self.find_by_type(type)
     WebHook.where(active: true)
-           .joins(:web_hook_event_types)
-           .where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
+      .joins(:web_hook_event_types)
+      .where("web_hooks.wildcard_web_hook = ? OR web_hook_event_types.name = ?", true, type.to_s)
   end
 
   def self.enqueue_hooks(type, opts = {})
@@ -40,11 +40,11 @@ class WebHook < ActiveRecord::Base
     end
   end
 
-  def self.enqueue_topic_hooks(event, topic, user=nil)
+  def self.enqueue_topic_hooks(event, topic, user = nil)
     WebHook.enqueue_hooks(:topic, topic_id: topic.id, category_id: topic&.category_id, event_name: event.to_s)
   end
 
-  def self.enqueue_post_hooks(event, post, user=nil)
+  def self.enqueue_post_hooks(event, post, user = nil)
     WebHook.enqueue_hooks(:post, post_id: post.id, category_id: post&.topic&.category_id, event_name: event.to_s)
   end
 end
diff --git a/app/models/web_hook_event.rb b/app/models/web_hook_event.rb
index f10b5cde31..0626c7fecc 100644
--- a/app/models/web_hook_event.rb
+++ b/app/models/web_hook_event.rb
@@ -6,12 +6,14 @@ class WebHookEvent < ActiveRecord::Base
   default_scope { order('created_at DESC') }
 
   def update_web_hook_delivery_status
-    web_hook.last_delivery_status = case status
-                                    when 200..299
-                                      WebHook.last_delivery_statuses[:successful]
-                                    else
-                                      WebHook.last_delivery_statuses[:failed]
-                                    end
+    web_hook.last_delivery_status =
+      case status
+      when 200..299
+        WebHook.last_delivery_statuses[:successful]
+      else
+        WebHook.last_delivery_statuses[:failed]
+      end
+
     web_hook.save!
   end
 end
diff --git a/app/serializers/admin_badge_serializer.rb b/app/serializers/admin_badge_serializer.rb
index 535d27d1bd..4f57896d90 100644
--- a/app/serializers/admin_badge_serializer.rb
+++ b/app/serializers/admin_badge_serializer.rb
@@ -2,6 +2,6 @@ class AdminBadgeSerializer < BadgeSerializer
   attributes :query, :trigger, :target_posts, :auto_revoke, :show_posts
 
   def include_long_description?
-     true
+    true
   end
 end
diff --git a/app/serializers/admin_user_action_serializer.rb b/app/serializers/admin_user_action_serializer.rb
index 0cc58aa27a..dfe2cbc631 100644
--- a/app/serializers/admin_user_action_serializer.rb
+++ b/app/serializers/admin_user_action_serializer.rb
@@ -75,8 +75,8 @@ class AdminUserActionSerializer < ApplicationSerializer
 
   def action_type
     object.user_actions.select { |ua| ua.user_id = object.user_id }
-                       .select { |ua| [UserAction::REPLY, UserAction::RESPONSE].include? ua.action_type }
-                       .first.try(:action_type)
+      .select { |ua| [UserAction::REPLY, UserAction::RESPONSE].include? ua.action_type }
+      .first.try(:action_type)
   end
 
   private
diff --git a/app/serializers/basic_group_serializer.rb b/app/serializers/basic_group_serializer.rb
index e9cac82f26..bb4fd9ff86 100644
--- a/app/serializers/basic_group_serializer.rb
+++ b/app/serializers/basic_group_serializer.rb
@@ -18,7 +18,8 @@ class BasicGroupSerializer < ApplicationSerializer
              :flair_color,
              :bio_raw,
              :bio_cooked,
-             :public,
+             :public_admission,
+             :public_exit,
              :allow_membership_requests,
              :full_name,
              :default_notification_level
diff --git a/app/serializers/basic_group_user_serializer.rb b/app/serializers/basic_group_user_serializer.rb
index fa2015b8c4..3b40272470 100644
--- a/app/serializers/basic_group_user_serializer.rb
+++ b/app/serializers/basic_group_user_serializer.rb
@@ -1,3 +1,7 @@
 class BasicGroupUserSerializer < ApplicationSerializer
-  attributes :group_id, :user_id, :notification_level
+  attributes :group_id, :user_id, :notification_level, :owner
+
+  def include_owner?
+    object.user_id == scope&.user&.id
+  end
 end
diff --git a/app/serializers/category_and_topic_lists_serializer.rb b/app/serializers/category_and_topic_lists_serializer.rb
index 239bc07981..173b417d46 100644
--- a/app/serializers/category_and_topic_lists_serializer.rb
+++ b/app/serializers/category_and_topic_lists_serializer.rb
@@ -5,7 +5,7 @@ class CategoryAndTopicListsSerializer < ApplicationSerializer
 
   def users
     users = object.topic_list.topics.map do |t|
-      t.posters.map{|poster| poster.try(:user)}
+      t.posters.map { |poster| poster.try(:user) }
     end
     users.flatten!
     users.compact!
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index f482dd7e13..dae914fc6d 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -35,7 +35,7 @@ class CategorySerializer < BasicCategorySerializer
   end
 
   def available_groups
-    Group.order(:name).pluck(:name) - group_permissions.map{|g| g[:group_name]}
+    Group.order(:name).pluck(:name) - group_permissions.map { |g| g[:group_name] }
   end
 
   def can_delete
@@ -44,7 +44,7 @@ class CategorySerializer < BasicCategorySerializer
 
   def include_is_special?
     [SiteSetting.meta_category_id, SiteSetting.staff_category_id, SiteSetting.uncategorized_category_id]
-    .include? object.id
+      .include? object.id
   end
 
   def is_special
@@ -76,7 +76,7 @@ class CategorySerializer < BasicCategorySerializer
   end
 
   def notification_level
-   user = scope && scope.user
+    user = scope && scope.user
    object.notification_level ||
      (user && CategoryUser.where(user: user, category: object).first.try(:notification_level))
   end
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 80de2e205c..a02c99d02b 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -137,7 +137,7 @@ class CurrentUserSerializer < BasicUserSerializer
   def muted_category_ids
     @muted_category_ids ||= CategoryUser.where(user_id: object.id,
                                                notification_level: TopicUser.notification_levels[:muted])
-                                         .pluck(:category_id)
+      .pluck(:category_id)
   end
 
   def dismissed_banner_key
diff --git a/app/serializers/detailed_user_badge_serializer.rb b/app/serializers/detailed_user_badge_serializer.rb
index 1fa408844d..b32f72b6b8 100644
--- a/app/serializers/detailed_user_badge_serializer.rb
+++ b/app/serializers/detailed_user_badge_serializer.rb
@@ -10,7 +10,6 @@ class DetailedUserBadgeSerializer < BasicUserBadgeSerializer
   alias :include_topic_id? :include_post_number?
   alias :include_topic_title? :include_post_number?
 
-
   def post_number
     object.post.post_number if object.post
   end
diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rb
index dc9e0c7649..3bd6bf31d1 100644
--- a/app/serializers/group_show_serializer.rb
+++ b/app/serializers/group_show_serializer.rb
@@ -1,8 +1,8 @@
 class GroupShowSerializer < BasicGroupSerializer
-  attributes :is_group_user, :is_group_owner
+  attributes :is_group_user, :is_group_owner, :mentionable
 
   def include_is_group_user?
-    scope.authenticated?
+    authenticated?
   end
 
   def is_group_user
@@ -10,15 +10,27 @@ class GroupShowSerializer < BasicGroupSerializer
   end
 
   def include_is_group_owner?
-    scope.authenticated?
+    authenticated?
   end
 
   def is_group_owner
     scope.is_admin? || fetch_group_user&.owner
   end
 
+  def include_mentionable?
+    authenticated?
+  end
+
+  def mentionable
+    Group.mentionable(scope.user).exists?(id: object.id)
+  end
+
   private
 
+  def authenticated?
+    scope.authenticated?
+  end
+
   def fetch_group_user
     @group_user ||= object.group_users.find_by(user: scope.user)
   end
diff --git a/app/serializers/grouped_search_result_serializer.rb b/app/serializers/grouped_search_result_serializer.rb
index d50cdd565d..bc4a5a6a7e 100644
--- a/app/serializers/grouped_search_result_serializer.rb
+++ b/app/serializers/grouped_search_result_serializer.rb
@@ -2,5 +2,14 @@ class GroupedSearchResultSerializer < ApplicationSerializer
   has_many :posts, serializer: SearchPostSerializer
   has_many :users, serializer: SearchResultUserSerializer
   has_many :categories, serializer: BasicCategorySerializer
-  attributes :more_posts, :more_users, :more_categories, :term
+  attributes :more_posts, :more_users, :more_categories, :term, :search_log_id, :more_full_page_results
+
+  def search_log_id
+    object.search_log_id
+  end
+
+  def include_search_log_id?
+    search_log_id.present?
+  end
+
 end
diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb
index 4e66641105..e0bf6f7c97 100644
--- a/app/serializers/post_action_type_serializer.rb
+++ b/app/serializers/post_action_type_serializer.rb
@@ -8,7 +8,7 @@ class PostActionTypeSerializer < ApplicationSerializer
 
   def is_custom_flag
     object.id == PostActionType.types[:notify_user] ||
-    object.id == PostActionType.types[:notify_moderators] 
+    object.id == PostActionType.types[:notify_moderators]
   end
 
   def name
@@ -20,16 +20,16 @@ class PostActionTypeSerializer < ApplicationSerializer
   end
 
   def description
-    i18n('description', {tos_url: tos_path})
+    i18n('description', tos_url: tos_path)
   end
 
   def short_description
-    i18n('short_description', {tos_url: tos_path})
+    i18n('short_description', tos_url: tos_path)
   end
 
   protected
 
-    def i18n(field, vars=nil)
+    def i18n(field, vars = nil)
       key = "post_action_types.#{object.name_key}.#{field}"
       vars ? I18n.t(key, vars) : I18n.t(key)
     end
diff --git a/app/serializers/post_item_excerpt.rb b/app/serializers/post_item_excerpt.rb
index be74db9bdf..7f0cc6322b 100644
--- a/app/serializers/post_item_excerpt.rb
+++ b/app/serializers/post_item_excerpt.rb
@@ -22,4 +22,3 @@ module PostItemExcerpt
   end
 
 end
-
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index 5c1a05f603..11b13677f4 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -27,7 +27,6 @@ class PostRevisionSerializer < ApplicationSerializer
              :wiki,
              :can_edit
 
-
   # Creates a field called field_name_changes with previous and
   # current members if a field has changed in this revision
   def self.add_compared_field(field)
@@ -59,8 +58,8 @@ class PostRevisionSerializer < ApplicationSerializer
 
   def previous_revision
     @previous_revision ||= revisions.select { |r| r["revision"] >= first_revision }
-                                    .select { |r| r["revision"] < current_revision }
-                                    .last.try(:[], "revision")
+      .select { |r| r["revision"] < current_revision }
+      .last.try(:[], "revision")
   end
 
   def current_revision
@@ -69,8 +68,8 @@ class PostRevisionSerializer < ApplicationSerializer
 
   def next_revision
     @next_revision ||= revisions.select { |r| r["revision"] <= last_revision }
-                                .select { |r| r["revision"] > current_revision }
-                                .first.try(:[], "revision")
+      .select { |r| r["revision"] > current_revision }
+      .first.try(:[], "revision")
   end
 
   def last_revision
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 5ea12e8cbe..ecd93e02ae 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -25,7 +25,8 @@ class SiteSerializer < ApplicationSerializer
              :top_tags,
              :wizard_required,
              :topic_featured_link_allowed_category_ids,
-             :user_themes
+             :user_themes,
+             :censored_words
 
   has_many :categories, serializer: BasicCategorySerializer, embed: :objects
   has_many :trust_levels, embed: :objects
@@ -36,16 +37,16 @@ class SiteSerializer < ApplicationSerializer
     cache_fragment("user_themes") do
       Theme.where('key = :default OR user_selectable',
                     default: SiteSetting.default_theme_key)
-           .order(:name)
-           .pluck(:key, :name)
-           .map{|k,n| {theme_key: k, name: n, default: k == SiteSetting.default_theme_key}}
-           .as_json
+        .order(:name)
+        .pluck(:key, :name)
+        .map { |k, n| { theme_key: k, name: n, default: k == SiteSetting.default_theme_key } }
+        .as_json
     end
   end
 
   def groups
     cache_fragment("group_names") do
-      Group.order(:name).pluck(:id,:name).map { |id,name| { id: id, name: name } }.as_json
+      Group.order(:name).pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json
     end
   end
 
@@ -142,4 +143,8 @@ class SiteSerializer < ApplicationSerializer
   def topic_featured_link_allowed_category_ids
     scope.topic_featured_link_allowed_category_ids
   end
+
+  def censored_words
+    WordWatcher.words_for_action(:censor).join('|')
+  end
 end
diff --git a/app/serializers/site_text_serializer.rb b/app/serializers/site_text_serializer.rb
index c686a08008..f0e3c1e4c3 100644
--- a/app/serializers/site_text_serializer.rb
+++ b/app/serializers/site_text_serializer.rb
@@ -19,4 +19,3 @@ class SiteTextSerializer < ApplicationSerializer
 
   alias_method :can_revert?, :overridden?
 end
-
diff --git a/app/serializers/topic_flag_type_serializer.rb b/app/serializers/topic_flag_type_serializer.rb
index a764d1a820..ee81618448 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)
+    def i18n(field, vars = nil)
       key = "topic_flag_types.#{object.name_key}.#{field}"
-      vars ? I18n.t(key,vars) : I18n.t(key)
+      vars ? I18n.t(key, vars) : I18n.t(key)
     end
 
 end
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index f9a548372e..49be96b8c7 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -90,13 +90,13 @@ class TopicViewSerializer < ApplicationSerializer
 
     if object.post_counts_by_user.present?
       result[:participants] = object.post_counts_by_user.map do |pc|
-        TopicPostCountSerializer.new({user: object.participants[pc[0]], post_count: pc[1]}, scope: scope, root: false)
+        TopicPostCountSerializer.new({ user: object.participants[pc[0]], post_count: pc[1] }, scope: scope, root: false)
       end
     end
 
     if object.suggested_topics.try(:topics).present?
-      result[:suggested_topics] = object.suggested_topics.topics.map do |topic|
-        SuggestedTopicSerializer.new(topic, scope: scope, root: false)
+      result[:suggested_topics] = object.suggested_topics.topics.map do |t|
+        SuggestedTopicSerializer.new(t, scope: scope, root: false)
       end
     end
 
@@ -220,7 +220,7 @@ class TopicViewSerializer < ApplicationSerializer
       result << { id: id,
                   count: 0,
                   hidden: false,
-                  can_act: scope.post_can_act?(post, sym)}
+                  can_act: scope.post_can_act?(post, sym) }
       # TODO: other keys? :can_defer_flags, :acted, :can_undo
     end
     result
@@ -277,7 +277,7 @@ class TopicViewSerializer < ApplicationSerializer
   end
 
   def unicode_title
-    gsub_emoji_to_unicode(object.topic.title)
+    Emoji.gsub_emoji_to_unicode(object.topic.title)
   end
 
   def include_pm_with_non_human_user?
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index 81b2cb2fe6..c6abea6a5c 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -31,7 +31,6 @@ class UserActionSerializer < ApplicationSerializer
              :closed,
              :archived
 
-
   def avatar_template
     User.avatar_template(object.username, object.uploaded_avatar_id)
   end
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index a6a7caeb23..b8253b40d7 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -22,7 +22,6 @@ class UserOptionSerializer < ApplicationSerializer
              :theme_key,
              :theme_key_seq
 
-
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
   end
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 0e75983daf..f41f762948 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -125,12 +125,12 @@ class UserSerializer < BasicUserSerializer
 
   def mailing_list_posts_per_day
     val = Post.estimate_posts_per_day
-    [val,SiteSetting.max_emails_per_day_per_user].min
+    [val, SiteSetting.max_emails_per_day_per_user].min
   end
 
   def groups
     object.groups.order(:id)
-          .visible_groups(scope.user)
+      .visible_groups(scope.user)
   end
 
   def group_users
@@ -145,13 +145,12 @@ class UserSerializer < BasicUserSerializer
     !(SiteSetting.enable_sso && SiteSetting.sso_overrides_bio)
   end
 
-
   def user_api_keys
     keys = object.user_api_keys.where(revoked_at: nil).map do |k|
       {
         id: k.id,
         application_name: k.application_name,
-        scopes: k.scopes.map{|s| I18n.t("user_api_key.scopes.#{s}")},
+        scopes: k.scopes.map { |s| I18n.t("user_api_key.scopes.#{s}") },
         created_at: k.created_at
       }
     end
@@ -178,7 +177,7 @@ class UserSerializer < BasicUserSerializer
   def website_name
     uri = URI(website.to_s) rescue nil
     return if uri.nil? || uri.host.nil?
-    uri.host.sub(/^www\./,'') + uri.path
+    uri.host.sub(/^www\./, '') + uri.path
   end
 
   def include_website_name
@@ -248,7 +247,7 @@ class UserSerializer < BasicUserSerializer
   end
 
   def bio_excerpt
-    object.user_profile.bio_excerpt(350 , { keep_newlines: true, keep_emoji_images: true })
+    object.user_profile.bio_excerpt(350 , keep_newlines: true, keep_emoji_images: true)
   end
 
   def include_suspend_reason?
diff --git a/app/serializers/watched_word_list_serializer.rb b/app/serializers/watched_word_list_serializer.rb
new file mode 100644
index 0000000000..e38d56365c
--- /dev/null
+++ b/app/serializers/watched_word_list_serializer.rb
@@ -0,0 +1,13 @@
+class WatchedWordListSerializer < ApplicationSerializer
+  attributes :actions, :words
+
+  def actions
+    WatchedWord.actions.keys
+  end
+
+  def words
+    object.map do |word|
+      WatchedWordSerializer.new(word, root: false)
+    end
+  end
+end
diff --git a/app/serializers/watched_word_serializer.rb b/app/serializers/watched_word_serializer.rb
new file mode 100644
index 0000000000..ffa46da512
--- /dev/null
+++ b/app/serializers/watched_word_serializer.rb
@@ -0,0 +1,7 @@
+class WatchedWordSerializer < ApplicationSerializer
+  attributes :id, :word, :action
+
+  def action
+    WatchedWord.actions[object.action]
+  end
+end
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index cfde16aa13..f76ab063e8 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -1,17 +1,17 @@
 class BadgeGranter
 
-  def initialize(badge, user, opts={})
+  def initialize(badge, user, opts = {})
     @badge, @user, @opts = badge, user, opts
     @granted_by = opts[:granted_by] || Discourse.system_user
     @post_id = opts[:post_id]
   end
 
-  def self.grant(badge, user, opts={})
+  def self.grant(badge, user, opts = {})
     BadgeGranter.new(badge, user, opts).grant
   end
 
   def grant
-    return if @granted_by and !Guardian.new(@granted_by).can_grant_badges?(@user)
+    return if @granted_by && !Guardian.new(@granted_by).can_grant_badges?(@user)
     return unless @badge.enabled?
 
     find_by = { badge_id: @badge.id, user_id: @user.id }
@@ -51,7 +51,7 @@ class BadgeGranter
                 data: { badge_id: @badge.id,
                         badge_name: @badge.display_name,
                         badge_slug: @badge.slug,
-                        username: @user.username}.to_json
+                        username: @user.username }.to_json
               )
               user_badge.update_attributes notification_id: notification.id
             end
@@ -63,7 +63,7 @@ class BadgeGranter
     user_badge
   end
 
-  def self.revoke(user_badge, options={})
+  def self.revoke(user_badge, options = {})
     UserBadge.transaction do
       user_badge.destroy!
       if options[:revoked_by]
@@ -178,7 +178,7 @@ class BadgeGranter
   #   :trigger - the Badge::Trigger id
   #   :explain - return the EXPLAIN query
   def self.preview(sql, opts = {})
-    params = {user_ids: [], post_ids: [], backfill: true}
+    params = { user_ids: [], post_ids: [], backfill: true }
 
     BadgeGranter.contract_checks!(sql, opts)
 
@@ -188,19 +188,19 @@ class BadgeGranter
 
     grants_sql =
      if opts[:target_posts]
-      "SELECT u.id, u.username, q.post_id, t.title, q.granted_at
-    FROM(#{sql}) q
-    JOIN users u on u.id = q.user_id
-    LEFT JOIN badge_posts p on p.id = q.post_id
-    LEFT JOIN topics t on t.id = p.topic_id
-    WHERE :backfill = :backfill
-    LIMIT 10"
+       "SELECT u.id, u.username, q.post_id, t.title, q.granted_at
+     FROM(#{sql}) q
+     JOIN users u on u.id = q.user_id
+     LEFT JOIN badge_posts p on p.id = q.post_id
+     LEFT JOIN topics t on t.id = p.topic_id
+     WHERE :backfill = :backfill
+     LIMIT 10"
      else
-      "SELECT u.id, u.username, q.granted_at
-    FROM(#{sql}) q
-    JOIN users u on u.id = q.user_id
-    WHERE :backfill = :backfill
-    LIMIT 10"
+       "SELECT u.id, u.username, q.granted_at
+     FROM(#{sql}) q
+     JOIN users u on u.id = q.user_id
+     WHERE :backfill = :backfill
+     LIMIT 10"
      end
 
     query_plan = nil
@@ -218,13 +218,13 @@ class BadgeGranter
       end
     end
 
-    {grant_count: grant_count, sample: sample, query_plan: query_plan}
+    { grant_count: grant_count, sample: sample, query_plan: query_plan }
   rescue => e
-    {errors: e.message}
+    { errors: e.message }
   end
 
   MAX_ITEMS_FOR_DELTA ||= 200
-  def self.backfill(badge, opts=nil)
+  def self.backfill(badge, opts = nil)
     return unless SiteSetting.enable_badges
     return unless badge.enabled
     return unless badge.query.present?
@@ -304,14 +304,15 @@ class BadgeGranter
                                  user_ids: user_ids || [-2]).each do |row|
 
       # old bronze badges do not matter
-      next if badge.badge_type_id == BadgeType::Bronze and row.granted_at < 2.days.ago
+      next if badge.badge_type_id == (BadgeType::Bronze) && row.granted_at < (2.days.ago)
 
       # Try to use user locale in the badge notification if possible without too much resources
-      notification_locale = if SiteSetting.allow_user_locale && row.locale.present?
-                              row.locale
-                            else
-                              SiteSetting.default_locale
-                            end
+      notification_locale =
+        if SiteSetting.allow_user_locale && row.locale.present?
+          row.locale
+        else
+          SiteSetting.default_locale
+        end
 
       # Make this variable in this scope
       notification = nil
@@ -327,7 +328,7 @@ class BadgeGranter
                             badge_name: badge.display_name,
                             badge_slug: badge.slug,
                             username: row.username
-        }.to_json )
+        }.to_json)
       end
 
       Badge.exec_sql("UPDATE user_badges SET notification_id = :notification_id WHERE id = :id",
diff --git a/app/services/color_scheme_revisor.rb b/app/services/color_scheme_revisor.rb
index ce66c37332..1fec2875f5 100644
--- a/app/services/color_scheme_revisor.rb
+++ b/app/services/color_scheme_revisor.rb
@@ -1,6 +1,6 @@
 class ColorSchemeRevisor
 
-  def initialize(color_scheme, params={})
+  def initialize(color_scheme, params = {})
     @color_scheme = color_scheme
     @params = params
   end
@@ -12,7 +12,7 @@ class ColorSchemeRevisor
   def revise
     ColorScheme.transaction do
 
-      @color_scheme.name    = @params[:name]    if @params.has_key?(:name)
+      @color_scheme.name = @params[:name]    if @params.has_key?(:name)
       @color_scheme.base_scheme_id = @params[:base_scheme_id] if @params.has_key?(:base_scheme_id)
       has_colors = @params[:colors]
 
diff --git a/app/services/group_action_logger.rb b/app/services/group_action_logger.rb
index 9f1f429a8f..58674016c3 100644
--- a/app/services/group_action_logger.rb
+++ b/app/services/group_action_logger.rb
@@ -24,7 +24,7 @@ class GroupActionLogger
   end
 
   def log_add_user_to_group(target_user)
-    @group.public || can_edit?
+    (target_user == @acting_user && @group.public_admission) || can_edit?
 
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:add_user_to_group],
@@ -33,7 +33,7 @@ class GroupActionLogger
   end
 
   def log_remove_user_from_group(target_user)
-    @group.public || can_edit?
+    (target_user == @acting_user && @group.public_exit) || can_edit?
 
     GroupHistory.create!(default_params.merge(
       action: GroupHistory.actions[:remove_user_from_group],
diff --git a/app/services/group_message.rb b/app/services/group_message.rb
index 16e18ddbb8..4e5a55f99a 100644
--- a/app/services/group_message.rb
+++ b/app/services/group_message.rb
@@ -16,11 +16,11 @@ class GroupMessage
 
   include Rails.application.routes.url_helpers
 
-  def self.create(group_name, message_type, opts={})
+  def self.create(group_name, message_type, opts = {})
     GroupMessage.new(group_name, message_type, opts).create
   end
 
-  def initialize(group_name, message_type, opts={})
+  def initialize(group_name, message_type, opts = {})
     @group_name = group_name
     @message_type = message_type
     @opts = opts
@@ -47,10 +47,8 @@ class GroupMessage
     @message_params ||= begin
       h = { base_url: Discourse.base_url }.merge(@opts[:message_params] || {})
       if @opts[:user]
-        h.merge!({
-          username: @opts[:user].username,
-          user_url: user_path(@opts[:user].username)
-        })
+        h.merge!(username: @opts[:user].username,
+                 user_url: user_path(@opts[:user].username))
       end
       h
     end
diff --git a/app/services/handle_chunk_upload.rb b/app/services/handle_chunk_upload.rb
index c71a656dad..de5bf7837d 100644
--- a/app/services/handle_chunk_upload.rb
+++ b/app/services/handle_chunk_upload.rb
@@ -1,6 +1,6 @@
 class HandleChunkUpload
 
-  def initialize(chunk, params={})
+  def initialize(chunk, params = {})
     @chunk = chunk
     @params = params
   end
diff --git a/app/services/notification_emailer.rb b/app/services/notification_emailer.rb
index 534d4037a1..bdbc5d7d35 100644
--- a/app/services/notification_emailer.rb
+++ b/app/services/notification_emailer.rb
@@ -66,12 +66,12 @@ class NotificationEmailer
 
     EMAILABLE_POST_TYPES ||= Set.new [Post.types[:regular], Post.types[:whisper]]
 
-    def enqueue(type, delay=default_delay)
+    def enqueue(type, delay = default_delay)
       return unless notification.user.user_option.email_direct?
       perform_enqueue(type, delay)
     end
 
-    def enqueue_private(type, delay=private_delay)
+    def enqueue_private(type, delay = private_delay)
       return unless notification.user.user_option.email_private_messages?
       perform_enqueue(type, delay)
     end
diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb
index 9672512e1b..130eec1285 100644
--- a/app/services/post_alerter.rb
+++ b/app/services/post_alerter.rb
@@ -48,11 +48,11 @@ class PostAlerter
       if post.last_editor_id != post.user_id
         # Mention comes from an edit by someone else, so notification should say who added the mention.
         editor = post.last_editor
-        mentioned_opts = {user_id: editor.id, original_username: editor.username, display_username: editor.username}
+        mentioned_opts = { user_id: editor.id, original_username: editor.username, display_username: editor.username }
       end
 
       expand_group_mentions(mentioned_groups, post) do |group, users|
-        notify_non_pm_users(users - notified, :group_mentioned, post, mentioned_opts.merge({group: group}))
+        notify_non_pm_users(users - notified, :group_mentioned, post, mentioned_opts.merge(group: group))
         notified += users
       end
 
@@ -84,14 +84,18 @@ class PostAlerter
     if new_record
       if post.topic.private_message?
         # users that aren't part of any mentioned groups
-        directly_targeted_users(post).each do |user|
+        users = directly_targeted_users(post)
+        DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+        users.each do |user|
           notification_level = TopicUser.get(post.topic, user).try(:notification_level)
           if notified.include?(user) || notification_level == TopicUser.notification_levels[:watching]
             create_notification(user, Notification.types[:private_message], post)
           end
         end
         # users that are part of all mentionned groups
-        indirectly_targeted_users(post).each do |user|
+        users = indirectly_targeted_users(post)
+        DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+        users.each do |user|
           # only create a notification when watching the group
           notification_level = TopicUser.get(post.topic, user).try(:notification_level)
 
@@ -118,17 +122,17 @@ class PostAlerter
 
       if topic.present?
         cat_watchers = topic.category_users
-                            .where(notification_level: CategoryUser.notification_levels[:watching_first_post])
-                            .pluck(:user_id)
+          .where(notification_level: CategoryUser.notification_levels[:watching_first_post])
+          .pluck(:user_id)
 
         tag_watchers = topic.tag_users
-                            .where(notification_level: TagUser.notification_levels[:watching_first_post])
-                            .pluck(:user_id)
+          .where(notification_level: TagUser.notification_levels[:watching_first_post])
+          .pluck(:user_id)
 
         group_ids = topic.allowed_groups.pluck(:group_id)
         group_watchers = GroupUser.where(group_id: group_ids,
                                          notification_level: GroupUser.notification_levels[:watching_first_post])
-                                  .pluck(:user_id)
+          .pluck(:user_id)
 
         watchers = [cat_watchers, tag_watchers, group_watchers].flatten
 
@@ -145,7 +149,9 @@ class PostAlerter
     # Don't notify the OP
     user_ids -= [post.user_id]
 
-    User.where(id: user_ids).each do |u|
+    users = User.where(id: user_ids)
+    DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
+    users.each do |u|
       create_notification(u, Notification.types[:watching_first_post], post)
     end
   end
@@ -161,17 +167,17 @@ class PostAlerter
 
   def unread_posts(user, topic)
     Post.secured(Guardian.new(user))
-        .where('post_number > COALESCE((
+      .where('post_number > COALESCE((
                SELECT last_read_post_number FROM topic_users tu
                WHERE tu.user_id = ? AND tu.topic_id = ? ),0)',
                 user.id, topic.id)
-        .where('reply_to_user_id = ? OR exists(
+      .where('reply_to_user_id = ? OR exists(
             SELECT 1 from topic_users tu
             WHERE tu.user_id = ? AND
               tu.topic_id = ? AND
               notification_level = ?
             )', user.id, user.id, topic.id, TopicUser.notification_levels[:watching])
-        .where(topic_id: topic.id)
+      .where(topic_id: topic.id)
   end
 
   def first_unread_post(user, topic)
@@ -192,7 +198,7 @@ class PostAlerter
     user.reload
   end
 
-  NOTIFIABLE_TYPES = [:mentioned, :replied, :quoted, :posted, :linked, :private_message, :group_mentioned].map{ |t|
+  NOTIFIABLE_TYPES = [:mentioned, :replied, :quoted, :posted, :linked, :private_message, :group_mentioned].map { |t|
     Notification.types[t]
   }
 
@@ -211,18 +217,18 @@ class PostAlerter
     end
   end
 
-  def notify_group_summary(user,post)
+  def notify_group_summary(user, post)
 
     @group_stats ||= {}
     stats = (@group_stats[post.topic_id] ||= group_stats(post.topic))
     return unless stats
 
     group_id = post.topic
-                   .topic_allowed_groups
-                   .where(group_id: user.groups.pluck(:id))
-                   .pluck(:group_id).first
+      .topic_allowed_groups
+      .where(group_id: user.groups.pluck(:id))
+      .pluck(:group_id).first
 
-    stat = stats.find{|s| s[:group_id] == group_id}
+    stat = stats.find { |s| s[:group_id] == group_id }
     return unless stat && stat[:inbox_count] > 0
 
     notification_type = Notification.types[:group_message_summary]
@@ -277,6 +283,8 @@ class PostAlerter
   def create_notification(user, type, post, opts = {})
     opts = @default_opts.merge(opts)
 
+    DiscourseEvent.trigger(:before_create_notification, user, type, post, opts)
+
     return if user.blank?
     return if user.id < 0
 
@@ -289,9 +297,9 @@ class PostAlerter
 
     # apply muting here
     return if notifier_id && MutedUser.where(user_id: user.id, muted_user_id: notifier_id)
-                                      .joins(:muted_user)
-                                      .where('NOT admin AND NOT moderator')
-                                      .exists?
+        .joins(:muted_user)
+        .where('NOT admin AND NOT moderator')
+        .exists?
 
     # skip if muted on the topic
     return if TopicUser.where(
@@ -311,10 +319,10 @@ class PostAlerter
 
     # Don't notify the same user about the same notification on the same post
     existing_notification = user.notifications
-                                .order("notifications.id DESC")
-                                .find_by(topic_id: post.topic_id,
-                                         post_number: post.post_number,
-                                         notification_type: type)
+      .order("notifications.id DESC")
+      .find_by(topic_id: post.topic_id,
+               post_number: post.post_number,
+               notification_type: type)
 
     return if existing_notification && !should_notify_previous?(user, existing_notification, opts)
 
@@ -368,13 +376,11 @@ class PostAlerter
       end
     end
 
-    notification_data.merge!({
-      topic_title: topic_title,
-      original_post_id: original_post.id,
-      original_post_type: original_post.post_type,
-      original_username: original_username,
-      display_username: opts[:display_username] || post.user.username
-    })
+    notification_data.merge!(topic_title: topic_title,
+                             original_post_id: original_post.id,
+                             original_post_type: original_post.post_type,
+                             original_username: original_username,
+                             display_username: opts[:display_username] || post.user.username)
 
     if group = opts[:group]
       notification_data[:group_id] = group.id
@@ -393,15 +399,15 @@ class PostAlerter
      # we may have an invalid post somehow, dont blow up
      post_url = original_post.url rescue nil
      if post_url
-        payload = {
-          notification_type: type,
-          post_number: original_post.post_number,
-          topic_title: original_post.topic.title,
-          topic_id: original_post.topic.id,
-          excerpt: original_post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
-          username: original_username,
-          post_url: post_url
-        }
+       payload = {
+         notification_type: type,
+         post_number: original_post.post_number,
+         topic_title: original_post.topic.title,
+         topic_id: original_post.topic.id,
+         excerpt: original_post.excerpt(400, text_entities: true, strip_links: true, remap_emoji: true),
+         username: original_username,
+         post_url: post_url
+       }
 
         MessageBus.publish("/notification-alert/#{user.id}", payload, user_ids: [user.id])
         push_notification(user, payload)
@@ -414,9 +420,9 @@ class PostAlerter
   def push_notification(user, payload)
     if SiteSetting.allow_user_api_key_scopes.split("|").include?("push") && SiteSetting.allowed_user_api_push_urls.present?
       clients = user.user_api_keys
-          .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes)) AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL",
+        .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes)) AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL",
                   SiteSetting.allowed_user_api_push_urls)
-          .pluck(:client_id, :push_url)
+        .pluck(:client_id, :push_url)
 
       if clients.length > 0
         Jobs.enqueue(:push_notification, clients: clients, payload: payload, user_id: user.id)
@@ -450,7 +456,6 @@ class PostAlerter
     [groups, users]
   end
 
-
   # TODO: Move to post-analyzer?
   # Returns a list of users who were quoted in the post
   def extract_quoted_users(post)
@@ -476,6 +481,7 @@ class PostAlerter
 
     users = [users] unless users.is_a?(Array)
 
+    DiscourseEvent.trigger(:before_create_notifications_for_users, users, post)
     users.each do |u|
       create_notification(u, Notification.types[type], post, opts)
     end
@@ -521,6 +527,7 @@ SQL
     exclude_user_ids = notified.map(&:id)
     notify = notify.where("id NOT IN (?)", exclude_user_ids) if exclude_user_ids.present?
 
+    DiscourseEvent.trigger(:before_create_notifications_for_users, notify, post)
     notify.each do |user|
       create_notification(user, Notification.types[:posted], post)
     end
diff --git a/app/services/random_topic_selector.rb b/app/services/random_topic_selector.rb
index 9446c4fcbb..f19b1a1718 100644
--- a/app/services/random_topic_selector.rb
+++ b/app/services/random_topic_selector.rb
@@ -3,7 +3,7 @@ class RandomTopicSelector
   BACKFILL_SIZE = 3000
   BACKFILL_LOW_WATER_MARK = 500
 
-  def self.backfill(category=nil)
+  def self.backfill(category = nil)
     exclude = category.try(:topic_id)
 
     # don't leak private categories into the "everything" group
@@ -20,13 +20,12 @@ class RandomTopicSelector
 
     query = TopicQuery.new(user, options)
 
-
     results = query.latest_results.order('RANDOM()')
-                   .where(closed: false, archived: false)
-                   .where("topics.created_at > ?", SiteSetting.suggested_topics_max_days_old.days.ago)
-                   .limit(BACKFILL_SIZE)
-                   .reorder('RANDOM()')
-                   .pluck(:id)
+      .where(closed: false, archived: false)
+      .where("topics.created_at > ?", SiteSetting.suggested_topics_max_days_old.days.ago)
+      .limit(BACKFILL_SIZE)
+      .reorder('RANDOM()')
+      .pluck(:id)
 
     key = cache_key(category)
     results.each do |id|
@@ -37,7 +36,7 @@ class RandomTopicSelector
     results
   end
 
-  def self.next(count, category=nil)
+  def self.next(count, category = nil)
     key = cache_key(category)
 
     results = []
@@ -45,12 +44,12 @@ class RandomTopicSelector
     return results if count < 1
 
     results = $redis.multi do
-      $redis.lrange(key, 0, count-1)
+      $redis.lrange(key, 0, count - 1)
       $redis.ltrim(key, count, -1)
     end
 
     if !results.is_a?(Array) # Redis is in readonly mode
-      results = $redis.lrange(key, 0, count-1)
+      results = $redis.lrange(key, 0, count - 1)
     else
       results = results[0]
     end
@@ -77,7 +76,7 @@ class RandomTopicSelector
     results
   end
 
-  def self.cache_key(category=nil)
+  def self.cache_key(category = nil)
     "random_topic_cache_#{category.try(:id)}"
   end
 
diff --git a/app/services/search_indexer.rb b/app/services/search_indexer.rb
index 72e526a301..e294f41131 100644
--- a/app/services/search_indexer.rb
+++ b/app/services/search_indexer.rb
@@ -15,7 +15,7 @@ class SearchIndexer
   end
 
   def self.update_index(table, id, raw_data)
-    raw_data = Search.prepare_data(raw_data)
+    raw_data = Search.prepare_data(raw_data, :index)
 
     table_name = "#{table}_search_data"
     foreign_key = "#{table}_id"
@@ -31,7 +31,7 @@ class SearchIndexer
     end
 
     # for user login and name use "simple" lowercase stemmer
-    stemmer = table == "user" ? "simple" : Search.long_locale
+    stemmer = table == "user" ? "simple" : Search.ts_config
 
     # Would be nice to use AR here but not sure how to execut Postgres functions
     # when inserting data like this.
@@ -110,7 +110,6 @@ class SearchIndexer
     end
   end
 
-
   class HtmlScrubber < Nokogiri::XML::SAX::Document
     attr_reader :scrubbed
 
@@ -130,7 +129,7 @@ class SearchIndexer
       me.scrubbed
     end
 
-    def start_element(name, attributes=[])
+    def start_element(name, attributes = [])
       attributes = Hash[*attributes.flatten]
       if attributes["alt"]
         scrubbed << " "
diff --git a/app/services/spam_rule/auto_block.rb b/app/services/spam_rule/auto_block.rb
index a44ac9a115..03bb1bf67c 100644
--- a/app/services/spam_rule/auto_block.rb
+++ b/app/services/spam_rule/auto_block.rb
@@ -21,17 +21,17 @@ class SpamRule::AutoBlock
     return false if @user.staged?
     return false if @user.has_trust_level?(TrustLevel[1])
 
-    if SiteSetting.num_spam_flags_to_block_new_user > 0 and
-        SiteSetting.num_users_to_block_new_user > 0 and
-        num_spam_flags_against_user >= SiteSetting.num_spam_flags_to_block_new_user and
-        num_users_who_flagged_spam_against_user >= SiteSetting.num_users_to_block_new_user
+    if SiteSetting.num_spam_flags_to_block_new_user > (0) &&
+        SiteSetting.num_users_to_block_new_user > (0) &&
+        num_spam_flags_against_user >= (SiteSetting.num_spam_flags_to_block_new_user) &&
+        num_users_who_flagged_spam_against_user >= (SiteSetting.num_users_to_block_new_user)
       return true
     end
 
-    if SiteSetting.num_tl3_flags_to_block_new_user > 0 and
-        SiteSetting.num_tl3_users_to_block_new_user > 0 and
-        num_tl3_flags_against_user >= SiteSetting.num_tl3_flags_to_block_new_user and
-        num_tl3_users_who_flagged >= SiteSetting.num_tl3_users_to_block_new_user
+    if SiteSetting.num_tl3_flags_to_block_new_user > (0) &&
+        SiteSetting.num_tl3_users_to_block_new_user > (0) &&
+        num_tl3_flags_against_user >= (SiteSetting.num_tl3_flags_to_block_new_user) &&
+        num_tl3_users_who_flagged >= (SiteSetting.num_tl3_users_to_block_new_user)
       return true
     end
 
@@ -66,14 +66,14 @@ class SpamRule::AutoBlock
 
   def flagged_post_ids
     Post.where(user_id: @user.id)
-        .where('spam_count > ? OR off_topic_count > ? OR inappropriate_count > ?', 0, 0, 0)
-        .pluck(:id)
+      .where('spam_count > ? OR off_topic_count > ? OR inappropriate_count > ?', 0, 0, 0)
+      .pluck(:id)
   end
 
   def block_user
     Post.transaction do
       if UserBlocker.block(@user, Discourse.system_user, message: :too_many_spam_flags) && SiteSetting.notify_mods_when_user_blocked
-        GroupMessage.create(Group[:moderators].name, :user_automatically_blocked, {user: @user, limit_once_per: false})
+        GroupMessage.create(Group[:moderators].name, :user_automatically_blocked, user: @user, limit_once_per: false)
       end
     end
   end
diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb
index 1cd09176af..b58ff9093e 100644
--- a/app/services/staff_action_logger.rb
+++ b/app/services/staff_action_logger.rb
@@ -10,16 +10,14 @@ class StaffActionLogger
     raise Discourse::InvalidParameters.new(:admin) unless @admin && @admin.is_a?(User)
   end
 
-  def log_user_deletion(deleted_user, opts={})
+  def log_user_deletion(deleted_user, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_user) unless deleted_user && deleted_user.is_a?(User)
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:delete_user],
-      ip_address: deleted_user.ip_address.to_s,
-      details: [:id, :username, :name, :created_at, :trust_level, :last_seen_at, :last_emailed_at].map { |x| "#{x}: #{deleted_user.send(x)}" }.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_user],
+                                          ip_address: deleted_user.ip_address.to_s,
+                                          details: [:id, :username, :name, :created_at, :trust_level, :last_seen_at, :last_emailed_at].map { |x| "#{x}: #{deleted_user.send(x)}" }.join("\n")))
   end
 
-  def log_custom(custom_type, details=nil)
+  def log_custom(custom_type, details = nil)
     raise Discourse::InvalidParameters.new(:custom_type) unless custom_type
 
     details ||= {}
@@ -28,7 +26,7 @@ class StaffActionLogger
     StaffActionLogger.base_attrs.each do |attr|
       attrs[attr] = details.delete(attr) if details.has_key?(attr)
     end
-    attrs[:details] = details.map {|r| "#{r[0]}: #{r[1]}"}.join("\n")
+    attrs[:details] = details.map { |r| "#{r[0]}: #{r[1]}" }.join("\n")
     attrs[:acting_user_id] = @admin.id
     attrs[:action] = UserHistory.actions[:custom_staff]
     attrs[:custom_type] = custom_type
@@ -36,7 +34,7 @@ class StaffActionLogger
     UserHistory.create(attrs)
   end
 
-  def log_post_deletion(deleted_post, opts={})
+  def log_post_deletion(deleted_post, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_post) unless deleted_post && deleted_post.is_a?(Post)
 
     topic = deleted_post.topic || Topic.with_deleted.find_by(id: deleted_post.topic_id)
@@ -54,14 +52,12 @@ class StaffActionLogger
       "raw: #{deleted_post.raw}"
     ]
 
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:delete_post],
-      post_id: deleted_post.id,
-      details: details.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_post],
+                                          post_id: deleted_post.id,
+                                          details: details.join("\n")))
   end
 
-  def log_topic_deletion(deleted_topic, opts={})
+  def log_topic_deletion(deleted_topic, opts = {})
     raise Discourse::InvalidParameters.new(:deleted_topic) unless deleted_topic && deleted_topic.is_a?(Topic)
 
     user = deleted_topic.user ? "#{deleted_topic.user.username} (#{deleted_topic.user.name})" : "(deleted user)"
@@ -77,48 +73,40 @@ class StaffActionLogger
       details << "raw: #{first_post.raw}"
     end
 
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:delete_topic],
-      topic_id: deleted_topic.id,
-      details: details.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_topic],
+                                          topic_id: deleted_topic.id,
+                                          details: details.join("\n")))
   end
 
-  def log_trust_level_change(user, old_trust_level, new_trust_level, opts={})
+  def log_trust_level_change(user, old_trust_level, new_trust_level, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user && user.is_a?(User)
     raise Discourse::InvalidParameters.new(:old_trust_level) unless TrustLevel.valid? old_trust_level
     raise Discourse::InvalidParameters.new(:new_trust_level) unless TrustLevel.valid? new_trust_level
-    UserHistory.create!( params(opts).merge({
-      action: UserHistory.actions[:change_trust_level],
-      target_user_id: user.id,
-      details: "old trust level: #{old_trust_level}\nnew trust level: #{new_trust_level}"
-    }))
+    UserHistory.create!(params(opts).merge(action: UserHistory.actions[:change_trust_level],
+                                           target_user_id: user.id,
+                                           details: "old trust level: #{old_trust_level}\nnew trust level: #{new_trust_level}"))
   end
 
-  def log_lock_trust_level(user, opts={})
+  def log_lock_trust_level(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user && user.is_a?(User)
-    UserHistory.create!( params(opts).merge({
-      action: UserHistory.actions[user.trust_level_locked ? :lock_trust_level : :unlock_trust_level],
-      target_user_id: user.id
-    }))
+    UserHistory.create!(params(opts).merge(action: UserHistory.actions[user.trust_level_locked ? :lock_trust_level : :unlock_trust_level],
+                                           target_user_id: user.id))
   end
 
-  def log_site_setting_change(setting_name, previous_value, new_value, opts={})
+  def log_site_setting_change(setting_name, previous_value, new_value, opts = {})
     raise Discourse::InvalidParameters.new(:setting_name) unless setting_name.present? && SiteSetting.respond_to?(setting_name)
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_site_setting],
-      subject: setting_name,
-      previous_value: previous_value,
-      new_value: new_value
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_site_setting],
+                                          subject: setting_name,
+                                          previous_value: previous_value,
+                                          new_value: new_value))
   end
 
   def theme_json(theme)
-    ThemeSerializer.new(theme, root:false).to_json
+    ThemeSerializer.new(theme, root: false).to_json
   end
 
-  def strip_duplicates(old,cur)
-    return [old,cur] unless old && cur
+  def strip_duplicates(old, cur)
+    return [old, cur] unless old && cur
 
     old = JSON.parse(old)
     cur = JSON.parse(cur)
@@ -135,144 +123,116 @@ class StaffActionLogger
     [old.to_json, cur.to_json]
   end
 
-  def log_theme_change(old_json, new_theme, opts={})
+  def log_theme_change(old_json, new_theme, opts = {})
     raise Discourse::InvalidParameters.new(:new_theme) unless new_theme
 
     new_json = theme_json(new_theme)
 
-    old_json,new_json = strip_duplicates(old_json,new_json)
+    old_json, new_json = strip_duplicates(old_json, new_json)
 
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_theme],
-      subject: new_theme.name,
-      previous_value: old_json,
-      new_value: new_json
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_theme],
+                                          subject: new_theme.name,
+                                          previous_value: old_json,
+                                          new_value: new_json))
   end
 
-  def log_theme_destroy(theme, opts={})
+  def log_theme_destroy(theme, opts = {})
     raise Discourse::InvalidParameters.new(:theme) unless theme
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:delete_theme],
-      subject: theme.name,
-      previous_value: theme_json(theme)
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:delete_theme],
+                                          subject: theme.name,
+                                          previous_value: theme_json(theme)))
   end
 
-  def log_site_text_change(subject, new_text=nil, old_text=nil, opts={})
+  def log_site_text_change(subject, new_text = nil, old_text = nil, opts = {})
     raise Discourse::InvalidParameters.new(:subject) unless subject.present?
-    UserHistory.create!( params(opts).merge({
-      action: UserHistory.actions[:change_site_text],
-      subject: subject,
-      previous_value: old_text,
-      new_value: new_text
-    }))
+    UserHistory.create!(params(opts).merge(action: UserHistory.actions[:change_site_text],
+                                           subject: subject,
+                                           previous_value: old_text,
+                                           new_value: new_text))
   end
 
-  def log_username_change(user, old_username, new_username, opts={})
+  def log_username_change(user, old_username, new_username, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_username],
-      target_user_id: user.id,
-      previous_value: old_username,
-      new_value: new_username
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_username],
+                                          target_user_id: user.id,
+                                          previous_value: old_username,
+                                          new_value: new_username))
   end
 
-  def log_name_change(user_id, old_name, new_name, opts={})
+  def log_name_change(user_id, old_name, new_name, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user_id
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:change_name],
-      target_user_id: user_id,
-      previous_value: old_name,
-      new_value: new_name
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:change_name],
+                                          target_user_id: user_id,
+                                          previous_value: old_name,
+                                          new_value: new_name))
   end
 
-  def log_user_suspend(user, reason, opts={})
+  def log_user_suspend(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:suspend_user],
-      target_user_id: user.id,
-      details: reason
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:suspend_user],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_user_unsuspend(user, opts={})
+  def log_user_unsuspend(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:unsuspend_user],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:unsuspend_user],
+                                          target_user_id: user.id))
   end
 
-  def log_badge_grant(user_badge, opts={})
+  def log_badge_grant(user_badge, opts = {})
     raise Discourse::InvalidParameters.new(:user_badge) unless user_badge
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:grant_badge],
-      target_user_id: user_badge.user_id,
-      details: user_badge.badge.name
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_badge],
+                                          target_user_id: user_badge.user_id,
+                                          details: user_badge.badge.name))
   end
 
-  def log_badge_revoke(user_badge, opts={})
+  def log_badge_revoke(user_badge, opts = {})
     raise Discourse::InvalidParameters.new(:user_badge) unless user_badge
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:revoke_badge],
-      target_user_id: user_badge.user_id,
-      details: user_badge.badge.name
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_badge],
+                                          target_user_id: user_badge.user_id,
+                                          details: user_badge.badge.name))
   end
 
-  def log_check_email(user, opts={})
+  def log_check_email(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:check_email],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_email],
+                                          target_user_id: user.id))
   end
 
-  def log_show_emails(users, opts={})
+  def log_show_emails(users, opts = {})
     return if users.blank?
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:check_email],
-      details: users.map { |u| "[#{u.id}] #{u.username}"}.join("\n")
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:check_email],
+                                          details: users.map { |u| "[#{u.id}] #{u.username}" }.join("\n")))
   end
 
-  def log_impersonate(user, opts={})
+  def log_impersonate(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:impersonate],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:impersonate],
+                                          target_user_id: user.id))
   end
 
-  def log_roll_up(subnets, opts={})
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:roll_up],
-      details: subnets.join(", ")
-    }))
+  def log_roll_up(subnets, opts = {})
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:roll_up],
+                                          details: subnets.join(", ")))
   end
 
-  def log_category_settings_change(category, category_params, old_permissions=nil)
+  def log_category_settings_change(category, category_params, old_permissions = nil)
     validate_category(category)
 
     changed_attributes = category.previous_changes.slice(*category_params.keys)
 
     if !old_permissions.empty? && (old_permissions != category_params[:permissions])
-      changed_attributes.merge!({ permissions: [old_permissions.to_json, category_params[:permissions].to_json] })
+      changed_attributes.merge!(permissions: [old_permissions.to_json, category_params[:permissions].to_json])
     end
 
     changed_attributes.each do |key, value|
-      UserHistory.create(params.merge({
-        action: UserHistory.actions[:change_category_settings],
-        category_id: category.id,
-        context: category.url,
-        subject: key,
-        previous_value: value[0],
-        new_value: value[1]
-      }))
+      UserHistory.create(params.merge(action: UserHistory.actions[:change_category_settings],
+                                      category_id: category.id,
+                                      context: category.url,
+                                      subject: key,
+                                      previous_value: value[0],
+                                      new_value: value[1]))
     end
   end
 
@@ -289,12 +249,10 @@ class StaffActionLogger
       details << "parent_category: #{parent_category.name}"
     end
 
-    UserHistory.create(params.merge({
-      action: UserHistory.actions[:delete_category],
-      category_id: category.id,
-      details: details.join("\n"),
-      context: category.url
-    }))
+    UserHistory.create(params.merge(action: UserHistory.actions[:delete_category],
+                                    category_id: category.id,
+                                    details: details.join("\n"),
+                                    context: category.url))
   end
 
   def log_category_creation(category)
@@ -305,132 +263,102 @@ class StaffActionLogger
       "name: #{category.name}"
     ]
 
-    UserHistory.create(params.merge({
-      action: UserHistory.actions[:create_category],
-      details: details.join("\n"),
-      category_id: category.id,
-      context: category.url
-    }))
+    UserHistory.create(params.merge(action: UserHistory.actions[:create_category],
+                                    details: details.join("\n"),
+                                    category_id: category.id,
+                                    context: category.url))
   end
 
-  def log_block_user(user, opts={})
+  def log_block_user(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:block_user],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:block_user],
+                                          target_user_id: user.id))
   end
 
-  def log_unblock_user(user, opts={})
+  def log_unblock_user(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:unblock_user],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:unblock_user],
+                                          target_user_id: user.id))
   end
 
-  def log_grant_admin(user, opts={})
+  def log_grant_admin(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:grant_admin],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_admin],
+                                          target_user_id: user.id))
   end
 
-  def log_revoke_admin(user, opts={})
+  def log_revoke_admin(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:revoke_admin],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_admin],
+                                          target_user_id: user.id))
   end
 
-  def log_grant_moderation(user, opts={})
+  def log_grant_moderation(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:grant_moderation],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:grant_moderation],
+                                          target_user_id: user.id))
   end
 
-  def log_revoke_moderation(user, opts={})
+  def log_revoke_moderation(user, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create( params(opts).merge({
-      action: UserHistory.actions[:revoke_moderation],
-      target_user_id: user.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_moderation],
+                                          target_user_id: user.id))
   end
 
-  def log_backup_create(opts={})
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:backup_create],
-      ip_address: @admin.ip_address.to_s
-    }))
+  def log_backup_create(opts = {})
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_create],
+                                          ip_address: @admin.ip_address.to_s))
   end
 
-  def log_backup_download(backup, opts={})
+  def log_backup_download(backup, opts = {})
     raise Discourse::InvalidParameters.new(:backup) unless backup
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:backup_download],
-      ip_address: @admin.ip_address.to_s,
-      details: backup.filename
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_download],
+                                          ip_address: @admin.ip_address.to_s,
+                                          details: backup.filename))
   end
 
-  def log_backup_destroy(backup, opts={})
+  def log_backup_destroy(backup, opts = {})
     raise Discourse::InvalidParameters.new(:backup) unless backup
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:backup_destroy],
-      ip_address: @admin.ip_address.to_s,
-      details: backup.filename
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:backup_destroy],
+                                          ip_address: @admin.ip_address.to_s,
+                                          details: backup.filename))
   end
 
-  def log_revoke_email(user, reason, opts={})
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:revoke_email],
-      target_user_id: user.id,
-      details: reason
-    }))
+  def log_revoke_email(user, reason, opts = {})
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:revoke_email],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_user_deactivate(user, reason, opts={})
+  def log_user_deactivate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:deactivate_user],
-      target_user_id: user.id,
-      details: reason
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:deactivate_user],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_user_activate(user, reason, opts={})
+  def log_user_activate(user, reason, opts = {})
     raise Discourse::InvalidParameters.new(:user) unless user
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:activate_user],
-      target_user_id: user.id,
-      details: reason
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:activate_user],
+                                          target_user_id: user.id,
+                                          details: reason))
   end
 
-  def log_wizard_step(step, opts={})
+  def log_wizard_step(step, opts = {})
     raise Discourse::InvalidParameters.new(:step) unless step
-    UserHistory.create(params(opts).merge({
-      action: UserHistory.actions[:wizard_step],
-      context: step.id
-    }))
+    UserHistory.create(params(opts).merge(action: UserHistory.actions[:wizard_step],
+                                          context: step.id))
   end
 
   def log_change_readonly_mode(state)
-    UserHistory.create(params.merge({
-      action: UserHistory.actions[:change_readonly_mode],
-      previous_value: !state,
-      new_value: state
-    }))
+    UserHistory.create(params.merge(action: UserHistory.actions[:change_readonly_mode],
+                                    previous_value: !state,
+                                    new_value: state))
   end
 
   private
 
-    def params(opts=nil)
+    def params(opts = nil)
       opts ||= {}
       { acting_user_id: @admin.id, context: opts[:context] }
     end
diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb
index a2fc8f4dd6..80b5781ea7 100644
--- a/app/services/topic_status_updater.rb
+++ b/app/services/topic_status_updater.rb
@@ -1,5 +1,5 @@
 TopicStatusUpdater = Struct.new(:topic, :user) do
-  def update!(status, enabled, opts={})
+  def update!(status, enabled, opts = {})
     status = Status.new(status, enabled)
 
     @topic_status_update = topic.public_topic_timer
@@ -19,7 +19,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
 
   private
 
-  def change(status, opts={})
+  def change(status, opts = {})
     result = true
 
     if status.pinned? || status.pinned_globally?
@@ -30,7 +30,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
       result = false if rc == 0
     else
       rc = Topic.where(:id => topic.id, status.name => !status.enabled)
-                .update_all(status.name => status.enabled?)
+        .update_all(status.name => status.enabled?)
 
       topic.send("#{status.name}=", status.enabled?)
       result = false if rc == 0
@@ -55,7 +55,7 @@ TopicStatusUpdater = Struct.new(:topic, :user) do
     result
   end
 
-  def create_moderator_post_for(status, message=nil)
+  def create_moderator_post_for(status, message = nil)
     topic.add_moderator_post(user, message || message_for(status), options_for(status))
     topic.reload
   end
diff --git a/app/services/tracked_topics_updater.rb b/app/services/tracked_topics_updater.rb
index 2222fc4c63..0ffb32e7e7 100644
--- a/app/services/tracked_topics_updater.rb
+++ b/app/services/tracked_topics_updater.rb
@@ -8,11 +8,10 @@ class TrackedTopicsUpdater
   def call
     topic_users = TopicUser.where(notifications_reason_id: nil, user_id: @id)
     if @threshold < 0
-      topic_users.update_all({notification_level: TopicUser.notification_levels[:regular]})
+      topic_users.update_all(notification_level: TopicUser.notification_levels[:regular])
     else
       topic_users.update_all(["notification_level = CASE WHEN total_msecs_viewed < ? THEN ? ELSE ? END",
                             @threshold, TopicUser.notification_levels[:regular], TopicUser.notification_levels[:tracking]])
     end
   end
 end
-
diff --git a/app/services/user_action_creator.rb b/app/services/user_action_creator.rb
index bbf21f9fb9..68a5d0847d 100644
--- a/app/services/user_action_creator.rb
+++ b/app/services/user_action_creator.rb
@@ -7,19 +7,19 @@ class UserActionCreator
     @disabled = false
   end
 
-  def self.log_notification(post, user, notification_type, acting_user_id=nil)
+  def self.log_notification(post, user, notification_type, acting_user_id = nil)
     return if @disabled
 
     action =
       case notification_type
-        when Notification.types[:quoted]
-          UserAction::QUOTE
-        when Notification.types[:replied]
-          UserAction::RESPONSE
-        when Notification.types[:mentioned]
-          UserAction::MENTION
-        when Notification.types[:edited]
-          UserAction::EDIT
+      when Notification.types[:quoted]
+        UserAction::QUOTE
+      when Notification.types[:replied]
+        UserAction::RESPONSE
+      when Notification.types[:mentioned]
+        UserAction::MENTION
+      when Notification.types[:edited]
+        UserAction::EDIT
       end
 
     # skip any invalid items, eg failed to save post and so on
diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb
index ac692d28d7..dbd58624bf 100644
--- a/app/services/user_anonymizer.rb
+++ b/app/services/user_anonymizer.rb
@@ -1,10 +1,10 @@
 class UserAnonymizer
-  def initialize(user, actor=nil)
+  def initialize(user, actor = nil)
     @user = user
     @actor = actor
   end
 
-  def self.make_anonymous(user, actor=nil)
+  def self.make_anonymous(user, actor = nil)
     self.new(user, actor).make_anonymous
   end
 
@@ -48,11 +48,11 @@ class UserAnonymizer
       @user.user_open_ids.find_each { |x| x.destroy }
       @user.api_key.try(:destroy)
 
-      UserHistory.create( action: UserHistory.actions[:anonymize_user],
-                          target_user_id: @user.id,
-                          acting_user_id: @actor ? @actor.id : @user.id,
-                          email: prev_email,
-                          details: "username: #{prev_username}" )
+      UserHistory.create(action: UserHistory.actions[:anonymize_user],
+                         target_user_id: @user.id,
+                         acting_user_id: @actor ? @actor.id : @user.id,
+                         email: prev_email,
+                         details: "username: #{prev_username}")
     end
     @user
   end
diff --git a/app/services/user_blocker.rb b/app/services/user_blocker.rb
index fe0091425e..8a35c5f239 100644
--- a/app/services/user_blocker.rb
+++ b/app/services/user_blocker.rb
@@ -1,14 +1,14 @@
 class UserBlocker
 
-  def initialize(user, by_user=nil, opts={})
+  def initialize(user, by_user = nil, opts = {})
     @user, @by_user, @opts = user, by_user, opts
   end
 
-  def self.block(user, by_user=nil, opts={})
+  def self.block(user, by_user = nil, opts = {})
     UserBlocker.new(user, by_user, opts).block
   end
 
-  def self.unblock(user, by_user=nil, opts={})
+  def self.unblock(user, by_user = nil, opts = {})
     UserBlocker.new(user, by_user, opts).unblock
   end
 
@@ -20,7 +20,7 @@ class UserBlocker
         message_type = @opts[:message] || :blocked_by_staff
         post = SystemMessage.create(@user, message_type)
         if post && @by_user
-          StaffActionLogger.new(@by_user).log_block_user(@user, {context: "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}"})
+          StaffActionLogger.new(@by_user).log_block_user(@user, context: "#{message_type}: '#{post.topic&.title rescue ''}' #{@opts[:reason]}")
         end
       end
     else
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index 9af5731fc9..e95d4ca60d 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -7,14 +7,14 @@ class UserDestroyer
 
   def initialize(actor)
     @actor = actor
-    raise Discourse::InvalidParameters.new('acting user is nil') unless @actor and @actor.is_a?(User)
+    raise Discourse::InvalidParameters.new('acting user is nil') unless @actor && @actor.is_a?(User)
     @guardian = Guardian.new(actor)
   end
 
   # Returns false if the user failed to be deleted.
   # Returns a frozen instance of the User if the delete succeeded.
-  def destroy(user, opts={})
-    raise Discourse::InvalidParameters.new('user is nil') unless user and user.is_a?(User)
+  def destroy(user, opts = {})
+    raise Discourse::InvalidParameters.new('user is nil') unless user && user.is_a?(User)
     raise PostsExistError if !opts[:delete_posts] && user.posts.count != 0
     @guardian.ensure_can_delete_user!(user)
 
@@ -31,18 +31,16 @@ class UserDestroyer
           # block all external urls
           if opts[:block_urls]
             post.topic_links.each do |link|
-              unless link.internal ||
-                (Oneboxer.engine(link.url) != Onebox::Engine::WhitelistedGenericOnebox)
-
-                ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
-              end
+              next if link.internal
+              next if Oneboxer.engine(link.url) != Onebox::Engine::WhitelistedGenericOnebox
+              ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
             end
           end
 
           PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy
 
           if post.topic && post.is_first_post?
-            Topic.unscoped.where(id: post.topic.id).update_all(user_id: nil)
+            Topic.unscoped.where(id: post.topic_id).update_all(user_id: nil)
           end
         end
       end
@@ -51,39 +49,39 @@ class UserDestroyer
         post_action.remove_act!(Discourse.system_user)
       end
 
+      # keep track of emails used
+      user_emails = user.user_emails.pluck(:email)
+
       user.destroy.tap do |u|
         if u
-
           if opts[:block_email]
-            b = ScreenedEmail.block(u.email, ip_address: u.ip_address)
-            b.record_match! if b
-          end
-
-          if opts[:block_ip] && u.ip_address
-            b = ScreenedIpAddress.watch(u.ip_address)
-            b.record_match! if b
-            if u.registration_ip_address && u.ip_address != u.registration_ip_address
-              b = ScreenedIpAddress.watch(u.registration_ip_address)
-              b.record_match! if b
+            user_emails.each do |email|
+              ScreenedEmail.block(email, ip_address: u.ip_address)&.record_match!
             end
           end
 
-          Post.with_deleted.where(user_id: user.id).update_all("user_id = NULL")
+          if opts[:block_ip] && u.ip_address
+            ScreenedIpAddress.watch(u.ip_address)&.record_match!
+            if u.registration_ip_address && u.ip_address != u.registration_ip_address
+              ScreenedIpAddress.watch(u.registration_ip_address)&.record_match!
+            end
+          end
+
+          Post.unscoped.where(user_id: u.id).update_all(user_id: nil)
 
           # If this user created categories, fix those up:
-          categories = Category.where(user_id: user.id)
-          categories.each do |c|
-            c.user_id = Discourse.system_user.id
+          Category.where(user_id: u.id).each do |c|
+            c.user_id = Discourse::SYSTEM_USER_ID
             c.save!
-            if topic = Topic.with_deleted.find_by(id: c.topic_id)
-              topic.try(:recover!)
-              topic.user_id = Discourse.system_user.id
+            if topic = Topic.unscoped.find_by(id: c.topic_id)
+              topic.recover!
+              topic.user_id = Discourse::SYSTEM_USER_ID
               topic.save!
             end
           end
 
           StaffActionLogger.new(@actor == user ? Discourse.system_user : @actor).log_user_deletion(user, opts.slice(:context))
-          MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
+          MessageBus.publish "/file-change", ["refresh"], user_ids: [u.id]
         end
       end
     end
diff --git a/app/services/username_changer.rb b/app/services/username_changer.rb
index 990534e282..a81f089415 100644
--- a/app/services/username_changer.rb
+++ b/app/services/username_changer.rb
@@ -1,12 +1,12 @@
 class UsernameChanger
 
-  def initialize(user, new_username, actor=nil)
+  def initialize(user, new_username, actor = nil)
     @user = user
     @new_username = new_username
     @actor = actor
   end
 
-  def self.change(user, new_username, actor=nil)
+  def self.change(user, new_username, actor = nil)
     self.new(user, new_username, actor).change
   end
 
diff --git a/app/services/username_checker_service.rb b/app/services/username_checker_service.rb
index 91bfe42de9..0f8d7a6251 100644
--- a/app/services/username_checker_service.rb
+++ b/app/services/username_checker_service.rb
@@ -4,7 +4,7 @@ class UsernameCheckerService
     if username && username.length > 0
       validator = UsernameValidator.new(username)
       if !validator.valid_format?
-        {errors: validator.errors}
+        { errors: validator.errors }
       else
         check_username_availability(username, email)
       end
@@ -23,7 +23,6 @@ class UsernameCheckerService
     Rails.configuration.respond_to?(:developer_emails) && Rails.configuration.developer_emails.include?(value)
   end
 
-
   def self.is_developer?(email)
     UsernameCheckerService.new.is_developer?(email)
   end
diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb
new file mode 100644
index 0000000000..11d61f0f52
--- /dev/null
+++ b/app/services/word_watcher.rb
@@ -0,0 +1,51 @@
+class WordWatcher
+
+  def initialize(raw)
+    @raw = raw
+  end
+
+  def self.words_for_action(action)
+    WatchedWord.where(action: WatchedWord.actions[action.to_sym]).limit(1000).pluck(:word)
+  end
+
+  def self.words_for_action_exists?(action)
+    WatchedWord.where(action: WatchedWord.actions[action.to_sym]).exists?
+  end
+
+  def self.word_matcher_regexp(action)
+    s = Discourse.cache.fetch(word_matcher_regexp_key(action), expires_in: 1.day) do
+      words = words_for_action(action)
+      words.empty? ? nil : '\b(' + words.map { |w| Regexp.escape(w).gsub("\\*", '\S*') }.join('|'.freeze) + ')\b'
+    end
+
+    s.present? ? Regexp.new(s, Regexp::IGNORECASE) : nil
+  end
+
+  def self.word_matcher_regexp_key(action)
+    "watched-words-regexp:#{action}"
+  end
+
+  def self.clear_cache!
+    WatchedWord.actions.sum do |a, i|
+      Discourse.cache.delete word_matcher_regexp_key(a)
+    end
+  end
+
+  def requires_approval?
+    word_matches_for_action?(:require_approval)
+  end
+
+  def should_flag?
+    word_matches_for_action?(:flag)
+  end
+
+  def should_block?
+    word_matches_for_action?(:block)
+  end
+
+  def word_matches_for_action?(action)
+    r = self.class.word_matcher_regexp(action)
+    r ? r.match(@raw) : false
+  end
+
+end
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index f30438dd2f..2733cc8167 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -6,7 +6,7 @@
       <h2><a href='<%= c.url %>' itemprop='item'>
         <span itemprop='name'><%= c.name %></span>
       </a></h2>
-      <span itemprop='description'><%= c.description %></span>
+      <span itemprop='description'><%= c.description&.html_safe %></span>
     </div>
   <% end %>
 </div>
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 1d30e8e296..f9b0146793 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -42,9 +42,7 @@
     Discourse.Environment = '<%= Rails.env %>';
     Discourse.SiteSettings = ps.get('siteSettings');
     Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>';
-    <%- if SiteSetting.enable_experimental_markdown_it %>
     Discourse.MarkdownItURL = '<%= asset_url('markdown-it-bundle.js') %>';
-    <%- end %>
     I18n.defaultLocale = '<%= SiteSetting.default_locale %>';
     Discourse.start();
     Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
diff --git a/app/views/common/_google_universal_analytics.html.erb b/app/views/common/_google_universal_analytics.html.erb
index 9067c94cb3..7c03711df4 100644
--- a/app/views/common/_google_universal_analytics.html.erb
+++ b/app/views/common/_google_universal_analytics.html.erb
@@ -5,4 +5,10 @@
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
   ga('create', '<%= SiteSetting.ga_universal_tracking_code %>', <%= ga_universal_json %>);
+
+  <% if SiteSetting.ga_universal_auto_link_domains.present? %>
+  ga('require', 'linker');
+  ga('linker:autoLink', <%= raw SiteSetting.ga_universal_auto_link_domains.split('|').to_json %>);
+  <% end %>
+
 </script>
diff --git a/bin/puma b/bin/puma
index 26523fced3..3249ddee00 100755
--- a/bin/puma
+++ b/bin/puma
@@ -12,7 +12,7 @@ if ARGV[0] == '--kill-existing'
   pids = `ps aux | grep puma | grep discourse | grep -v grep | awk '{print $2;}'`.strip
     .split("\n")
     .map(&:to_i)
-    .reject{|pid| pid == Process.pid}
+    .reject { |pid| pid == Process.pid }
 
   if pids.length > 0
     STDERR.puts "Terminating old version of puma at pid #{pids[0]}"
diff --git a/config.ru b/config.ru
index c74954f4f4..9a0cd31d67 100644
--- a/config.ru
+++ b/config.ru
@@ -3,4 +3,3 @@ require ::File.expand_path('../config/environment',  __FILE__)
 map ActionController::Base.config.try(:relative_url_root) || "/" do
   run Discourse::Application
 end
-
diff --git a/config/application.rb b/config/application.rb
index f49a372783..a0a9920d48 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,7 +22,6 @@ if defined?(Bundler)
   Bundler.require(*Rails.groups(assets: %w(development test profile)))
 end
 
-
 module Discourse
   class Application < Rails::Application
 
@@ -169,7 +168,7 @@ module Discourse
 
     # we configure rack cache on demand in an initializer
     # our setup does not use rack cache and instead defers to nginx
-    config.action_dispatch.rack_cache =  nil
+    config.action_dispatch.rack_cache = nil
 
     # ember stuff only used for asset precompliation, production variant plays up
     config.ember.variant = :development
@@ -177,7 +176,7 @@ module Discourse
     config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
 
     require 'auth'
-    Discourse.activate_plugins! unless Rails.env.test? and ENV['LOAD_PLUGINS'] != "1"
+    Discourse.activate_plugins! unless Rails.env.test? && ENV['LOAD_PLUGINS'] != ("1")
 
     if GlobalSetting.relative_url_root.present?
       config.relative_url_root = GlobalSetting.relative_url_root
@@ -207,7 +206,18 @@ module Discourse
       # So open id logs somewhere sane
       OpenID::Util.logger = Rails.logger
       if plugins = Discourse.plugins
-        plugins.each{|plugin| plugin.notify_after_initialize}
+        plugins.each { |plugin| plugin.notify_after_initialize }
+      end
+
+      # This nasty hack is required for not precompiling QUnit assets
+      # in test mode. see: https://github.com/rails/sprockets-rails/issues/299#issuecomment-167701012
+      ActiveSupport.on_load(:action_view) do
+        default_checker = ActionView::Base.precompiled_asset_checker
+
+        ActionView::Base.precompiled_asset_checker = -> logical_path do
+          default_checker[logical_path] ||
+            %w{qunit.js qunit.css test_helper.css test_helper.js wizard/test/test_helper.js}.include?(logical_path)
+        end
       end
     end
 
diff --git a/config/boot.rb b/config/boot.rb
index 7180eb1fbb..929f1a62fe 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -10,7 +10,6 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 
-
 if ENV['RAILS_ENV'] != 'production'
   require 'bootsnap'
 
diff --git a/config/cloud/cloud66/files/production.rb b/config/cloud/cloud66/files/production.rb
index db662574be..42d9caa9fc 100644
--- a/config/cloud/cloud66/files/production.rb
+++ b/config/cloud/cloud66/files/production.rb
@@ -27,13 +27,13 @@ Discourse::Application.configure do
 
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
-     :address              => ENV['SMTP_ADDRESS'],
-     :port                 => ENV['SMTP_PORT'],
-     :domain               => ENV['SMTP_DOMAIN'],
-     :user_name            => ENV['SMTP_USERNAME'],
-     :password             => ENV['SMTP_PASSWORD'],
-     :authentication       => 'plain',
-     :enable_starttls_auto => true  }
+     address: ENV['SMTP_ADDRESS'],
+     port: ENV['SMTP_PORT'],
+     domain: ENV['SMTP_DOMAIN'],
+     user_name: ENV['SMTP_USERNAME'],
+     password: ENV['SMTP_PASSWORD'],
+     authentication: 'plain',
+     enable_starttls_auto: true  }
 
   #config.action_mailer.delivery_method = :sendmail
   #config.action_mailer.sendmail_settings = {arguments: '-i'}
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 560d560130..d9c10db2e8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -48,8 +48,6 @@ Discourse::Application.configure do
   config.enable_anon_caching = false
   require 'rbtrace'
 
-
-
   if emails = GlobalSetting.developer_emails
     config.developer_emails = emails.split(",").map(&:downcase).map(&:strip)
   end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b4331f15ac..6489a1777e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -35,10 +35,10 @@ Discourse::Application.configure do
 
     settings[:openssl_verify_mode] = GlobalSetting.smtp_openssl_verify_mode if GlobalSetting.smtp_openssl_verify_mode
 
-    config.action_mailer.smtp_settings = settings.reject{|_, y| y.nil?}
+    config.action_mailer.smtp_settings = settings.reject { |_, y| y.nil? }
   else
     config.action_mailer.delivery_method = :sendmail
-    config.action_mailer.sendmail_settings = {arguments: '-i'}
+    config.action_mailer.sendmail_settings = { arguments: '-i' }
   end
 
   # Send deprecation notices to registered listeners
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 16cab97ce1..5cd785ce22 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -18,7 +18,7 @@ Discourse::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -41,4 +41,9 @@ Discourse::Application.configure do
   config.assets.digest = false
 
   config.eager_load = false
+
+  unless ENV['RAILS_ENABLE_TEST_LOG']
+    config.logger = Logger.new(nil)
+    config.log_level = :fatal
+  end
 end
diff --git a/config/initializers/001-redis.rb b/config/initializers/001-redis.rb
index 73340cc49d..af3e829842 100644
--- a/config/initializers/001-redis.rb
+++ b/config/initializers/001-redis.rb
@@ -4,12 +4,11 @@ if Rails.env.development? && ENV['DISCOURSE_FLUSH_REDIS']
 end
 
 if defined?(PhusionPassenger)
-    PhusionPassenger.on_event(:starting_worker_process) do |forked|
-        if forked
-            Discourse.after_fork
-        else
-            # We're in conservative spawning mode. We don't need to do anything.
-        end
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    if forked
+      Discourse.after_fork
+    else
+      # We're in conservative spawning mode. We don't need to do anything.
     end
+  end
 end
-
diff --git a/config/initializers/004-message_bus.rb b/config/initializers/004-message_bus.rb
index 5faf89f9e8..fabada48a0 100644
--- a/config/initializers/004-message_bus.rb
+++ b/config/initializers/004-message_bus.rb
@@ -1,4 +1,4 @@
-MessageBus.site_id_lookup do |env=nil|
+MessageBus.site_id_lookup do |env = nil|
   if env
     setup_message_bus_env(env)
     env["__mb"][:site_id]
diff --git a/config/initializers/006-ensure_login_hint.rb b/config/initializers/006-ensure_login_hint.rb
index e177601737..1cc7b51429 100644
--- a/config/initializers/006-ensure_login_hint.rb
+++ b/config/initializers/006-ensure_login_hint.rb
@@ -18,5 +18,5 @@ if User.limit(20).count < 20 && User.where(admin: true).human_users.count == 0
     SiteSetting.has_login_hint = true
   end
 
-# we may be booting with no User table eg: first migration, just skip
+  # we may be booting with no User table eg: first migration, just skip
 end rescue nil
diff --git a/config/initializers/006-mini_profiler.rb b/config/initializers/006-mini_profiler.rb
index e39b1a33de..a04c888fce 100644
--- a/config/initializers/006-mini_profiler.rb
+++ b/config/initializers/006-mini_profiler.rb
@@ -6,7 +6,7 @@ if Rails.configuration.respond_to?(:load_mini_profiler) && Rails.configuration.l
   begin
     require 'memory_profiler'
   rescue => e
-     STDERR.put "#{e} failed to require mini profiler"
+    STDERR.put "#{e} failed to require mini profiler"
   end
 
   # initialization is skipped so trigger it
@@ -48,7 +48,7 @@ if defined?(Rack::MiniProfiler)
     path = env['PATH_INFO']
 
     (env['HTTP_USER_AGENT'] !~ /iPad|iPhone|Android/) &&
-    !skip.any?{|re| re =~ path}
+    !skip.any? { |re| re =~ path }
   end
 
   # without a user provider our results will use the ip address for namespacing
@@ -68,7 +68,6 @@ if defined?(Rack::MiniProfiler)
   Rack::MiniProfiler.config.backtrace_ignores << /config\/initializers\/silence_logger/
   Rack::MiniProfiler.config.backtrace_ignores << /config\/initializers\/quiet_logger/
 
-
   # Rack::MiniProfiler.counter_method(ActiveRecord::QueryMethods, 'build_arel')
   # Rack::MiniProfiler.counter_method(Array, 'uniq')
   # require "#{Rails.root}/vendor/backports/notification"
@@ -97,9 +96,8 @@ if defined?(Rack::MiniProfiler)
   # Rack::MiniProfiler.profile_method ActionView::PathResolver, 'find_templates'
 end
 
-
 if ENV["PRINT_EXCEPTIONS"]
-  trace      = TracePoint.new(:raise) do |tp|
+  trace = TracePoint.new(:raise) do |tp|
     puts tp.raised_exception
     puts tp.raised_exception.backtrace.join("\n")
     puts
diff --git a/config/initializers/008-rack-cors.rb b/config/initializers/008-rack-cors.rb
index 4864b961f6..2ba7b01fb3 100644
--- a/config/initializers/008-rack-cors.rb
+++ b/config/initializers/008-rack-cors.rb
@@ -8,7 +8,7 @@ if GlobalSetting.enable_cors
     end
 
     def call(env)
-      if env['REQUEST_METHOD'] == 'OPTIONS' and env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']
+      if env['REQUEST_METHOD'] == ('OPTIONS') && env['HTTP_ACCESS_CONTROL_REQUEST_METHOD']
         return [200, apply_headers(env), []]
       end
 
@@ -16,7 +16,7 @@ if GlobalSetting.enable_cors
       [status, apply_headers(env, headers), body]
     end
 
-    def apply_headers(env, headers=nil)
+    def apply_headers(env, headers = nil)
       headers ||= {}
 
       origin = nil
diff --git a/config/initializers/050-force_https.rb b/config/initializers/050-force_https.rb
index 7ac71e1135..0185fbd742 100644
--- a/config/initializers/050-force_https.rb
+++ b/config/initializers/050-force_https.rb
@@ -1,7 +1,7 @@
 # tiny middleware to force https if needed
 class Discourse::ForceHttpsMiddleware
 
-  def initialize(app, config={})
+  def initialize(app, config = {})
     @app = app
   end
 
@@ -11,4 +11,3 @@ class Discourse::ForceHttpsMiddleware
   end
 
 end
-
diff --git a/config/initializers/099-anon-cache.rb b/config/initializers/099-anon-cache.rb
index d2c90beee8..e0a90c71f1 100644
--- a/config/initializers/099-anon-cache.rb
+++ b/config/initializers/099-anon-cache.rb
@@ -1,13 +1,13 @@
 require_dependency "middleware/anonymous_cache"
 
-enabled = if Rails.configuration.respond_to?(:enable_anon_caching)
-            Rails.configuration.enable_anon_caching
-          else
-            Rails.env.production?
-          end
+enabled =
+  if Rails.configuration.respond_to?(:enable_anon_caching)
+    Rails.configuration.enable_anon_caching
+  else
+    Rails.env.production?
+  end
 
 if !ENV['DISCOURSE_DISABLE_ANON_CACHE'] && enabled
   # in an ideal world this is position 0, but mobile detection uses ... session and request and params
   Rails.configuration.middleware.insert_after ActionDispatch::ParamsParser, Middleware::AnonymousCache
 end
-
diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb
index d913051336..c7277684c6 100644
--- a/config/initializers/100-logster.rb
+++ b/config/initializers/100-logster.rb
@@ -44,12 +44,12 @@ end
 # middleware that logs errors sits before multisite
 # we need to establish a connection so redis connection is good
 # and db connection is good
-Logster.config.current_context = lambda{|env,&blk|
+Logster.config.current_context = lambda { |env, &blk|
   begin
     if Rails.configuration.multisite
       request = Rack::Request.new(env)
       ActiveRecord::Base.connection_handler.clear_active_connections!
-      RailsMultisite::ConnectionManagement.establish_connection(:host => request['__ws'] || request.host)
+      RailsMultisite::ConnectionManagement.establish_connection(host: request['__ws'] || request.host)
     end
     blk.call
   ensure
@@ -73,7 +73,7 @@ RailsMultisite::ConnectionManagement.each_connection do
 
   if (error_rate_per_minute || 0) > 0
     store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate|
-      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'minute', publish_at: Time.current.to_i })
+      MessageBus.publish("/logs_error_rate_exceeded", rate: rate, duration: 'minute', publish_at: Time.current.to_i)
     end
   end
 
@@ -81,7 +81,7 @@ RailsMultisite::ConnectionManagement.each_connection do
 
   if (error_rate_per_hour || 0) > 0
     store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate|
-      MessageBus.publish("/logs_error_rate_exceeded", { rate: rate, duration: 'hour', publish_at: Time.current.to_i })
+      MessageBus.publish("/logs_error_rate_exceeded", rate: rate, duration: 'hour', publish_at: Time.current.to_i)
     end
   end
 end
diff --git a/config/initializers/100-quiet_logger.rb b/config/initializers/100-quiet_logger.rb
index 55c0dfcb4c..908b0c2cfd 100644
--- a/config/initializers/100-quiet_logger.rb
+++ b/config/initializers/100-quiet_logger.rb
@@ -6,7 +6,7 @@ Rails::Rack::Logger.class_eval do
   def call_with_quiet_assets(env)
 
     override = false
-    if (env['PATH_INFO'].index("/assets/") == 0) or
+    if (env['PATH_INFO'].index("/assets/") == 0) ||
        (env['PATH_INFO'].index("mini-profiler-resources") == 0)
       if ::Logster::Logger === Rails.logger
         override = true
diff --git a/config/initializers/100-sidekiq.rb b/config/initializers/100-sidekiq.rb
index a155c113cb..efde736012 100644
--- a/config/initializers/100-sidekiq.rb
+++ b/config/initializers/100-sidekiq.rb
@@ -35,7 +35,7 @@ if Sidekiq.server?
             manager.tick
           rescue => e
             # the show must go on
-            Discourse.handle_job_exception(e, {message: "While ticking scheduling manager"})
+            Discourse.handle_job_exception(e, message: "While ticking scheduling manager")
           end
           sleep 1
         end
diff --git a/config/initializers/100-verify_config.rb b/config/initializers/100-verify_config.rb
index c0c0a8965a..2d91431db6 100644
--- a/config/initializers/100-verify_config.rb
+++ b/config/initializers/100-verify_config.rb
@@ -1,6 +1,6 @@
 # Check that the app is configured correctly. Raise some helpful errors if something is wrong.
 
-if defined?(Rails::Server) and Rails.env.production? # Only run these checks when starting up a production server
+if defined?(Rails::Server) && Rails.env.production? # Only run these checks when starting up a production server
 
   if ['localhost', 'production.localhost'].include?(Discourse.current_hostname)
     puts <<END
@@ -16,7 +16,7 @@ END
     raise "Invalid host_names in database.yml"
   end
 
-  if !Dir.glob(File.join(Rails.root,'public','assets','application*.js')).present?
+  if !Dir.glob(File.join(Rails.root, 'public', 'assets', 'application*.js')).present?
     puts <<END
 
       Assets have not been precompiled. Please run the following command
diff --git a/config/initializers/200-message_bus_request_tracker.rb b/config/initializers/200-message_bus_request_tracker.rb
index 203c8d2711..7f66c97ef6 100644
--- a/config/initializers/200-message_bus_request_tracker.rb
+++ b/config/initializers/200-message_bus_request_tracker.rb
@@ -10,4 +10,3 @@ if Rails.env != 'development' || ENV['TRACK_REQUESTS']
   require 'middleware/request_tracker'
   Rails.configuration.middleware.unshift Middleware::RequestTracker
 end
-
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 2020ed70ce..31f0686c77 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -10,9 +10,10 @@ ar:
     number:
       format:
         separator: "."
+        delimiter: " "
       human:
         storage_units:
-          format: '%n% u'
+          format: '%n %u'
           units:
             byte:
               zero: بايت
@@ -207,29 +208,33 @@ ar:
       visible:
         enabled: 'أدرجه %{when}'
         disabled: 'أزال إدراجه %{when}'
+      banner:
+        enabled: 'جعل هذا إعلانًا %{when}. سيظهر أعلى كلّ صفحة حتّى يزيله المستخدم منها.'
+        disabled: 'أزال هذا الإعلان %{when}. لن يظهر بعد الآن في أعلى كلّ صفحة.'
     topic_admin_menu: "عمليات المدير"
     wizard_required: "مرحبًا في دسكورس الجديد! فلنبدأ مستخدمين <a href='%{url}' data-auto-route='true'>مرشد الإعداد</a> ✨"
     emails_are_disabled: "لقد عطّل أحد المدراء الرّسائل الصادرة للجميع. لن تُرسل إشعارات عبر البريد الإلكتروني أيا كان نوعها."
     bootstrap_mode_enabled: "الموقع اﻷن مفعل بالطريقة التمهيدية لكى تتمكن من اطلاق موقعك الجديد بسهولة. سيسجل كل الأعضاء الجدد بمستوى ثقة 1 وسيكون اختيار ارسال الملخص اليومى عن طريق البريد الالكترونى مفعل. سيتم الغاء تفعيل الطريقة التمهيدية تلقائيا عندما يتخطى عدد اﻷعضاء %{min_users} عضو."
     bootstrap_mode_disabled: "سيتم الغاء تفعيل الطريقة التمهيدية خلال ال 24 ساعة القادمة"
     themes:
-      default_description: "افترضى"
+      default_description: "افتراضى"
     s3:
       regions:
-        us_east_1: "شرق الولايات المتحدة (فرجينيا الشمالية)"
-        us_west_1: "غرب الولايات المتحدة (كاليفورنيا الشمالية)"
-        us_west_2: "غرب الولايات المتحدة (أوريغون)"
-        us_gov_west_1: "إستضافة أمازون الحسابية الحكومية (الولايات المتحدة الأمريكية)"
-        eu_west_1: "الاتحاد الأوروبي (أيرلندا)"
-        eu_west_2: "الاتحاد الأوروبي (أيرلندا)"
-        eu_central_1: "الاتحاد الأوروبي (فرانكفورت)"
-        ap_southeast_1: "آسيا والمحيط الهادئ (سنغافورة)"
-        ap_southeast_2: "آسيا والمحيط الهادئ (سيدني)"
-        ap_south_1: "آسيا والمحيط الهادئ (مومباي)"
         ap_northeast_1: "آسيا والمحيط الهادئ (طوكيو)"
         ap_northeast_2: "آسيا والمحيط الهادئ ( سيول)"
-        sa_east_1: "أمريكا الجنوبية (ساو باولو)"
+        ap_south_1: "آسيا والمحيط الهادئ (مومباي)"
+        ap_southeast_1: "آسيا والمحيط الهادئ (سنغافورة)"
+        ap_southeast_2: "آسيا والمحيط الهادئ (سيدني)"
         cn_north_1: "الصين (بكين)"
+        eu_central_1: "الاتحاد الأوروبي (فرانكفورت)"
+        eu_west_1: "الاتحاد الأوروبي (أيرلندا)"
+        eu_west_2: "الاتحاد الأوروبي (أيرلندا)"
+        sa_east_1: "أمريكا الجنوبية (ساو باولو)"
+        us_east_1: "شرق الولايات المتحدة (فرجينيا الشمالية)"
+        us_east_2: "غرب الولايات المتحدة (اوهايو)"
+        us_gov_west_1: "إستضافة أمازون الحسابية الحكومية (الولايات المتحدة الأمريكية)"
+        us_west_1: "غرب الولايات المتحدة (كاليفورنيا الشمالية)"
+        us_west_2: "غرب الولايات المتحدة (أوريغون)"
     edit: 'عدّل عنوان هذا الموضوع وفئته'
     not_implemented: "لم تُنجز هذه الميزة بعد، نأسف."
     no_value: "لا"
@@ -237,7 +242,7 @@ ar:
     generic_error: "نأسف، حدث عطل ما."
     generic_error_with_reason: "حدث عطل ما: %{error}"
     sign_up: "سجّل حسابا"
-    log_in: "تسجل الدخول"
+    log_in: "لِج"
     age: "العمر"
     joined: "انضم في"
     admin_title: "المدير"
@@ -308,7 +313,7 @@ ar:
         bookmark: "انقر لتعليم أوّل مشاركة في هذا الموضوع"
         unbookmark: "انقر لإزالة كلّ العلامات في هذا الموضوع"
     bookmarks:
-      not_logged_in: "نأسف، عليك الدخول لتعليم المشاركات"
+      not_logged_in: "نأسف، عليك الولوج لتعليم المشاركات"
       created: "لقد علّمت هذه المشاركة"
       not_bookmarked: "لقد قرأتَ هذه المشاركة، انقر لتعليمها"
       last_read: "هذا آخر مشاركة قرأتها، انقر لتعليمها"
@@ -452,6 +457,7 @@ ar:
         add_members: "إضافة أعضاء"
         delete_member_confirm: "أأزيل ’%{username}‘ من مجموعة ’%{group}‘؟"
       name_placeholder: "اسم المجموعة، بدون مسافات. يتبع قواعد اسم المستخدم"
+      public: "السماح للأعضاء بالانظمام\\مغادرة المجموعة بحرية (يتطلب مجموعة مرئية للجميع)"
       empty:
         posts: "لا مشاركات من أعضاء هذه المجموعة."
         members: "لا أعضاء في هذه المجموعة."
@@ -466,6 +472,7 @@ ar:
       automatic_group: مجموعة تلقائية
       closed_group: مجموعة مغلقة
       is_group_user: "أنت عضو في هذه المجموعة"
+      allow_membership_requests: "السماح للأعضاء بأرسالة طلب انضمام لمدراء المجموعة"
       membership: "العضوية"
       name: "الاسم"
       user_count: "عدد اﻷعضاء"
@@ -488,6 +495,13 @@ ar:
       posts: "المشاركات"
       mentions: "الإشارات"
       messages: "الرسائل"
+      notification_level: "المستوى الأفتراضي لأشعارات الرسائل في المجموعة"
+      visibility_levels:
+        title: "من يستطيع رؤية هذه المجموعة ؟"
+        public: "الكل"
+        members: "مدراء المجموعة, الاعضاء و المشرفون"
+        staff: "مدراء المجموعة و الطاقم"
+        owners: "مدراء المجموعة و المشرفون"
       alias_levels:
         title: "مَن يمكنه مراسلة هذه المجموعة و@الإشارة إليها؟"
         nobody: "لا أحد"
@@ -577,7 +591,7 @@ ar:
       location_not_found: (غيرمعرف)
       organisation: المنظمات
       phone: هاتف
-      other_accounts: "حساب آخر بنفس العنوان"
+      other_accounts: "الحسابات الأخرى بعنوان IP هذا:"
       delete_other_accounts: "حذف %{count}"
       username: "إسم المستخدم"
       trust_level: "TL"
@@ -623,6 +637,7 @@ ar:
       first_notification: "إشعارك الأول! قم بالضغط عليه للبدء."
       disable_jump_reply: "لا تنتقل إلى مشاركتي بعدما أردّ"
       dynamic_favicon: "أظهر عدد المواضيع الجديدة/المحدّثة في أيقونة المتصفّح"
+      theme_default_on_all_devices: "اجعل القالب افتراضياً على جميع اجهزتي"
       external_links_in_new_tab: "فتح الروابط الخارجية في ألسنة جديدة"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
       change: "تغيير"
@@ -694,6 +709,15 @@ ar:
         move_to_archive: "الارشيف"
         failed_to_move: "فشل في نقل الرسائل المحددة (ربما يكون اتصالك ضعيفاً)"
         select_all: "إختيار الكل"
+      preferences_nav:
+        account: "الحساب"
+        profile: "اللاحة"
+        emails: "البُرد الإلكترونية"
+        notifications: "التنبيهات"
+        categories: "الفئات"
+        tags: "الوسوم"
+        interface: "الواجهة"
+        apps: "التطبيقات"
       change_password:
         success: "(تم ارسال الرسالة)"
         in_progress: "(يتم ارسال رسالة)"
@@ -944,7 +968,7 @@ ar:
         most_liked_users: "أكثر من أعجبه"
         most_replied_to_users: "أكثر من رَدّ عليه"
         no_likes: "لا إعجابات بعد."
-      associated_accounts: "جلسات الدخول"
+      associated_accounts: "جلسات الولوج"
       ip_address:
         title: "عنوان IP الأخير"
       registration_ip_address:
@@ -987,11 +1011,9 @@ ar:
     refresh: "تحديث"
     read_only_mode:
       enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تتابع تصفّحه، ولكنّ الرّدّ، والإعجاب وغيرها من إجراءات معطّلة حاليًّا."
-      login_disabled: "الدخول معطّل في حال كان الموقع في وضع القراءة فقط."
+      login_disabled: "الولوج معطّل في حال كان الموقع في وضع القراءة فقط."
       logout_disabled: "الخروج معطّل في حال كان الموقع في وضع القراءة فقط."
     too_few_topics_and_posts_notice: " يوجد حاليا<strong>%{currentTopics} / %{requiredTopics}</strong> المواضيع و <strong>%{currentPosts} / %{requiredPosts}</strong> المشاركات. "
-    too_few_topics_notice: "قم بإنشاء على الاقل 5 مواضيع عامة و %{posts} عامة للبدء بالمناقشة , المستخدمين الجدد لايمكن أن يحصلوا على مستوى الثقة حتى يكون هناك محتوى لهم , هذه الرسالة تظهر فقط للمدير"
-    too_few_posts_notice: "دعونا <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>الحصول على هذه المناقشة التي بدأت!</a> يوجد حاليا <strong>%{currentPosts} / %{requiredPosts}</strong> مشاركات. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> وصل الحد الأعلى لإعدادت الموقع %{siteSettingRate}."
       exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> يتجاوز الحد الأعلى لإعدادت الموقع %{siteSettingRate}."
@@ -1021,7 +1043,7 @@ ar:
       sign_up: "إشترك"
       hide_session: "ذكرني غدا"
       hide_forever: "لا شكرا"
-      hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دومًا استخدام ’تسجل الدخول‘ لإنشاء حساب."
+      hidden_for_session: "لا بأس، سأسلك غدًا. يمكنك دومًا استخدام ’لِج‘ لإنشاء حساب."
       intro: "يا مرحبًا! :heart_eyes: يبدو أنّك مستمتع بقراءة هذا النّقاش، ولكنّك لم تسجّل حسابًا بعد."
       value_prop: "عندما تنتهي من إنشاء الحساب، سترجع إلى حيث توقّفت، فنحن نتذكّر  دومًا المكان الذي توقّفت عنده. يمكنك أيضًا استقبال الإشعارات عبر الموقع والبريد الإلكترونيّ متى ما نُشرت مشاركات جديدة. ولا تنسَ إبداء إعجابك بتلك المشاركات التي تحبّها. :heartbeat:"
     summary:
@@ -1063,13 +1085,13 @@ ar:
       complete_username_not_found: "لا حساب يطابق اسم المستخدم <b>%{username}</b>"
       complete_email_not_found: "لا حساب يطابق <b>%{email}</b>"
     login:
-      title: "سجل دخولك"
+      title: "لِج"
       username: "المستخدم"
       password: "كلمة السّرّ"
       email_placeholder: "البريد الإلكتروني أو اسم المستخدم"
       caps_lock_warning: "مفتاح Caps Lock مفعّل"
       error: "خطأ مجهول"
-      rate_limit: "رجاءً انتظر قبل أن تسجل الدخول مرّة أخرى."
+      rate_limit: "رجاءً انتظر قبل أن تلج مرّة أخرى."
       blank_username_or_password: "رجاءً أدخل اسم المستخدم (أو البريد الإلكترونيّ) وكلمة السّرّ."
       reset_password: 'صفّر كلمة السّرّ'
       logging_in: "يلج..."
@@ -1077,15 +1099,16 @@ ar:
       authenticating: "يستوثق..."
       awaiting_approval: "لم يوافق أيّ من أعضاء الطّاقم على حسابك بعد. سيُرسل إليك بريد حالما يتمّ ذلك."
       requires_invite: "المَعذرة، الوصول لهذا الموقع خاص بالمدعويين فقط."
-      not_activated: "لا يمكنك الدخول بعد. لقد أرسلنا سابقًا بريدًا إلى <b>{{sentTo}}</b>. رجاء اتّبع الإرشادات فيه لتفعيل حسابك."
-      not_allowed_from_ip_address: "لا يمكنك الدخول من عنوان IP هذا."
-      admin_not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول كمدير من عنوان IP هذا."
+      not_activated: "لا يمكنك الولوج بعد. لقد أرسلنا سابقًا بريدًا إلى <b>{{sentTo}}</b>. رجاء اتّبع الإرشادات فيه لتفعيل حسابك."
+      not_allowed_from_ip_address: "لا يمكنك الولوج من عنوان IP هذا."
+      admin_not_allowed_from_ip_address: "لا يمكنك الولوج كمدير من عنوان IP هذا."
       resend_activation_email: "انقر هنا لإرسال بريد التّفعيل مرّة أخرى."
+      submit_new_email: "حدث عنوان البريد الإلكتروني"
       sent_activation_email_again: "لقد أرسلنا بريد تفعيل آخر إلى <b>{{currentEmail}}</b>. قد يستغرق وصوله بضعة دقائق. تحقّق من فحص مجلّد السّخام."
-      to_continue: "رجاءً سجل دخولك"
-      preferences: "عليك تسجيل الدخول لتغيير تفضيلاتك الشّخصيّة."
+      to_continue: "رجاءً لِج"
+      preferences: "عليك الولوج لتغيير تفضيلاتك الشّخصيّة."
       forgot: "لا أذكر معلومات حسابي"
-      not_approved: "لم تتمّ الموافقة على حسابك بعد. سيصلك إشعار عبر البريد عندما يجهز لتسجل دخولك."
+      not_approved: "لم تتمّ الموافقة على حسابك بعد. سيصلك إشعار عبر البريد عندما يجهز لتلج."
       google:
         title: "عبر غوغل"
         message: "يستوثق عبر غوغل (تأكّد من تعطيل مانعات المنبثقات)"
@@ -1111,10 +1134,13 @@ ar:
       accept_title: "دعوة"
       welcome_to: "مرحباً بك في %{site_name}!"
       invited_by: "لقد دعاك:"
-      social_login_available: "يمكنك أيضًا الدخول عبر أيّ شبكة اجتماعيّة مستخدمًا هذا البريد."
+      social_login_available: "يمكنك أيضًا الولوج عبر أيّ شبكة اجتماعيّة مستخدمًا هذا البريد."
       your_email: "بريدك الإلكتروني  <b>%{email}</b>."
       accept_invite: "قُبول الدعوة "
-      success: "أُنشئ حسابك وقد سجلت الدخول الآن."
+      success: "أُنشئ حسابك وقد ولجت الآن."
+      name_label: "الاسم"
+      password_label: "ضع كلمة المرور"
+      optional_description: "(إختياري)"
     password_reset:
       continue: "تابع نحو %{site_name}"
     emoji_set:
@@ -1320,6 +1346,7 @@ ar:
           first: تلك المشاركة الاولى
           seen: قرأتها
           unseen: لم أقرأها
+          all_tags: ضُم كل الوسوم
         statuses:
           label: بشرط أن تكون المواضيع
           open: مفتوحة
@@ -1355,8 +1382,10 @@ ar:
         dismiss_new: "أزل الجديد"
         toggle: "إيقاف/تشغيل الاختيار المتعدد للمواضيع"
         actions: "عمليات تنفذ دفعة واحدة"
+        change_category: "ضع الفئة"
         close_topics: "إغلاق المواضيع"
         archive_topics: "أرشفة المواضيع"
+        notification_level: "التنبيهات"
         choose_new_category: "اختر القسم الجديد للمواضيع:"
         selected:
           zero: "لم تحدد شيئا."
@@ -1365,7 +1394,10 @@ ar:
           few: "حددت <b>{{count}}</b> مواضيع."
           many: "حددت <b>{{count}}</b> موضوعا."
           other: "حددت <b>{{count}}</b> موضوع."
+        change_tags: "غيّر الوسم"
+        append_tags: "ألحق الوسوم"
         choose_new_tags: "اختر وسوم جديدة لهذه المواضيع:"
+        choose_append_tags: "اختر وسوم جديدة لإلحاقها بالمواضيع"
         changed_tags: "تغيرت وسوم هذه المواضيع."
       none:
         unread: "ليست هناك مواضيع غير مقروءة."
@@ -1433,7 +1465,7 @@ ar:
       invalid_access:
         title: "الموضوع خاص"
         description: "لا تملك صلاحيات للوصول لهذا الموضوع"
-        login_required: "عليك بتسجيل الدخول لمشاهدة هذا الموضوع."
+        login_required: "عليك الولوج لمشاهدة هذا الموضوع."
       server_error:
         title: "فشل تحميل الموضوع"
         description: "آسفون، تعذر علينا تحميل هذا الموضوع، قد يرجع ذلك إلى مشكلة بالاتصال. من فضلك حاول مجددا. أخبرنا بالمشكلة إن استمر حدوثها."
@@ -1481,6 +1513,11 @@ ar:
       jump_reply_up: انتقل إلى أول رد
       jump_reply_down: انتقل إلى آخر رد
       deleted: "الموضوع محذوف"
+      auto_update_input:
+        tomorrow: "غداً"
+        this_weekend: "هذا الأسبوع"
+        next_week: "الاسبوع القادم"
+        next_month: "الشهر القادم"
       status_update_notice:
         auto_open: "سيُفتح هذا الموضوع آليًّا %{timeLeft}."
         auto_close: "سيُغلق هذا الموضوع آليًّا %{timeLeft}."
@@ -1629,7 +1666,7 @@ ar:
         username_placeholder: "اسم المستخدم"
         action: 'أرسل دعوة'
         help: 'ادعُ الغير إلى هذا الموضوع عبر البريد الإلكترونيّ أو الإشعارات'
-        to_forum: "سنُرسل بريدًا يتيح لصديقك الانضمام مباشرةً بنقر رابط ما، الدخول غير مطلوب."
+        to_forum: "سنُرسل بريدًا يتيح لصديقك الانضمام مباشرةً بنقر رابط فيه، الولوج غير مطلوب."
         sso_enabled: "أدخل اسم مَن تريد دعوته إلى هذا الموضوع."
         to_topic_blank: "أدخل اسم مَن تريد دعوته إلى هذا الموضوع أو بريده."
         to_topic_email: "لقد أدخلت عنوان بريد إلكترونيّ. سنرسل بريدًا يحتوي دعوة تتيح لصديقك الرّد مباشرة على هذا الموضوع."
@@ -1639,7 +1676,7 @@ ar:
         success_email: "قمنا بإرسال دعوة بالبريد لـ <b>{{emailOrUsername}}</b> . سيتم تنبيهك عند قبول الدعوة , تحقق من تبويب الدعوات في صفحتك الشخصية لمتابعة دعوتك."
         success_username: "دعونا هذا العضو للمشاركة في هذا الموضوع."
         error: "نأسف لا يمكنك دعوة هذا المُستَخدم , ربما لأنه مُسَجِل لدينا مسبقاً (الدعوات محدودة)"
-      login_reply: 'عليك تسجيل الدخول للرّدّ'
+      login_reply: 'عليك الولوج للرّدّ'
       filters:
         n_posts:
           zero: "لا مشاركات"
@@ -1777,7 +1814,7 @@ ar:
         too_many_dragged_and_dropped_files: "آسفون، يمكنك فقط رفع 10 ملفّات كلّ مرة."
         image_upload_not_allowed_for_new_user: "نأسف، لا يمكن للمستخدمين الجدد رفع الصّور."
         attachment_upload_not_allowed_for_new_user: "نأسف، لا يمكن للمستخدمين الجدد رفع المرفقات."
-        attachment_download_requires_login: "نأسف، عليك تسجيل الدخول لتنزيل المرفقات."
+        attachment_download_requires_login: "نأسف، عليك الولوج لتنزيل المرفقات."
       abandon:
         confirm: "أمتأكد من التخلي عن المشاركة؟"
         no_value: "لا، أبقها"
@@ -1794,7 +1831,7 @@ ar:
         has_liked: "أعجبتك هذه المشاركة"
         undo_like: "ألغِ الإعجاب"
         edit: "عدّل المشاركة"
-        edit_anonymous: "نأسف، عليك تسجيل الدخول لتعديل المشاركة."
+        edit_anonymous: "نأسف، عليك الولوج لتعديل المشاركة."
         flag: "بلَغ عن هذا الموضوع او ارسل تنبيه خاص لأدارة الموقع."
         delete: "احذف المشاركة"
         undelete: "التراجع عن حذف المشاركة"
@@ -2131,7 +2168,7 @@ ar:
         two: "إثنتان أخريتان"
         few: "%{count} أخرى"
         many: "%{count} أخرى"
-        other: "%{count} أخرى"
+        other: "%{count} أكثر"
     topic_statuses:
       warning:
         help: "هذا تحذير رسمي."
@@ -2784,7 +2821,10 @@ ar:
         import: "استيراد"
         delete: "حذف"
         delete_confirm: "أأحذف هذه السّمة؟"
+        color: "لون"
+        opacity: "الشفافية"
         copy: "نسخ"
+        theme_owner: "غير قابل للتعديل ، مملوك بواسطة : "
         email_templates:
           title: "قالب البريد الالكتروني "
           subject: "الموضوع"
@@ -2793,6 +2833,30 @@ ar:
           none_selected: "اختر أحد قوالب البريد لتعدله."
           revert: "اعاده التغيرات "
           revert_confirm: "هل انت متاكد من انك تريد اعاده التغيرات؟ "
+        theme:
+          title: "السمات"
+          common: "شائع"
+          desktop: "سطح المكتب"
+          mobile: "هاتف محمول"
+          preview: "مراجعة"
+          is_default: "السمة مفعلة إفتراضيا"
+          custom_sections: "مُخصص القسم:"
+          theme_components: "مكونات السمة"
+          uploads: "المرفوعة"
+          upload: "رفع"
+          child_themes_check: "السمة "
+          css_html: "مُخصص CSS/HTML"
+          edit_css_html: "عدل CSS/HTML"
+          about_theme: "عن السمة"
+          license: "الرخصة"
+          update_to_latest: "حدث لآخر"
+          check_for_updates: "تحقق من التحديثات"
+          scss:
+            text: "CSS"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
           title: "الألوان"
           long_title: "مخططات الألوان"
@@ -2913,6 +2977,8 @@ ar:
           block: "حظر"
           do_nothing: "لا تفعل شيء"
         staff_actions:
+          all: "الكل"
+          filter: "رشح:"
           title: "عمليات المشرفين"
           clear_filters: "إظهار كل شيء"
           staff_user: "عضو  إداري"
@@ -2933,6 +2999,8 @@ ar:
             change_trust_level: "تغيير مستوى الثقة"
             change_username: "تغيير اسم المستخدم"
             change_site_setting: "تغيير اعدادات الموقع"
+            change_theme: "غيّر السمة"
+            delete_theme: "أحذف السمة"
             change_site_text: "تغيير نص الموقع."
             suspend_user: "حظر المستخدم"
             unsuspend_user: "رفع الحظر "
@@ -2964,6 +3032,7 @@ ar:
             change_readonly_mode: "غير وضع القراءة فقط"
             backup_download: "حَمل النسخة الاحتياطية"
             backup_destroy: "دمر النسخة الاحتياطية"
+            reviewed_post: "مشاركة مراجعة"
         screened_emails:
           title: "عناوين بريد إلكتروني محجوبة."
           description: "عندما يحاول أحدهم إنشاء حساب جديد، ستُفحص عناوين البريد الإلكتروني وسيُمنع التسجيل إن تطابق إحداها، أو أن يُتّخذ أي إجراء آخر."
@@ -3280,7 +3349,7 @@ ar:
           legal: "قانوني"
           uncategorized: 'أخرى'
           backups: "النسخ الإحتياطية"
-          login: "تسجيل الدخول"
+          login: "الولوج"
           plugins: "الإضافات "
           user_preferences: "تفضيلات العضو"
           tags: "الوسوم"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 60ba98671b..ce884503d0 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -139,19 +139,19 @@ bs_BA:
     bootstrap_mode_disabled: "Bootstrap mod će biti ugašen u sljedećih 24 sata."
     s3:
       regions:
-        us_east_1: "SAD Istok (Sjeverna Virdžinija)"
-        us_west_1: "SAD Zapad (Sjeverna Kalifornija)"
-        us_west_2: "SAD Zapad (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irska)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Azija Pacifik (Singapur)"
-        ap_southeast_2: "Azija Pacifik (Sidnej)"
-        ap_south_1: "Azija Pacifik (Mumai)"
         ap_northeast_1: "Azija Pacifik (Tokio)"
         ap_northeast_2: "Azija Pacifik (Seul)"
-        sa_east_1: "Južna Amerika (Sao Paulo)"
+        ap_south_1: "Azija Pacifik (Mumai)"
+        ap_southeast_1: "Azija Pacifik (Singapur)"
+        ap_southeast_2: "Azija Pacifik (Sidnej)"
         cn_north_1: "Kina (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irska)"
+        sa_east_1: "Južna Amerika (Sao Paulo)"
+        us_east_1: "SAD Istok (Sjeverna Virdžinija)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "SAD Zapad (Sjeverna Kalifornija)"
+        us_west_2: "SAD Zapad (Oregon)"
     edit: 'izmjeni naslov i kategoriju ove teme'
     not_implemented: "That feature hasn't been implemented yet, sorry!"
     no_value: "Ne"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index ab0a8bbe57..10307b7a83 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -119,6 +119,7 @@ cs:
           other: "za %{count} let"
       previous_month: 'Předchozí měsíc'
       next_month: 'Další měsíc'
+      placeholder: Vyber datum
     share:
       topic: 'sdílet odkaz na toto téma'
       post: 'příspěvek #%{postNumber}'
@@ -157,21 +158,24 @@ cs:
     emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány."
     bootstrap_mode_enabled: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile počet registrovaných uživatelů překročí %{min_users}."
     bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
+    themes:
+      default_description: "Výchozí"
     s3:
       regions:
-        us_east_1: "Východ USA (S. Virginie)"
-        us_west_1: "Západ USA (S. Kalifornie)"
-        us_west_2: "Západ USA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irsko)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapur)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Bombaj)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Soul)"
-        sa_east_1: "Jižní Amerika (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Bombaj)"
+        ap_southeast_1: "Asia Pacific (Singapur)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Čína (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irsko)"
+        eu_west_2: "EU (Londýn)"
+        sa_east_1: "Jižní Amerika (Sao Paulo)"
+        us_east_1: "Východ USA (S. Virginie)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "Západ USA (S. Kalifornie)"
+        us_west_2: "Západ USA (Oregon)"
     edit: 'upravit název a kategorii příspěvku'
     not_implemented: "Tato funkce ještě nebyla naprogramována, omlouváme se."
     no_value: "Ne"
@@ -351,6 +355,8 @@ cs:
         change_group_setting: "Změnit nastavení skupiny"
         add_user_to_group: "Přidat uživatele"
         remove_user_from_group: "Odebrat uživatele"
+        make_user_group_owner: "Udělej vlastníkem"
+        remove_user_as_group_owner: "Odstraň vlastníka"
     groups:
       logs:
         title: "Logy"
@@ -364,9 +370,18 @@ cs:
       edit:
         title: 'Editovat skupinu'
         full_name: 'Celé jméno'
+        add_members: "Přidat členy"
+        delete_member_confirm: "Odstranit '%{username}' ze skupiny '%{group}'?"
+      name_placeholder: "Název skupiny, bez mezer, stejná pravidla jako pro uživatelská jména"
       add: "Přidat"
+      join: "Přidat se ke skupině"
+      leave: "Opustit skupinu"
+      request: "Požádat o členství ve skupině"
       automatic_group: Automatická skupina
+      closed_group: Uzavřená skupina
+      is_group_user: "Jsi členem této skupiny"
       membership: "Členství"
+      name: "Název"
       user_count: "Počet členů"
       bio: "O skupině"
       selector_placeholder: "Přidat členy"
@@ -384,6 +399,10 @@ cs:
       posts: "Odpovědi"
       mentions: "Zmínění"
       messages: "Zprávy"
+      visibility_levels:
+        title: "Kdo vidí tuto skupinu?"
+        public: "Všichni"
+        members: "Vlastníci skupiny, členové a správci"
       alias_levels:
         title: "Kdo může do této skupiny psát zprávy a @zmiňovat ji?"
         nobody: "Nikdo"
@@ -475,6 +494,11 @@ cs:
       profile: "Profil"
       mute: "Ignorovat"
       edit: "Upravit nastavení"
+      download_archive:
+        button_text: "Stáhnout vše"
+        confirm: "Jste si jistí, že chcete stáhnout všechny své příspěvky?"
+        success: "Stahování zahájeno, až bude dokončeno, přijde ti zpráva."
+        rate_limit_error: "Příspěvky mohou být staženy jen jednou za den. Zkus to, prosím, zítra."
       new_private_message: "Nová zpráva"
       private_message: "Zpráva"
       private_messages: "Zprávy"
@@ -572,12 +596,23 @@ cs:
         move_to_archive: "Archivovat"
         failed_to_move: "Nepodařilo se přesunout vybrané zprávy (možná vám spadlo připojení)"
         select_all: "Vybrat vše"
+      preferences_nav:
+        account: "Účet"
+        profile: "Profil"
+        emails: "Emaily"
+        notifications: "Upozornění"
+        categories: "Kategorie"
+        tags: "Tagy"
+        interface: "Rozhraní"
+        apps: "Aplikace"
       change_password:
         success: "(email odeslán)"
         in_progress: "(odesílám)"
         error: "(chyba)"
         action: "Odeslat email na obnovu hesla"
         set_password: "Nastavit heslo"
+        choose_new: "Zvolte si nové heslo"
+        choose: "Vyber si heslo"
       change_about:
         title: "Změna o mně"
         error: "Došlo k chybě při pokusu změnit tuto hodnotu."
@@ -627,9 +662,11 @@ cs:
         ok: "Parádní jméno"
       username:
         title: "Uživatelské jméno"
+        instructions: "jedinečné, bez mezer, krátké"
         short_instructions: "Lidé vás mohou zmínit pomocí @{{username}}"
         available: "Vaše uživatelské jméno je volné"
         not_available: "Není k dispozici. Co třeba {{suggestion}}?"
+        not_available_no_suggestion: "Není k dispozici"
         too_short: "Uživatelské jméno je moc krátké"
         too_long: "Uživatelské jméno je moc dlouhé"
         checking: "Zjišťuji, zda je uživatelské jméno volné..."
@@ -719,6 +756,8 @@ cs:
         expired: "Poznávka je už prošlá."
         rescind: "Smazat"
         rescinded: "Pozvánka odstraněna"
+        rescind_all: "Odstranit všechny pozvánky"
+        rescinded_all: "Všechny pozvánky odstraněny!"
         reinvite: "Znovu poslat pozvánku"
         reinvite_all: "Znovu poslat všechny pozvánky"
         reinvited: "Pozvánka byla opětovně odeslána."
@@ -739,6 +778,7 @@ cs:
         same_as_username: "Vaše heslo je stejné jako Vaše uživatelské jméno."
         same_as_email: "Vaše heslo je stejné jako váš e-mail."
         ok: "Vaše heslo je v pořádku."
+        instructions: "alespoň %{count} znaků"
       summary:
         title: "Souhrn"
         stats: "Statistiky"
@@ -901,6 +941,8 @@ cs:
       complete_email_found: "Byl nalezen účet odpovídající emailu <b>%{email}</b>. Za chvilku obdržíte email s instrukcemi jak přenastavit vaše heslo."
       complete_username_not_found: "Nebyl nalezen účet s uživatelským jménem <b>%{username}</b>"
       complete_email_not_found: "Nebyl nalezen účet s odpovídající emailu <b>%{email}</b>"
+      button_ok: "OK"
+      button_help: "Nápověda"
     login:
       title: "Přihlásit se"
       username: "Uživatel"
@@ -920,6 +962,7 @@ cs:
       not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit."
       admin_not_allowed_from_ip_address: "Z této IP adresy se nemůžete přihlásit jako administrátor."
       resend_activation_email: "Klikněte sem pro zaslání aktivačního emailu."
+      submit_new_email: "Aktualizovat emailovou adresu"
       sent_activation_email_again: "Zaslali jsme vám další aktivační email na <b>{{currentEmail}}</b>. Může trvat několik minut, než vám dorazí. Zkontrolujte také vaši složku s nevyžádanou pošlou."
       to_continue: "Přihlaš se, prosím"
       preferences: "Pro to, aby jsi mohl měnit své uživatelské nastavení, se musíš přihlásit."
@@ -947,14 +990,22 @@ cs:
         message: "Autentizuji přes GitHub (ujistěte se, že nemáte zablokovaná popup okna)"
     invites:
       accept_title: "Pozvání"
+      welcome_to: "Vítejte na %{site_name}!"
       invited_by: "Pozvání od:"
+      accept_invite: "Přijmout pozvání"
       success: "Váš účet byl vytvořen a nyní jste přihlášeni."
+      name_label: "Jméno"
+      password_label: "Nastavit heslo"
+      optional_description: "(volitelné)"
+    password_reset:
+      continue: "Pokračovat na %{site_name}"
     emoji_set:
       apple_international: "Apple/Mezinárodní"
       google: "Google"
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Pouze kategorie"
       categories_with_featured_topics: "Kategorie a vybrané příspěvky"
@@ -969,6 +1020,7 @@ cs:
       options: "Možnosti"
       whisper: "šeptat"
       unlist: "neviditelné"
+      blockquote_text: "Bloková citace"
       add_warning: "Toto je oficiální varování."
       toggle_whisper: "Přepnout šeptání"
       toggle_unlisted: "Přepnout neviditelné"
@@ -1117,6 +1169,7 @@ cs:
       sort_by: "Seřadil"
       relevance: "Relevance"
       latest_post: "Poslední příspěvek"
+      latest_topic: "Nejnovější téma"
       most_viewed: "Nejzobrazovanější"
       most_liked: "Nejoblíbenější"
       select_all: "Vybrat vše"
@@ -1131,6 +1184,7 @@ cs:
       no_more_results: "Nenalezeny žádné další výsledky."
       searching: "Hledám ..."
       post_format: "#{{post_number}} od {{username}}"
+      results_page: "Výsledky hledání"
       context:
         user: "Vyhledat příspěvky od @{{username}}"
         category: "Hledat v kategorii #{{category}}"
@@ -1162,6 +1216,7 @@ cs:
           seen: jsem četl
           unseen: jsem nečetl
           wiki: jsou wiki
+          all_tags: Obsahuje všechny štítky
         statuses:
           label: Kde příspěvky
           open: jsou otevřeny
@@ -1197,8 +1252,10 @@ cs:
         dismiss_new: "Odbýt nová"
         toggle: "hromadný výběr témat"
         actions: "Hromadné akce"
+        change_category: "Nastavit kategorii"
         close_topics: "Zavřít téma"
         archive_topics: "Archivovat témata"
+        notification_level: "Upozornění"
         choose_new_category: "Zvolte novou kategorii pro témata:"
         selected:
           one: "Vybrali jste <b>1</b> téma."
@@ -1317,6 +1374,7 @@ cs:
         go: "go"
         jump_bottom: "na poslední příspěvek"
         jump_prompt: "přejít na..."
+        jump_prompt_of: "%{count} příspěvků"
         jump_prompt_long: "Na který příspěvek chcete přejít?"
         jump_bottom_with_number: "Skočit na příspěvěk %{post_number}"
         total: celkem příspěvků
@@ -1509,9 +1567,11 @@ cs:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "Cituj"
       edit: "Editujete {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Důvod: "
       post_number: "příspěvek č. {{number}}"
+      wiki_last_edited_on: "wiki naposledy upravena"
       last_edited_on: "příspěvek naposledy upraven"
       reply_as_new_topic: "Odpovědět v propojeném tématu"
       continue_discussion: "Pokračující diskuze z {{postLink}}:"
@@ -1562,6 +1622,8 @@ cs:
       via_email: "tento příspěvek byl přijat přes email"
       via_auto_generated_email: "tento příspěvek byl přijat přes automaticky generovaný email"
       whisper: "tento příspěvek je soukromé šeptání pro moderátory"
+      wiki:
+        about: "toto je wiki příspěvek"
       archetypes:
         save: 'Uložit nastavení'
       few_likes_left: "Díky za šíření lásky! Zbývá ti pro dnešek už jen několi \"líbí se\"."
@@ -1571,6 +1633,7 @@ cs:
         has_liked: "tento příspěvek se mi líbí"
         undo_like: "už se mi to nelíbí"
         edit: "upravit příspěvek"
+        edit_action: "Upravit"
         edit_anonymous: "Omlouváme se, ale pro editaci tohoto příspěvku musíte být přihlášení."
         flag: "nahlásit příspěvek moderátorovi"
         delete: "smazat příspěvek"
@@ -1694,6 +1757,11 @@ cs:
           one: "Opravdu chcete odstranit tento příspěvek?"
           few: "Opravdu chcete odstranit všechny tyto příspěvky?"
           other: "Opravdu chcete odstranit všechny tyto příspěvky?"
+      merge:
+        confirm:
+          one: "Opravdu chceš sloučit tyto příspěvky?"
+          few: "Opravdu chceš sloučit {{count}} příspěvky?"
+          other: "Opravdu chceš sloučit {{count}} příspěvků?"
       revisions:
         controls:
           first: "První revize"
@@ -1703,14 +1771,26 @@ cs:
           hide: "Schovejte revizi"
           show: "Zobrazte revizi"
           revert: "Vrátit se k této revizi"
+          edit_wiki: "Upravit Wiki"
+          edit_post: "upravit příspěvek"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
             title: "Vykreslený příspěvek se změnami zobrazenými v textu"
+            button: 'HTML'
           side_by_side:
             title: "Rozdíli mezi vykreslenými příspěveky vedle sebe"
+            button: 'HTML'
           side_by_side_markdown:
             title: "Show the raw source diffs side-by-side"
+      raw_email:
+        displays:
+          text_part:
+            title: "Ukázat textovou část emailu"
+            button: 'Text'
+          html_part:
+            title: "Zobrazit html část emailu"
+            button: 'HTML'
     category:
       can: 'smí&hellip; '
       none: '(bez kategorie)'
@@ -1794,6 +1874,8 @@ cs:
         created: "Vytvořena"
       sort_ascending: 'Vzestupně'
       sort_descending: 'Sestupně'
+      subcategory_list_styles:
+        rows: "Řady"
     flagging:
       title: 'Děkujeme, že pomáháte udržovat komunitu zdvořilou!'
       action: 'Nahlásit příspěvek'
@@ -2324,6 +2406,8 @@ cs:
         description: "Popis"
         go_back: "Zpět na seznam"
         payload_url_placeholder: "https://example.com/postreceive"
+        content_type: "Typ obsahu"
+        wildcard_event: "Pošli mi vše."
         active: "Aktivní"
         delivery_status:
           inactive: "Neaktivní"
@@ -2434,6 +2518,9 @@ cs:
         color: "Barva"
         opacity: "Neprůhlednost"
         copy: "Kopírovat"
+        copy_to_clipboard: "Kopírovat do schránky"
+        copied_to_clipboard: "Zkopírováno do schránky"
+        theme_owner: "není editovatelné, vlastněno:"
         email_templates:
           title: "Šablona emailu"
           subject: "Předmět"
@@ -2442,6 +2529,12 @@ cs:
           none_selected: "Pro začátek editace zvolte šablonu emailu."
           revert: "Vrátit změny"
           revert_confirm: "Opravdu chcete vrátit změny?"
+        theme:
+          customize_desc: "Přizpůsobit:"
+          edit: "Upravit"
+          mobile: "Mobilní verze"
+          preview: "Náhled"
+          color_scheme: "Barevné schéma"
         colors:
           title: "Barvy"
           long_title: "Barevná schémata"
@@ -2505,6 +2598,8 @@ cs:
         delivery_method: "Způsob doručení"
         preview_digest_desc: "Zobraz náhled mailů se souhrnem posílaným neaktivním uživatelúm."
         refresh: "Aktualizovat"
+        send_digest: "Poslat"
+        sending_email: "Posílám email..."
         format: "Formát"
         html: "html"
         text: "text"
@@ -2557,6 +2652,8 @@ cs:
           block: "blokovat"
           do_nothing: "nedělat nic"
         staff_actions:
+          all: "vše"
+          filter: "Filtr:"
           title: "Akce redaktorů"
           clear_filters: "Zobrazit vše"
           staff_user: "Člen redakce"
@@ -2596,9 +2693,14 @@ cs:
             revoke_admin: "odebrat administrátorská práva"
             grant_moderation: "udělit moderátorská práva"
             revoke_moderation: "odebrat moderátorská práva"
+            backup_create: "vytvořit zálohu"
             deleted_tag: "smazaný štítek"
             renamed_tag: "přejmenovaný štítek"
             revoke_email: "Odebrat email"
+            activate_user: "aktivovat uživatele"
+            deactivate_user: "deaktivovat uživatele"
+            backup_download: "stáhnout zálohu"
+            backup_destroy: "smazat zálohu"
         screened_emails:
           title: "Filtrované emaily"
           description: "Při registraci nového účtu budou konzultovány následujíci adresy. Při shodě bude registrace zablokována, nebo bude provedena jiná akce."
@@ -2891,6 +2993,7 @@ cs:
           user_preferences: "Uživatelká nastavení"
           tags: "Tagy"
           search: "Vyhledávání"
+          groups: "Skupiny"
       badges:
         title: Odznaky
         new_badge: Nový odznak
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 25e59cb583..4424690f4c 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -148,20 +148,20 @@ da:
       default_description: "Standard"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asien (Singapore)"
-        ap_southeast_2: "Asien (Sydney)"
-        ap_south_1: "Asien (Mumbai)"
         ap_northeast_1: "Asien (Tokyo)"
         ap_northeast_2: "Asien (Seoul)"
-        sa_east_1: "Sydamerika (Sao Paulo)"
+        ap_south_1: "Asien (Mumbai)"
+        ap_southeast_1: "Asien (Singapore)"
+        ap_southeast_2: "Asien (Sydney)"
         cn_north_1: "Kina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Sydamerika (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'redigér titel og kategori for dette emne'
     not_implemented: "Beklager, denne feature er ikke blevet implementeret endnu."
     no_value: "Nej"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 1ef54b63d9..581d1a023b 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -148,20 +148,20 @@ de:
       default_description: "Standard"
     s3:
       regions:
-        us_east_1: "USA Ost (Nord-Virginia)"
-        us_west_1: "USA West (Nordkalifornien)"
-        us_west_2: "USA West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asien-Pazifik (Singapur)"
-        ap_southeast_2: "Asien-Pazifik (Sydney)"
-        ap_south_1: "Asien-Pazifik (Mumbai)"
         ap_northeast_1: "Asien-Pazifik (Tokio)"
         ap_northeast_2: "Asien-Pazifik (Seoul)"
-        sa_east_1: "Südamerika (São Paulo)"
+        ap_south_1: "Asien-Pazifik (Mumbai)"
+        ap_southeast_1: "Asien-Pazifik (Singapur)"
+        ap_southeast_2: "Asien-Pazifik (Sydney)"
         cn_north_1: "China (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Südamerika (São Paulo)"
+        us_east_1: "USA Ost (Nord-Virginia)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "USA West (Nordkalifornien)"
+        us_west_2: "USA West (Oregon)"
     edit: 'Titel und Kategorie dieses Themas ändern'
     not_implemented: "Entschuldige, diese Funktion wurde noch nicht implementiert!"
     no_value: "Nein"
@@ -1011,7 +1011,6 @@ de:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Windows 10"
-      google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "nur Kategorien"
@@ -3014,6 +3013,7 @@ de:
         reset_bounce_score:
           label: "Zurücksetzen"
           title: "Anzahl unzustellbarer E-Mails auf 0 zurücksetzen"
+        visit_profile: "Besuche die <a href='%{url}'>Benutzer-Einstellungen</a>, um dieses Profil zu bearbeiten"
         deactivate_explanation: "Ein deaktivierter Benutzer muss seine E-Mail-Adresse erneut bestätigen."
         suspended_explanation: "Ein gesperrter Benutzer kann sich nicht anmelden."
         block_explanation: "Ein geblockter Benutzer kann keine Themen erstellen oder Beiträge veröffentlichen."
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 4924686d61..620ff626c9 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -9,15 +9,15 @@ el:
   js:
     number:
       format:
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: "."
       human:
         storage_units:
           format: '%n %u'
           units:
             byte:
               one: Byte
-              other: Byte
+              other: Bytes
             gb: GB
             kb: KB
             mb: MB
@@ -66,8 +66,8 @@ el:
         almost_x_years:
           one: "1χ"
           other: "%{count}έ"
-        date_month: "DD ΜΜΜ"
-        date_year: "ΜΜΜ 'ΕΕ"
+        date_month: "DD MMM"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
           one: "1 λεπτό"
@@ -78,7 +78,7 @@ el:
         x_days:
           one: "1 ημέρα"
           other: "%{count} ημέρες"
-        date_year: "ΜΜΜ Η, 'ΕΕ"
+        date_year: "MMM D, 'YY"
       medium_with_ago:
         x_minutes:
           one: "πριν από 1 λεπτό "
@@ -104,16 +104,16 @@ el:
       placeholder: Επιλέξτε ημερομηνία
     share:
       topic: 'κοινοποίησε έναν σύνδεσμο προς αυτό το νήμα'
-      post: 'Ανάρτηση #%{postNumber}'
+      post: 'ανάρτηση #%{postNumber}'
       close: 'κλείσιμο'
       twitter: 'κοινοποίησε τον σύνδεσμο στο Twitter'
       facebook: 'κοινοποίησε τον σύνδεσμο στο Facebook'
       google+: 'κοινοποίησε τον σύνδεσμο στο Google+'
       email: 'στείλε αυτόν τον σύνδεσμο με ένα μήνυμα ηλεκτρονικού ταχυδρομείου'
     action_codes:
-      public_topic: "έκανε το θέμα δημόσιο στις ${when}"
-      private_topic: "έκανε το θέμα ιδιωτικό στις %{when}"
-      split_topic: "διαχώρισε αυτό το θέμα στις %{when}"
+      public_topic: "έκανε το νήμα δημόσιο στις %{when}"
+      private_topic: "έκανε το νήμα ιδιωτικό στις %{when}"
+      split_topic: "διαχώρισε αυτό το νήμα στις %{when}"
       invited_user: "προσκάλεσε τον χρήστη %{who} στις %{when}"
       invited_group: "προσκάλεσε τον χρήστη %{who} στις %{when}"
       removed_user: "αφαίρεσε τον χρήστη %{who} στις %{when}"
@@ -137,8 +137,8 @@ el:
         enabled: 'καταχωρήθηκε %{when}'
         disabled: 'μη καταχωρημένο %{when}'
       banner:
-        enabled: 'έγινε μπάνερ %{when}. Θα εμφανίζεται στην κορυφή κάθε σελίδας μέχρι να απορριφθεί από τον χρήστη.'
-        disabled: 'αφαιρέθηκε μπάνερ %{when}. Δεν θα εμφανίζεται πια στην κορυφή κάθε σελίδας.'
+        enabled: 'το έκανε νήμα ανακοίνωσης στις %{when}. Θα εμφανίζεται στην κορυφή κάθε σελίδας μέχρι να απορριφθεί από τον χρήστη.'
+        disabled: 'αφαίρεσε αυτό το νήμα ανακοίνωσης %{when}. Δεν θα εμφανίζεται πλέον στην κορυφή κάθε σελίδας.'
     topic_admin_menu: "Διαχείριση νήματος"
     wizard_required: "Καλώς ήλθατε στο νέο σας Discourse! Ας αρχίσουμε με τον <a href='%{url}' data-auto-route='true'>οδηγό εγκατάστασης</a> ✨"
     emails_are_disabled: "Τα εξερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου έχουν απενεργοποιηθεί από κάποιον διαχειριστή. Δε θα σταλεί κανένα μήνυμα ηλεκτρονικού ταχυδρομείου."
@@ -148,21 +148,22 @@ el:
       default_description: "Προεπιλογή"
     s3:
       regions:
-        us_east_1: "Ανατολικές ΗΠΑ (Β. Βιρτζίνια)"
-        us_west_1: "Δυτικές ΗΠΑ (Β. Καλιφόρνια)"
-        us_west_2: "Δυτικές ΗΠΑ (Όρεγκον)"
-        us_gov_west_1: "AWS GovCloud (ΗΠΑ)"
-        eu_west_1: "ΕΕ (Ιρλανδία)"
-        eu_west_2: "EU (Λονδίνο)"
-        eu_central_1: "ΕΕ (Φρανκφούρτη)"
-        ap_southeast_1: "Ασία-Ειρηνικός (Σιγκαπούρη)"
-        ap_southeast_2: "Ασία-Ειρηνικός (Σίδνεϊ)"
-        ap_south_1: "Ασία - Ειρηνικός (Μομβάη)"
         ap_northeast_1: "Ασία-Ειρηνικός (Τόκιο)"
         ap_northeast_2: "Ασία-Ειρηνικός (Σεούλ)"
-        sa_east_1: "Ασία-Ειρηνικός (Σάο Πάολο)"
-        cn_north_1: "Κίνα(Πεκίνο)"
-    edit: 'αλλαγή του τίτλου και την κατηγορίας του νήματος'
+        ap_south_1: "Ασία - Ειρηνικός (Μομβάη)"
+        ap_southeast_1: "Ασία-Ειρηνικός (Σιγκαπούρη)"
+        ap_southeast_2: "Ασία-Ειρηνικός (Σίδνεϊ)"
+        cn_north_1: "Κίνα (Πεκίνο)"
+        eu_central_1: "ΕΕ (Φρανκφούρτη)"
+        eu_west_1: "ΕΕ (Ιρλανδία)"
+        eu_west_2: "EU (Λονδίνο)"
+        sa_east_1: "Νότια Αμερική (Σάο Πάολο)"
+        us_east_1: "Ανατολικές ΗΠΑ (Β. Βιρτζίνια)"
+        us_east_2: "Ανατολικές ΗΠΑ (Οχάιο)"
+        us_gov_west_1: "AWS GovCloud (ΗΠΑ)"
+        us_west_1: "Δυτικές ΗΠΑ (Β. Καλιφόρνια)"
+        us_west_2: "Δυτικές ΗΠΑ (Όρεγκον)"
+    edit: 'αλλαγή του τίτλου και της κατηγορίας του νήματος'
     not_implemented: "Λυπούμαστε! Αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα."
     no_value: "Όχι"
     yes_value: "Ναι"
@@ -179,11 +180,11 @@ el:
     links: "Σύνδεσμοι"
     links_lowercase:
       one: "Σύνδεσμος"
-      other: "Σύνδεσμοι"
+      other: "σύνδεσμοι"
     faq: "Συχνές ερωτήσεις"
     guidelines: "Οδηγίες"
-    privacy_policy: "Πολιτική προστασίας δεδομένων"
-    privacy: "Προστασία δεδομένων"
+    privacy_policy: "Πολιτική Απορρήτου"
+    privacy: "Ιδιωτικότητα"
     terms_of_service: "Όροι χρήσης"
     mobile_view: "Προβολή για κινητό"
     desktop_view: "Προβολή για σταθερό υπολογιστή"
@@ -222,7 +223,7 @@ el:
       topic_count: "Νήματα"
       post_count: "Αναρτήσεις"
       user_count: "Χρήστες"
-      active_user_count: "Ενεργός χρήστης"
+      active_user_count: "Ενεργοί Χρήστες"
       contact: "Επικοινώνησε μαζί μας"
       contact_info: "Σε περίπτωση που προκύψει κάποιο κρίσιμο πρόβλημα ή κάποιο επείγον θέμα που αφορά αυτόν τον ιστότοπο, παρακαλούμε να επικοινωνήσεις μαζί μας στο %{contact_info}."
     bookmarked:
@@ -230,14 +231,14 @@ el:
       clear_bookmarks: "Διαγραφή σελιδοδεικτών"
       help:
         bookmark: "Πάτα εδώ για να μπεί σελιδοδείκτης στην πρώτη ανάρτηση του νήματος."
-        unbookmark: "Πάτα εδώ να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το θέμα."
+        unbookmark: "Πάτα εδώ να αφαιρεθούν όλοι οι σελιδοδείκτες από αυτό το νήμα."
     bookmarks:
       not_logged_in: "Λυπούμαστε, για να τοποθετήσεις έναν σελιδοδείκτη θα πρέπει να συνδεθείς πρώτα"
       created: "έχεις προσθέσει σελιδοδείκτη σε αυτή την ανάρτηση"
       not_bookmarked: "έχεις διαβάσει αυτή την ανάρτηση. Πάτησε για να προστεθεί σελιδοδείκτης"
       last_read: "αυτή είναι η τελευταία ανάρτηση που διάβασες. Πάτησε για να προστεθεί σελιδοδείκτης"
       remove: "Αφαίρεση σελιδοδείκτη"
-      confirm_clear: "Είστε σίγουρος ότι θέλετε να σβηστούν όλα τα αγαπημένα από αυτό το θέμα;"
+      confirm_clear: "Είστε σίγουρος ότι θέλετε να σβηστούν όλα τα αγαπημένα από αυτό το νήμα;"
     topic_count_latest:
       one: "{{count}} νέο ενημερωμένο νήμα"
       other: "{{count}} νέα ή ενημερωμένα νήματα."
@@ -265,8 +266,8 @@ el:
     switch_to_anon: "Έναρξη κατάστασης ανωνυμίας"
     switch_from_anon: "Τερματισμός κατάστασης ανωνυμίας"
     banner:
-      close: "Απομάκρυνε αυτή την εικόνα"
-      edit: "Επεξεργάσου αυτό το banner >>"
+      close: "Απομάκρυνε αυτό το νήμα ανακοίνωσης"
+      edit: "Επεξεργάσου αυτό το νήμα ανακοίνωσης >>"
     choose_topic:
       none_found: "Δεν βρέθηκαν νήματα."
       title:
@@ -284,9 +285,9 @@ el:
       view_pending: "προβολή εκκρεμών αναρτήσεων"
       has_pending_posts:
         one: "Αυτό το θέμα έχει <b>1</b> ανάρτηση που αναμένει έγκριση"
-        other: "Αυτό το θέμα έχει <b>{{count}}</b> αναρτήσεις που αναμένουν έγκριση"
+        other: "Αυτό το νήμα έχει <b>{{count}}</b> αναρτήσεις που αναμένουν έγκριση"
       confirm: "Αποθήκευση αλλαγών"
-      delete_prompt: "Είστε σίγουρος πως θέλετε να διαγράψετε τον/την <b>%{username}</b>? Αυτό θα διαγράψει όλες τους τις αναρτήσεις και θα μπλοκάρει την διεύθυνση ηλεκτρονικού ταχυδρομείου τους και την IP διεύθυνσή τους."
+      delete_prompt: "Είστε σίγουρος πως θέλετε να διαγράψετε τον/την <b>%{username}</b>; Αυτό θα διαγράψει όλες τους τις αναρτήσεις και θα μπλοκάρει την διεύθυνση ηλεκτρονικού ταχυδρομείου τους και την IP διεύθυνσή τους."
       approval:
         title: "Η ανάρτηση χρειάζεται έγκριση"
         description: "Η νέα σου ανάρτηση καταχωρήθηκε αλλά χρειάζεται να εγκριθεί από έναν συντονιστή. Παρακαλώ περιμένετε."
@@ -295,7 +296,7 @@ el:
           other: "Έχετε <strong>{{count}}</strong> εκκρεμείς αναρτήσεις."
         ok: "OK"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ανάρτησε το νήμα <a href='{{topicUrl}}'></a>"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ανάρτησε <a href='{{topicUrl}}'>το νήμα </a>"
       you_posted_topic: "<a href='{{userUrl}}'>Ανάρτησες</a> αυτό <a href='{{topicUrl}}'>το νήμα</a>"
       user_replied_to_post: "Ο/Η <a href='{{userUrl}}'>{{user}}</a> απάντησε στο <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Απάντησες</a> στο νήμα <a href='{{postUrl}}'>{{post_number}}</a>"
@@ -312,36 +313,36 @@ el:
       filter_name: "φιλτράρισμα με βάση το όνομα χρήστη"
       title: "Χρήστες"
       likes_given: "Δόθηκαν"
-      likes_received: "Λήφθηκαν"
+      likes_received: "Λήφθησαν"
       topics_entered: "Προβλήθηκαν"
-      topics_entered_long: "Θέματα που προβλήθηκαν"
+      topics_entered_long: "Νήματα που προβλήθηκαν"
       time_read: "Ωρα ανάγνωσης"
-      topic_count: "Θέματα"
+      topic_count: "Νήματα"
       topic_count_long: "Νήματα που δημιουργήθηκαν"
       post_count: "Απαντήσεις"
-      post_count_long: "Απαντήσεις που δημοσιεύθηκαν"
+      post_count_long: "Αναρτημένες Απαντήσεις"
       no_results: "Δεν βρέθηκαν αποτελέσματα"
       days_visited: "Επισκέψεις"
       days_visited_long: "Μέρες επίσκεψης"
       posts_read: "Διαβασμένο"
-      posts_read_long: "Διαβασμένες αναρτήσεις"
+      posts_read_long: "Διαβασμένες Αναρτήσεις"
       total_rows:
         one: "1 χειριστής"
-        other: "%{count} χειριστές"
+        other: "%{count} χρήστες"
     group_histories:
       actions:
         change_group_setting: "Αλλαγή ρυθμίσεων ομάδας"
         add_user_to_group: "Προσθήκη χρήστη"
         remove_user_from_group: "Αφαίρεση χρήστη"
         make_user_group_owner: "Κάνε ιδιοκτήτη"
-        remove_user_as_group_owner: "Απόσυρε ιδιοκτήτη"
+        remove_user_as_group_owner: "Απέσυρε ιδιοκτήτη"
     groups:
       logs:
         title: "Αρχεία καταγραφής"
         when: "Όταν"
         action: "Δράση"
-        acting_user: "Δραστήριοι χρήστες"
-        target_user: "Χρήστης στόχος"
+        acting_user: "Ενεργοί χρήστες"
+        target_user: "Επιδιοκώμενος χρήστη"
         subject: "Θέμα"
         details: "Λεπτομέρειες"
         from: "Από"
@@ -350,19 +351,20 @@ el:
         title: 'Επεξεργασία ομάδας'
         full_name: 'Ονοματεπώνυμο'
         add_members: "Προσθήκη μελών"
-        delete_member_confirm: "Ναι αφαιρεθεί ο/η '%{username}' από την '%{group}' ομάδα;"
+        delete_member_confirm: "Να αφαιρεθεί ο/η '%{username}' από την '%{group}' ομάδα;"
       name_placeholder: "Όνομα ομάδας, χωρίς κενά, ίδιοι κανόνες με τους κανόνες για το όνομα χρήστη"
       empty:
-        posts: "Δεν υπάρχουν δημοσιεύσεις από μέλη της ομάδας."
+        posts: "Δεν υπάρχουν αναρτήσεις από μέλη της ομάδας."
         members: "Δεν υπάρχουν μέλη σε αυτή την ομάδα."
         mentions: "Δεν υπάρχει καμία αναφορά για αυτή την ομάδα."
         messages: "Δεν υπάρχουν μηνύματα για αυτή την ομάδα."
-        topics: "Δεν υπάρχουν θέματα από μέλη της ομάδας."
+        topics: "Δεν υπάρχουν νήματα από μέλη της ομάδας."
         logs: "Δεν υπάρχουν αρχεία καταγραφής για αυτή την ομάδα."
       add: "Προσθήκη"
       join: "Συμμετοχή στην ομάδα"
-      leave: "Απομάκρυνση από την ομάδα"
+      leave: "Αποχώρηση από την ομάδα"
       request: "Αίτημα για συμμετοχή στην ομάδα"
+      message: "Μήνυμα"
       automatic_group: Αυτόματη ομάδα
       closed_group: Κλειστή ομάδα
       is_group_user: "Είσαι μέλος αυτής της ομάδας"
@@ -381,11 +383,17 @@ el:
         other: "ομάδες"
       activity: "Δραστηριότητα"
       members: "Μέλη"
-      topics: "Θέματα"
+      topics: "Νήματα"
       posts: "Αναρτήσεις"
       mentions: "Αναφορές"
       messages: "Μηνύματα"
       notification_level: "Προκαθορισμένο επίπεδο ειδοποιήσεων για μηνύματα ομάδων"
+      visibility_levels:
+        title: "Ποιος μπορεί να δει αυτή την ομάδα;"
+        public: "Όλοι"
+        members: "Ιδιοκτήτες ομάδας, μέλη και διαχειριστές"
+        staff: "Ιδιοκτήτες ομάδας και προσωπικό"
+        owners: "Ιδιοκτήτες ομάδας και διαχειριστές"
       alias_levels:
         title: "Ποιός μπορεί να στείλει μήνυμα και να @αναφέρει αυτή την ομάδα?"
         nobody: "Κανένας"
@@ -399,10 +407,10 @@ el:
       notifications:
         watching:
           title: "Παρατηρείται"
-          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια δημοσίευση σε κάθε μήνυμα, και η καταμέτρηση των καινούριων απαντήσεων θα εμφανίζεται."
+          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια ανάρτηση σε κάθε μήνυμα, και η καταμέτρηση των καινούριων απαντήσεων θα εμφανίζεται."
         watching_first_post:
           title: "Παρακολούθηση της πρώτης ανάρτησης"
-          description: "Θα ειδοποιήστε μόνο για την πρώτη ανάρτηση σε κάθε νέο θέμα σε αυτή την ομάδα."
+          description: "Θα ειδοποιήστε μόνο για την πρώτη ανάρτηση σε κάθε νέο νήμα σε αυτή την ομάδα."
         tracking:
           title: "Παρακολουθείται"
           description: "Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα, και η καταμέτρηση των καινούριων απαντήσεων θα εμφανίζεται."
@@ -411,14 +419,14 @@ el:
           description: "Θα ειδοποιηθείτε αν κάποιος αναφέρει το @name σας ή σας απαντήσει"
         muted:
           title: "Σε σιγή"
-          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικά με τις καινούριες δημοσιεύσεις της ομάδας."
+          description: "Δε θα λαμβάνεις ποτέ ειδοποιήσεις για οτιδήποτε σχετικά με νέα νήματα σε αυτήν την ομάδα."
       flair_url: "Avatar Flair εικόνα"
-      flair_url_placeholder: "( προαιρετικό) Εικόνα URL ή Font Awesome κατηγορία "
+      flair_url_placeholder: "(προαιρετικό) URL εικόνας ή Font Awesome κατηγορία "
       flair_bg_color: "Avatar Flair χρώμα φόντου"
       flair_bg_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
       flair_color: "Avatar Flair χρώμα"
       flair_color_placeholder: "(Προαιρετικό) Τιμή χρώματος Hex"
-      flair_preview_icon: "Προεπισκόπηση εικονίσματος"
+      flair_preview_icon: "Προεπισκόπηση εικονιδίου"
       flair_preview_image: "Προεπισκόπηση εικόνας"
       flair_note: "Σημείωση: Το Flair θα εμφανιστεί μονο για την κύρια ομάδα του χρήστη"
     user_action_groups:
@@ -444,32 +452,32 @@ el:
         title: "Επαναταξινόμησε τις κατηγορίες"
         title_long: "Αναδιοργάνωση της λίστας κατηγοριών"
         fix_order: "Σταθερές θέσεις"
-        fix_order_tooltip: "Δε έχουν όλες οι κατηγορίες μοναδικό νούμερο θέσης, το οποίο ίσως προκαλέσει αναπάντεχα αποτελέσματα."
-        save: "Αποθήκευση εντολής"
+        fix_order_tooltip: "Δεν έχουν όλες οι κατηγορίες μοναδικό νούμερο θέσης, το οποίο ίσως προκαλέσει αναπάντεχα αποτελέσματα."
+        save: "Αποθήκευση Κατάταξης"
         apply_all: "Εφαρμογή"
         position: "Θέση"
       posts: "Αναρτήσεις"
       topics: "Νήματα"
-      latest: "Τελευταία νήματα"
-      latest_by: "τελευταία ανάρτηση από τον/την"
-      toggle_ordering: "Αλλαγή ταξινόμησης"
+      latest: "Πρόσφατες"
+      latest_by: "πρόσφατα από"
+      toggle_ordering: "εναλλαγή ταξινόμησης"
       subcategories: "Υποκατηγορίες"
       topic_sentence:
         one: "1 θέμα"
-        other: "%{count} θέματα"
+        other: "%{count} νήματα"
       topic_stat_sentence:
         one: "%{count} νέο νήμα στα τελευταία %{unit}."
         other: "%{count} νέα νήματα στα τελευταία %{unit}."
     ip_lookup:
       title: Αναζήτηση διεύθυνσης IP
       hostname: Όνομα εξυπηρετητή
-      location: Διεύθυνση
+      location: Τοποθεσία
       location_not_found: (άγνωστο)
       organisation: Οργάνωση
       phone: Τηλέφωνο
       other_accounts: "Άλλοι λογαριασμοί με αυτή την IP διεύθυνση:"
       delete_other_accounts: "Διαγραφή %{count}"
-      username: "Όνομα χρήστη"
+      username: "χρηστώνυμο"
       trust_level: "TL"
       read_time: "χρόνος ανάγνωσης"
       topics_entered: "νήματα που είδες"
@@ -484,9 +492,9 @@ el:
       edit: "Επεξεργασία ρυθμίσεων"
       download_archive:
         button_text: "Λήψη Όλων"
-        confirm: "Είσαι σίγουρος πως θέλεις να κάνεις λήψη των δημοσιεύσεων σου;"
-        success: "Όταν θα αρχίσει να κατεβαίνει το αρχείο, θα ειδοποιηθείται μέσω μυνήματος μόλις ολοκληρωθεί η διαδικασία."
-        rate_limit_error: "Μπορείς να κάνεις λήψη των δημοσιεύσεών σου μια φορά την ημέρα, προσπάθησε ξανά αύριο."
+        confirm: "Είσαι σίγουρος πως θέλεις να κάνεις λήψη των αναρτήσεών σου;"
+        success: "Ξεκίνησε η διαδικασία λήψης. Θα ειδοποιηθείτε ]μόλις ολοκληρωθεί η διαδικασία."
+        rate_limit_error: "Μπορείς να κάνεις λήψη των αναρτήσεών σου μια φορά την ημέρα, προσπάθησε ξανά αύριο."
       new_private_message: "Νέο Μήνυμα"
       private_message: "Μήνυμα"
       private_messages: "Μηνύματα"
@@ -498,7 +506,7 @@ el:
       invited_by: "Προσκλήθηκε από τον/την"
       trust_level: "Επίπεδο εμπιστοσύνης"
       notifications: "Ειδοποιήσεις"
-      statistics: "Αναλυτικά στοιχεία"
+      statistics: "Στατιστικά"
       desktop_notifications:
         label: "Ειδοποιήσεις στην επιφάνεια εργασίας"
         not_supported: "Οι ειδοποιήσεις δεν υποστηρίζονται από αυτό το πρόγραμμα περιήγησης. Λυπάμαι."
@@ -507,12 +515,12 @@ el:
         perm_denied_expl: "Απορρίψατε την άδεια για ειδοποιήσεις. Επιτρέψτε τις ειδοποιήσεις μέσω των ρυθμίσεων του φυλλομετρητή σας."
         disable: "Απενεργοποίηση ειδοποιήσεων"
         enable: "Ενεργοποίηση ειδοποιήσεων"
-        each_browser_note: "Σημείωση: Έχετε αλλάξει αυτή τη ρύθμιση σε κάθε φυλλομετρητή που χρησιμοποιείτε."
-      dismiss_notifications: "Διώξτα όλα"
+        each_browser_note: "Σημείωση: Θα πρέπει να αλλάξετε αυτή τη ρύθμιση σε κάθε φυλλομετρητή που χρησιμοποιείτε."
+      dismiss_notifications: "Απόρριψη όλων"
       dismiss_notifications_tooltip: "Όλες οι αδιάβαστες ειδοποιήσεις να χαρακτηριστούν διαβασμένες"
       first_notification: "Η πρώτη σου ειδοποίηση! Επίλεξε την για να ξεκινήσεις."
-      disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφ' ότου απαντήσω"
-      dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων αναρτήσεων στο εικονίδιο του προγράμματος περιήγησης"
+      disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφού απαντήσω"
+      dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων νημάτων στο εικονίδιο του προγράμματος περιήγησης"
       theme_default_on_all_devices: "Αυτό να γίνει το προεπιλεγμένο θέμα σε όλες μου τις συσκευές"
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
@@ -522,7 +530,7 @@ el:
       moderator_tooltip: "Αυτός ο χρήστης είναι συντονιστής"
       admin_tooltip: "Αυτός ο χρήστης είναι διαχειριστής"
       blocked_tooltip: "Ο χρήστης είναι μπλοκαρισμένος"
-      suspended_notice: "Αυτός ο χρήστης είναι αποκλεισμένος μέχρι τις {{date}}."
+      suspended_notice: "Αυτός ο χρήστης είναι σε αποβολή μέχρι τις {{date}}."
       suspended_reason: "Αιτιολογία:"
       github_profile: "Github"
       email_activity_summary: "Περίληψη ενεργειών"
@@ -538,21 +546,21 @@ el:
         few_per_day: "Στείλε μου ένα email για κάθε νέα ανάρτηση (περίπου 2 τη μέρα)"
       tag_settings: "Ετικέτες"
       watched_tags: "Εθεάθη"
-      watched_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Θα λαμβάνεις ειδοποιήσεις για όλες τις καινούριες δημοσιεύσεις και νήματα, και η καταμέτρηση των καινούριων δημοσιεύσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
+      watched_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Θα λαμβάνεις ειδοποιήσεις για όλες τις καινούριες αναρτήσεις και νήματα, και η καταμέτρηση των καινούριων αναρτήσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
       tracked_tags: "Παρακολουθείται"
-      tracked_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Η καταμέτρηση των καινούριων δημοσιεύσεων θα εμφανίζεται δίπλα σε αυτό το νήμα."
+      tracked_tags_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτές τις ετικέτες. Η καταμέτρηση των καινούριων αναρτήσεων θα εμφανίζεται δίπλα σε αυτό το νήμα."
       muted_tags: "Σίγαση"
-      muted_tags_instructions: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με τα καινούρια νήματα, και δε θα εμφανίζονται στα τελευταία. "
+      muted_tags_instructions: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με νέα νήματα με αυτές τις ετικέτες και δε θα εμφανίζονται στα τελευταία. "
       watched_categories: "Παρατηρείται"
-      watched_categories_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για όλες τις καινούριες δημοσιεύσεις και νήματα, και η καταμέτρηση των δημοσιεύσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
+      watched_categories_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για όλες τις καινούριες αναρτήσεις και νήματα, και η καταμέτρηση των αναρτήσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
       tracked_categories: "Παρακολουθείται"
-      tracked_categories_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Η καταμέτρηση των καινούριων δημοσιεύσεων θα εμφανίζεται δίπλα στο νήμα."
-      watched_first_post_categories: "Παρακολούθηση πρώτης δημοσίευσης"
-      watched_first_post_categories_instructions: "Θα ειδοποιηθείς για την πρώτη δημοσίευση του κάθε καινούριου θέματος αυτών των κατηγοριών."
-      watched_first_post_tags: "Παρακολούθηση πρώτης δημοσίευσης"
-      watched_first_post_tags_instructions: "Θα ειδοποιηθείς για την πρώτη δημοσίευση του κάθε καινούριου θέματος με αυτές τις ετικέτες. "
+      tracked_categories_instructions: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Η καταμέτρηση των καινούριων αναρτήσεων θα εμφανίζεται δίπλα στο νήμα."
+      watched_first_post_categories: "Παρακολούθηση πρώτης ανάρτησης"
+      watched_first_post_categories_instructions: "Θα ειδοποιηθείς για την πρώτη ανάρτηση σε κάθε νέο νήμα αυτών των κατηγοριών."
+      watched_first_post_tags: "Παρακολούθηση πρώτης ανάρτησης"
+      watched_first_post_tags_instructions: "Θα ειδοποιηθείς για την πρώτη ανάρτηση σε κάθε νέο νήμα με αυτές τις ετικέτες. "
       muted_categories: "Σε σίγαση"
-      muted_categories_instructions: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με τις καινούριες δημοσιεύσεις σε αυτές τις κατηγορίες, και δε θα εμφανίζονται στα τελευταία."
+      muted_categories_instructions: "Δε θα λαμβάνεις ειδοποιήσεις για τίποτα σχετικά με τα νέα νήματα σε αυτές τις κατηγορίες, και δε θα εμφανίζονται στα τελευταία."
       no_category_access: "Ως συντονιστής έχεις περιορισμένη πρόσβαση στην κατηγορία, η αποθήκευση είναι απενεργοποιημένη."
       delete_account: "Διαγραφή του λογαριασμού μου "
       delete_account_confirm: "Είσαι σίγουρος πως θέλεις να διαγράψεις μόνιμα τον λογαριασμό σου; Αυτή η πράξη είναι μη αναστρέψιμη."
@@ -560,9 +568,9 @@ el:
       delete_yourself_not_allowed: "Δεν μπορείς να διαγράψεις τον λογαριασμό σου αυτή την στιγμή. Επικοινώνησε με έναν διαχειριστή για να τον διαγράψει αυτός για σένα."
       unread_message_count: "Μηνύματα"
       admin_delete: "Διαγραφή"
-      users: "χειριστές"
+      users: "Χρήστες"
       muted_users: "Σε σίγαση"
-      muted_users_instructions: "Αποσιώπησε όλες τις ειδοποιήσεις από αυτούς τους χειριστές"
+      muted_users_instructions: "Αποσιώπησε όλες τις ειδοποιήσεις από αυτούς τους χρήστες."
       muted_topics_link: "Δείξε τα νήματα που είναι σε σίγαση"
       watched_topics_link: "Δείξε τα νήματα που παρακολουθούνται"
       tracked_topics_link: "Δείξτε τα νήματα που παρακολουθούνται"
@@ -595,7 +603,7 @@ el:
         emails: "Emails"
         notifications: "Ειδοποιήσεις"
         categories: "Κατηγορίες"
-        tags: "Εττικέτες"
+        tags: "Ετικέτες"
         interface: "Διεπαφή"
         apps: "Εφαρμογές"
       change_password:
@@ -611,7 +619,7 @@ el:
         error: "Προέκυψε σφάλμα στην αλλαγή της αξίας."
       change_username:
         title: "Αλλαγή χρηστώνυμου"
-        confirm: "Εάν αλλάξεις το όνομα χρήστη σου, όλες οι προηγούμενες παραθέσεις των δημοσιεύσεων σου και οι αναφορές στο @όνομά σου θα χαθούν. Είσαι απόλυτα βέβαιος πως θέλεις;"
+        confirm: "Εάν αλλάξεις το όνομα χρήστη σου, όλες οι προηγούμενες παραθέσεις των αναρτήσεων σου και οι αναφορές στο @όνομά σου θα χαθούν. Είσαι απόλυτα βέβαιος πως θέλεις;"
         taken: "Λυπούμαστε, αυτό το χρηστώνυμο χρησιμοποιείται ήδη."
         invalid: "Αυτό το χρηστώνυμο δεν είναι έγκυρο. Θα πρέπει να αποτελείται μόνο από αριθμούς και γράμματα"
       change_email:
@@ -639,7 +647,7 @@ el:
         instructions: "Οι εικόνες στο φόντο θα κεντραρίζονται και το προκαθορισμένο πλάτος τους είναι 590px."
       email:
         title: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
-        instructions: "Να μην εμφανίζεται ποτέ δημόσια"
+        instructions: "δεν εμφανίζεται ποτέ δημόσια"
         ok: "Για επιβεβαίωση θα σου στείλουμε ένα μήνυμα ηλεκτρονικού ταχυδρομείου"
         invalid: "Παρακαλώ δώσε μία έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου"
         authenticated: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σου ταυτοποιήθηκε από τον πάροχο {{provider}}"
@@ -676,7 +684,7 @@ el:
       last_seen: "Ειδώθηκε"
       created: "Μέλος από"
       log_out: "Αποσύνδεση"
-      location: "Διεύθυνση"
+      location: "Τοποθεσία"
       card_badge:
         title: "Παράσημο καρτέλας χρήστη"
       website: "Ιστοσελίδα"
@@ -684,12 +692,12 @@ el:
       like_notification_frequency:
         title: "Ειδοποίησε με όταν έχω \"μου αρέσει\""
         always: "Πάντα"
-        first_time_and_daily: "Πρώτη φορά που η δημοσίευση έχει \"μου αρέσει\" και καθημερινά"
-        first_time: "Πρώτη φορά που η δημοσίευση έχει \"μου αρέσει\""
+        first_time_and_daily: "Πρώτη φορά που η ανάρτηση έχει \"μου αρέσει\" και καθημερινά"
+        first_time: "Πρώτη φορά που η ανάρτηση έχει \"μου αρέσει\""
         never: "Ποτέ"
       email_previous_replies:
         title: "Συμπερίλαβε προηγούμενες απαντήσεις στο κάτω μέρος των ηλεκτρονικών μηνυμάτων"
-        unless_emailed: "Εάν δεν έχει σταλεί προηγουμένως"
+        unless_emailed: "εάν δεν έχει σταλεί προηγουμένως"
         always: "πάντα"
         never: "ποτέ"
       email_digests:
@@ -697,11 +705,11 @@ el:
         every_30_minutes: "κάθε 30 λεπτά"
         every_hour: "ωριαία"
         daily: "καθημερινά"
-        every_three_days: "Κάθε τρεις μέρες"
+        every_three_days: "κάθε τρεις μέρες"
         weekly: "εβδομαδιαία"
-        every_two_weeks: "Κάθε τρεις μέρες"
+        every_two_weeks: "κάθε δύο εβδομάδες"
       include_tl0_in_digests: "Συμπεριλάμβανε περιεχόμενο από νέους χρήστες σε περιληπτικά μηνύματα"
-      email_in_reply_to: "Συμπερίλαβε ένα απόσπασμα της απάντησης για να το δημοσιεύσεις σέ ηλεκτρονικό μήνυμα"
+      email_in_reply_to: "Συμπεριέλαβε ένα απόσπασμα της απάντησης για να το στείλεις με ηλεκτρονικό μήνυμα"
       email_direct: "Στείλε μου ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν κάποιος παραθέσει ανάρτησή μου, απαντήσει σε ανάρτησή μου, αναφέρει το @username μου ή με προσκαλεί σε ένα νήμα."
       email_private_messages: "Στείλε μου ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν κάποιος που στείλει προσωπικό μήνυμα."
       email_always: "Στείλε μου ειδοποιήσεις μέσω ηλεκτρονικού μηνύματος όταν είμαι ενεργός στην ιστοσελίδα"
@@ -711,10 +719,10 @@ el:
         label: "Τα νήματα να θεωρούνται νέα όταν"
         not_viewed: "Δεν τα έχω δει αυτά ακόμη"
         last_here: "δημιουργήθηκαν από την τελευταία επίσκεψή μου"
-        after_1_day: "δημιουργήθηκε την τελευταία ημέρα"
-        after_2_days: "δημιουργήθηκε τις 2 τελευταίες ημέρες"
+        after_1_day: "δημιουργήθηκαν την τελευταία ημέρα"
+        after_2_days: "δημιουργήθηκαν τις 2 τελευταίες ημέρες"
         after_1_week: "δημιουργήθηκαν την τελευταία εβδομάδα"
-        after_2_weeks: "δημιουργήθηκε τις 2 τελευταίες εβδομάδες"
+        after_2_weeks: "δημιουργήθηκαν τις 2 τελευταίες εβδομάδες"
       auto_track_topics: "Τα νήματα που βλέπω να παρακολουθούνται αυτόματα "
       auto_track_options:
         never: "ποτέ"
@@ -726,7 +734,7 @@ el:
         after_4_minutes: "μετά από 4 λεπτά"
         after_5_minutes: "μετά από 5 λεπτά"
         after_10_minutes: "μετά από 10 λεπτά"
-      notification_level_when_replying: "Όταν δημοσιοποιώ ένα νήμα, τοποθέτησε αυτό το νήμα σε"
+      notification_level_when_replying: "Όταν αναρτώ σε ένα νήμα, τοποθέτησε αυτό το νήμα σε"
       invited:
         search: "γράψε για να αναζητήσεις προσκλήσεις..."
         title: "Προσκλήσεις"
@@ -735,7 +743,7 @@ el:
         none: "Δεν υπάρχουν προσκλήσεις σε εκκρεμότητα να σου δείξω."
         truncated:
           one: "Δείχνοντας την πρώτη πρόσκληση."
-          other: "Δείχνοντας την πρώτη {{count}} προσκλήσεις."
+          other: "Προβάλονται οι πρώτες {{count}} προσκλήσεις."
         redeemed: "Προσκλήσεις που έγιναν αποδεκτές"
         redeemed_tab: "Εξοφλήθηκε"
         redeemed_tab_with_count: "Εξοφλήθηκε ({{count}})"
@@ -744,10 +752,13 @@ el:
         pending_tab: "Σε εκκρεμότητα"
         pending_tab_with_count: "Σε εκκρεμότητα ({{count}})"
         topics_entered: "Νήματα που ειδώθηκαν"
-        posts_read_count: "Διαβασμένες αναρτήσεις"
+        posts_read_count: "Διαβασμένες Αναρτήσεις"
         expired: "Αυτή η πρόσκληση έχει λήξει."
         rescind: "Αναίρεση πρόσκλησης"
         rescinded: "Η πρόσκληση αναιρέθηκε"
+        rescind_all: "Αναίρεσε όλες τις προσκλήσεις"
+        rescinded_all: "Όλες οι προσκλήσεις αναιρέθηκαν!"
+        rescind_all_confirm: "Θέλετε σίγουρα να αναιρέσετε όλες τις προσκλήσεις;"
         reinvite: "Επαναποστολή πρόσκλησης"
         reinvite_all: "Αποστολή ξανά όλων των προσκλήσεων"
         reinvite_all_confirm: "Σίγουρα θέλετε να στείλετε ξανά όλες τις προσκλήσεις;"
@@ -757,9 +768,9 @@ el:
         days_visited: "Μέρες επίσκεψης"
         account_age_days: "Ηλικία λογαριασμού σε μέρες"
         create: "Αποστολή πρόσκλησης"
-        generate_link: "Αντιγραφή Πρόσκληση Σύνδεσμος"
-        link_generated: "Η πρόσκληση του συνδέσμου έγινε επιτυχώς!"
-        valid_for: "Η πρόσκληση συνδέσμου είναι έγκυρη μόνο για τη διεύθυνση ηλεκτρονικού μηνύματος: %{email}"
+        generate_link: "Αντιγραφή Συνδέσμου Πρόσκλησης"
+        link_generated: "Η δημιουργία του συνδέσμου πρόσκλησης έγινε επιτυχώς!"
+        valid_for: "Ο σύνδεσμος πρόσκλησης είναι έγκυρος μόνο για αυτή τη διεύθυνση ηλεκτρονικού μηνύματος: %{email}"
         bulk_invite:
           none: "Δεν έχετε προσκαλέσει κανέναν ακόμα. Στείλτε ατομικές προσκλήσεις, ή καλέστε πολλά άτομα με τη μία <a href='https://meta.discourse.org/t/send-bulk-invites/16468'> μεταφορτώνοντας ένα αρχείο CSV </a>."
           text: "Ομαδική πρόσκληση από αρχείο"
@@ -782,28 +793,28 @@ el:
           other: "τα θέματα δημιουργήθηκαν"
         post_count:
           one: "οι δημοσιεύσεις"
-          other: "οι δημοσιεύσεις δημιουργήθηκαν"
+          other: "αναρτήσεις που δημιουργήθηκαν"
         likes_given:
           one: "<i class='fa fa-heart'></i> δεδομένο"
-          other: "<i class='fa fa-heart'></i> δεδομένο"
+          other: "<i class='fa fa-heart'></i> δόθηκαν"
         likes_received:
           one: "<i class='fa fa-heart'></i> ελήφθη"
-          other: "<i class='fa fa-heart'></i> ελήφθη"
+          other: "<i class='fa fa-heart'></i> ελήφθησαν"
         days_visited:
           one: "ημέρα που επισκέφτηκες"
           other: "ημέρες που επισκέφτηκες"
         posts_read:
           one: "η δημοσίευση διαβάστηκε"
-          other: "οι δημοσιεύσεις διαβάστηκαν"
+          other: "αναρτήσεις που διαβάστηκαν"
         bookmark_count:
           one: "σελιδοδείκτης"
           other: "σελιδοδείκτες"
         top_replies: "Κορυφαίες απαντήσεις"
         no_replies: "Καμία απάντηση ακόμα."
         more_replies: "Περισσότερες Απαντήσεις"
-        top_topics: "Κορυφαία Θέματα"
-        no_topics: "Κανένα θέμα ακόμα."
-        more_topics: "Περισσότερα Θέματα"
+        top_topics: "Κορυφαία Νήματα"
+        no_topics: "Κανένα νήμα ακόμα."
+        more_topics: "Περισσότερα Νήματα"
         top_badges: "Κορυφαία Παράσημα"
         no_badges: "Κανένα παράσημο ακόμα."
         more_badges: "Περισσότερα Παράσημα"
@@ -828,11 +839,11 @@ el:
       stream:
         posted_by: "Αναρτήθηκε από"
         sent_by: "Στάλθηκε από"
-        private_message: "Μήνυμα"
+        private_message: "μήνυμα"
         the_topic: "το νήμα"
     loading: "Φόρτωση... "
     errors:
-      prev_page: "στο ανέβασμα"
+      prev_page: "κατά το φόρτωμα"
       reasons:
         network: "Σφάλμα δικτύου"
         server: "Σφάλμα διακομιστή"
@@ -858,12 +869,12 @@ el:
       enabled: "Αυτή η ιστοσελίδα είναι σε λειτουργία μόνο ανάγνωσης. Παρακαλώ συνέχισε να κάνεις περιήγηση, όμως το να απαντάς να πατάς \"μου αρέσει\" και κάποιες άλλες λειτουργίες δεν είναι διαθέσιμες τώρα."
       login_disabled: "Η δυνατότητα σύνδεσης έχει απενεργοποιηθεί για όσο το φόρουμ είναι σε κατάσταση μόνο ανάγνωσης."
       logout_disabled: "Η αποσύνδεση δεν είναι διαθέσιμη ενώ η ιστοσελίδα είναι σε λειτουργία μόνο ανάγνωσης."
-    too_few_topics_and_posts_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα και <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύεις. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
-    too_few_topics_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν  <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα και <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύεις. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
-    too_few_posts_notice: "Ας <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>ξεκινήσουμε αυτή τη συζήτηση!</a> Υπάρχουν προσωρινά <strong>%{currentPosts} / %{requiredPosts}</strong> δημοσιεύσεις. Οι καινούριοι επισκέπτες χρειάζοντε να διαβάσουν και να απαντήσουν σε μερικές συζητήσεις."
+    too_few_topics_and_posts_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα και <strong>%{currentPosts} / %{requiredPosts}</strong> αναρτήσεις. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
+    too_few_topics_notice: "Ας αρχίσουμε <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'> αυτή την συζήτηση! </a> Υπάρχουν  <strong>%{currentTopics} / %{requiredTopics}</strong> νήματα. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
+    too_few_posts_notice: "Ας <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>ξεκινήσουμε αυτή τη συζήτηση!</a> Υπάρχουν <strong>%{currentPosts} / %{requiredPosts}</strong> αναρτήσεις. Οι νέοι επισκέπτες χρειάζονται κάποιες συνομιλίες για να τις διαβάσουν και να απαντήσουν σε αυτές."
     logs_error_rate_notice:
       reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> έχει φτάσει το ορισμένο όριο της ιστοσελίδας των %{siteSettingRate}."
-      exceeded: "<b>&{relativeAge}</b> - <a href='%{url}' target='_blank'>%{rate}</a> υπερβαίνει το όριο των ρυθμίσεων της ιστοσελίδας %{siteSettingRate}. "
+      exceeded: "<b>%{relativeAge}</b> - <a href='%{url}' target='_blank'>%{rate}</a> υπερβαίνει το όριο των ρυθμίσεων της ιστοσελίδας %{siteSettingRate}. "
       rate:
         one: "1 σφάλματα/%{duration}"
         other: "%{count} σφάλματα/%{duration}"
@@ -889,14 +900,14 @@ el:
       sign_up: "Εγγραφή"
       hide_session: "Υπενθύμιση αύριο"
       hide_forever: "όχι ευχαριστώ"
-      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" και για να δημιουργήσεις ένα λογαριασμό."
-      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις εγγραφεί σε ένα λογαριασμό."
-      value_prop: "Όταν δημιουργείς έναν λογαριασμό, θυμόμαστε ακριβώς τι έχεις διαβάσει, έτσι ώστε πάντα να επιστρέφεις όπου είχες μείνει. Επίσης, λαμβάνεις ειδοποιήσεις, εδώ και μέσω ηλεκτρονικού μηνύματος, κάθε φορά που δημιουργούνται καινούριες δημοσιεύσεις. Και μπορείς να πατήσεις \"μου αρέσει\" στις δημοσιεύσεις για να μοιραστείς την αγάπη. :heartbeat:"
+      hidden_for_session: "Εντάξει, θα σε ρωτήσω αύριο. Μπορείς πάντα να χρησιμοποιείς τη \"Σύνδεση\" για να δημιουργήσεις ένα λογαριασμό."
+      intro: "Γεια σου! :heart_eyes: Φαίνεται να απολαμβάνεις τη συζήτηση, όμως δεν έχεις δημιουργήσει ακόμα δικό σου λογαριασμό."
+      value_prop: "Όταν δημιουργείς έναν λογαριασμό, θυμόμαστε ακριβώς τι έχεις διαβάσει, έτσι ώστε πάντα να επιστρέφεις όπου είχες μείνει. Επίσης, λαμβάνεις ειδοποιήσεις, εδώ και μέσω ηλεκτρονικού μηνύματος, κάθε φορά που δημιουργούνται καινούριες αναρτήσεις. Επίσης μπορείς να πατήσεις \"μου αρέσει\" στις αναρτήσεις για να μοιραστείς την αγάπη. :heartbeat:"
     summary:
-      enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις όπως αυτές καθορίστηκαν από την κοινότητα."
+      enabled_description: "Βλέπεις μια περίληψη αυτού του νήματος: οι πιο ενδιαφέρουσες αναρτήσεις, όπως αυτές καθορίστηκαν από την κοινότητα."
       description: "Υπάρχουν <b>{{replyCount}}</b> απαντήσεις."
       description_time: "Υπάρχουν <b>{{replyCount}}</b> απαντήσεις με εκτιμώμενο χρόνο ανάγνωσης <b>{{readingTime}} λεπτών</b>."
-      enable: 'Κάνε  μια σύνοψη αυτού του νήματος'
+      enable: 'Σύνοψη αυτού του νήματος'
       disable: 'Εμφάνιση όλων των αναρτήσεων'
     deleted_filter:
       enabled_description: "Αυτό το νήμα περιέχει σβησμένες αναρτήσεις, οι οποίες αποκρύπτονται."
@@ -916,7 +927,7 @@ el:
     trust_level: 'Επίπεδο εμπιστοσύνης'
     search_hint: 'χρηστώνυμο, διεύθυνση ηλεκτρονικού ταχυδρομείου ή IP διεύθυνση'
     create_account:
-      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'> πολιτική προστασίας προσωπικών δεδομένων</a> και <ahref='{{tos_link}}'> με τους όρους υπηρεσίας</a>."
+      disclaimer: "Κάνοντας εγγραφή συμφωνείς με την <a href='{{privacy_link}}'>πολιτική προστασίας προσωπικών δεδομένων</a> και <a href='{{tos_link}}'>με τους όρους χρήσης</a>."
       title: "Δημιουργία νέου λογαριασμού"
       failed: "Κάτι πήγε στραβά. Ίσως αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου να είναι ήδη δηλωμένη. Δοκίμασε το σύνδεσμο «ξέχασα τον κωδικό μου»."
     forgot_password:
@@ -943,7 +954,7 @@ el:
       rate_limit: "Παρακαλώ περιμένετε προτού προσπαθήσετε ξανά να συνδεθείτε."
       blank_username_or_password: "Παρακαλώ δώσε την διεύθυνση ηλεκτρονικού ταχυδρομείου σου ή το χρηστώνυμό σου και τον κωδικό πρόσβασής σου."
       reset_password: 'Επαναφορά κωδικού πρόσβασης'
-      logging_in: "Συνδέεσε..."
+      logging_in: "Σύνδεση..."
       or: "Ή"
       authenticating: "Ταυτοποιώ..."
       awaiting_activation: "Ο λογαριασμός σας αναμένει ενεργοποίηση, χρησιμοποιήστε τον σύνδεσμο ξεχασμένου συνθηματικού για δημιουργία νέου email ενεργοποίησης."
@@ -985,9 +996,9 @@ el:
         message: "Ταυτοποίηση μέσω του Github (βεβαιώσου πως δεν έχει ενεργοποιηθεί το μπλοκάρισμα των αναδυόμενων παραθύρων)"
     invites:
       accept_title: "Πρόσκληση"
-      welcome_to: "Καλώς ήλθατε στο %{site_name}!"
+      welcome_to: "Καλώς ήλθατε στην %{site_name}!"
       invited_by: "Προσκληθήκατε από:"
-      social_login_available: "Θα μπορούσατε επίσεις να συνδεθείτε μέσω οποιοδήποτε μέσoυ κοινωνικής δικτύωσης χρησημοποιώντας αυτή την διεύθυνση ηλεκτρονικού ταχυδρομείου."
+      social_login_available: "Μπορείτε επίσης να συνδεθείτε μέσω λογαριασμών κοινωνικής δικτύωσης χρησημοποιώντας αυτή την διεύθυνση ηλεκτρονικού ταχυδρομείου."
       your_email: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου του λογαριασμού σας είναι <b>%{email}</b>."
       accept_invite: "Αποδοχή πρόσκλησης"
       success: "Ο λογαριασμός σας έχει δημιουργηθεί και έχετε συνδεθεί. "
@@ -1000,16 +1011,35 @@ el:
       apple_international: "Apple/Διεθνής"
       google: "Google"
       twitter: "Twitter"
-      emoji_one: "Emoji ένα"
-      win10: "Κερδισαι10"
+      emoji_one: "Emoji One"
+      win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Μόνο Κατηγορίες"
-      categories_with_featured_topics: "Κατηγορίες με Προτεινόμενα Θέματα"
-      categories_and_latest_topics: "Κατηγορίες και Τελευταία Θέματα"
+      categories_with_featured_topics: "Κατηγορίες με Προτεινόμενα Νήματα"
+      categories_and_latest_topics: "Κατηγορίες και Τελευταία Νήματα"
     shortcut_modifier_key:
       shift: ' Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Αναζήτηση για emoji
+      people: Άνθρωποι
+      nature: Φύση
+      food: Τροφή
+      activity: Δραστηριότητα
+      travel: Ταξίδια
+      objects: Αντικείμενα
+      celebration: Γιορτή
+      custom: Προσαρμοσμένα emojis
+      recent: Πρόσφατα χρησιμοποιημένα
+      default_tone: Χωρίς απόχρωση επιδερμίδας
+      light_tone: Λευκή απόχρωση επιδερμίδας
+      medium_light_tone: Ανοιχτόχρωμη απόχρωση επιδερμίδας
+      medium_tone: Καυκάσια απόχρωση επιδερμίδας
+      medium_dark_tone: Μελαμψή απόχρωση επιδερμίδας
+      dark_tone: Σκούρη απόχρωση επιδερμίδας
     composer:
       emoji: "Emoji :)"
       more_emoji: "περισσότερα..."
@@ -1018,8 +1048,8 @@ el:
       unlist: "μη καταχωρημένος"
       blockquote_text: "Blockquote"
       add_warning: "Αυτή είναι μια επίσημη προειδοποίηση."
-      toggle_whisper: "Ανταλλαγή ψιθύρων"
-      toggle_unlisted: "Μεταβάλλω ακαταχώριστα"
+      toggle_whisper: "Εναλλαγή ψιθύρων"
+      toggle_unlisted: "Εναλλαγή ακαταχώρητων"
       posting_not_on_topic: "Σε ποιο νήμα θέλεις να απαντήσεις;"
       saving_draft_tip: "αποθήκευση..."
       saved_draft_tip: "αποθηκεύτηκε"
@@ -1028,7 +1058,7 @@ el:
       drafts_offline: "τοπικά πρόχειρα"
       group_mentioned:
         one: "Αναφέροντας {{group}}, πρόκειται να λάβει ειδοποίηση <a href='{{group_link}}'> 1 άτομο</a> - είσαι βέβαιος;"
-        other: "Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} άνθρωποι</a> - είσαι σίγουρος;"
+        other: "Αναφέροντας το {{group}}, πρόκειται να ειδοποίησεις <a href='{{group_link}}'>{{count}} μέλη</a> - είσαι σίγουρος;"
       cannot_see_mention:
         category: "Ανέφερες το {{username}} αλλά δε θα λάβουν ειδοποίηση, επειδή δεν έχουν πρόσβαση σε αυτή την κατηγορία. Θα πρέπει να τους προσθέσεις σε μια ομάδα που έχει πρόσβαση σε αυτή την κατηγορία."
         private: "Ανέφερες {{username}} αλλά δεν θα λάβουν ειδοποίηση, επειδή δεν μπορούν να δουν αυτό το προσωπικό μήνυμα. Πρέπει να τους προσκαλέσεις σε αυτό το ιδιωτικό μήνυμα."
@@ -1039,14 +1069,14 @@ el:
         title_too_long: "Ο τίτλος δεν μπορεί να έχει πάνω από {{max}} χαρακτήρες"
         post_missing: "Μία ανάρτηση δεν μπορεί να είναι κενή"
         post_length: "Κάθε ανάρτηση πρέπει να περιέχει τουλάχιστον {{min}} χαρακτήρες"
-        try_like: 'Έχεις δοκιμάσει το κουμπί <i class="fa fa-heart"></i> ;'
+        try_like: 'Έχεις δοκιμάσει το κουμπί <i class="fa fa-heart"></i>;'
         category_missing: "Πρέπει να διαλέξεις μια κατηγορία"
       save_edit: "Αποθήκευση Επεξεργασίας"
       reply_original: "Απάντηση στο αρχικό νήμα"
       reply_here: "Απάντησε εδώ"
       reply: "Απάντηση"
       cancel: "Ακύρωση"
-      create_topic: "Δημιουργία Θέματος"
+      create_topic: "Δημιουργία Νήματος"
       create_pm: "Μήνυμα"
       title: "Ή πάτα Ctrl+Enter"
       users_placeholder: "Προσθήκη χρήστη"
@@ -1064,10 +1094,10 @@ el:
       show_preview: 'εμφάνιση της προεπισκόπησης &raquo;'
       hide_preview: '&laquo; απόκρυψη της προεπισκόπησης'
       quote_post_title: "Παράθεση ολόκληρης την ανάρτησης"
-      bold_label: "Β"
+      bold_label: "B"
       bold_title: "Έντονα"
       bold_text: "Έντονη γραφή"
-      italic_label: "Ι"
+      italic_label: "I"
       italic_title: "Έμφαση"
       italic_text: "κείμενο σε έμφαση"
       link_title: "Σύνδεσμος"
@@ -1085,7 +1115,7 @@ el:
       olist_title: "Αριθμημένη λίστα"
       ulist_title: "Κουκίδες"
       list_item: "Στοιχείο Λίστας"
-      heading_label: "Η"
+      heading_label: "H"
       heading_title: "Επικεφαλίδα"
       heading_text: "Επικεφαλίδα"
       hr_title: "Οριζόντια γραμμή"
@@ -1097,7 +1127,7 @@ el:
       yourself_confirm:
         title: "Ξεχάσατε να προσθέσετε αποδέκτες;"
         body: "Αυτή τη στιγμή το ηλεκτρονικό μήνυμα στέλνεται μόνο σε εσάς!"
-      admin_options_title: "Προαιρετικές ρυθμίσεις προσωπικού για αυτό το θέμα"
+      admin_options_title: "Προαιρετικές ρυθμίσεις προσωπικού για αυτό το νήμα"
     notifications:
       title: "ειδοποιήσεις για αναφορές στο @name, απαντήσεις στις αναρτήσεις σου και στα νήματά σου, προσωπικά μηνύματα, κλπ."
       none: "Αυτή τη στιγμή δεν είναι δυνατόν να φορτωθούν οι ειδοποιήσεις."
@@ -1105,7 +1135,7 @@ el:
       more: "Εμφάνιση παλιότερων ειδοποιήσεων"
       total_flagged: "σύνολο επισημασμένων αναρτήσεων"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
-      group_mentioned: "<i title='goup mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p> "
+      group_mentioned: "<i title='group mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       quoted: "<i title='quoted' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
       replied: "<i title='replied' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
       posted: "<i title='posted' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p> "
@@ -1114,7 +1144,7 @@ el:
       liked_2: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}}</span>{{description}}</p> "
       liked_many:
         one: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} και 1 άλλος</span> {{description}}</p>"
-        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} και {{count}}άλλους</span> {{description}}</p> "
+        other: "<i title='liked' class='fa fa-heart'></i><p><span>{{username}}, {{username2}} και {{count}} ακόμα</span> {{description}}</p> "
       private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -1123,7 +1153,7 @@ el:
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p> "
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p> Κέρδισες το παράσημο '{{description}}'</p>"
       topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
-      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Νέο θέμα</span> {{description}}</p> "
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Νέο νήμα</span> {{description}}</p> "
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} μηνύματα στα {{group_name}} εισερχόμενά σου</p>"
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} μηνύματα στα {{group_name}} εισερχόμενά σου</p> "
@@ -1131,67 +1161,67 @@ el:
         mentioned: "Αναφέρθηκε από"
         quoted: "Απόσπασμα από "
         replied: "Απαντήθηκε"
-        posted: "Δημοσίευση από"
-        edited: "Επεξεργασία της δημοσίευσης από"
-        liked: "Η δημοσίευσή σου έχει \"μου αρέσει\""
+        posted: "Ανάρτηση από"
+        edited: "Επεξεργασία της ανάρτησης από"
+        liked: "Η ανάρτησή σου έχει \"μου αρέσει\""
         private_message: "Προσωπικό μήνυμα από"
         invited_to_private_message: "Πρόσκληση σε προσωπικό μήνυμα από"
-        invited_to_topic: "Πρόσκληση σε θέμα από"
+        invited_to_topic: "Προσκλήθηκε στο νήμα από"
         invitee_accepted: "Η πρόσκληση έγινε δεκτή από"
-        moved_post: "Η δημοσίευση σου μετακινήθηκε από"
-        linked: "Σύνδεση στη δημοσίευσή σου"
-        granted_badge: "Χορηγήθηκε σήμα"
+        moved_post: "Η ανάρτησή σου μετακινήθηκε από"
+        linked: "Σύνδεση στη ανάρτησή σου"
+        granted_badge: "Χορηγήθηκε παράσημο"
         group_message_summary: "Μηνύματα στα εισερχόμενα ομάδας"
       popup:
-        mentioned: 'Ο/Η {{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
-        group_mentioned: '{{username}} ανέφερε εσένα σε "{{topic}}" - {{site_title}}'
-        quoted: 'Ο/Η {{username}} σε παράθεσε στο "{{topic}}" - {{site_title}}'
-        replied: 'Ο/Η {{username}} σου απάντησε στο "{{topic}}" - {{site_title}}'
-        posted: 'Ο/Η {{username}} ανάρτησε στο "{{topic}}" - {{site_title}}'
-        private_message: 'Ο/Η {{username}} σου έστειλε ένα προσωπικό μήνυμα στο "{{topic}}" - {{site_title}}'
-        linked: 'Ο/Η {{username}} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "{{topic}}" - {{site_title}}'
+        mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
+        group_mentioned: '{{username}} σε ανέφερε στο "{{topic}}" - {{site_title}}'
+        quoted: '{{username}} σε παράθεσε στο "{{topic}}" - {{site_title}}'
+        replied: '{{username}} σου απάντησε στο "{{topic}}" - {{site_title}}'
+        posted: '{{username}} ανάρτησε στο "{{topic}}" - {{site_title}}'
+        private_message: '{{username}} σου έστειλε ένα προσωπικό μήνυμα στο "{{topic}}" - {{site_title}}'
+        linked: '{{username}} έκανε μια σύνδεση στην ανάρτηση που έκανες στο νήμα "{{topic}}" - {{site_title}}'
     upload_selector:
       title: "Προσθήκη εικόνας"
       title_with_attachments: "Προσθήκη εικόνας ή αρχείου"
       from_my_computer: "Από τη συσκευή μου"
       from_the_web: "Από το διαδίκτυο"
       remote_tip: "υπερσύνδεσμος προς μια εικόνα"
-      remote_tip_with_attachments: "σύνδεσμος σε μια εικόνα ή ένα φάκελο {{authorized_extensions}}"
+      remote_tip_with_attachments: "σύνδεσμος σε εικόνα ή φάκελο {{authorized_extensions}}"
       local_tip: "επιλογή εικόνων από τη συσκευή σου"
       local_tip_with_attachments: "επίλεξε εικόνες ή φακέλους από τη συσκευή σου {{authorized_extensions}}"
       hint: "(μπορείς να τα σύρεις με το ποντίκι στην περιοχή για να τα ανεβάσεις)"
       hint_for_supported_browsers: "μπορείς επίσης να μεταφέρεις ή να επικόλλησεις εικόνες από τον συντάκτη"
       uploading: "Ανεβαίνει"
-      select_file: "Επιλογή Φακέλου"
+      select_file: "Επιλογή Αρχείου"
       image_link: "υπερσύνδεσμος στον οποίο θα δείχνει η εικόνα σου"
     search:
       sort_by: "Ταξινόμηση κατά"
-      relevance: "συνάφεια"
-      latest_post: "Τελευταίες Δημοσιεύσεις"
+      relevance: "Συνάφεια"
+      latest_post: "Τελευταίες Αναρτήσεις"
       latest_topic: "Πρόσφατο Νήμα"
       most_viewed: "Περισσότερες εμφανίσεις"
       most_liked: "Περισσότερα \"μου αρέσει\""
       select_all: "Επιλογή όλων"
       clear_all: "Καθαρισμός όλων"
-      too_short: "Ο όρος στην αναζήτησή σου είναι πολύ μικρός."
+      too_short: "Ο όρος αναζήτησής σου είναι πολύ μικρός."
       result_count:
-        one: "1 αποτέλεσμα για <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} αποτελέσματα για <span class='term'>\"{{term}}\"</span>"
+        one: "1 αποτέλεσμα για <span class='term'>{{term}}</span>"
+        other: "{{count}} αποτελέσματα για <span class='term'>{{term}}</span>"
       title: "ψάξε σε νήματα, αναρτήσεις, χρήστες ή κατηγορίες"
       no_results: "Δε βρέθηκε κάτι."
-      no_more_results: "Δε βρέθηκαν αποτελέσματα"
+      no_more_results: "Δε βρέθηκαν άλλα αποτελέσματα"
       searching: "Ψάχνω ..."
       post_format: "#{{post_number}} από {{username}}"
       results_page: "Αποτελέσματα Αναζήτησης"
       context:
         user: "Ψάξε στις αναρτήσεις του χρήστη @{{username}}"
-        category: "Αναζήτηση στην #{{category}} κατηγορία"
+        category: "Αναζήτηση στην κατηγορία #{{category}} "
         topic: "Ψάξε σε αυτό το νήμα"
         private_messages: "Αναζήτηση στα μηνύματα"
       advanced:
         title: Προηγμένη Αναζήτηση
         posted_by:
-          label: Δημοσιεύθηκε από
+          label: Αναρτήθηκε από
         in_category:
           label: Σε κατηγορία
         in_group:
@@ -1199,16 +1229,16 @@ el:
         with_badge:
           label: Με σήμα
         with_tags:
-          label: Με ετικέτες
+          label: Με Ετικέτες
         filters:
-          label: Να επιστρέψεις μόνο νήματα/δημοσιεύσεις που...
+          label: Να επιστρέψεις μόνο νήματα/αναρτήσεις που...
           likes: Μου αρέσει
-          posted: Δημοσίευσα σε
+          posted: ανάρτησα σε
           watching: Παρακολουθώ
-          tracking: Παρακολουθώ
+          tracking: Ακολουθώ
           private: είναι στα μηνύματα μου
           bookmarks: Έχω βάλει σελιδοδείκτη
-          first: είναι η πρώτη πρώτη δημοσίευση
+          first: είναι η πρώτη πρώτη ανάρτηση
           pinned: καρφιτσώθηκαν
           unpinned: δεν καρφιτσώθηκαν
           seen: Διάβασα
@@ -1216,17 +1246,17 @@ el:
           wiki: ' είναι βίκι'
           all_tags: Πειρέχει όλες τις ετικέτες
         statuses:
-          label: όπου θέματα
+          label: Όπου τα νήματα
           open: είναι ανοιχτά
           closed: είναι κλειστά
           archived: είναι αρχειοθετημένα
           noreplies: έχουν μηδέν απαντήσεις
-          single_user: περιέχει ένα μόνο χρήστη
+          single_user: περιέχουν ένα μόνο χρήστη
         post:
           count:
-            label: Ελάχιστη καταμέτρηση δημοσιεύσεων
+            label: Ελάχιστος αριθμός αναρτήσεων
           time:
-            label: Δημοσιεύθηκε
+            label: Αναρτήθηκε
             before: πριν
             after: μετά
     hamburger_menu: "πήγαινε σε άλλη καταχώρηση νήματος ή κατηγορία"
@@ -1239,33 +1269,36 @@ el:
       bulk:
         select_all: "Επιλογή όλων"
         clear_all: "Καθαρισμός όλων"
-        unlist_topics: "Μη καταχωρημένα θέματα"
-        reset_read: "Επαναφορά διαβασμένων"
-        delete: "Διαγραφή νημάτων"
+        unlist_topics: "Απέκρυψε Νήματα"
+        relist_topics: "Εμφάνισε Νήματα"
+        reset_read: "Μηδενισμός Διαβασμένων"
+        delete: "Διαγραφή Νημάτων"
         dismiss: "Απόρριψη"
         dismiss_read: "Απόρριψη όλων των μη αναγνωσμένων"
         dismiss_button: "Απόρριψη..."
-        dismiss_tooltip: "Απόρριψη μόνο των καινούριων δημοσιεύσεων ή διακοπή των νημάτων που παρακολουθούνται"
-        also_dismiss_topics: "Διακοπή παρακολούθησης αυτών των νημάτων ώστε να μην εμφανιστούν ξανά ως μη αναγνωσμένα σε εμένα"
+        dismiss_tooltip: "Απόρριψη μόνο των νέων αναρτήσεων ή διακοπή των νημάτων που ακολουθούνται"
+        also_dismiss_topics: "Διακοπή ακολούθησης αυτών των νημάτων ώστε να μην εμφανιστούν ξανά ως μη αναγνωσμένα σε εμένα"
         dismiss_new: "Αγνόησε τα νέα"
-        toggle: "μαζική επιλογή νημάτων"
+        toggle: "εναλλαγή μαζικής επιλογής νημάτων"
         actions: "Μαζικές ενέργειες"
-        close_topics: "Κλείσιμο νημάτων"
-        archive_topics: "Αρχειοθέτηση νημάτων"
+        change_category: "Θέσε Κατηγορία"
+        close_topics: "Κλείσιμο Νημάτων"
+        archive_topics: "Αρχειοθέτηση Νημάτων"
+        notification_level: "Ειδοποιήσεις"
         choose_new_category: "Διάλεξε τη νέα κατηγορία για τα νήματα:"
         selected:
           one: "Έχεις διαλέξει <b>1</b> νήμα."
           other: "Έχεις διαλέξει <b>{{count}}</b> νήματα."
-        change_tags: "Αντικατάσταση ετικετών "
-        append_tags: "Προσάρτηση ετικετών "
-        choose_new_tags: "Επίλεξε καινούριες ετικέτες από αυτά τα θέματα:"
+        change_tags: "Αντικατάσταση Ετικετών "
+        append_tags: "Προσάρτηση Ετικετών "
+        choose_new_tags: "Επίλεξε καινούριες ετικέτες για αυτά τα νήματα:"
         choose_append_tags: "Επιλογή νέων ετικετών για την προσάρτηση τους σε αυτά τα νήματα"
-        changed_tags: "Οι ετικέτες αυτών των θεμάτων έχουν αλλάξει."
+        changed_tags: "Οι ετικέτες αυτών των νημάτων έχουν αλλάξει."
       none:
         unread: "Έχεις διαβάσει όλα τα νήματα."
         new: "Δεν υπάρχουν νέα νήματα."
         read: "Δεν έχεις διαβάσει κανένα νήμα ακόμη."
-        posted: "Δεν έχεις αναρτήσει τίποτε ακόμη."
+        posted: "Δεν έχεις αναρτήσει σε κάποιο νήμα ακόμη."
         latest: "Δεν υπάρχουν νεότερα νήματα. Αυτό είναι λυπηρό."
         hot: "Δεν υπάρχουν δημοφιλή νήματα."
         bookmarks: "Δεν έχεις βάλει σελιδοδείκτη σε κανένα νήμα."
@@ -1273,18 +1306,18 @@ el:
         top: "Δεν υπάρχουν κορυφαία νήματα."
         search: "Δεν υπάρχουν αποτελέσματα σε αυτή την αναζήτηση."
         educate:
-          new: '<p>Τα νέα σου θέματα εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα θέματα θεωρούνται καινούρια και θα δείχνουν ένα <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">καινούριο</span> δείκτη εαν έχουν δημιουργηθεί τις τελευταίες 2 μέρες.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
-          unread: '<p>Τα αδιάβαστα νήματά σου εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα νήματα θεωρούνται αδιάβαστα και θα δείχνουν αδιάβαστα <span class="badge new-posts badge-notification">1</span> έαν:</p><ul><li> Δημιούργησες το νήμα</li><li>Απάντησεσ στο νήμα</li><li>Διάβασεσ το νήμα για περισσότερα από 4 λεπτά</li></ul><p>Ή εάν έχεις ορίσει το νήμα να παρακολουθήται μέσω έλεγχο ειδοποιήσης στο κάτω μέρος του κάθε νήματος.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
+          new: '<p>Τα νέα σου νήματα εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα νήματα συζητήσεων θεωρούνται καινούρια και θα δείχνουν ένα <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">καινούριο</span> δείκτη εαν έχουν δημιουργηθεί τις τελευταίες 2 μέρες.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
+          unread: '<p>Τα αδιάβαστα νήματά σου εμφανίζονται εδώ.</p><p>Από προεπιλογή, τα νήματα συζητήσεων θεωρούνται αδιάβαστα και θα δείχνουν αδιάβαστα <span class="badge new-posts badge-notification">1</span> έαν:</p><ul><li> Δημιούργησες το νήμα</li><li>Απάντησες στο νήμα</li><li>Διάβασες το νήμα για περισσότερα από 4 λεπτά</li></ul><p>Ή εάν έχεις ορίσει το νήμα να παρακολουθείται μέσω της επιλογής ειδοποιήσεων στο κάτω μέρος του κάθε νήματος.</p><p>Επισκέψου τις <a href="%{userPrefsUrl}">προτιμήσεις σου</a> για να το αλλάξεις αυτό.</p>'
       bottom:
-        latest: "Αυτά ήταν τα πρόσφατα νήματα."
-        hot: "Αυτά ήταν όλα τα δημοφιλή νήματα."
-        posted: "Αυτά ήταν όλα τα νήματα."
-        read: "Αυτά ήταν όλα τα διαβασμένα νήματα."
-        new: "Αυτά ήταν όλα τα νέα νήματα."
-        unread: "Αυτά ήταν όλα τα αδιάβαστα νήματα."
-        category: "Αυτά ήταν όλα τα νήματα στην κατηγορία {{category}}."
-        top: "Αυτά ήταν όλα τα κορυφαία νήματα."
-        bookmarks: "Αυτά ήταν όλα τα νήματα με σελιδοδείκτη."
+        latest: "Δεν υπάρχουν άλλα πρόσφατα νήματα."
+        hot: "Δεν υπάρχουν άλλα δημοφιλή νήματα."
+        posted: "Δεν υπάρχουν άλλα νήματα."
+        read: "Δεν υπάρχουν άλλα διαβασμένα νήματα."
+        new: "Δεν υπάρχουν άλλα νέα νήματα."
+        unread: "Δεν υπάρχουν άλλα αδιάβαστα νήματα."
+        category: "Δεν υπάρχουν άλλα νήματα στην κατηγορία {{category}}."
+        top: "Δεν υπάρχουν άλλα κορυφαία νήματα."
+        bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
         search: "Δεν υπάρχουν άλλα αποτελέσματα σε αυτή την αναζήτηση."
     topic:
       unsubscribe:
@@ -1292,7 +1325,7 @@ el:
         change_notification_state: "Η τρέχουσα κατάσταση των ειδοποιήσεων σου είναι"
       filter_to:
         one: "1 δημοσίευση σε νήματα"
-        other: "{{count}} δημοσιεύσεις σε νήματα"
+        other: "{{count}} αναρτήσεις σε νήματα"
       create: 'Νέο νήμα'
       create_long: 'Δημιουργία νέου νήματος'
       private_message: 'Ξεκίνα ένα προσωπικό μήνυμα'
@@ -1340,30 +1373,70 @@ el:
       toggle_information: "Εμφάνιση ή απόκρυψη λεπτομερειών νήματος"
       read_more_in_category: "Θέλεις να διαβάσεις περισσότερα; Βρες άλλα νήματα στο {{catLink}} ή {{latestLink}}."
       read_more: "Θέλεις να διαβασεις περισσότερα; {{catLink}} ή {{latestLink}}."
-      read_more_MF: "Έχεις { UNREAD, plural, =0 {} one { is <a href='/unread'>1 αδιάβαστο</a> } other { are <a href='/unread'># αδιάβαστα</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'>1 νέο</a> νήμα} other { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'># νέα</a> νήματα} } ακόμη, ή {CATEGORY, select, true {περιηγήσου σε άλλα νήματα {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Έχεις { UNREAD, plural, =0 {} one { μόνο <a href='/unread'>1 αδιάβαστο</a> } other { <a href='/unread'># αδιάβαστα</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'>1 νέο</a> νήμα} other { {BOTH, select, true{and } false {έχεις } other{}} <a href='/new'># νέα</a> νήματα} } ακόμη, ή {CATEGORY, select, true {περιηγήσου σε άλλα νήματα {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Περιήγηση σε όλες τις κατηγορίες
       view_latest_topics: δες τα πρόσφατα νήματα
       suggest_create_topic: Γιατί δεν φτιάχνεις ένα νέο νήμα;
       jump_reply_up: μετάβαση στην απάντηση που προηγείται
       jump_reply_down: μετάβαση στην  απάντηση που ακολουθεί
       deleted: "Το νήμα έχει διαγραφεί "
+      topic_status_update:
+        title: "Ρύθμιση Χρονοδιακόπτη Νήματος"
+        save: "Ρύθμιση Χρονοδιακόπτη"
+        num_of_hours: "Ώρες:"
+        remove: "Αφαίρεση Χρονοδιακόπτη"
+        publish_to: "Δημοσίευση Σε:"
+        when: "Πότε:"
+      auto_update_input:
+        later_today: "Αργότερα σήμερα"
+        tomorrow: "Αύριο"
+        later_this_week: "Αργότερα αυτή την εβδομάδα"
+        this_weekend: "Αυτό το Σαββατοκύριακο"
+        next_week: "Την άλλη εβδομάδα"
+        next_month: "Τον άλλο μήνα"
+        pick_date_and_time: "Επέλεξε ημερομηνία και ώρα"
+        set_based_on_last_post: "Κλείσε ανάλογα με την τελευταία ανάρτηση"
+      publish_to_category:
+        title: "Χρονοδιάγραμμα Αναρτήσεων"
+      temp_open:
+        title: "Ανοιχτό Προσωρινά"
+      auto_reopen:
+        title: "Αυτόματο άνοιγμα νήματος"
+      temp_close:
+        title: "Κλειστό Προσωρινά"
+      auto_close:
+        title: "Αυτόματο κλείσιμο νήματος"
+        label: "Ώρες αυτόματου κλεισίματος νήματος:"
+        error: "Παρακαλώ εισάγετε μια έγκυρη αξία."
+        based_on_last_post: "Να μην κλείσει μέχρι η τελευταία ανάρτηση στο νήμα να είναι τόσο παλιά."
+      auto_delete:
+        title: "Αυτόματη διαγραφή νήματος"
+      reminder:
+        title: "Υπενθύμισέ Με"
+      status_update_notice:
+        auto_open: "Αυτό το νήμα θα ανοίξει αυτόματα σε %{timeLeft}."
+        auto_close: "Αυτό το νήμα θα κλείσει αυτόματα σε %{timeLeft}."
+        auto_publish_to_category: "Αυτό το νήμα θα αναρτηθεί στην κατηγορία <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
+        auto_close_based_on_last_post: "Αυτό το νήμα θα κλείσει σε %{duration} μετά την τελευταία απάντηση."
+        auto_delete: "Αυτό το νήμα θα διαγραφεί αυτόματα σε %{timeLeft}."
+        auto_reminder: "Θα λάβεις υπενθύμιση σχετικά με αυτό το νήμα σε %{timeLeft}."
       auto_close_title: 'Ρυθμίσεις για το αυτόματο κλείσιμο'
       auto_close_immediate:
         one: "Η τελευταία δημοσίευση στο νήμα είναι ήδη 1 ώρα παλιό, έτσι το νήμα θα κλείσει αμέσως."
-        other: "Η τελευταία δημοσίευση είναι ήδη %{count} ώρες παλιό, έτσι το νήμα θα κλείσει αμέσως."
+        other: "Η τελευταία ανάρτηση είναι ήδη %{count} ώρες παλιά, έτσι το νήμα θα κλείσει αμέσως."
       timeline:
         back: "Πίσω"
-        back_description: "Πήγαινε πίσω στην τελευταία μη αναγνωσμένη δημοσιεύση"
+        back_description: "Πήγαινε πίσω στην τελευταία μη αναγνωσμένη ανάρτηση"
         replies_short: "%{current} / %{total}"
       progress:
         title: πρόοδος νήματος
         go_top: "αρχή"
         go_bottom: "τέλος"
         go: "πάμε"
-        jump_bottom: "μεταπήδηση στην τελευταία δημοσίευση"
+        jump_bottom: "μεταπήδηση στην τελευταία ανάρτηση"
         jump_prompt: "μεταπήδηση σε..."
-        jump_prompt_of: "των %{count} δημοσιεύσεων"
-        jump_prompt_long: "Σε ποια δημοσίευση θα ήθελες να μεταπηδήσεις;"
+        jump_prompt_of: "των %{count} αναρτήσεων"
+        jump_prompt_long: "Σε ποια ανάρτηση θα ήθελες να μεταπηδήσεις;"
         jump_bottom_with_number: "μετάβαση στην ανάρτηση %{post_number}"
         total: σύνολο αναρτήσεων
         current: τρέχουσα ανάρτηση
@@ -1371,12 +1444,16 @@ el:
         title: άλλαξε το πόσο συχνά ειδοποιείσαι για αυτό το θέμα
         reasons:
           mailing_list_mode: "Έχεις ενεργοποιημένη τη λειτουργία λίστας αποδεκτών αλληλογραφίας, έτσι θα λαμβάνεις ενημερώσεις για τις απαντήσεις για το νήμα μέσω ηλεκτρονικών μηνυμάτων."
-          '3_10': 'Θα λάβεις ειδοποιήσεις, επειδή παρακολουθείς μια ετικέτα πάνω σε αυτό το θέμα.'
+          '3_10': 'Θα λάβεις ειδοποιήσεις, επειδή παρακολουθείς μια ετικέτα πάνω σε αυτό το νήμα.'
           '3_6': 'Θα λαμβάνεις ειδοποιήσεις επειδή παρακολουθείς αυτή την κατηγορία.'
           '3_5': 'Θα λαμβάνεις ειδοποιήσεις επειδή ξεκίνησες να παρακολουθείς αυτόματα αυτό το νήμα.'
           '3_2': 'Θα λαμβάνεις ειδοποιήσεις επειδή παρακολουθείς αυτό το νήμα.'
           '3_1': 'Θα λαμβάνεις ειδοποιήσεις επειδή δημιούργησες αυτό το νήμα.'
           '3': 'Θα λαμβάνεις ειδοποιήσεις επειδή παρακολουθείς αυτό το νήμα.'
+          '2_8': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή ακολουθείς αυτήν την κατηγορία.'
+          '2_4': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή απάντησες σε αυτό το νήμα.'
+          '2_2': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή ακολουθείς αυτό το νήμα.'
+          '2': 'Θα βλέπεις έναν μετρητή νέων απαντήσεων επειδή <a href="/u/{{username}}/preferences">διάβασες αυτό το νήμα</a>.'
           '1_2': 'Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
           '1': 'Θα λαμβάνεις ειδοποιήσεις, εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα.'
           '0_7': 'Θα αγνοούνται όλες οι ειδοποιήσεις από αυτή την κατηγορία.'
@@ -1387,7 +1464,7 @@ el:
           description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια απάντηση σε αυτό το μήνυμα, και το πλήθος των καινούριων απαντήσεων θα εμφανίζεται."
         watching:
           title: "Παρατηρείται"
-          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια απάντηση σε αυτό το νήμα, και καταμέτρηση καινούριων απαντήσεων θα εμφανίζεται."
+          description: "Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια απάντηση σε αυτό το νήμα και ένας μετρητής νέων απαντήσεων θα εμφανίζεται."
         tracking_pm:
           title: "Παρακολουθείται"
           description: "Το πλήθος των καινούριων απαντήσεων θα εμφανίζεται για αυτό το μήνυμα. Θα λαμβάνεις ειδοποιήσεις εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα."
@@ -1412,6 +1489,7 @@ el:
         open: "Νέο νήμα"
         close: "Κλείσε το νήμα"
         multi_select: "Διάλεξε αναρτήσεις..."
+        timed_update: "Θέσε τον χρονοδιακόπτη του νήματος..."
         pin: "Καρφίτσωσε το νήμα..."
         unpin: "Ξεκαρφίτσωσε το νήμα..."
         unarchive: "Επανέφερε το νήμα από το αρχείο"
@@ -1419,8 +1497,8 @@ el:
         invisible: "Κάντο αόρατο"
         visible: "Κάντο ορατό"
         reset_read: "Επαναφορά «διαβασμένων»"
-        make_public: "Κάνε Δημόσιο το θέμα"
-        make_private: "Γράψε προσωπικό μήνυμα"
+        make_public: "Κάνε Δημόσιο το νήμα"
+        make_private: "Κάνε Προσωπικό Μήνυμα"
       feature:
         pin: "Καρφίτσωσε το νήμα"
         unpin: "Ξεκαρφίτσωσε το νήμα"
@@ -1429,7 +1507,7 @@ el:
         remove_banner: "Να αφαιρεθεί η ιδιότητα του νήματος ανακοίνωσης"
       reply:
         title: 'Απάντηση'
-        help: 'Ξεκινήστε να συνθέτετε μια απάντηση σε αυτό το θέμα'
+        help: 'ξεκινήστε να συνθέτετε μια απάντηση σε αυτό το νήμα'
       clear_pin:
         title: "Ξεκαρφίτσωμα"
         help: "Ξεκαρφίτσωσε αυτό το νήμα ώστε να μην εμφανίζεται πια στην κορυφή της λίστας."
@@ -1444,26 +1522,26 @@ el:
         help: 'Επισήμανε αυτό το νήμα στους συντονιστές ή στείλε ένα προσωπικό μήνυμα για αυτό.'
         success_message: 'Σήμανες αυτό το νήμα.'
       feature_topic:
-        title: "Το νήμα να γίνει προεξέχον"
+        title: "Θέσε το νήμα σε προβολή"
         pin: "Το νήμα αυτό να εμφανίζεται στην κορυφή της {{categoryLink}} κατηγορίας μέχρι"
         confirm_pin: "Υπάρχουν ήδη {{count}} καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις ακόμη ένα νήμα σε αυτή την κατηγορία;"
         unpin: "Απομάκρυνε το νήμα από την κορυφή της κατηγορίας {{categoryLink}}."
         unpin_until: "Απομάκρυνε το νήμα από την κορυφή της {{categoryLink}} κατηγορίας ή περίμενε μέχρι <strong>%{until}</strong>."
         pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν αυτό το νήμα ο καθένας για τον εαυτό του."
-        pin_validation: "Απαιτείται ημερομηνία για να καρφιτσώσεις το θέμα."
+        pin_validation: "Απαιτείται ημερομηνία για να καρφιτσώσεις το νήμα."
         not_pinned: "Δεν υπάρχουν νήματα καρφιτσωμένα σε {{categoryLink}}."
         already_pinned:
           one: "Νήματα προσωρινά καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
           other: "Νήματα προσωρινά καρφιτσωμένα σε {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Εμφάνισε αυτό το νήμα στην κορυφή όλων των καταχωρήσεων νημάτων μέχρι"
         confirm_pin_globally: "Υπάρχουν ήδη {{count}} καθολικά καρφιτσωμένα νήματα. Τόσα πολλά καρφιτσωμένα νήματα μπορεί να είναι υπερβολικός φόρτος για νέους και ανώνυμους χρήστες. Θες στ' αλήθεια να καρφιτσώσεις καθολικά ακόμη ένα νήμα;"
-        unpin_globally: "Αφαίρεσε αυτό το θέμα από την κορυφή όλων των λίστων θεμάτων"
+        unpin_globally: "Αφαίρεσε αυτό το νήμα από την κορυφή όλων των λίστων νημάτων"
         unpin_globally_until: "Απομάκρυνε το νήμα από την κορυφή όλων των καταχωρήσεων των νημάτων ή περίμενε μέχρι <strong>%{until}</strong>."
         global_pin_note: "Οι χρήστες μπορούν να ξεκαρφιτσώσουν το νήμα ο καθένας για τον εαυτό του."
-        not_pinned_globally: "Δεν υπάρχουν καρφιτσωμένα θέματα παγκοσμίως."
+        not_pinned_globally: "Δεν υπάρχουν καθολικά καρφιτσωμένα νήματα."
         already_pinned_globally:
           one: "Τα νήματα πρόσφατα καρφιτσώθηκαν παγκοσμίως:<strong class='badge badge-notification unread'>1</strong>"
-          other: "Τα νήματα πρόσφατα καρφιτσώθηκαν παγκοσμίως: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Πρόσφατα καθολικά καρφιτσωμένα νήματα: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Αυτό το νήμα να γίνει νήμα ανακοίνωσης που θα φαίνεται στην αρχή όλων των σελίδων."
         remove_banner: "Απομακρύνει το νήμα ανακοίνωσης από την αρχή όλων των σελίδων."
         banner_note: "Οι χρήστες μπορούν να κλείσουν την ανακοίνωση έτσι ώστε να μην εμφανίζεται σε αυτούς. Ένα μόνο νήμα μπορεί να είναι νήμα ανακοίνωσης κάθε φορά."
@@ -1490,12 +1568,13 @@ el:
         sso_enabled: "Δώσε το χρηστώνυμο του προσώπου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
         to_topic_blank: "Δώσε το χρηστώνυμο ή τη διεύθυνση ηλεκτρονικού ταχυδρομείου του προσώπου που θα ήθελες να προσκαλέσεις σε αυτό το νήμα."
         to_topic_email: "Έδωσες μια διεύθυνση ηλεκτρονικού ταχυδρομείου. Θα στείλουμε μια πρόσκληση που θα επιτρέπει στον παραλήπτη να απαντήσει απευθείας σε αυτό το νήμα."
-        to_topic_username: "Έχεις εισαγάγει όνομα χρήστη. Θα σου στείλουμε ειδοποίηση με ένα σύνδεσμο προσκαλώντας τους σε αυτό το νήμα."
-        to_username: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις. Θα σου στείλουμε ειδοποίηση με ένα σύνδεσμο προσκαλώντας τους σε αυτό το νήμα."
+        to_topic_username: "Έχεις εισαγάγει όνομα χρήστη. Θα του στείλουμε ειδοποίηση με ένα σύνδεσμο προσκαλώντας τον σε αυτό το νήμα."
+        to_username: "Δώσε το όνομα χρήστη του ατόμου που θα ήθελες να προσκαλέσεις. Θα του στείλουμε ειδοποίηση με ένα σύνδεσμο προσκαλώντας τον σε αυτό το νήμα."
         email_placeholder: 'name@example.com'
         success_email: "Στείλαμε μια πρόσκληση στον/στην <b>{{emailOrUsername}}</b>. Θα σε ειδοποιήσουμε όταν η πρόσκληση γίνει αποδεκτή. Στη σελίδα του προφίλ σου μπορείς να παρακολουθήσεις την εξέλιξη όλων των προσκλήσεών σου."
         success_username: "Προσκαλέσαμε τον χρήστη να συμμετέχει σε αυτό το νήμα."
         error: "Λυπούμαστε αλλά δεν μπορέσαμε να προσκαλέσουμε αυτό το πρόσωπο. Μήπως έχει ήδη προσκληθεί; (ο ρυθμός αποστολής προσκλήσεων είναι περιορισμένος)"
+        success_existing_email: "Ο χρήστης με email <b>{{emailOrUsername}}</b> υπάρχει ήδη. Προσκαλέσαμε αυτόν τον χρήστης να συμμετέχει στο νήμα."
       login_reply: 'Συνδέσου για να απαντήσεις'
       filters:
         n_posts:
@@ -1518,9 +1597,9 @@ el:
           one: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις την ανάρτηση."
           other: "Παρακαλώ επίλεξε το νήμα στο οποίο θέλεις να μεταφέρεις τις <b>{{count}}</b> αυτές αναρτήσεις."
       merge_posts:
-        title: "Συγχώνευσε επιλεγμένες δημοσιεύσεις"
-        action: "συγχώνευσε επιλεγμένες δημοσιεύσεις"
-        error: "Προέκυψε σφάλμα κατά τη συγχώνευση των επιλεγμένων δημοσιεύσεων."
+        title: "Συγχώνευσε επιλεγμένες αναρτήσεις"
+        action: "συγχώνευσε επιλεγμένες αναρτήσεις"
+        error: "Προέκυψε σφάλμα κατά τη συγχώνευση των επιλεγμένων αναρτήσεων."
       change_owner:
         title: "Άλλαξε τους ιδιοκτήτες των αναρτήσεων"
         action: "Αλλαγή ιδιοκτήτη"
@@ -1530,16 +1609,17 @@ el:
         instructions:
           one: "Παρακαλώ επίλεξε τον νέο ιδιοκτήτη της ανάρτησης του <b>{{old_user}}</b>."
           other: "Παρακαλώ επίλεξε τον νέο ιδιοκτήτη των {{count}} αναρτήσεων του <b>{{old_user}}</b>."
-        instructions_warn: "Έχε υπόψη πως δεν θα μεταφερθούν αναδρομικά όλες οι ειδοποιήσεις για αυτή την ανάρτηση στο νέο χρήστη.<br/>Προειδοποίηση: Τώρα κανένα δεδομένο σχετικό με την ανάρτηση δε θα μεταφερθεί στο νέο χρήστη. Χρησιμοποίησέ το με προσοχή."
+        instructions_warn: "Τυχόν ειδοποιήσεις σχετικές με την ανάρτηση δεν θα μεταφερθούν στον νέο χρήστη.<br>Προειδοποίηση: Στην παρούσα φάση κανένα δεδομένο σχετικό με την ανάρτηση δε θα μεταφερθεί στο νέο χρήστη. Χρησιμοποίησέ το με προσοχή."
       change_timestamp:
+        title: "Αλλαγή Χρονοσήμανσης..."
         action: "αλλαγή χρονοσήμανσης"
         invalid_timestamp: "Η χρονοσήμανση δεν μπορεί να υπάρξει στο μέλλον."
         error: "Προέκυψε σφάλμα κατά την αλλαγή χρονοσήμανσης του νήματος."
-        instructions: "Παρακαλώ επίλεξε τη νέα χρονοσήμανση του νήματος. Οι δημοσιεύσεις του νήματος θα ενημερωθούν να έχουν την ίδια διαφορά ώρας."
+        instructions: "Παρακαλώ επίλεξε τη νέα χρονοσήμανση του νήματος. Οι αναρτήσεις του νήματος θα ενημερωθούν ώστε να έχουν την ίδια διαφορά ώρας."
       multi_select:
         select: 'επίλεξε'
         selected: 'επιλεγμένες ({{count}})'
-        select_replies: 'επίλεξε και συμπερίλαβε τις απαντήσεις'
+        select_replies: 'επίλεξε +replies'
         delete: διαγραφή επιλεγμένων
         cancel: ακύρωση επιλογής
         select_all: επιλογή όλων
@@ -1550,12 +1630,12 @@ el:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      quote_reply: "Φράση"
+      quote_reply: "Παράθεση"
       edit: "Επεξεργασία του {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "Αιτία:"
       post_number: "ανάρτηση {{number}}"
       wiki_last_edited_on: "το βίκι επεξεργάστηκε τελευταία φορά στις"
-      last_edited_on: "Η τελευταία φορά που άλλαξε η ανάρτηση ήταν "
+      last_edited_on: "η ανάρτηση  επεξεργάστηκε τελευταία φορά στις"
       reply_as_new_topic: "Απάντηση με διασυνδεδεμένο νήμα"
       reply_as_new_private_message: "Απάντηση ως νέο μήνυμα στον ίδιο παραλήπτη"
       continue_discussion: "Συνέχιση της συζήτησης από το {{postLink}}:"
@@ -1578,33 +1658,33 @@ el:
         other: "{{count}} \"Μου αρέσει\""
       has_likes_title:
         one: "1 άτομο πάτησε \"μου αρέσει\" στη δημοσίευση"
-        other: "{{count}} άτομα που πάτησαν \"Μου αρέσει\" στη δημοσίευση"
-      has_likes_title_only_you: "Σου αρέσει αυτή η δημοσίευση"
+        other: "{{count}} άτομα πάτησαν \"Μου αρέσει\" στην ανάρτηση"
+      has_likes_title_only_you: "σου αρέσει αυτή η ανάρτηση"
       has_likes_title_you:
         one: "εσύ και 1 άλλο άτομο πάτησε \"Μου αρέσει\" στη δημοσίευση"
-        other: "εσύ και {{count}} άλλα άτομα πατήσατε \"Μου αρέσει\" στη δημοσίευση"
+        other: "εσύ και {{count}} ακόμα άτομα πατήσατε \"Μου αρέσει\" στην ανάρτηση"
       errors:
         create: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την δημιουργία της ανάρτησης. Προσπάθησε πάλι."
         edit: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά την επεξεργασία της ανάρτησης. Προσπάθησε πάλι."
         upload: "Λυπούμαστε, παρουσιάστηκε σφάλμα κατά το ανέβασμα του αρχείου. Προσπάθησε πάλι."
-        file_too_large: "Λυπούμαστε, αυτός ο φάκελος είναι πολύ μεγάλος (το μέγιστο μέγεθος είναι {{max_size_kb}}kb). Γιατί δεν μεταφορτώνεις τον μεγάλο σου φάκελο σε μια υπηρεσία ανταλλαγής cloud κι έπειτα να μοιραστείς τον σύνδεσμο;"
+        file_too_large: "Λυπούμαστε, αυτό το αρχείο είναι πολύ μεγάλο (το μέγιστο μέγεθος είναι {{max_size_kb}}kb). Γιατί δεν μεταφορτώνεις το αρχείο σου σε μια υπηρεσία ανταλλαγής αρχείων κι έπειτα να μοιραστείς τον σύνδεσμο;"
         too_many_uploads: "Λυπούμαστε, μπορείς να ανεβάζεις μόνο ένα αρχείο τη φορά."
-        too_many_dragged_and_dropped_files: "Λυπούμαστε, μπορείς να ανεβάσεις μόνο 10 φακέλους τη φορά."
-        upload_not_authorized: "Λυπούμαστε, ο φάκελος που προσπαθείς να ανεβάσεις δεν επιτρέπεται (επιτρεπόμενες επεκτάσεις:{{authorized_extensions}})"
-        image_upload_not_allowed_for_new_user: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να ανεβάζουν εικόνες."
-        attachment_upload_not_allowed_for_new_user: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να ανεβάζουν συννημένα."
-        attachment_download_requires_login: "Λυπούμαστε, για να κατεβάζεις συνημμένα πρέπει πρώτα να συνδεθείς."
+        too_many_dragged_and_dropped_files: "Λυπούμαστε, μπορείς να ανεβάσεις μόνο 10 αρχεία τη φορά."
+        upload_not_authorized: "Λυπούμαστε, το αρχείο που προσπαθείς να ανεβάσεις δεν επιτρέπεται (επιτρεπόμενες επεκτάσεις:{{authorized_extensions}})"
+        image_upload_not_allowed_for_new_user: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να ανεβάσουν εικόνες."
+        attachment_upload_not_allowed_for_new_user: "Λυπούμαστε, οι νέοι χρήστες δεν μπορούν να επισυνάψουν αρχεία."
+        attachment_download_requires_login: "Λυπούμαστε, για να κατεβάσεις συνημμένα αρχεία, πρέπει πρώτα να συνδεθείς."
       abandon:
         confirm: "Σίγουρα θέλεις να απορρίψεις την ανάρτησή σου;"
         no_value: "Όχι, κράτησέ τη"
         yes_value: "Ναί, απέρριψέ τη"
       via_email: "αυτή η ανάρτηση έγινε μέσω ηλεκτρονικού ταχυδρομείου"
-      via_auto_generated_email: "αυτή η δημοσίευση έφτασε μέσω ενός ηλεκτρονικού μηνύματος που δημιουργήθηκε αυτόματα"
-      whisper: "αυτή η δημοσίευση λέγεται εμπιστευτικά στους συντονιστές"
+      via_auto_generated_email: "αυτή η ανάρτηση έφτασε μέσω ενός ηλεκτρονικού μηνύματος που δημιουργήθηκε αυτόματα"
+      whisper: "αυτή η ανάρτηση είναι εμπιστευτική προς τους συντονιστές"
       wiki:
-        about: "αυτή η δημοσίευση είναι βίκι"
+        about: "αυτή η ανάρτηση είναι βίκι"
       archetypes:
-        save: 'Αποθήκευση επιλογών'
+        save: 'Αποθήκευση Επιλογών'
       few_likes_left: "Ευχαριστούμε που μοιράστηκες την αγάπη σου! Έχεις μόνο μερικά \"μου αρέσει\" ακόμα να χρησιμοποιήσεις σήμερα."
       controls:
         reply: "απάντησε σε αυτή την ανάρτηση"
@@ -1612,8 +1692,9 @@ el:
         has_liked: "αυτή η ανάρτηση σου αρέσει"
         undo_like: "δεν «μου αρέσει» πια"
         edit: "επεξεργασία ανάρτησης"
+        edit_action: "Επεξεργασία"
         edit_anonymous: "Λυπούμαστε, αλλά για να επεξεργαστείς αυτή την ανάρτηση πρέπει πρώτα να συνδεθείς."
-        flag: "Ανάφερε αυτή την ανάρτηση στους συντονιστές ή στείλε ένα προσωπικό μήνυμα"
+        flag: "ανάφερε την ανάρτηση στους συντονιστές ή στείλε ένα προσωπικό μήνυμα σχετικά με αυτή"
         delete: "Σβήσε αυτή την ανάρτηση"
         undelete: "επανάφερε αυτή την ανάρτηση "
         share: "κοινοποίησε έναν σύνδεσμο προς αυτή την ανάρτηση "
@@ -1624,14 +1705,14 @@ el:
             other: "Θέλεις επίσης να σβήσεις τις {{count}} άμεσες απαντήσεις σε αυτή την ανάρτηση;"
           yes_value: "Ναι, σβήσε και τις απαντήσεις"
           no_value: "Όχι, μόνο αυτή την ανάρτηση"
-        admin: "Δράσεις διαχειριστών"
+        admin: "ενέργειες διαχειριστή ανάρτησης"
         wiki: "Δημιουργία βίκι"
         unwiki: "Αφαίρεση βίκι"
         convert_to_moderator: "Πρόσθεσε χρωματισμό στους συνεργάτες"
         revert_to_regular: "Αφαίρεσε το χρωματισμό από τους συνεργάτες"
         rebake: "Ανανέωση HTML"
         unhide: "Επανεμφάνιση"
-        change_owner: "Αλλαγή ιδιοκτησίας"
+        change_owner: "Αλλαγή Ιδιοκτησίας"
       actions:
         flag: 'Επισήμανση'
         defer_flags:
@@ -1642,7 +1723,7 @@ el:
           spam: "Αναίρεση σήμανσης"
           inappropriate: "Αναίρεση σήμανσης"
           bookmark: "Αφαίρεση σελιδοδείκτη"
-          like: "δεν «μου αρέσει» πια"
+          like: "Αναίρεση «μου αρέσει»"
           vote: "Αναίρεση ψήφου"
         people:
           off_topic: "μαρκαρισμένο σαν εκτός θέματος"
@@ -1650,9 +1731,9 @@ el:
           inappropriate: "μαρκαρισμένο σαν ακατάλληλο"
           notify_moderators: "ειδοποιήθηκαν οι συντονιστές"
           notify_user: "έστειλε ένα μήνυμα"
-          bookmark: "του έβαλαν σελιδοδείκτη"
-          like: "Σου άρεσε αυτό"
-          vote: "Ψήφισες για αυτό"
+          bookmark: "του έβαλε σελιδοδείκτη"
+          like: "άρεσε αυτό"
+          vote: "ψήφισε  αυτό"
         by_you:
           off_topic: "Το επισήμανες σαν εκτός θέματος"
           spam: "Το επισήμανες σαν ανεπιθύμητο"
@@ -1677,13 +1758,13 @@ el:
             other: "Εσύ και άλλοι {{count}}  το επισημάνατε στους συντονιστές"
           notify_user:
             one: "Εσύ και ένα ακόμη πρόσωπο στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
-            other: "Εσύ και {{count}} άλλοι στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
+            other: "Εσύ και άλλοι {{count}} στείλατε ένα μήνυμα σε αυτόν τον χρήστη"
           bookmark:
             one: "Εσύ και άλλος ένας τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
             other: "Εσύ και άλλοι {{count}} τοποθετήσατε σελιδοδείκτη στην ανάρτηση"
           like:
             one: "Εσένα και ενός άλλου «σας άρεσε»"
-            other: "Εσένα και {{count}} άλλων «σας άρεσε»"
+            other: "Εσένα και άλλους {{count}} «σας άρεσε»"
           vote:
             one: "Εσύ και άλλος ένας ψηφίσατε για την ανάρτηση"
             other: "Εσύ και άλλοι {{count}} ψηφίσατε για την ανάρτηση"
@@ -1702,7 +1783,7 @@ el:
             other: "{{count}} άτομα το επισημάνανε στους συντονιστές"
           notify_user:
             one: "1 πρόσωπο έστειλε ένα μήνυμα σε αυτόν τον χρήστη"
-            other: "{{count}} πρόσωπα έστειλαν ένα μήνυμα σε αυτόν τον χρήστη"
+            other: "{{count}} άτομα έστειλαν ένα μήνυμα σε αυτόν τον χρήστη"
           bookmark:
             one: "Ένα άτομο τοποθέτησε σελιδοδείκτη στην ανάρτηση"
             other: "{{count}} άτομα τοποθέτησαν σελιδοδείκτη στην ανάρτηση"
@@ -1716,6 +1797,10 @@ el:
         confirm:
           one: "Είσαι σίγουρος ότι θέλεις να σβήσεις αυτή την ανάρτηση;"
           other: "Είσαι σίγουρος ότι θέλεις να σβήσεις όλες αυτές τις αναρτήσεις;"
+      merge:
+        confirm:
+          one: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις δημοσιεύσεις;"
+          other: "Είσαι σίγουρος πως θέλεις να συγχωνεύσεις αυτές τις {{count}} αναρτήσεις;"
       revisions:
         controls:
           first: "Πρώτη αναθεώρηση"
@@ -1724,19 +1809,19 @@ el:
           last: "Τελευταία αναθεώρηση"
           hide: "Κρύψε την αναθεώρηση"
           show: "Εμφάνισε την αναθεώρηση"
-          revert: "Επιστροφή στην αναθεώρηση"
-          edit_wiki: "Επεξεργασία της Wiki"
-          edit_post: "Επεξεργασία δημοσίευσης"
+          revert: "Επιστροφή σε αυτήν την αναθεώρηση"
+          edit_wiki: "Επεξεργασία του Βίκι"
+          edit_post: "Επεξεργασία Ανάρτησης"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> /{{total}}"
         displays:
           inline:
-            title: "Δείξε τις αλλαγές ανάμεσα στο κείμενο"
+            title: "Δείξε το τελικό κείμενο με τις αλλαγές και προσθηκες ενσωματωμένες σε αυτό"
             button: 'HTML'
           side_by_side:
             title: "Δείξε τις αλλαγές δίπλα στο κείμενο"
             button: 'HTML'
           side_by_side_markdown:
-            title: "Δείξε τα αρχικά κείμενα δίπλα-δίπλα για σύγκριση"
+            title: "Δείξε το αρχικό κείμενο δίπλα-δίπλα για σύγκριση"
             button: 'Ακατέργαστο'
       raw_email:
         displays:
@@ -1759,22 +1844,24 @@ el:
       view: 'Δείξε τα νήματα αυτής της κατηγορίας'
       general: 'Γενικά'
       settings: 'Ρυθμίσεις'
-      topic_template: "Δείγμα νήματος"
+      topic_template: "Πρότυπο Νήματος"
       tags: "Ετικέτες"
+      tags_allowed_tags: "Επέτρεψε μόνο σε αυτές τις ετικέτες να χρησιμοποιηθούν σε αυτή την κατηγορία."
+      tags_allowed_tag_groups: "Επέτρεψε μόνο ετικέτες από αυτές τις ομάδες να χρησιμοποιηθούν σε αυτή την κατηγορία."
       tags_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ετικετών"
-      tag_groups_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ετικετών σε ομάδες"
+      tag_groups_placeholder: "(Προαιρετική) λίστα επιτρεπόμενων ομάδων ετικετών"
       topic_featured_link_allowed: "Επίτρεψε προτεινόμενους συνδέσμους σε αυτή την κατηγορία"
       delete: 'Διαγραφή κατηγορίας'
       create: 'Νέα κατηγορία'
-      create_long: 'Δημιουργία καινούριας κατηγορίας'
+      create_long: 'Δημιουργία νέας κατηγορίας'
       save: 'Αποθήκευση κατηγορίας'
-      slug: 'Μνημονικό για το URL'
+      slug: 'Φιλικό Όνομα Κατηγορίας'
       slug_placeholder: '(Προαιρετικά) με λέξεις ενωμένες με παύλα για το URL'
       creation_error: Παρουσιάστηκε κάποιο σφάλμα κατά την δημιουργία της κατηγορίας
       save_error: Παρουσιάστηκε κάποιο σφάλμα κατά την αποθήκευση της κατηγορίας.
       name: "Όνομα κατηγορίας"
       description: "Περιγραφή"
-      topic: "Κατηγορία νήματος"
+      topic: "νήμα κατηγορίας"
       logo: "Εικονίδιο κατηγορίας"
       background_image: "Εικόνα φόντου κατηγορίας"
       badge_colors: "Χρώματα παράσημου"
@@ -1794,15 +1881,16 @@ el:
       email_in: "Προσαρμοσμένη διεύθυνση για εισερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου:"
       email_in_allow_strangers: "Αποδοχή μηνυμάτων ηλεκτρονικού ταχυδρομείου από ανώνυμους χρήστες, χωρίς λογαριασμούς"
       email_in_disabled: "Η δημιουργία νέων νημάτων μέσω ηλεκτρονικού ταχυδρομείου είναι απενεργοποιημένη στις ρυθμίσεις. Για να επιτραπεί η δημιουργία νέων νημάτων μέσω ηλεκτρονικού ταχυδρομείου,"
-      email_in_disabled_click: 'ενεργοποίσε τη ρύθμιση «είσοδος με ηλ. ταχυδρομείο»'
+      email_in_disabled_click: 'ενεργοποίσε τη ρύθμιση «εισερχόμενα email».'
       suppress_from_homepage: "Αποσιώπηση αυτής της κατηγορίας από την αρχική σελίδα."
-      show_subcategory_list: "Προβολή υποκατηγοριών κάτω απο τα νήματα αυτής της κατηγορίας "
+      show_subcategory_list: "Προβολή λίστας υποκατηγοριών πάνω απο τα νήματα αυτής της κατηγορίας "
       num_featured_topics: "Αριθμός νημάτων που εμφανίζονται στην σελίδα κατηγοριών:"
       subcategory_num_featured_topics: "Αριθμός προτεινόμενων νημάτων στην σελίδα της γονικής κατηγορίας:"
       all_topics_wiki: "Φτιάξε καινούρια νήματα βίκι από προεπιλογή. "
       subcategory_list_style: "Στυλ λίστας υποκατηγορίας:"
       sort_order: "Ταξινόμηση λίστας νημάτων κατά:"
       default_view: "Προκαθορισμένη λίστα νημάτων:"
+      default_top_period: "Προκαθόρισμένο χρονικό διάστημα κορυφαίων νημάτων:"
       allow_badges_label: "Να επιτρέπεται η απονομή παράσημων σε αυτή την κατηγορία"
       edit_permissions: "Επεξεργασία δικαιωμάτων"
       add_permission: "Προσθήκη δικαιώματος"
@@ -1815,13 +1903,13 @@ el:
       notifications:
         watching:
           title: "Παρατηρείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια δημοσίευση, και το πλήθος των νέων απαντήσεων θα εμφανίζεται."
+          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις για κάθε καινούρια ανάρτηση και το πλήθος των νέων απαντήσεων θα εμφανίζεται."
         watching_first_post:
-          title: "Παρακολούθηση πρώτης δημοσίευσης"
-          description: "Θα λαμβάνεις ειδοποίηση μόνο για την πρώτη δημοσίευση των καινούριων θεμάτων σε αυτές τις κατηγορίες."
+          title: "Παρακολούθηση πρώτης ανάρτησης"
+          description: "Θα λαμβάνεις ειδοποίηση μόνο για την πρώτη ανάρτηση για κάθε νέο νήμα σε αυτές τις κατηγορίες."
         tracking:
-          title: "Παρακολουθείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις, εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα, και το πλήθος των νέων απαντήσεων θα εμφανίζεται."
+          title: "Ακολουθείται"
+          description: "Θα ακολουθείς αυτόματα όλα τα νήματα σε αυτές τις κατηγορίες. Θα λαμβάνεις ειδοποιήσεις, εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε εσένα, και το πλήθος των νέων απαντήσεων θα εμφανίζεται."
         regular:
           title: "Φυσιολογικά"
           description: "Θα ειδοποιείσαι εάν κάποιος αναφέρει το @όνομά σου ή απαντά σε εσένα."
@@ -1831,11 +1919,11 @@ el:
       sort_options:
         default: "προεπιλογή"
         likes: "Αρέσει"
-        op_likes: "Πρωτότυπο Δημοσίευση \"Μου αρέσει\""
+        op_likes: "\"Μου αρέσει\" Αρχικής Ανάρτησης"
         views: "Προβολές"
-        posts: "Δημοσιεύσεις"
+        posts: "Αναρτήσεις"
         activity: "Δραστηριότητα"
-        posters: "Αφίσες"
+        posters: "Συμμετέχοντες"
         category: "Κατηγορία"
         created: "Δημιουργήθηκε"
       sort_ascending: 'Αύξουσα'
@@ -1852,7 +1940,7 @@ el:
       notify_action: 'Μήνυμα'
       official_warning: 'Επίσημη Προειδοποίηση'
       delete_spammer: "Διαγραφή του ανεπιθύμητου χρήστη"
-      delete_confirm_MF: "Πρόκειται να διαγράψεις {POSTS, plural, one {<b>1</b> post} άλλα {<b>#</b> δημοσιεύσεις}} και{TOPICS,plural, one {<b>1</b> topic} άλλα {<b>#</b> topics}} από το χρήστη, αφαίρεσε το λογαριασμό τους, μπλόκαρε τις εγγραφές από τη διεύθυνση IP <b>{ip_address}</b>, και πρόσθεσε τη διεύθυνση του ηλεκτρονικού ταχυδρομείου τους <b>{email}</b> σε μια μόνιμη καταχώρηση μπλοκαρισμένων. Είσαι βέβαιος πως αυτός ο χρήστης είναι ανεπιθύμητος;"
+      delete_confirm_MF: "Πρόκειται να διαγράψεις {POSTS, plural, one {<b>1</b> ανάρτηση} other {<b>#</b> αναρτήσεις}} και{TOPICS,plural, one {<b>1</b> νήμα} other {<b>#</b> νήματα}} από το χρήστη, να διαγράψεις τον λογαριασμό του, να απαγορεύσεις τις εγγραφές από τη διεύθυνση IP <b>{ip_address}</b> και να πρόσθεσεις την διεύθυνση email <b>{email}</b> στην λίστα ανεπιθύμητων. Είσαι βέβαιος πως αυτός ο χρήστης είναι ανεπιθύμητος;"
       yes_delete_spammer: "Ναι, σβήσε τον ανεπιθύμητο χρήστη"
       ip_address_missing: "(μη διαθέσιμο)"
       hidden_email_address: "(κρυφό)"
@@ -1872,24 +1960,24 @@ el:
           other: "βάλε τουλάχιστον {{count}} χαρακτήρες"
         more:
           one: "1 να πας..."
-          other: "{{count}} να πας..."
+          other: "{{count}} ακόμα..."
         left:
           one: "1 απομένει"
-          other: "{{count}} απομένει"
+          other: "{{count}} απομένουν"
     flagging_topic:
       title: "Ευχαριστούμε για τη συνεισφρορά σου..."
       action: "Επισήμανση του νήματος"
       notify_action: "Μήνυμα"
     topic_map:
       title: "Περίληψη νήματος"
-      participants_title: "Συχνές δημοσιεύσεις"
+      participants_title: "Συχνοί Συμμετέχοντες"
       links_title: "Δημοφιλείς Σύνδεσμοι"
-      links_shown: "εμφάνισε περισσότερες συνδέσεις"
+      links_shown: "εμφάνισε περισσότερους συνδέσμους..."
       clicks:
         one: "1 κλικ"
         other: "%{count} κλικ"
     post_links:
-      about: "επέκτεινε περισσότερους συνδέσμους για αυτή τη δημοσίευση"
+      about: "ανάπτυξε περισσότερους συνδέσμους για αυτή την ανάρτηση"
       title:
         one: "1 περισσότερο"
         other: "%{count} περισσότερα"
@@ -1901,28 +1989,28 @@ el:
       locked:
         help: "Αυτό το νήμα είναι πια κλειστό. Οι απαντήσεις δεν είναι πλέον δυνατές"
       archived:
-        help: "Αυτό το νήμα είναι αρχικοποιημένο. Έχει παγώσει και δεν μπορεί πλέον να τροποποιηθεί"
+        help: "Αυτό το νήμα είναι αρχειοθετημένο. Έχει παγώσει και δεν μπορεί πλέον να τροποποιηθεί"
       locked_and_archived:
-        help: "Αυτό το θέμα είναι κλειστό και αρχειοθετημένο. Δε δέχεται πια καινούριες απαντήσεις και δεν μπορεί να αλλάξει."
+        help: "Αυτό το νήμα είναι κλειστό και αρχειοθετημένο. Δε δέχεται πια καινούριες απαντήσεις και δεν μπορεί να αλλάξει."
       unpinned:
         title: "Ξεκαρφιτσωμένο"
         help: "Για σένα αυτό το νήμα είναι ξεκαρφιτσωμένο. Θα εμφανίζεται στην κανονική του σειρά."
       pinned_globally:
-        title: "Παντού καρφιτσωμένο"
-        help: "Αυτό το νήμα είναι καρφιτσωμένο παγκοσμίως. Θα εμφανίζεται στην κορυφή των τελευταίων και στην κατηγορία του"
+        title: "Καρφιτσωμένο Καθολικά"
+        help: "Αυτό το νήμα είναι καρφιτσωμένο καθολικά. Θα εμφανίζεται στην κορυφή των τελευταίων και στην κατηγορία του"
       pinned:
         title: "Καρφιτσωμένο"
         help: "Αυτό το νήμα είναι καρφιτσωμένο για σένα. Θα εμφανίζεται πάντα στην κορυφή της κατηγορίας του "
       invisible:
-        help: "Αυτό το νήμα είναι αόρατο. Δε θα εμφανίζεται σε καμια λίστα νημάτων και μπορεί να φάνε μόνο αν ακολουθήσεις ένα άμεσο σύνδεσμο προς αυτό."
+        help: "Αυτό το νήμα είναι αόρατο. Δε θα εμφανίζεται σε καμια λίστα νημάτων και μπορεί να εμφανιστεί μόνο αν ακολουθήσεις ένα άμεσο σύνδεσμο προς αυτό."
     posts: "Αναρτήσεις"
     posts_long: "υπάρχουν {{number}} αναρτήσεις σε αυτό το νήμα"
     posts_likes_MF: |
       Αυτό το νήμα έχει {count, plural, one {1 απάντηση} other {# απαντήσεις}} {ratio, select,
-      χαμηλό {με μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-      μέτριο {με πολύ μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
-      ψηλό
-      {με εξαιρετικά μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις} other {}}
+      low {με μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
+      med {με πολύ μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
+      high {με εξαιρετικά μεγάλη αναλογία «μου αρέσει» στις αναρτήσεις}
+      other {}}
     original_post: "Αρχική ανάρτηση"
     views: "Προβολές"
     views_lowercase:
@@ -1951,7 +2039,7 @@ el:
     categories_list: "Λίστα κατηγοριών"
     filters:
       with_topics: "%{filter} νήματα"
-      with_category: "%{filter}ε νήματα στην %{category}"
+      with_category: "%{filter} %{category} νήματα"
       latest:
         title: "Τελευταία"
         title_with_count:
@@ -1959,7 +2047,7 @@ el:
           other: "Τελευταία ({{count}})"
         help: "νήματα με πρόσφατες αναρτήσεις"
       hot:
-        title: "Δημοφιλές"
+        title: "Δημοφιλή"
         help: "μια επιλογή από δημοφιλή νήματα"
       read:
         title: "Διαβασμένο"
@@ -1985,7 +2073,7 @@ el:
           one: "1 νέο"
           other: "{{count}} νέα"
         lower_title: "νέο"
-        title: "Καινούριο"
+        title: "Νέο"
         title_with_count:
           one: "Νέα (1)"
           other: "Νέα ({{count}})"
@@ -2008,20 +2096,20 @@ el:
         all:
           title: "Από πάντα"
         yearly:
-          title: "Ανά έτος"
+          title: "Ετήσια"
         quarterly:
-          title: "Τριμηνιαία έκδοση"
+          title: "Τριμηνιαία"
         monthly:
           title: "Ανά μήνα"
         weekly:
-          title: "Ανά εβδομάδα"
+          title: "Εβδομαδιαία"
         daily:
           title: "Ανά μέρα"
         all_time: "Από πάντα"
         this_year: "Χρόνος"
         this_quarter: "Τέταρτο"
         this_month: "Μήνας"
-        this_week: "εβδομάδα"
+        this_week: "Εβδομάδα"
         today: "Σήμερα"
         other_periods: "δες τα κορυφαία"
     browser_update: 'Δυστυχώς, <a href="http://www.discourse.org/faq/#browser">το πρόγραμμα περιήγησής σου είναι πολύ παλιό για να δουλέψει σε αυτό τον ιστότοπο</a>. Παρακαλώ <a href="http://browsehappy.com">ενημέρωσέ το</a>.'
@@ -2032,7 +2120,7 @@ el:
     lightbox:
       download: "λήψη"
     keyboard_shortcuts_help:
-      title: 'Συντόμευση Πληκτρολογίου'
+      title: 'Συντομεύσεις Πληκτρολογίου'
       jump_to:
         title: 'Μεταπήδηση σε'
         home: '<b>g</b>, <b>h</b> Αρχική'
@@ -2046,40 +2134,40 @@ el:
         messages: '<b>g</b>, <b>m</b> Μηνύματα'
       navigation:
         title: 'Πλοήγηση'
-        jump: '<b>#</b> Πήγαινε στη δημοσίευση #'
+        jump: '<b>#</b> Πήγαινε στην ανάρτηση #'
         back: '<b>u</b> Πίσω'
         up_down: '<b>k</b>j</b> Μετακίνηση επιλογής &uarr; &darr;'
-        open: '<b>o</b> ή <b>Εισαγωγή</b> Άνοιξε το επιλεγμένο νήμα'
+        open: '<b>o</b> ή <b>Enter</b> Άνοιξε το επιλεγμένο νήμα'
         next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Επόμενη/Προηγούμενη ενότητα'
       application:
         title: 'Εφαρμογή'
-        create: 'Δημιουργία νέου νήματος'
+        create: '<b>c</b> Δημιουργία νέου νήματος'
         notifications: '<b>n</b> Άνοιγμα ειδοποιήσεων'
         hamburger_menu: '<b>=</b>''Ανοιξε το μενού χάμπουρκερ'
         user_profile_menu: '<b>p</b> Άνοιγμα του μενού του χρήστη'
         show_incoming_updated_topics: '<b>.</b> Εμφάνιση ενημερωμένων νημάτων'
         search: '<b>/</b> Αναζήτηση'
         help: '<b>?</b> Εμβάνισε τη βοήθεια πληκτρολογίου'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Αγνόησε νέα νήματα/αναρτήσεεις'
-        dismiss_topics: '<b>x</b>, <b>t</b> Απόρριψη νημάτων'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Απόρριψη Νέων/Αναρτήσεων'
+        dismiss_topics: '<b>x</b>, <b>t</b> Απόρριψη Νημάτων'
         log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Αποσύνδεση'
       actions:
         title: 'Δράσεις'
-        bookmark_topic: 'Τοποθέτηση σελιδοδείκτη στο νήμα'
+        bookmark_topic: '<b>f</b> Εναλλαγή σελιδοδείκτη στο νήμα'
         pin_unpin_topic: '<b>shift</b>+<b>p</b> Καρφίτσωμα/Ξεκαρφίτσωμα νήματος'
         share_topic: '<b>shift</b>+<b>s</b> Κοινοποίηση νήματος'
-        share_post: '<b>s</b> Κοινοποίηση δημοσίευσης'
+        share_post: '<b>s</b> Κοινοποίηση ανάρτησης'
         reply_as_new_topic: '<b>t</b> Απάντηση σαν συνδεδεμένο νήμα'
         reply_topic: '<b>shift</b>+<b>r</b> Απάντηση στο νήμα'
-        reply_post: '<b>r</b> Απάντηση στη δημοσίευση'
-        quote_post: '<b>q</b> Παράθεση δημοσίευσης'
-        like: '<b>I</b> "Μου αρέσει" η δημοσίευση'
-        flag: '<b>!</b> Επισήμανση δημοσίευσης'
-        bookmark: '<b>b</b> Τοποθέτηση σελιδοδείκτη στη δημοσίευση'
-        edit: '<b>e</b> Επεξεργασία δημοσίευσης'
+        reply_post: '<b>r</b> Απάντηση στην ανάρτηση'
+        quote_post: '<b>q</b> Παράθεση ανάρτησης'
+        like: '<b>I</b> "Μου αρέσει" η ανάρτηση'
+        flag: '<b>!</b> Επισήμανση ανάρτησης'
+        bookmark: '<b>b</b> Τοποθέτηση σελιδοδείκτη στην ανάρτηση'
+        edit: '<b>e</b> Επεξεργασία ανάρτησης'
         delete: '<b>d</b> Διαγραφή ανάρτησης'
         mark_muted: '<b>m</b>, <b>m</b> Σίγαση νήματος'
-        mark_regular: '<b>m</b>, <b>r</b> Κανονικό (προεπιλογμένο) νήμα'
+        mark_regular: '<b>m</b>, <b>r</b> Κανονικό (προεπιλογή) νήμα'
         mark_tracking: '<b>m</b>, <b>t</b> Παρακολούθηση νήματος'
         mark_watching: '<b>m</b>, <b>w</b> Παρατήρηση νήματος'
         print: '<b>ctrl</b>+<b>p</b> Εκτύπωση νήματος'
@@ -2090,6 +2178,8 @@ el:
       granted_on: "Χορηγήθηκε στις %{date}"
       others_count: "Άλλοι με αυτό το παράσημο (%{count})"
       title: Παράσημα
+      allow_title: "Μπορείς να χρησιμοποιήσεις αυτό το παράσημο σαν τίτλο"
+      multiple_grant: "Μπορείς να το κερδίσεις πολλές φορές"
       badge_count:
         one: "1 Παράσημο"
         other: "%{count} Παράσημα"
@@ -2111,100 +2201,99 @@ el:
         other:
           name: Άλλο
         posting:
-          name: Δημοσιεύεται
+          name: Αναρτάται
     google_search: |
       <h3>Αναζήτηση στο Google</h3>
       <p>
-      <form action='//google.com/search' id='google-search'
-      onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
       <input type="text" id='user-query' value="">
       <input type='hidden' id='google-query' name="q">
-      <button class="btn btn-primary"> Google</button>
+      <button class="btn btn-primary">Google</button>
       </form>
       </p>
     tagging:
       all_tags: "Όλες οι Ετικέτες"
       selector_all_tags: "όλες οι ετικέτες"
       selector_no_tags: "καμία ετικέτα"
-      changed: "οι ετικέτες άλλαξαν"
+      changed: "αλλαγμένες ετικέτες:"
       tags: "Ετικέτες"
       choose_for_topic: "επίλεξε προαιρετικές ετικέτες για αυτό το νήμα"
       delete_tag: "Αφαίρεση Ετικέτας"
       delete_confirm: "Είσαι σίγουρος πως θέλεις να αφαιρέσεις την ετικέτα;"
       rename_tag: "Μετονομασία Ετικέτας"
       rename_instructions: "Επίλεξε ένα καινούριο όνομα για την ετικέτα:"
-      sort_by: "Ταξινόμηση κατά"
-      sort_by_count: "μετρώ"
+      sort_by: "Ταξινόμηση κατά:"
+      sort_by_count: "άθροισμα"
       sort_by_name: "όνομα"
       manage_groups: "Διαχείριση Ομάδων Ετικέτας"
       manage_groups_description: "Καθορισμός ομάδων για την οργάνωση ετικετών"
       filters:
         without_category: "%{filter} %{tag} νήματα"
-        with_category: "%{filter} %{tag} θέματα στην %{category}"
+        with_category: "%{filter} %{tag} νήματα στην %{category}"
         untagged_without_category: "%{filter} νήματα χωρίς ετικέτες"
         untagged_with_category: "%{filter} νήματα χωρίς ετικέτες σε %{category}"
       notifications:
         watching:
           title: "Παρακολούθηση"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Θα λαμβάνεις ειδοποιήσεις όλων των καινούριων δημοσιεύσεων και νημάτων, και το πλήθος των μη αναγνωσμένων και καινούριων δημοσιεύσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
+          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Θα λαμβάνεις ειδοποιήσεις όλων των καινούριων αναρτήσεων και νημάτων και το πλήθος των μη αναγνωσμένων και καινούριων δημοσιεύσεων θα εμφανίζεται επίσης δίπλα στο νήμα."
         watching_first_post:
-          title: "Παρακολούθηση πρώτης δημοσίευσης"
-          description: "Θα λαμβάνεις ειδοποιήσεις μόνο για την πρώτη δημοσίευση του κάθε καινούριου νήματος με αυτή την ετικέτα."
+          title: "Παρακολούθηση πρώτης ανάρτησης"
+          description: "Θα λαμβάνεις ειδοποιήσεις για την πρώτη ανάρτηση για κάθε νέο νήμα με αυτή την ετικέτα."
         tracking:
           title: "Παρακολουθείται"
-          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Το πλήθος των μη αναγνωσμένων δημοσιεύσεων θα εμφανίζεται δίπλα στο νήμα."
+          description: "Θα παρακολουθείς αυτόματα όλα τα νήματα με αυτή την ετικέτα. Το πλήθος των μη αναγνωσμένων αναρτήσεων θα εμφανίζεται δίπλα στο νήμα."
         regular:
           title: "Κανονικός"
-          description: "Θα λαμβάνεις ειδοποίηση εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε αυτή τη δημοσίευση."
+          description: "Θα λαμβάνεις ειδοποίηση εάν κάποιος αναφέρει το @όνομά σου ή απαντήσει σε αυτή τη ανάρτηση."
         muted:
           title: "Σίγαση"
           description: "Δε θα λαμβάνεις ειδοποιήσεις για οτιδήποτε σχετικά με τα καινούρια νήματα με αυτή την ετικέτα, και δε θα εμφανίζονται στην καρτέλα με τα μη αναγνωσμένα."
       groups:
-        title: "Ομάδες ετικέτας"
-        about: "Πρόσθεσε ετικέτες στις ομάδες για να τις διαχειριστείς με περισσότερη ευκολία."
+        title: "Ομάδες Ετικετών"
+        about: "Πρόσθεσε ετικέτες σε ομάδες για να τις διαχειριστείς με περισσότερη ευκολία."
         new: "Καινούρια ομάδα"
         tags_label: "Ετικέτες σε αυτή την ομάδα:"
         parent_tag_label: "Μητρική Ετικέτα:"
         parent_tag_placeholder: "Προαιρετικό"
         parent_tag_description: "Οι ετικέτες από αυτή την ομάδα δεν μπορούν να χρησιμοποιηθούν αν δεν είναι παρούσα η μητρική ετικέτα."
         one_per_topic_label: "Περιορισμός μιας ετικέτας για κάθε νήμα από αυτή την ομάδα"
-        new_name: "Νέα ομαδική ετικέτα"
+        new_name: "Νέα Ομάδα Ετικετών"
         save: "Αποθήκευση"
         delete: "Διαγραφή"
-        confirm_delete: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτή την ομαδική ετικέτα;"
+        confirm_delete: "Είσαι βέβαιος πως θέλεις να διαγράψεις αυτή την ομάδα ετικετών;"
       topics:
         none:
           unread: "Δεν υπάρχουν μη αναγνωσμένα νήματα."
           new: "Δεν υπάρχουν νέα νήματα."
           read: "Δεν έχεις διαβάσει κανένα νήμα ακόμα."
-          posted: "Δεν έχεις δημοσιεύσει σε κανένα νήμα ακόμα."
+          posted: "Δεν έχεις αναρτήσει σε κανένα νήμα ακόμα."
           latest: "Δεν υπάρχουν τελευταία νήματα."
           hot: "Δεν υπάρχουν δημοφιλή νήματα."
           bookmarks: "Δεν υπάρχουν νήματα με σελιδοδείκτη ακόμα."
           top: "Δεν υπάρχουν κορυφαία νήματα."
           search: "Δεν υπάρχουν αποτελέσματα από την αναζήτηση."
         bottom:
-          latest: "Δεν υπάρχουν πια τελευταία νήματα."
+          latest: "Δεν υπάρχουν άλλα τελευταία νήματα."
           hot: "Δεν υπάρχουν άλλα κορυφαία μυνήματα"
-          posted: "Δεν υπάρχουν πια νήματα που έχουν δημοσιευθεί."
-          read: "Δεν υπάρχουν πια διαβασμένα νήματα."
-          new: "Αυτά ήταν όλα τα νέα νήματα."
-          unread: "Δεν υπάρχουν πια μη αναγνωσμένα νήματα."
-          top: "Δεν υπάρχουν πια κορυφαία νήματα."
-          bookmarks: "Δεν υπάρχουν πια νήματα με σελιδοδείκτη."
-          search: "Δεν υπάρχουν αποτελέσματα για αυτή την αναζήτηση."
+          posted: "Δεν υπάρχουν άλλα νήματα που έχουν δημοσιευθεί."
+          read: "Δεν υπάρχουν άλλα διαβασμένα νήματα."
+          new: "Δεν υπάρχουν άλλα νέα νήματα."
+          unread: "Δεν υπάρχουν άλλα μη αναγνωσμένα νήματα."
+          top: "Δεν υπάρχουν άλλα κορυφαία νήματα."
+          bookmarks: "Δεν υπάρχουν άλλα νήματα με σελιδοδείκτη."
+          search: "Δεν υπάρχουν άλλα αποτελέσματα για αυτή την αναζήτηση."
     invite:
-      custom_message: "Κάνε την πρόσκλησή σου λίγο πιο προσωπική γράφοντας ένα/μια"
+      custom_message: "Κάνε την πρόσκλησή σου λίγο πιο προσωπική γράφοντας ένα"
       custom_message_link: "προσαρμοσμένο μήνυμα"
       custom_message_placeholder: "Πρόσθεσε το προσαρμοσμένο μήνυμά σου"
-      custom_message_template_forum: "Γεια, θα πρέπει να λάβεις μέρος σε αυτό το φόρουμ/χώρο συζητήσεων!"
+      custom_message_template_forum: "Γεια, θα πρέπει να λάβεις μέρος σε αυτό το χώρο συζητήσεων!"
       custom_message_template_topic: "Γεια, νομίζω ότι θα απολαύσεις αυτό το νήμα!"
     safe_mode:
       enabled: "Η λειτουργία ασφαλείας είναι ενεργοποιημένη, για να εξέλθεις από τη λειτουργία ασφαλείας κλείσε το παράθυρο περιήγησης"
   admin_js:
     type_to_filter: "γράψε εδώ για φιλτράρισμα..."
     admin:
-      title: 'Διαχειριστής του Discourse'
+      title: 'Διαχειριστής'
       moderator: 'Συντονιστής'
       dashboard:
         title: "Πίνακας ελέγχου"
@@ -2226,7 +2315,7 @@ el:
         moderators: 'Συντονιστές: '
         admins: 'Διαχειριστές:'
         blocked: 'Αποκλεισμένοι:'
-        suspended: 'Αποκλεισμένα:'
+        suspended: 'Αποβλημένοι:'
         private_messages_short: "Μνμτ."
         private_messages_title: "Μηνύματα"
         mobile_title: "Κινητό"
@@ -2269,37 +2358,37 @@ el:
         agree_flag_restore_post_title: "Επανάφερε την ανάρτηση"
         agree_flag: "Συμφωνώ με τη επισήμανση "
         agree_flag_title: "Συμφωνώ με την επισήμανση και κρατάω την ανάρτηση αμετάβλητη"
-        defer_flag: "Παρέπεμψέ το"
+        defer_flag: "Αναβολή"
         defer_flag_title: "Αφαίρεσε αυτή την επισήμανση. Δεν χρειάζεται να γίνει κάποια ενέργεια αυτή τη στιγμή"
-        delete: "Σβήστη"
-        delete_title: "Σβήσε την ανάρτηση στην οποία αναφέρεται αυτή η επισήμανση."
-        delete_post_defer_flag: "Σβήσε την ανάρτηση και αγνόησε την επισήμανση"
-        delete_post_defer_flag_title: "Σβήσε την ανάρτηση. Αν είναι η πρώτη στο νήμα, σβήστο και αυτό"
-        delete_post_agree_flag: "Σβήσε την ανάρτηση και συμφώνησε με την επισήμανση"
-        delete_post_agree_flag_title: "Σβήσε την ανάρτηση. Αν είναι η πρώτη, σβήστο και αυτό"
-        delete_flag_modal_title: "Σβήσε και..."
+        delete: "Διαγραφή"
+        delete_title: "Διέγραψε την ανάρτηση στην οποία αναφέρεται αυτή η επισήμανση."
+        delete_post_defer_flag: "Διέγραψε την ανάρτηση και ανέβαλε την επισήμανση"
+        delete_post_defer_flag_title: "Διέγραψε την ανάρτηση. Αν είναι η πρώτη στο νήμα, διέγραψε και αυτό"
+        delete_post_agree_flag: "Διέγραψε την ανάρτηση και συμφώνησε με την επισήμανση"
+        delete_post_agree_flag_title: "Διέγραψε την ανάρτηση. Αν είναι η πρώτη στο νήμα, διέγραψε και αυτό"
+        delete_flag_modal_title: "Διέγραψε και..."
         delete_spammer: "Διαγραφή ανεπιθύμητου χρήστη"
         delete_spammer_title: "Διέγραψε το χρήστη και όλες τις αναρτήσεις και τα νήματά του"
         disagree_flag_unhide_post: "Διαφωνώ (εμφάνισε την ανάρτηση)"
         disagree_flag_unhide_post_title: "Απόρριψε όλες τις επισημάνσεις για την ανάρτηση και κάντη και πάλι ορατή"
-        disagree_flag: "Απόρριψη"
-        disagree_flag_title: "Απόρριψε την επισήμανση ως άκυρη ή εσφαλμένη"
+        disagree_flag: "Διαφωνώ"
+        disagree_flag_title: "Αρνήσου την επισήμανση ως άκυρη ή εσφαλμένη"
         clear_topic_flags: "Έγινε"
         clear_topic_flags_title: "Το νήμα ελέγχθηκε και τα προβλήματα επιλύθηκαν. Κάνε κλίκ στο «έγινε» για να αφαιρέσεις τις επισημάνσεις."
         more: "(περισσότερες απαντήσεις...)"
         dispositions:
-          agreed: "συμφωνώ"
-          disagreed: "απορρίπτω"
-          deferred: "αγνοώ"
-        flagged_by: "Επισημάνθηκε από τον"
-        resolved_by: "Επιλύθηκα από τον"
-        took_action: "Αντέδρασε"
+          agreed: "συμφώνησε"
+          disagreed: "διαφώνησε"
+          deferred: "ανέβαλε"
+        flagged_by: "Επισημάνθηκε από"
+        resolved_by: "Επιλύθηκε από"
+        took_action: "Ενήργησε"
         system: "Σύστημα"
         error: "Κάτι πήγε λάθος"
         reply_message: "Απάντηση"
         no_results: "Δεν υπάρχουν επισημάνσεις."
         topic_flagged: "Αυτό το <strong>νήμα</strong> έχει επισημανθεί."
-        visit_topic: "Επισκέψου το νήμα για να αντιδράσεις"
+        visit_topic: "Επισκέψου το νήμα για να ενεργήσεις"
         was_edited: "Η ανάρτηση έχει υποστεί επεξεργασία μετά την πρώτη επισήμανση"
         previous_flags_count: "Αυτό το νήμα έχει επισημανθεί ήδη {{count}} φορές"
         summary:
@@ -2336,7 +2425,8 @@ el:
         add_members: "Προσθήκη μελών"
         custom: "Προσαρμοσμένο"
         bulk_complete: "Οι χρήστες έχουν προστεθεί στην ομάδα."
-        bulk: "Προσθήκη ομαδικής αποστολής αλληλογραφίας σε ομάδα"
+        bulk_complete_users_not_added: "Αυτοί οι χρήστες δεν προστέθηκαν (βεβαιώσου ότι έχουν λογαριασμό χρήστη):"
+        bulk: "Μαζική Προσθήκη σε Ομάδα"
         bulk_paste: "Κάνε επικόλληση μια λίστα με ονόματα χρηστών η διευθύνσεις ηλεκτρονικών μηνυμάτων, ένα σε κάθε σειρά:"
         bulk_select: "(επέλεξε μια ομάδα)"
         automatic: "Αυτόματα"
@@ -2351,7 +2441,7 @@ el:
         none_selected: "Επέλεξε ομάδα για να ξεκινήσεις"
         no_custom_groups: "Δημιουργία νέας προσαρμοσμένης ομάδας"
       api:
-        generate_master: "Δημιουγία κλειδιού Master API"
+        generate_master: "Δημιουργία Master API Key"
         none: "Δεν υπάρχουν ενεργά κλειδιά API αυτή την στιγμή."
         user: "Χρήστης"
         title: "API"
@@ -2359,16 +2449,16 @@ el:
         generate: "Δημιουργία"
         regenerate: "Αναδημιουγία"
         revoke: "Ανάκληση"
-        confirm_regen: "Θες στ' αλήθεια να αντικαταστήσεις το κλειδί API με ένα καινούργιο;"
-        confirm_revoke: "Θες στ' αλήθεια να ανακαλέσεις το κλειδί API;"
+        confirm_regen: "Θέλεις να αντικαταστήσεις το κλειδί API με ένα καινούργιο;"
+        confirm_revoke: "Θέλεις σίγουρα να ανακαλέσεις το κλειδί API;"
         info_html: "Το κλειδί API σου δίνει τη δυνατότητα να δημιουργήσεις και να επεξεργαστείς νήματα μέσω κλήσεων JSON."
         all_users: "Όλοι οι χρήστες"
-        note_html: "Αυτό το κλειδί κράτα το <strong>κρυφό</strong>. Όλοι οι χρήστες που το κατέχουν μπορούν να δημιουργήσουν αναρτήσεις υποδυόμενοι οποιονδήποτε χρήστη χωρίς κανέναν περιορισμό."
+        note_html: "Κράτα αυτό το κλειδί <strong>κρυφό</strong>. Όλοι οι χρήστες που το κατέχουν μπορούν να δημιουργήσουν αναρτήσεις υποδυόμενοι οποιονδήποτε χρήστη χωρίς κανέναν περιορισμό."
       web_hooks:
         title: "Webhooks"
         none: "Δεν υπάρχουν Webhooks αυτή τη στιγμή."
-        instruction: "Τα \"Webhooks\" επιτρέπουν στην Discourse να ειδοποιεί εξωτερικές υπηρεσίες όταν ένα συμβάν λαμβάνει χώρα στον ιστότοπό σας. Όταν το \"webhook\"  τεθεί σε λειτουργία θα στείλει ένα αίτημα τύπου POST στα URLs τα οποία δόθηκαν. "
-        detailed_instruction: "Ένα αίτημα δημοσίευσης θα σταλεί στο παρεχόμενο URL όταν συμβεί η εκδήλωση που έχει επιλεγεί."
+        instruction: "Τα \"Webhooks\" επιτρέπουν στην ιστοσελίδα να ειδοποιεί εξωτερικές υπηρεσίες όταν ένα γεγονός συμβεί στον ιστότοπό σας. Όταν το \"webhook\"  τεθεί σε λειτουργία θα στείλει ένα αίτημα τύπου POST στα URLs τα οποία δόθηκαν. "
+        detailed_instruction: "Ένα POST request θα σταλεί στο παρεχόμενο URL όταν συμβεί το γεγονός που έχει επιλεγεί."
         new: "Νέο Webhook"
         create: "Δημιουργία"
         save: "Αποθήκευση"
@@ -2376,66 +2466,67 @@ el:
         description: "Περιγραφή"
         controls: "Έλεγχοι"
         go_back: "Πίσω στη λίστα"
-        payload_url: "Φορτίο URL"
+        payload_url: "Payload URL"
         payload_url_placeholder: "https://example.com/postreceive"
-        warn_local_payload_url: "Φαίνεται ότι προσπαθείς να εγκαταστήσεις το webhook σε ένα τοπικό url. Η εκδήλωση που διανέμεται σε μια τοπική διεύθυνση ενδέχεται να προκαλέσει παρενέργειες ή απρόσμενες συμπεριφορές. Συνέχεια;"
+        warn_local_payload_url: "Φαίνεται ότι προσπαθείς να εγκαταστήσεις το webhook σε ένα τοπικό url. Το γεγονός που διανέμεται σε μια τοπική διεύθυνση ενδέχεται να προκαλέσει παρενέργειες ή απρόσμενες συμπεριφορές. Συνέχεια;"
         secret_invalid: "Ο μυστικός κωδικός δεν πρέπει να έχει κενούς χαρακτήρες."
         secret_too_short: "Ο μυστικός κωδικός πρέπει να έχει τουλάχιστον 12 χαρακτήρες."
         secret_placeholder: "Χρήση ενός προαιρετικού string, για τη δημιουργία υπογραφής. "
-        event_type_missing: "Πρέπει να εγκαταστήσεις τουλάχιστον ένα είδος εκδήλωσης."
+        event_type_missing: "Πρέπει να ρυθμίσεις τουλάχιστον ένα είδος γεγονότος."
         content_type: "Είδος περιεχομένου"
         secret: "Μυστικός κωδικός"
+        event_chooser: "Ποια γεγονότα θα ενεργοποιήσουν αυτό το webhook?"
         wildcard_event: "Στείλε μου τα πάντα."
-        individual_event: "Επίλεξε ατομικές εκδηλώσεις."
-        verify_certificate: "Έλεγχος TLS για το πιστοποιητικό του URL του payload. "
-        active: "Ενργός"
-        active_notice: "Θα διανέμουμε λεπτομέρεις για την εκδήλωση όταν αυτή θα λαμβάνει μέρος"
-        categories_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το συμβάν σχετίζεται με τις προσδιορισμένες κατηγορίες. Για να ενεργοποιήσετε τα webhooks για όλες της κατηγορίες, αφήστε κενό. "
+        individual_event: "Επίλεξε μεμονομένα γεγονότα."
+        verify_certificate: "Έλεγχος TLS certificate για το payload url"
+        active: "Ενεργός"
+        active_notice: "Θα στείλουμε λεπτομέρεις για το γεγονός όταν αυτό συμβεί"
+        categories_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το γεγονός σχετίζεται με τις προσδιορισμένες κατηγορίες. Για να ενεργοποιήσετε τα webhooks για όλες της κατηγορίες, αφήστε κενό. "
         categories_filter: "Ενεργοποιημένες Κατηγορίες"
-        groups_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το συμβάν σχετίζεται με τις προσδιορισμένες όμάδες. Για να ενεργοποιήσετε τα webhooks για όλες της ομάδες, αφήστε κενό. "
+        groups_filter_instructions: "Τα σχετικά webhooks θα τεθούν σε λειτουργεία μόνο εαν το γεγονός σχετίζεται με τις προσδιορισμένες όμάδες. Για να ενεργοποιήσετε τα webhooks για όλες της ομάδες, αφήστε κενό. "
         groups_filter: "Ενεργοποιημένες Ομάδες"
         delete_confirm: "Διαγραφή αυτού του webhook;"
         topic_event:
-          name: "Εκδήλωση νήματος"
+          name: "Γεγονός Νήματος"
           details: "Όταν υπάρχει ένα καινούριο νήμα, αναθεωρημένο, αλλαγμένο ή διαγραμμένο."
         post_event:
-          name: "Δημοσίευση Εκδήλωσης"
+          name: "Post Event"
           details: "Όταν υπάρχει μια καινούρια απάντηση, επεξεργασμένη, διαγραμμένη ή ανακτημένη."
         user_event:
-          name: "Εκδήλωση Χρήστη"
+          name: "Γεγονός Χρήστη"
           details: "Όταν ένας χρήστης δημιουργείται, εγκρίνεται ή ενημερώνεται."
         delivery_status:
           title: "Κατάσταση διανομής"
-          inactive: "Ανενεργός"
+          inactive: "Ανενεργό"
           failed: "Απέτυχε"
           successful: "Επιτυχής"
         events:
-          none: "Δεν υπάρχουν σχετικές εκδηλώσεις."
+          none: "Δεν υπάρχουν σχετικά γεγονότα."
           redeliver: "Διανομή ξανά"
           incoming:
             one: "Υπάρχει μία καινούρια εκδήλωση."
-            other: "Υπάρχουν {{count}} καινούριες εκδηλώσεις."
+            other: "Υπάρχουν {{count}} καινούρια γεγονότα."
           completed_in:
             one: "Ολοκληρώνεται σε 1 δευτερόλεπτο."
-            other: "Ολοκληρώνεται σε {{count}} δευτερόλεπτα."
+            other: "Ολοκληρώθηκε σε {{count}} δευτερόλεπτα."
           request: "Αίτημα"
           response: "Απάντηση"
           redeliver_confirm: "Είστε σιγουρος/η ότι θέλετε να παραδώσετε εκ νέου το ίδιο payload;"
-          headers: "Επικεφαλίδες"
-          payload: "Φορτίο επί πληρωμή"
-          body: "Σώμα"
+          headers: "Headers"
+          payload: "Payload"
+          body: "Body"
           go_list: "Πήγαινε στη λίστα"
           go_details: "Επεξεργασία Webhook"
-          go_events: "Πήγαινε στις εκδηλώσεις"
+          go_events: "Πήγαινε στα γεγονότα"
           ping: "Ping"
-          status: "Κωδικός κατάστασης"
-          event_id: "Ταυτότητα"
+          status: "Status Code"
+          event_id: "ID"
           timestamp: "Δημιουργήθηκε"
           completion: "Ώρα ολοκλήρωσης"
-          actions: "Δράσεις"
+          actions: "Ενέργειες"
       plugins:
-        title: "Πρόσθετα"
-        installed: "Εγκατεστημένα πρόσθετα"
+        title: "Plugins"
+        installed: "Εγκατεστημένα Plugins"
         name: "Όνομα"
         none_installed: "Δεν έχεις εγκαταστήσει πρόσθετα"
         version: "Έκδοση"
@@ -2517,33 +2608,106 @@ el:
         title: "Προσαρμογή"
         long_title: "Προσαρμογές ιστότοπου"
         preview: "προεπισκόπηση "
+        explain_preview: "Δες την ιστοσελίδα με αυτό το θέμα ενεργό"
         save: "Αποθήκευση"
         new: "Νέο"
         new_style: "Νέο στυλ"
         import: "Εισαγωγή"
         delete: "Σβήσιμο"
-        about: "Προσάρμοσε τα αρχεία στυλ CSS και την κεφαλίδα HTML του ιστότοπου. Πρόσθεσε μια προσαρμογή για να ξεκινήσεις."
+        delete_confirm: "Διαγραφή αυτού του θέματος;"
+        about: "Προσάρμοσε τα CSS stylesheets και τα HTML headers της ιστοσελίδας. Πρόσθεσε μια προσαρμογή για να ξεκινήσεις."
         color: "Χρώμα"
         opacity: "Αδιαφάνεια"
         copy: "Αντιγραφή"
+        copy_to_clipboard: "Αντιγραφή στο Clipboard"
+        copied_to_clipboard: "Αντιγράφτηκε στο Clipboard"
+        copy_to_clipboard_error: "Σφάλμα αντιγραφής δεδομένων στο Clipboard"
+        theme_owner: "Μη επεξεργάσιμο, ανήκει σε:"
         email_templates:
-          title: "Τύπος ηλεκτρονικού ταχυδρομείου"
+          title: "Πρότυπα Ηλεκτρονικού Ταχυδρομείου"
           subject: "Θέμα"
           multiple_subjects: "Αυτό το πρότυπο ηλεκτρονικού μηνύματος έχει πολλά θέματα."
           body: "Σώμα"
-          none_selected: "Επίλεξε ένα πρότυπο ηλεκτρονικού μηνύματος να ξεκινήσεις την επεξεργασία."
+          none_selected: "Επίλεξε ένα πρότυπο ηλεκτρονικού μηνύματος για να ξεκινήσεις την επεξεργασία."
           revert: "Επαναφορά αλλαγών"
           revert_confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τις αλλαγές;"
+        theme:
+          import_theme: "Εισαγωγή Θέματος"
+          customize_desc: "Προσαρμογή:"
+          title: "Θέματα"
+          long_title: "Τροποποίησε τα χρώματα, CSS και HTML περιεχόμενο της ιστοσελίδας"
+          edit: "Επεξεργασία"
+          edit_confirm: "Αυτό είναι ένα απομακρυσμένο θέμα. Αν επεξεργαστείτε το CSS/HTML οι αλλαγές σας θα διαγραφούν την επόμενη φορά που θα ενημερώσετε το θέμα."
+          common: "Κοινό"
+          desktop: "Desktop"
+          mobile: "Mobile"
+          preview: "Προεπισκόπηση"
+          is_default: "Το θέμα είναι ενεργό εξ ορισμού"
+          user_selectable: "Το θέμα μπορεί να επιλεχθεί από τους χρήστες"
+          color_scheme: "Χρωματική Παλέτα"
+          color_scheme_select: "Επιλέξτε τα χρώματα που θα χρησιμοποιούνται από το θέμα"
+          custom_sections: "Προσαρμοσμένα τμήματα:"
+          theme_components: "Στοιχεία Θέματος"
+          uploads: "Μεταφορτώσεις"
+          no_uploads: "Μπορείτε να μεταφορτώσετε στοιχεία σχετικά με το θέμα σας, όπως γραμματοσειρές και εικόνες."
+          add_upload: "Προσθήκη Αρχείου"
+          upload_file_tip: "Επιλέξτε στοιχείο για μεταφόρτωση (png, woff2, etc...)"
+          variable_name: "SCSS var name:"
+          upload: "Μεταφόρτωση"
+          child_themes_check: "Το θέμα περιλαμβάνει άλλα υποθέματα"
+          css_html: "Custom CSS/HTML"
+          edit_css_html: "Edit CSS/HTML"
+          edit_css_html_help: "Δεν επεξεργαστήκατε το CSS ή το HTML"
+          delete_upload_confirm: "Διαγραφή αυτής της μεταφόρτωσης; (Το CSS του θέματος ενδέχεται να σταματήσει να λειτουργεί!)"
+          import_web_tip: "Αποθηκευτικός χώρος που περιέχει το θέμα"
+          import_file_tip: ".dcstyle.json αρχείο που περιέχει το θέμα"
+          about_theme: "Σχετικά με το Θέμα"
+          license: "Άδεια Χρήσης"
+          component_of: "Το θέμα είναι στοιχείο από:"
+          update_to_latest: "Ενημέρωση στην τελευταία έκδοση"
+          check_for_updates: "Έλεγχος για ενημερώσεις"
+          updating: "Ενημέρωση..."
+          up_to_date: "Το θέμα είναι ενημερωμένο, τελευταίος έλεγχος:"
+          add: "Προσθήκη"
+          commits_behind:
+            one: "Το θέμα είναι 1 έκδοση πίσω!"
+            other: "Το θέμα είναι {{count}} εκδόσεις πίσω!"
+          scss:
+            text: "CSS"
+            title: "Καταχώρησε custom CSS, γίνονται δεκτά όλα τα valid CSS και SCSS styles"
+          header:
+            text: "Header"
+            title: "Καταχώρησε HTML το οποίο θα εμφανίζεται πάνω από το header της ιστοσελίδας"
+          after_header:
+            text: "Μετά το Header"
+            title: "Καταχώρησε HTML το οποίο θα εμφανίζεται σε όλες τις σελίδες μετά το header"
+          footer:
+            text: "Footer"
+            title: "Καταχώρησε HTML το οποίο θα εμφανίζεται στο footer"
+          embedded_scss:
+            text: "Embedded CSS"
+            title: "Καταχώρησε custom CSS to deliver with embedded version of comments"
+          head_tag:
+            text: "</head>"
+            title: "HTML το οποίο θα προστίθεται πριν το </head> tag"
+          body_tag:
+            text: "</body>"
+            title: "HTML το οποίο θα προστίθεται πριν το </body> tag"
         colors:
+          select_base:
+            title: "Επέλεξε βασική χρωματική παλέτα"
+            description: "Βασική παλέτα:"
           title: "Χρώματα"
-          long_title: "Χρωματικά σύνολα"
-          new_name: "Νέο χρωματικό σύνολο"
+          edit: "Επεξεργασία Χρωματικής Παλέτας"
+          long_title: "Χρωματική Παλέτα"
+          about: "Αλλάξτε τα χρώματα που χρησιμοποιούν τα θέματά σας. Δημιουργήστε μια νέα χρωματική παλέτα για να ξεκινήσετε."
+          new_name: "Νέα Χρωματική Παλέτα"
           copy_name_prefix: "Αντίγραφο του"
-          delete_confirm: "Να διαγραφεί αυτό το χρωματικό σύνολο;"
+          delete_confirm: "Να διαγραφεί αυτή η χρωματική παλέτα;"
           undo: "αναίρεση"
           undo_title: "Να αναιρεθούν οι αλλαγές που έγιναν σε αυτό το χρώμα από την τελευταία αποθήκευσή του και έπειτα."
           revert: "απόρριψη"
-          revert_title: "Επανέφερε αυτό το χρώμα στο προκαθορισμένο χρωματικό σύνολο του Discourse."
+          revert_title: "Επανέφερε αυτό το χρώμα στην προκαθορισμένη χρωματική παλέτα του Discourse."
           primary:
             name: 'κύριο'
             description: 'Τα περισσότερα κείμενα, εικονίδια και πλαίσια.'
@@ -2575,7 +2739,7 @@ el:
             name: 'αγάπη'
             description: "Το χρώμα του κουμπιού «μου αρέσει»."
       email:
-        title: "Μήνυμα Ηλεκτρονικού Ταχυδρομείου"
+        title: "Emails"
         settings: "Ρυθμίσεις"
         templates: "Πρότυπα"
         preview_digest: "Προεπισκόπηση σύνοψης"
@@ -2603,7 +2767,7 @@ el:
         sending_email: "Αποστολή ηλεκτρονικού μηνύματος..."
         format: "Μορφή"
         html: "html"
-        text: "κείμενο"
+        text: "text"
         last_seen_user: "Τελευταίος χρήστης:"
         no_result: "Δεν βρέθηκαν αποτελέσματα για περίληψη."
         reply_key: "Κλειδί απάντησης"
@@ -2613,12 +2777,12 @@ el:
           to_addresses: "Προς"
           cc_addresses: "Cc"
           subject: "Θέμα"
-          error: "Λάθος"
+          error: "Σφάλμα"
           none: "Δε βρέθηκε κανένα εισερχόμενο μήνυμα."
           modal:
             title: "Λεπτομέρειες εισερχόμενων μηνυμάτων"
             error: "Σφάλμα"
-            headers: "Επικεφαλίδες"
+            headers: "Headers"
             subject: "Θέμα"
             body: "Σώμα"
             rejection_message: "Μήνυμα απόρριψης"
@@ -2639,22 +2803,24 @@ el:
             skipped_reason_placeholder: "λόγος"
       logs:
         title: "Αρχεία καταγραφής"
-        action: "Δράση"
+        action: "Ενέργεια"
         created_at: "Δημιουργήθηκε"
-        last_match_at: "Τελευταίο αποτέλεσμα"
-        match_count: "Αποτελέσματα"
+        last_match_at: "Τελευταία Αντιστοίχιση"
+        match_count: "Αντιστοιχίσεις"
         ip_address: "IP"
         topic_id: "Ταυτότητα νήματος"
         post_id: "Ταυτότητα ανάρτησης"
         category_id: "Ταυτότητα Κατηγορίας"
-        delete: 'Σβήσιμο'
+        delete: 'Διαγραφή'
         edit: 'Επεξεργασία'
         save: 'Αποθήκευση'
         screened_actions:
           block: "αποκλεισμός"
           do_nothing: "μην κάνεις τίποτα"
         staff_actions:
-          title: "Δράσεις συνεργατών"
+          all: "όλα"
+          filter: "Φίλτρο:"
+          title: "Ενέργειες Συνεργατών"
           clear_filters: "Δείξτα όλα"
           staff_user: "Συνεργάτης"
           target_user: "Χρήστη που τον αφορά"
@@ -2662,29 +2828,31 @@ el:
           when: "Πότε"
           context: "Πλαίσιο αναφοράς"
           details: "Λεπτομέρειες"
-          previous_value: "Παλιότερο"
+          previous_value: "Προηγούμενο"
           new_value: "Νέο"
           diff: "Σύγκριση"
           show: "Δείξε"
           modal_title: "Λεπτομέρειες"
           no_previous: "Δεν υπάρχει προηγούμενη τιμή."
-          deleted: "Καμία νέα τιμή. Η εγγραφή σβήστηκε."
+          deleted: "Δεν υπάρχει νέα τιμή. Η εγγραφή διεγράφη."
           actions:
             delete_user: "διαγραφή χρήστη"
             change_trust_level: "αλλαγή επιπέδου εμπιστοσύνης"
             change_username: "αλλαγή χρηστώνυμου"
             change_site_setting: "αλλαγή ρυθμίσεων ιστότοπου"
-            change_site_text: "αλλαγή θέσης κειμένου"
-            suspend_user: "Αποκλεισμός του χρήστη"
-            unsuspend_user: "Αναίρεση αποκλεισμού χρήστη"
-            grant_badge: "Απονομή παράσημου"
+            change_theme: "αλλαγή θέματος"
+            delete_theme: "διαγραφή θέματος"
+            change_site_text: "αλλαγή κειμένου ιστοσελίδας"
+            suspend_user: "αποβολή του χρήστη"
+            unsuspend_user: "αναίρεση αποβολής χρήστη"
+            grant_badge: "απονομή παράσημου"
             revoke_badge: "απόσυρση παράσημου"
-            check_email: "Κοίτα στο ηλεκτρονικό σου ταχυδρομείο"
-            delete_topic: "Σβήσε το νήμα"
-            delete_post: "Σβήσε την ανάρτηση"
+            check_email: "έλεγχος email"
+            delete_topic: "διαγραφή νήματος"
+            delete_post: "διαγραφή ανάρτησης"
             impersonate: "υποδύσου"
             anonymize_user: "ανωνυμοποίηση χρήστη"
-            roll_up: "Τυλιγμένα IP εμπόδια"
+            roll_up: "roll up IP blocks"
             change_category_settings: "αλλαγή ρυθμίσεων κατηγορίας"
             delete_category: "διαγραφή κατηγορίας"
             create_category: "δημιουργία κατηγορίας"
@@ -2694,10 +2862,10 @@ el:
             revoke_admin: "ανάκληση διαχειριστή"
             grant_moderation: "χορήγηση συντονιστή"
             revoke_moderation: "ανάκληση συντονιστή"
-            backup_create: "δημιουργία αντίγραφου"
-            deleted_tag: "η ετικέτα διαγράφηκε"
-            renamed_tag: "η ετικέτα μετονομάστηκε"
-            revoke_email: "Ανακάλεσε το email"
+            backup_create: "δημιουργία αντιγράφου"
+            deleted_tag: "διεγραμμένη ετικέτα"
+            renamed_tag: "μετονομασμένη ετικέτα"
+            revoke_email: "ανακάλεσε το email"
             lock_trust_level: "κλείδωσε το επίπεδο εμπιστοσύνης"
             unlock_trust_level: "ξεκλείδωσε το επίπεδο εμπιστοσύνης"
             activate_user: "ενεργοποίηση χρήστη"
@@ -2705,19 +2873,21 @@ el:
             change_readonly_mode: "αλλαγή λειτουργίας \"μόνο-ανάγνωση\""
             backup_download: "λήψη αντίγραφου"
             backup_destroy: "καταστροφή αντίγραφου"
+            reviewed_post: "έλεγξε ανάρτηση"
+            custom_staff: "προσαρμοσμένη ενέργεια προσθέτου"
         screened_emails:
-          title: "Ελεγμένες διευθύνσεις ηλεκτρονικού ταχυδρομείου"
+          title: "Ελεγχόμενες διευθύνσεις ηλεκτρονικού ταχυδρομείου"
           description: "Όταν κάποιος φτιάξει έναν λογαριασμό, οι παρακάτω διευθύνσεις ηλεκτρονικού ταχυδρομείου θα ελεγχθούν και η εγγραφή θα αποκλειστεί, ή θα συμβεί κάποια άλλη πράξη."
           email: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
           actions:
             allow: "Επίτρεψε"
         screened_urls:
-          title: "Ελεγμένα URL"
+          title: "Ελεγχόμενα URL"
           description: "Τα URL της λίστας χρησιμοποιήθηκαν σε αναρτήσεις από χρήστες που έχουν εντοπιστεί πως αναρτούν ανεπιθύμητα μηνύματα."
           url: "URL"
           domain: "Domain"
         screened_ips:
-          title: "Ελεγμένες IP"
+          title: "Ελεγχόμενες IP"
           description: 'Διευθύνσεις IP που παρακολουθούνται. Χρησιμοποίησε το «επίτρεψε» για να τις βάλεις στη λίστα επιτρεπόμενων.'
           delete_confirm: "Σίγουρα θέλεις να αφαιρέσεις τον κανόνα για τη διεύθυνση %{ip_address};"
           roll_up_confirm: "Σίγουρα θες να συνοψίσεις σε υποδίκτυα τις συχνά αποκλεισμένες διευθύνσεις IP;"
@@ -2729,7 +2899,7 @@ el:
             allow_admin: "Να επιτρέπεται στο διαχειριστή"
           form:
             label: "Νέο:"
-            ip_address: "διεύθυνση IP"
+            ip_address: "IP διεύθυνση"
             add: "Προσθήκη"
             filter: "Αναζήτηση"
           roll_up:
@@ -2737,25 +2907,49 @@ el:
             title: "Δημιουργεί νέες εγγραφές για τον αποκλεισμό υποδικτύων αν υπάρχουν τουλάχιστον  'min_ban_entries_for_roll_up' εγγραφές."
         logster:
           title: "Αρχεία καταγραφής σφαλμάτων"
+      watched_words:
+        title: "Εποπτευόμενες Λέξεις"
+        search: "αναζήτηση"
+        clear_filter: "Καθαρισμός"
+        show_words: "προβολή λέξεων"
+        word_count:
+          one: "1 λέξη"
+          other: "%{count} λέξεις"
+        actions:
+          block: 'Αποκλεισμός'
+          censor: 'Λογοκρισία'
+          require_approval: 'Απαιτεί Έγκριση'
+          flag: 'Σήμανση'
+        action_descriptions:
+          block: 'Αποτροπή της καταχώρησης αναρτήσεων που περιέχουν αυτές τις λέξεις. Ο χρήστης θα ενημερωθεί με μήνυμα λάθους όταν προσπαθήσει να καταχωρήσει την αναρτηση.'
+          censor: 'Επέτρεψε τις αναρτήσεις με αυτές τις λέξεις, αλλά αντικατέστησε τις λογοκριμένες λέξεις με άλλους χαρακτήρες.'
+          require_approval: 'Οι αναρτήσεις που περιέχουν αυτές τις λέξεις, χρειάζονται έγκριση από το προσωπικό πριν αναρτηθούν.'
+          flag: 'Επέτρεψε τις αναρτήσεις που περιέχουν αυτές τις λέξεις, αλλά επισήμανέ τες ως ανάρμοστες για έλεγχο από συντονιστή.'
+        form:
+          label: 'Νέα Λέξη:'
+          add: 'Προσθήκη'
+          success: 'Επιτυχία'
+          upload: "Μεταφόρτωση"
+          upload_successful: "Επιτυχημένη μεταφόρτωση. Οι λέξεις προστέθηκαν."
       impersonate:
         title: "Να υποδυθώ"
         help: "Χρησιμοποίησε αυτό το εργαλείο για να εντοπίσεις λάθη υποδυόμενος κάποιον άλλο χρήστη. Θα πρέπει να αποσυνδεθείς όταν τελειώσεις."
         not_found: "Ο χρήστης δεν μπορεί να βρεθεί"
-        invalid: "Συγγνώμη, δεν μπορείς να εκπροσωπήσεις αυτό τον χρήστη"
+        invalid: "Συγγνώμη, δεν μπορείς να υποδυθείς αυτό τον χρήστη"
       users:
         title: 'Χρήστες'
         create: 'Προσθήκη διαχειριστή'
         last_emailed: "Τελευταίο μήνυμα ηλεκτρονικού ταχυδρομείου"
         not_found: "Λυπούμαστε αλλά αυτό το χρηστώνυμο δεν υπάρχει στο σύστημα."
         id_not_found: "Λυπούμαστε αλλά αυτή η ταυτότητα χρήστη δεν υπάρχει στο σύστημα."
-        active: "Ενεργά"
+        active: "Ενεργοί"
         show_emails: "Δείξε τα μηνύματα ηλεκτρονικού ταχυδρομείου"
         nav:
           new: "Νέο"
           active: "Ενεργό"
           pending: "Εκκρεμεί"
           staff: 'Προσωπικό'
-          suspended: 'Αποκλεισμένοι'
+          suspended: 'Αποβλημένοι'
           blocked: 'Αποκλεισμένο'
           suspect: 'Ύποπτο'
         approved: "Εγκεκριμένο;"
@@ -2778,38 +2972,38 @@ el:
           admins: 'Διαχειριστές'
           moderators: 'Συντονιστές'
           blocked: 'Αποκλεισμένοι χρήστες'
-          suspended: 'Απενεργοποιημένοι Χρήστες'
+          suspended: 'Αποβλημένοι Χρήστες'
           suspect: 'Ύποπτοι χρήστες'
         reject_successful:
           one: "Επιτυχώς απορρίφθηκε 1 χρήστης."
           other: "Επιτυχώς απορρίφθησαν %{count} χρήστες."
         reject_failures:
           one: "Αποτυχία απόρριψης 1 χρήστη."
-          other: "Αποτυχία απόρριψης %{count} χρηστών."
+          other: "Αποτυχία απόρριψης %{count}χρήστες."
         not_verified: "Μη επαληθευμένος"
         check_email:
           title: "Εμφάνισε το email αυτού του χρήστη"
           text: "Εμφάνιση"
       user:
-        suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αναστολή αυτού του χρήστη {{error}}"
-        unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση του αποκλεισμού αυτού του χρήστη {{error}}"
-        suspend_duration: "Για πόσο χρονικό διάστημα θα γίνει αναστολή του συγκεκριμένου χρήστη;"
+        suspend_failed: "Κάποιο λάθος εμφανίστηκε κατά την αποβολή αυτού του χρήστη {{error}}"
+        unsuspend_failed: "Κάτι πήγε στραβά κατά την αναίρεση της αποβολής αυτού του χρήστη {{error}}"
+        suspend_duration: "Πόσο χρονικό διάστημα θα κρατήσει η αποβολή του χρήστη;"
         suspend_duration_units: "(ημέρες)"
-        suspend_reason_label: "Γιατί απενεργοποιείες; Αυτό το κείμενο <b>θα είναι ορατό σε όλους</b> στη σελίδα προφίλ αυτού του χρήστη και θα εμφανίζεται στο χρήστη όταν αυτός προσπαθήσει να συνδεθεί. Φρόντισε να είναι σύντομο."
+        suspend_reason_label: "Γιατί αποβάλεις τον χρήστη; Αυτό το κείμενο <b>θα είναι ορατό σε όλους</b> στη σελίδα προφίλ αυτού του χρήστη και θα εμφανίζεται στο χρήστη όταν αυτός προσπαθήσει να συνδεθεί. Φρόντισε να είναι σύντομο."
         suspend_reason: "Αιτία"
-        suspended_by: "Απενεργοποιήθηκε από τον/την"
+        suspended_by: "Αποβλήθηκε από τον/την"
         delete_all_posts: "Σβήσε όλες τις αναρτήσεις"
-        delete_all_posts_confirm_MF: "Είσαι έτοιμος να σβήσεις %{posts} αναρτήσεις και %{topics} νήματα. Επιβεβαίωση;"
-        suspend: "Απενεργοποίηση"
-        unsuspend: "Αναίρεση απενεργοποίησης"
-        suspended: "Απενεργοποιημένος;"
+        delete_all_posts_confirm_MF: "Πρόκειται να διαγράψεις {POSTS, plural, one {1 ανάρτηση} other {# αναρτήσεις}} and {TOPICS, plural, one {1 νήμα} other {# νήματα}}. Είσαι σίγουρος;"
+        suspend: "Αποβολή"
+        unsuspend: "Αναίρεση αποβολής"
+        suspended: "Αποβλημένος;"
         moderator: "Συντονιστής;"
         admin: "Διαχειριστής;"
         blocked: "Αποκλείστηκε; "
-        staged: "Σταδιακή?"
+        staged: "Στάδιο Μετάβασης;"
         show_admin_profile: "Διαχείριση"
         refresh_browsers: "Να ανανεωθεί αναγκαστικά η σελίδα"
-        refresh_browsers_message: "Το μήνυμα στάλθηκε σε όλους τους πελάτες!"
+        refresh_browsers_message: "Το μήνυμα στάλθηκε σε όλους τους χρήστες!"
         show_public_profile: "Εμφάνισε το Δημόσιο Προφίλ"
         impersonate: 'Να υποδυθώ'
         action_logs: "Καταγραφές ενεργειών"
@@ -2818,8 +3012,9 @@ el:
         logged_out: "Ο χρήστης αποσυνδέθηκε από όλες τις συσκευές"
         revoke_admin: 'Ανάκληση δικαιωμάτων διαχειριστή'
         grant_admin: 'Απόδοση δικαιωμάτων διαχειριστή'
+        grant_admin_confirm: "Έχουμε στείλει ένα email για να επιβεβαιώσουμε τον νέο διαχειριστή. Παρακαλούμε ανοίξτε το και ακολουθήστε τις οδηγίες."
         revoke_moderation: 'Ανάκληση δικαιωμάτων συντονιστή'
-        grant_moderation: 'Ανάκληση δικαιωμάτων συντονιστή'
+        grant_moderation: 'Απόδοση δικαιωμάτων συντονιστή'
         unblock: 'Αναίρεση αποκλεισμού'
         block: 'Αποκλεισμός'
         reputation: Φήμη
@@ -2868,24 +3063,25 @@ el:
         activate_failed: "Παρουσιάστηκε πρόβλημα κατά την ενεργοποίηση του χρήστη."
         deactivate_account: "Απενεργοποίηση του λογαριασμού"
         deactivate_failed: "Παρουσιάστηκε πρόβλημα κατά την απενεργοποίηση του χρήστη."
-        unblock_failed: 'Παρουσιάστηκε πρόβλημα κατά την ενεργοποίηση του χρήστη.'
-        block_failed: 'Παρουσιάστηκε πρόβλημα κατά την απενεργοποίηση του χρήστη.'
-        block_confirm: 'Είσαι βέβαιος πως θέλεις να αποκλείσεις αυτόν τον χρήστη; Δε θα μπορεί να δημιουργήσει καινούρια νήματα ή δημοσιεύσεις.'
+        unblock_failed: 'Παρουσιάστηκε πρόβλημα κατά την άρση αποκλεισμού του χρήστη.'
+        block_failed: 'Παρουσιάστηκε πρόβλημα κατά τον αποκλεισμό του χρήστη.'
+        block_confirm: 'Είσαι βέβαιος πως θέλεις να αποκλείσεις αυτόν τον χρήστη; Δε θα μπορεί να δημιουργήσει καινούρια νήματα ή αναρτήσεις.'
         block_accept: 'Ναι, αποκλεισμός του χρήστη'
-        bounce_score: "Βαθμολόγηση επιστρεφόμενων"
+        bounce_score: "Bounce Score"
         reset_bounce_score:
           label: "Επαναφορά"
           title: "Επαναφορά βαθμολόγησης επιστρεφόμενων πίσω στο 0"
+        visit_profile: "Επισκεφθείτε <a href='%{url}'>την σελίδα προτιμήσεων του χρήστη</a> για να επεξεργαστείτε το προφίλ του"
         deactivate_explanation: "Ένας απενεργοποιημένος χρήστης πρέπει να επιβεβαιώσει ξανά τη διεύθυνση του ηλεκτρονικού του ταχυδρομείου."
-        suspended_explanation: "Ένας χρήστης που έχει απενεργοποιηθεί δεν γίνεται να συνδεθεί."
-        block_explanation: "Ένας απενεργοποιημένος χρήστης δεν μπορεί να δημοσιεύει ή να δημιουργεί νήματα"
-        staged_explanation: "Ένας staged χρήστης μπορεί να κάνει αναρτήσεις μέσω ηλεκτρονικου ταχυδρομίου και σε συγκεκριμένα θέματα. "
+        suspended_explanation: "Ένας χρήστης που έχει αποβληθεί δεν γίνεται να συνδεθεί."
+        block_explanation: "Ένας απενεργοποιημένος χρήστης δεν μπορεί να αναρτήσει ή να δημιουργεί νήματα"
+        staged_explanation: "Ένας χρήστης σε στάδιο μετάβασης μπορεί να κάνει αναρτήσεις μέσω ηλεκτρονικου ταχυδρομίου και σε συγκεκριμένα θέματα. "
         bounce_score_explanation:
           none: "Κανένα επιστρεφόμενο μήνυμα δεν ελήφθη από αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου."
           some: "Μερικά επιστρεφόμενα μηνύματα ελήφθησαν πρόσφατα από αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου."
           threshold_reached: "Ελήφθησαν πολλά επιστρεφόμενα μηνύματα από αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου."
         trust_level_change_failed: "Παρουσιάστηκε πρόβλημα κατά την αλλαγή του επιπέδου εμπιστοσύνης του χρήστη."
-        suspend_modal_title: "Απενεργοποίηση χρήστη."
+        suspend_modal_title: "Αποβολή Χρήστη."
         trust_level_2_users: "Χρήστες στο επιπέδου εμπιστοσύνης 2"
         trust_level_3_requirements: "Χρήστες στο επιπέδου εμπιστοσύνης 3"
         trust_level_locked_tip: "το επίπεδο εμπιστοσύνης κλειδώθηκε, το σύστημα δεν θα προβιβάσει ή υποβιβάσει τον χρήστη"
@@ -2898,20 +3094,20 @@ el:
             one: "Την τελευταία μέρα:"
             other: "Τις τελευταίες %{count} μέρες:"
           value_heading: "Τιμή"
-          requirement_heading: "Προϋποθέσεις"
+          requirement_heading: "Προϋπόθεση"
           visits: "Επισκέψεις"
           days: "ημέρες"
-          topics_replied_to: "Τα νήματα όπου απάντησες"
-          topics_viewed: "Τα νήματα που είδες"
+          topics_replied_to: "Νήματα που απάντησε"
+          topics_viewed: "Νήματα που είδε"
           topics_viewed_all_time: "Νήματα που ιδώθηκαν (συνολικά)"
           posts_read: "Αναρτήσεις που διαβάστηκαν"
           posts_read_all_time: "Αναρτήσεις που διαβάστηκαν (συνολικά)"
           flagged_posts: "Αναρτήσεις που επισημάνθηκαν"
           flagged_by_users: "Χρήστες που επισήμαναν"
           likes_given: "Μου αρέσει που αποδόθηκαν"
-          likes_received: "«Μου αρέσει» που δεχτήκες."
-          likes_received_days: "Μου αρέσει που έλαβα: ξεχωριστές μέρες"
-          likes_received_users: "Μου αρέσει που έλαβα: ξεχωριστοί χρήστες"
+          likes_received: "«Μου αρέσει» που λήφθησαν"
+          likes_received_days: "Μου αρέσει που ελήφθησαν: ξεχωριστές μέρες"
+          likes_received_users: "Μου αρέσει που ελήφθησαν: ξεχωριστοί χρήστες"
           qualifies: "Πληροί τις προϋποθέσεις για το επίπεδο εμπιστοσύνης 3."
           does_not_qualify: "Δεν πληροί τις προϋποθέσεις για το επίπεδο εμπιστοσύνης 3."
           will_be_promoted: "Θα προβιβαστεί σύντομα."
@@ -2921,11 +3117,11 @@ el:
           locked_will_not_be_demoted: "Το επίπεδο εμπιστοσύνης κλειδώθηκε. Δεν πρόκειται ποτέ να υποβιβαστεί. "
         sso:
           title: "Single Sign On"
-          external_id: "Εξωτερικό ID"
+          external_id: "External ID"
           external_username: "Χρηστώνυμο"
           external_name: "Όνομα"
           external_email: "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
-          external_avatar_url: "URL για την εικόνα προφίλ"
+          external_avatar_url: "URL Εικόνας Προφίλ"
       user_fields:
         title: "Πεδία Χρήστη"
         help: "Προσθέστε πεδία που οι χρήστες μπορουν να συμπληρώσουν."
@@ -2959,7 +3155,7 @@ el:
         field_types:
           text: 'Πεδίο κειμένου'
           confirm: 'Επιβεβαίωση'
-          dropdown: "Άνοιγμα"
+          dropdown: "Dropdown"
       site_text:
         description: "Μπορείς να προσαρμόσεις οποιοδήποτε κείμενο στο χώρο συζητήσεων σου. Παρακαλώ ξεκίνησε κάνοντας αναζήτηση παρακάτω:"
         search: "Αναζήτησε το κείμενο που θα ήθελες να επεξεργαστείς"
@@ -2969,7 +3165,7 @@ el:
         revert_confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τις αλλαγές;"
         go_back: "Πίσω στην αναζήτηση"
         recommended: "Σου προτείνουμε να προσαρμόσεις το ακόλουθο κείμενο στις ανάγκες σου:"
-        show_overriden: 'Δείξε μόνο τα πιο σημαντικά'
+        show_overriden: 'Δείξε μόνο αυτά που άλλαξαν'
       site_settings:
         show_overriden: 'Δείξε μόνο αυτά που άλλαξαν'
         title: 'Ρυθμίσεις'
@@ -2977,7 +3173,7 @@ el:
         none: 'κανένα'
         no_results: "Δεν βρέθηκαν αποτελέσματα."
         clear_filter: "Καθάρισμα φίλτρου"
-        add_url: "δώσε URL"
+        add_url: "προσθήκη URL"
         add_host: "προσθήκη host"
         categories:
           all_results: 'Όλα'
@@ -2992,11 +3188,11 @@ el:
           onebox: "Onebox"
           seo: 'SEO'
           spam: 'Ανεπιθύμητο'
-          rate_limits: 'Περιορισμοί'
+          rate_limits: 'Όριο Συχνότητας'
           developer: 'Κατασκευαστής λογισμικού'
           embedding: "Ενσωμάτωση"
           legal: "Νομικά"
-          user_api: 'Χρήστης API'
+          user_api: 'User API'
           uncategorized: 'Άλλα'
           backups: "Αντίγραφα ασφαλέιας"
           login: "Σύνδεση"
@@ -3028,10 +3224,10 @@ el:
         reason: Αιτία
         expand: Επέκταση &hellip;
         revoke_confirm: Είσαι σίγουρος πως θέλεις να ανακαλέσεις αυτό το παράσημο;
-        edit_badges: Επεξεργασία παράσημου
+        edit_badges: Επεξεργασία παρασήμων
         grant_badge: Απονομή παράσημου
         granted_badges: Απονεμηθέντα παράσημα
-        grant: Απόνεμε
+        grant: Απονομή
         no_user_badges: "Στο χρήστη %{name} δεν έχουν απονεμηθεί παράσημα."
         no_badges: Δεν υπάρχουν παράσημα που να μπορούν να απονεμηθούν.
         none_selected: "Διάλεξε ένα παράσημο για να ξεκινήσεις"
@@ -3053,7 +3249,7 @@ el:
           post_revision: "Όταν ένας χρήστης επεξεργάζεται ή δημιουργεί μια ανάρτηση"
           trust_level_change: "Όταν το επίπεδο εμπιστοσύνης ενός χρήστη αλλάξει"
           user_change: "Όταν ένας χρήστης δημιουργείται ή υφίσταται επεξεργασία  "
-          post_processed: "Αφού μια δημοσίευση έχει δεχτεί επεξεργασία"
+          post_processed: "Αφού μια ανάρτηση έχει δεχτεί επεξεργασία"
         preview:
           link_text: "Προεπισκόπηση απονεμηθέντων παράσημων"
           plan_text: "Προεπισκόπηση του ερωτήματος"
@@ -3086,34 +3282,36 @@ el:
         sample: "Χρησιμοποιήστε τον ακόλουθο HTML κώδικα στον ιστότοπό σας για να ενθέσετε θέματα. Αντικαταστήστε <b>REPLACE_ME</b> με το κανονικό URL της σελίδας στην οποία θα ενθέσετε το θέμα. "
         title: "Ενσωμάτωση"
         host: "Επιτρεπόμενα hosts"
-        path_whitelist: "Μονοπάτι Λίστας Επιτρεπομένων"
+        class_name: "Class Name"
+        path_whitelist: "Path Whitelist"
         edit: "επεξεργασία"
-        category: "Δημοσίευση στην κατηγορία"
+        category: "Ανάρτηση στην Κατηγορία"
         add_host: "Προσθήκη host"
-        settings: "Ενσωματωμένες ρυθμίσεις"
-        feed_settings: "Ρυθμίσεις τροφοδοσίας"
+        settings: "Ρυθμίσεις Ενσωμάτωσης"
+        feed_settings: "Ρυθμίσεις Τροφοδοσίας"
         feed_description: "Με το να συμπεριλαμβάνετε ένα  RSS/ATOM feed για τον ιστότοπό σας βελτιώνετε την δυνατότητα του Discourse να εισάγει τα περιεχόμενά σας. "
-        crawling_settings: "Ρυθμίσεις ανίχνευσης"
-        crawling_description: "Όταν η ομιλία δημιουργεί νήματα για τις δημοσιεύσεις σου, εάν δεν είναι κανένα από τα RSS/ATOM παρούσα θα προσπαθήσει να αναλύσει το περιεχόμενο του HTML σου. Κάποιες φορές μπορεί να αποτελεί πρόκληση το να εξάγεις το περιεχόμενο σου, έτσι σου παρέχουμε την ικανότητα να προσδιορίσεις τους νόμους CSS για να κάνεις την εξαγωγή σου ευκολότερη."
+        crawling_settings: "Ρυθμίσεις Crawler "
+        crawling_description: "Όταν η ιστοσελίδα δημιουργεί νήματα για τις αναρτήσεις σου, άν δεν υπάρχει RSS/ATOM feed θα προσπαθήσει να αναλύσει το περιεχόμενο του HTML σου. Κάποιες φορές μπορεί να αποτελεί πρόκληση το να εξάγει το περιεχόμενο σου, έτσι σου παρέχουμε την ικανότητα να προσδιορίσεις τα CSS rules για να κάνεις την εξαγωγή ευκολότερη."
         embed_by_username: "Όνομα χρήστη για δημιουργία νήματος"
-        embed_post_limit: "Μέγιστος αριθμός δημοσιεύσεων για συγχώνευση"
-        embed_username_key_from_feed: "Κλειδή για έλξη του ονόματος χρήστη του discource από τη τροφή"
-        embed_title_scrubber: "Κανονική έκφραση χρησιμοποιείται για τον τίτλο της δημοσίευσης"
-        embed_truncate: "Κόψιμο των ενσωματωμένων δημοσιεύσεων"
-        embed_whitelist_selector: "CSS διαλογέας για στοιχεία που επιτρέπονται στα συγχωνευμένα"
-        embed_blacklist_selector: "CSS διαλογέας για στοιχεία που έχουν απομακρυνθεί από τα συγχωνευμένα"
-        embed_classname_whitelist: "Επιτρεπόμενα CSS ονόματα τάξης"
-        feed_polling_enabled: "Εισαγωγή δημοσιεύσεων μέσω RSS/ATOM"
-        feed_polling_url: "Η διεύθυνση URL του RSS/ATOM τροφοδοτεί την ανιχνεύση"
-        save: "Αποθήκευση ενσωματωμένων αλλαγών"
+        embed_post_limit: "Μέγιστος αριθμός αναρτήσεων για συγχώνευση"
+        embed_username_key_from_feed: "Κλειδί για λήψη του ονόματος χρήστη από το feed"
+        embed_title_scrubber: "Regular expression που χρησιμοποιείται για την λήψη των τίτλων των αναρτήσεων"
+        embed_truncate: "Truncate the embedded posts"
+        embed_whitelist_selector: "CSS selector για στοιχεία που επιτρέπονται στα συγχωνευμένα"
+        embed_blacklist_selector: "CSS selector για στοιχεία που έχουν απομακρυνθεί από τα συγχωνευμένα"
+        embed_classname_whitelist: "Επιτρεπόμενα CSS class names"
+        feed_polling_enabled: "Εισαγωγή αναρτήσεων μέσω RSS/ATOM"
+        feed_polling_url: "URL of RSS/ATOM feed to crawl"
+        feed_polling_frequency_mins: "Συχνότητα του feed polling (σε λεπτά)"
+        save: "Αποθήκευση των ρυθμίσεων Embedding "
       permalink:
-        title: "Μόνιμοι Σύνδεσμοι"
-        url: "διεύθυνση URL"
-        topic_id: "Ταυτότητα νήματος"
+        title: "Permalinks"
+        url: "URL"
+        topic_id: "Topic ID"
         topic_title: "Νήμα"
-        post_id: "Ταυτότητα δημοσίευσης"
-        post_title: "Δημοσίευση"
-        category_id: "Ταυτότητα Κατηγορίας"
+        post_id: "Post ID"
+        post_title: "Ανάρτηση"
+        category_id: "Category ID"
         category_title: "Κατηγορία"
         external_url: "Εξωτερική διεύθυνση URL"
         delete_confirm: Είσαι βέβαιος πως θέλεις να διαγράψεις αυτόν τον μόνιμο σύνδεσμο;
@@ -3126,17 +3324,17 @@ el:
       done: "Ολοκληρώθηκε"
       back: "Πίσω"
       next: "Επόμενο"
-      step: "%{current} του %{total}"
-      upload: "Μεταφόρτωση"
-      uploading: "Μεταφορτώνεται..."
+      step: "%{current} από %{total}"
+      upload: "Ανέβασμα"
+      uploading: "Ανεβαίνει..."
       quit: "Ίσως αργότερα"
       staff_count:
         one: "Η κοινότητά σου έχει 1 μέλος του προσωπικού."
         other: "Η κοινότητά σου έχει %{count} μέλη του προσωπικού."
       invites:
-        add_user: "προσθέτω"
+        add_user: "προσθήκη"
         none_added: "Δεν έχεις προσκαλέσει το προσωπικό. Είσαι βέβαιος πως θέλεις να συνεχίσεις;"
         roles:
           admin: "Διαχειριστής"
-          moderator: "Μεσολαβιτής"
+          moderator: "Συντονιστής"
           regular: "Τακτικός χρήστης"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 1bb210eb6c..0d08df5c56 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -409,7 +409,8 @@ en:
         add_members: "Add Members"
         delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
       name_placeholder: "Group name, no spaces, same as username rule"
-      public: "Allow users to join/leave the group freely (Requires publicly visible group)"
+      public_admission: "Allow users to join the group freely (Requires publicly visible group)"
+      public_exit: "Allow users to leave the group freely"
       empty:
         posts: "There are no posts by members of this group."
         members: "There are no members in this group."
@@ -421,6 +422,7 @@ en:
       join: "Join Group"
       leave: "Leave Group"
       request: "Request to Join Group"
+      message: "Message"
       automatic_group: Automatic Group
       closed_group: Closed Group
       is_group_user: "You are a member of this group"
@@ -1134,6 +1136,24 @@ en:
       ctrl: 'Ctrl'
       alt: 'Alt'
 
+    emoji_picker:
+      filter_placeholder: Search for emoji
+      people: People
+      nature: Nature
+      food: Food
+      activity: Activity
+      travel: Travel
+      objects: Objects
+      celebration: Celebration
+      custom: Custom emojis
+      recent: Recently used
+      default_tone: No skin tone
+      light_tone: Light skin tone
+      medium_light_tone: Medium light skin tone
+      medium_tone: Medium skin tone
+      medium_dark_tone: Medium dark skin tone
+      dark_tone: Dark skin tone
+
     composer:
       emoji: "Emoji :)"
       more_emoji: "more..."
@@ -1313,14 +1333,15 @@ en:
       clear_all: "Clear All"
       too_short: "Your search term is too short."
       result_count:
-        one: "1 result for <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} results for <span class='term'>\"{{term}}\"</span>"
+        one: "1 result for <span class='term'>{{term}}</span>"
+        other: "{{count}} results for <span class='term'>{{term}}</span>"
       title: "search topics, posts, users, or categories"
       no_results: "No results found."
       no_more_results: "No more results found."
       searching: "Searching ..."
       post_format: "#{{post_number}} by {{username}}"
       results_page: "Search Results"
+      more_results: "There are more results. Please narrow your search criteria."
 
       context:
         user: "Search posts by @{{username}}"
@@ -1354,6 +1375,7 @@ en:
           seen: I've read
           unseen: I've not read
           wiki: are wiki
+          images: includes image(s)
           all_tags: Contains all tags
         statuses:
           label: Where topics
@@ -1724,6 +1746,7 @@ en:
         success_email: "We mailed out an invitation to <b>{{emailOrUsername}}</b>. We'll notify you when the invitation is redeemed. Check the invitations tab on your user page to keep track of your invites."
         success_username: "We've invited that user to participate in this topic."
         error: "Sorry, we couldn't invite that person. Perhaps they have already been invited? (Invites are rate limited)"
+        success_existing_email: "A user with email <b>{{emailOrUsername}}</b> already exists. We've invited that user to participate in this topic."
 
       login_reply: 'Log In to Reply'
 
@@ -3129,6 +3152,31 @@ en:
         logster:
           title: "Error Logs"
 
+      watched_words:
+        title: "Watched Words"
+        search: "search"
+        clear_filter: "Clear"
+        show_words: "show words"
+        word_count:
+          one: "1 word"
+          other: "%{count} words"
+        actions:
+          block: 'Block'
+          censor: 'Censor'
+          require_approval: 'Require Approval'
+          flag: 'Flag'
+        action_descriptions:
+          block: 'Prevent posts containing these words from being posted. The user will see an error message when they try to submit their post.'
+          censor: 'Allow posts containing these words, but replace them with characters that hide the censored words.'
+          require_approval: 'Posts containing these words will require approval by staff before they can be seen.'
+          flag: 'Allow posts containing these words, but flag them as inappropriate so moderators can review them.'
+        form:
+          label: 'New Word:'
+          add: 'Add'
+          success: 'Success'
+          upload: "Upload"
+          upload_successful: "Upload successful. Words have been added."
+
       impersonate:
         title: "Impersonate"
         help: "Use this tool to impersonate a user account for debugging purposes. You will have to log out once finished."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index b06ed639d6..7df0882ba7 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -148,20 +148,20 @@ es:
       default_description: "Por defecto"
     s3:
       regions:
-        us_east_1: "EEUU Este (Virginia del Norte)"
-        us_west_1: "EEUU Oeste (Californa norte)"
-        us_west_2: "EEUU Oeste (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "UE (Irlanda)"
-        eu_west_2: "EU (Londres)"
-        eu_central_1: "UE (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapur)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Bombay)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seúl)"
-        sa_east_1: "Sudamérica (São Paulo)"
+        ap_south_1: "Asia Pacific (Bombay)"
+        ap_southeast_1: "Asia Pacific (Singapur)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Pekín)"
+        eu_central_1: "UE (Frankfurt)"
+        eu_west_1: "UE (Irlanda)"
+        eu_west_2: "EU (Londres)"
+        sa_east_1: "Sudamérica (São Paulo)"
+        us_east_1: "EEUU Este (Virginia del Norte)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "EEUU Oeste (Californa norte)"
+        us_west_2: "EEUU Oeste (Oregon)"
     edit: 'editar el título y la categoría de este tema'
     not_implemented: "Esta característica no ha sido implementada aún, ¡lo sentimos!"
     no_value: "No"
@@ -819,8 +819,8 @@ es:
         more_badges: "Más distintivos"
         top_links: "Top enlaces"
         no_links: "No hay enlaces aún."
-        most_liked_by: "Los que dieron más me gusta"
-        most_liked_users: "Más gustado"
+        most_liked_by: "De quienes recibió más me gusta"
+        most_liked_users: "A quienes dio más me gusta"
         most_replied_to_users: "A quienes más respondió"
         no_likes: "No hay me gusta aún."
       associated_accounts: "Inicios de sesión"
@@ -1012,7 +1012,6 @@ es:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
-      google_classic: "Google Classic"
       facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Solo categorías"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 722887e363..aa3872e639 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -141,19 +141,19 @@ et:
     bootstrap_mode_disabled: "Käivitusrežiim lülitub välja järgmise 24 tunni jooksul."
     s3:
       regions:
-        us_east_1: "US Ida (N. Virginia)"
-        us_west_1: "US Lääs (N. California)"
-        us_west_2: "US Lääs (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EL (Iirimaa)"
-        eu_central_1: "EL (Frankfurt)"
-        ap_southeast_1: "Aasia ja Vaikne ookean (Singapur)"
-        ap_southeast_2: "Aasia ja Vaikne ookean (Sydney)"
-        ap_south_1: "Aasia ja Vaikse Ookeani (Mumbai)"
         ap_northeast_1: "Aasia ja Vaikne ookean (Tokyo)"
         ap_northeast_2: "Aasia ja Vaikne ookean (Seoul)"
-        sa_east_1: "Lõuna-Ameerika (Sao Paulo)"
+        ap_south_1: "Aasia ja Vaikse Ookeani (Mumbai)"
+        ap_southeast_1: "Aasia ja Vaikne ookean (Singapur)"
+        ap_southeast_2: "Aasia ja Vaikne ookean (Sydney)"
         cn_north_1: "Hiina (Beijing)"
+        eu_central_1: "EL (Frankfurt)"
+        eu_west_1: "EL (Iirimaa)"
+        sa_east_1: "Lõuna-Ameerika (Sao Paulo)"
+        us_east_1: "US Ida (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US Lääs (N. California)"
+        us_west_2: "US Lääs (Oregon)"
     edit: 'muuda teema pealkirja ja foorumit'
     not_implemented: "Seda omadust pole veel rakendatud, vabandame!"
     no_value: "Ei"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 9fe342d8da..059d88b002 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -95,7 +95,7 @@ fa_IR:
     action_codes:
       public_topic: "این موضوع در %{when}  عمومی شده"
       private_topic: "این موضوع در %{when}  خصوصی شده"
-      split_topic: "این موضوع را در %{when} جدا کنید "
+      split_topic: "این موضوع  %{when} جدا شد "
       invited_user: "%{who} در %{when} دعوت شده"
       invited_group: "%{who} در %{when} دعوت شده"
       removed_user: "%{who} در %{when} حذف شد"
@@ -130,20 +130,20 @@ fa_IR:
       default_description: "پیش‌فرض"
     s3:
       regions:
-        us_east_1: "شرق ایالات متحده (ویرجینیا شمالی)"
-        us_west_1: "غرب ایالات متحده (کالیفرنیا شمالی)"
-        us_west_2: "غرب ایالات متحده  (اورگان)"
-        us_gov_west_1: "AWS GovCloud (ایالات متحده)"
-        eu_west_1: "اروپا (ایرلند)"
-        eu_west_2: "اروپا (لندن)"
-        eu_central_1: "اروپا (فرانکفورت)"
-        ap_southeast_1: "آسیا و اقیانوسیه (سنگاپور)"
-        ap_southeast_2: "آسیا و اقیانوسیه (سیدنی)"
-        ap_south_1: "آسیا و اقیانوسیه (بمبئی)"
         ap_northeast_1: "آسیا و اقیانوسیه (توکیو)"
         ap_northeast_2: "آسیا و اقیانوسیه (سئول)"
-        sa_east_1: "آمریکای جنوبی (سائوپائولو)"
+        ap_south_1: "آسیا و اقیانوسیه (بمبئی)"
+        ap_southeast_1: "آسیا و اقیانوسیه (سنگاپور)"
+        ap_southeast_2: "آسیا و اقیانوسیه (سیدنی)"
         cn_north_1: "چین (پکن)"
+        eu_central_1: "اروپا (فرانکفورت)"
+        eu_west_1: "اروپا (ایرلند)"
+        eu_west_2: "اروپا (لندن)"
+        sa_east_1: "آمریکای جنوبی (سائوپائولو)"
+        us_east_1: "شرق ایالات متحده (ویرجینیا شمالی)"
+        us_gov_west_1: "AWS GovCloud (ایالات متحده)"
+        us_west_1: "غرب ایالات متحده (کالیفرنیا شمالی)"
+        us_west_2: "غرب ایالات متحده  (اورگان)"
     edit: 'موضوع و دسته‌ی این موضوع را ویرایش کنید'
     not_implemented: "آن ویژگی هنوز به کار گرفته نشده، متأسفیم!"
     no_value: "خیر"
@@ -1084,7 +1084,7 @@ fa_IR:
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
-      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{description}}'  را بدست آورده</p>"
+      granted_badge: "<i title=\"اعطای نشان\" class=\"fa fa-certificate\"></i><p>نشان '{{description}}'  را بدست آوردید</p>"
       topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>موضوع جدید</span> {{description}}</p"
       group_message_summary:
@@ -1295,7 +1295,7 @@ fa_IR:
       toggle_information: " تغییر وضعیت جزئیات موضوع"
       read_more_in_category: "می‌خواهید بیشتر بخوانید؟موضوعات دیگر را در {{catLink}} یا {{latestLink}} مرور کنید."
       read_more: "می‌خواهید بیشتر بخوانید؟ {{catLink}} یا {{latestLink}}."
-      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>یک پیام خوانده نشده</a> وجود دارد } other { <a href='/unread'># پیام خوانده نشده</a> وجود دارد } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 موضوع جدید</a> } other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># موضوع جدید</a> } } remaining, or {CATEGORY, select, true {نمایش سایر موضوعات دسته‌بندی {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "{ UNREAD, plural, =0 {} one { <a href='/unread'>یک پیام خوانده نشده</a>  } other { <a href='/unread'># پیام خوانده نشده</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{و } false { } other{}} <a href='/new'>1 موضوع جدید</a> } other { {BOTH, select, true{و } false { } other{}} <a href='/new'># موضوع جدید</a> } } وجود دارد, یا {CATEGORY, select, true {نمایش سایر موضوعات دسته‌بندی {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: جستوجوی همه‌ی دسته‌‌بندی‌ها
       view_latest_topics: مشاهده آخرین موضوع
       suggest_create_topic: چرا یک موضوع ایجاد نمی‌کنید؟
@@ -1376,7 +1376,7 @@ fa_IR:
           '2_2': 'به دلیل پیگیری این موضوع، تعداد پاسخ‌های جدید را خواهید دید.'
           '2': 'شما به دلیل <a href="/u/{{username}}/preferences">خواندن این موضوع</a>. تعداد پاسخ‌های جدید آن را خواهید دید.'
           '1_2': 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد به شما اطلاع داده خواهد شد.'
-          '1': 'در صورتی که فردی با @نام به شما اشاره کند یا به پاسخی دهد به شما اطلاع داده خواهد شد.'
+          '1': 'در صورتی که فردی با @نام به شما اشاره کند یا پاسخی دهد، به شما اطلاع داده خواهد شد.'
           '0_7': 'شما تمام اعلان‌های این دسته‌بندی را نادیده گرفته اید'
           '0_2': 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
           '0': 'شما تمام اعلان‌های این موضوع را نادیده گرفته اید'
@@ -1882,10 +1882,10 @@ fa_IR:
     posts: "نوشته‌ها"
     posts_long: "این موضوع {{number}} نوشته دارد"
     posts_likes_MF: |
-      این موضوع {count, plural, one {1 پاسخ} other {# پاسخ}} با {ratio, select,
-      low {تعداد پسند به نوشته بالایی دارد}
-      med {تعداد پسند به نوشته بسیار بالایی دارد}
-      high {تعداد پسند به نوشته بشدت بالایی دارد}
+      این موضوع دارای {count, plural, one {1 پاسخ} other {# پاسخ}} است {ratio, select,
+      low {و مورد پسند دیگران واقع شده است}
+      med {و بسیار مورد پسند دیگران واقع شده است}
+      high {و به شدت مورد پسند دیگران واقع شده است}
       other {}}
     original_post: "نوشته اصلی"
     views: "نمایش‌ها"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index bef9a585b9..04bc7fa721 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -148,20 +148,21 @@ fi:
       default_description: "Oletus"
     s3:
       regions:
-        us_east_1: "itäinen USA (Pohjois-Virginia)"
-        us_west_1: "Läntinen USA (Pohjois-Kalifornia)"
-        us_west_2: "Läntinen USA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irlanti)"
-        eu_west_2: "EU (Lontoo)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Aasia ja Tyynimeri (Singapore)"
-        ap_southeast_2: "Aasia ja Tyynimeri (Sydney)"
-        ap_south_1: "Aasia ja Tyynimeri (Mumbai)"
         ap_northeast_1: "Aasia ja Tyynimeri (Tokio)"
         ap_northeast_2: "Aasia ja Tyynimeri (Soul)"
-        sa_east_1: "Etelä-Amerikka (Sao Paulo)"
+        ap_south_1: "Aasia ja Tyynimeri (Mumbai)"
+        ap_southeast_1: "Aasia ja Tyynimeri (Singapore)"
+        ap_southeast_2: "Aasia ja Tyynimeri (Sydney)"
         cn_north_1: "Kiina (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanti)"
+        eu_west_2: "EU (Lontoo)"
+        sa_east_1: "Etelä-Amerikka (Sao Paulo)"
+        us_east_1: "itäinen USA (Pohjois-Virginia)"
+        us_east_2: "Itäinen USA (Ohio)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "Läntinen USA (Pohjois-Kalifornia)"
+        us_west_2: "Läntinen USA (Oregon)"
     edit: 'muokkaa ketjun otsikkoa ja aluetta'
     not_implemented: "Tätä toimintoa ei ole vielä toteutettu, pahoittelut!"
     no_value: "Ei"
@@ -206,8 +207,8 @@ fi:
       one: "{{count}} merkki"
       other: "{{count}} merkkiä"
     suggested_topics:
-      title: "Ehdotetut ketjut"
-      pm_title: "Ehdotetut viestit"
+      title: "Ketjuehdotuksia"
+      pm_title: "Keskusteluehdotuksia"
     about:
       simple_title: "Tietoja"
       title: "Tietoja sivustosta %{title}"
@@ -352,7 +353,8 @@ fi:
         add_members: "Lisää jäseniä"
         delete_member_confirm: "Poista '%{username}' ryhmästä '%{group}'?"
       name_placeholder: "Ryhmän nimi. Ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
-      public: "Salli käyttäjien liittyä ryhmään ja poistua siitä vapaasti (ryhmän täytyy olla julkisesti näkyvillä)"
+      public_admission: "Salli käyttäjien liittyä ryhmään vapaasti (Ryhmän täytyy olla julkinen)"
+      public_exit: "Salli käyttäjien poistua ryhmästä vapaasti"
       empty:
         posts: "Ryhmän jäsenet eivät ole lähettäneet viestejä."
         members: "Ryhmässä ei ole jäseniä."
@@ -364,6 +366,7 @@ fi:
       join: "Liity ryhmään"
       leave: "Poistu ryhmästä"
       request: "Hae ryhmään"
+      message: "Viesti"
       automatic_group: Automaattinen ryhmä
       closed_group: Suljettu ryhmä
       is_group_user: "Olet tämän ryhmän jäsen"
@@ -1013,6 +1016,8 @@ fi:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Vain alueet"
       categories_with_featured_topics: "Alueet, joiden yhteydessä ketjuja"
@@ -1021,6 +1026,23 @@ fi:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Etsi emojia
+      people: Ihmiset
+      nature: Luonto
+      food: Ruoka
+      activity: Harrasteet
+      travel: Matkustelu
+      objects: Esineet
+      celebration: Juhlinta
+      custom: Mukautetut emojit
+      recent: Hiljattain käytetyt
+      default_tone: Ei ihonsävyä
+      light_tone: Vaalea ihonväri
+      medium_light_tone: Vaaleanruskea ihonväri
+      medium_tone: Ruskea ihonväri
+      medium_dark_tone: Tummanruskea ihonväri
+      dark_tone: Tumma ihonväri
     composer:
       emoji: "Emoji :)"
       more_emoji: "lisää..."
@@ -2884,6 +2906,27 @@ fi:
             title: "Luo uusia aliverkkojen laajuisia porttikieltoja, jos kieltoja on asetettu vähintään 'min_ban_entries_for_roll_up' asetuksen määrä."
         logster:
           title: "Virhelokit"
+      watched_words:
+        title: "Tarkkaillut sanat"
+        search: "haku"
+        clear_filter: "Tyhjennä"
+        show_words: "näytä sanat"
+        actions:
+          block: 'Estä'
+          censor: 'Sensuroi'
+          require_approval: 'Vie hyväksyttäväksi'
+          flag: 'Liputa'
+        action_descriptions:
+          block: 'Estä lähettämästä viestiä, jossa esiintyy joku näistä sanoista. Käyttäjälle näytetään virheilmoitus, kun hän yrittää lähettää viestinsä.'
+          censor: 'Salli viesti, jossa esiintyy joku näistä sanoista, mutta korvaa ne merkeillä, jotka piilottavat sensuroidut sanat.'
+          require_approval: 'Viesti, jossa esiintyy joku näistä sanoista, tarvitsee henkilökunnan hyväksynnän ennen sen julkaisemista.'
+          flag: 'Salli viesti, jossa esiintyy joku näistä sanoista, mutta liputa se sopimattomaksi, jotta valvojat voivat tarkastella sitä.'
+        form:
+          label: 'Uusi sana:'
+          add: 'Lisä'
+          success: 'Onnistui'
+          upload: "Lataa"
+          upload_successful: "Lataus onnistui. Sanoja lisättiin."
       impersonate:
         title: "Esiinny käyttäjänä"
         help: "Tällä työkalulla voi esiintyä toisena käyttäjänä virheiden paikantamista varten. Sinun täytyy kirjautua ulos, kun olet valmis."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index f094071c20..6df4471f1e 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -148,20 +148,20 @@ fr:
       default_description: "Par défaut"
     s3:
       regions:
-        us_east_1: "États-Unis est (Virginie)"
-        us_west_1: "États-Unis ouest (Californie)"
-        us_west_2: "États-Unis ouest (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "UE (Irlande)"
-        eu_west_2: "UE (Londres)"
-        eu_central_1: "UE (Francfort)"
-        ap_southeast_1: "Asie-Pacifique (Singapour)"
-        ap_southeast_2: "Asie-Pacifique (Sydney)"
-        ap_south_1: "Asie-Pacifique (Bombay)"
         ap_northeast_1: "Asie-Pacifique (Tokyo)"
         ap_northeast_2: "Asie-Pacifique (Séoul)"
-        sa_east_1: "Amérique du Sud (Sao Paulo)"
+        ap_south_1: "Asie-Pacifique (Bombay)"
+        ap_southeast_1: "Asie-Pacifique (Singapour)"
+        ap_southeast_2: "Asie-Pacifique (Sydney)"
         cn_north_1: "Chine (Pékin)"
+        eu_central_1: "UE (Francfort)"
+        eu_west_1: "UE (Irlande)"
+        eu_west_2: "UE (Londres)"
+        sa_east_1: "Amérique du Sud (Sao Paulo)"
+        us_east_1: "États-Unis est (Virginie)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "États-Unis ouest (Californie)"
+        us_west_2: "États-Unis ouest (Oregon)"
     edit: 'modifier le titre et la catégorie de ce sujet'
     not_implemented: "Cette fonctionnalité n'a pas encore été implémentée, désolé."
     no_value: "Non"
@@ -352,6 +352,7 @@ fr:
         add_members: "Ajouter des membres"
         delete_member_confirm: "Supprimer %{username} du groupe « %{group} » ?"
       name_placeholder: "Nom du groupe, sans espaces, même règle que pour les pseudos"
+      public: "Autoriser les utilisateurs à rejoindre/quitter le groupe librement (nécessite que le groupe soit visible)"
       empty:
         posts: "Il n'y a aucun message de membres de ce groupe."
         members: "Il n' y a aucun membre dans ce groupe."
@@ -386,6 +387,12 @@ fr:
       mentions: "Mentions"
       messages: "Messages"
       notification_level: "Niveau de notification par défaut pour les messages de groupe"
+      visibility_levels:
+        title: "Qui peut voir ce groupe ?"
+        public: "Tout le monde"
+        members: "Propriétaires du groupe, membres et administrateurs"
+        staff: "Propriétaires du groupe et responsables"
+        owners: "Propriétaires du groupe et administrateurs"
       alias_levels:
         title: "Qui peut envoyer un message et @notifier ce groupe ?"
         nobody: "Personne"
@@ -1005,6 +1012,8 @@ fr:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Classique Google"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Catégories seules"
       categories_with_featured_topics: "Catégories et sujets sélectionnés"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index e24bf1778d..e44e69bb6e 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -140,17 +140,17 @@ gl:
     emails_are_disabled: "Todos os correos electrónicos saíntes foron desactivados globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico."
     s3:
       regions:
-        us_east_1: "EE.UU. Leste (N. Virxinia)"
-        us_west_1: "EE.UU. Oeste (N. California)"
-        us_west_2: "EE.UU. Oeste (Oregón)"
-        us_gov_west_1: "AWS GovCloud (EE.UU)"
-        eu_west_1: "EU (Irlanda)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacífico (Singapur)"
-        ap_southeast_2: "Asia Pacífico (Sidney)"
         ap_northeast_1: "Asia Pacífico (Tokio)"
         ap_northeast_2: "Asia Pacífico (Seúl)"
+        ap_southeast_1: "Asia Pacífico (Singapur)"
+        ap_southeast_2: "Asia Pacífico (Sidney)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
         sa_east_1: "América do Sur (São Paulo)"
+        us_east_1: "EE.UU. Leste (N. Virxinia)"
+        us_gov_west_1: "AWS GovCloud (EE.UU)"
+        us_west_1: "EE.UU. Oeste (N. California)"
+        us_west_2: "EE.UU. Oeste (Oregón)"
     edit: 'editar o título e a categoría deste tema'
     not_implemented: "Sentímolo pero esta funcionalidade non se implementou aínda."
     no_value: "Non"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index f85c41bd71..57475c3339 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -18,10 +18,10 @@ he:
             byte:
               one: בית
               other: בתים
-            gb: GB
-            kb: KB
-            mb: MB
-            tb: TB
+            gb: ג״ב
+            kb: ק״ב
+            mb: מ״ב
+            tb: ט״ב
       short:
         thousands: "k{{number}}"
         millions: "{{number}}M"
@@ -44,7 +44,7 @@ he:
         half_a_minute: "פחות מדקה"
         less_than_x_seconds:
           one: "פחות משנייה"
-          other: "פחות מ-%{count} שניות"
+          other: "פחות מ־%{count} שניות"
         x_seconds:
           one: "שנייה אחת"
           other: "%{count} שניות"
@@ -62,7 +62,7 @@ he:
           other: "%{count} שנים"
         over_x_years:
           one: "יותר משנה"
-          other: "יותר מ-%{count} שנים"
+          other: "יותר מ־%{count} שנים"
         almost_x_years:
           one: "שנה אחת"
           other: "%{count} שנים"
@@ -109,7 +109,7 @@ he:
       twitter: 'שתפו קישור זה בטוויטר'
       facebook: 'שתפו קישור זה בפייסבוק'
       google+: 'שתפו קישור זה בגוגל+'
-      email: 'שלח קישור בדוא"ל'
+      email: 'שליחת קישור בדוא״ל'
     action_codes:
       public_topic: "הפכו נושא זה לפומבי %{when}"
       private_topic: "הפכו נושא זה לפרטי %{when}"
@@ -137,31 +137,32 @@ he:
         enabled: 'נכנס לרשימה %{when}'
         disabled: 'הוצא מהרשימה %{when}'
       banner:
-        enabled: 'באנר זה נוצר ב-%{when}. הוא יופיע בראש כל דף עד שישוחרר על ידי המשתמש/ת.'
-        disabled: 'באנר זה הוסר ב-%{when}. הוא לא יופיע יותר בראש כל דף.'
+        enabled: 'באנר זה נוצר ב־%{when}. הוא יופיע בראש כל דף עד שישוחרר על ידי המשתמש/ת.'
+        disabled: 'באנר זה הוסר ב־%{when}. הוא לא יופיע יותר בראש כל דף.'
     topic_admin_menu: "פעולות ניהול לנושא"
-    wizard_required: "ברוכים הבאים לסידקורס החדש שלכם! בואו נתחיל עם <a href='%{url}' data-auto-route='true'>אשף ההתקנה</a> ✨"
-    emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, לא תשלח."
+    wizard_required: "ברוכים הבאים לדיסקורס החדש שלכם! בואו נתחיל עם <a href='%{url}' data-auto-route='true'>אשף ההתקנה</a> ✨"
+    emails_are_disabled: "כל הדוא״ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא״ל, מכל סוג שהוא, לא תשלח."
     bootstrap_mode_enabled: "כדי להקל על הקמת האתר החדש שלכם, אתם במצב איתחול-ראשוני. כל המשתמשים החדשים יקבלו רמת אמון 1 ויקבלו תמצות יומי במייל. אפשרות זו תכובה אוטומטית כאשר יהיו יותר מ %{min_users} משתמשים."
     bootstrap_mode_disabled: "מצב איתחול-ראשוני יכובה ב 24 השעות הקרובות."
     themes:
       default_description: "ברירת מחדל"
     s3:
       regions:
-        us_east_1: "מזרח ארה\"ב (צפון וירג'יניה)"
-        us_west_1: "מערב ארה\"ב (צפון קליפורניה)"
-        us_west_2: "מערב ארה\"ב (ארגון)"
-        us_gov_west_1: "AWS GovCloud (ארה״ב)"
-        eu_west_1: "האיחוד האירופי (אירלנד)"
-        eu_west_2: "אירופה (לונדון)"
-        eu_central_1: "האיחוד האירופי (פרנקפורט)"
-        ap_southeast_1: "אסיה הפסיפית (סינגפור)"
-        ap_southeast_2: "אסיה הפסיפית (סידני)"
-        ap_south_1: "אסיה פסיפית (מומבאי)"
         ap_northeast_1: "אסיה הפסיפית (טוקיו)"
         ap_northeast_2: "אסיה הפסיפית (סיאול)"
-        sa_east_1: "דרום אמריקה (סאו פאולו)"
+        ap_south_1: "אסיה פסיפית (מומבאי)"
+        ap_southeast_1: "אסיה הפסיפית (סינגפור)"
+        ap_southeast_2: "אסיה הפסיפית (סידני)"
         cn_north_1: "סין (בייג׳ינג)"
+        eu_central_1: "האיחוד האירופי (פרנקפורט)"
+        eu_west_1: "האיחוד האירופי (אירלנד)"
+        eu_west_2: "אירופה (לונדון)"
+        sa_east_1: "דרום אמריקה (סאו פאולו)"
+        us_east_1: "מזרח ארה״ב (צפון וירג׳יניה)"
+        us_east_2: "ארה״ב מזרח (אוהיו)"
+        us_gov_west_1: "AWS GovCloud (ארה״ב)"
+        us_west_1: "מערב ארה\"ב (צפון קליפורניה)"
+        us_west_2: "מערב ארה\"ב (ארגון)"
     edit: 'עירכו את הכותרת והקטגוריה של נושא זה'
     not_implemented: "סליחה, תכונה זו עדיין לא מומשה!"
     no_value: "לא"
@@ -352,6 +353,8 @@ he:
         add_members: "הוספת חברים"
         delete_member_confirm: "הסרת '%{username}' מהקבוצה '%{group}'?"
       name_placeholder: "שם קבוצה, ללא רווחים, לפי הכללים של שמות משתמשים"
+      public_admission: "אפשרו למשתמשים להצטרף לקבוצה בחופשיות (דורש קבוצה פומבית)"
+      public_exit: "אפשרו למשתמשים לעזוב את הקבוצה בחופשיות"
       empty:
         posts: "אין פוסטים של חברי קבוצה זו."
         members: "אין חברים בקבוצה זו."
@@ -363,6 +366,7 @@ he:
       join: "הצטרפות לקבוצה"
       leave: "עזיבת קבוצה"
       request: "בקשה להצטרפות לקבוצה"
+      message: "הודעה"
       automatic_group: קבוצה אוטומטית
       closed_group: קבוצה סגורה
       is_group_user: "אתם חברים בקבוצה זו."
@@ -386,6 +390,12 @@ he:
       mentions: "אזכורים"
       messages: "הודעות"
       notification_level: "ברירת מחדל של רמת התראות להודעות קבוצה"
+      visibility_levels:
+        title: "מי יכול לראות קבוצה זו?"
+        public: "כולם"
+        members: "בעלי קבוצה, חברים ואדמיניסטרטורים"
+        staff: "בעלי קבוצה וצוות"
+        owners: "בעלי קבוצה ואדמיניסטרטורים"
       alias_levels:
         title: "מי יכולים לשלוח מסרים ו@לאזכר בקבוצה זו?"
         nobody: "אף אחד"
@@ -748,6 +758,9 @@ he:
         expired: "פג תוקף ההזמנה."
         rescind: "הסרה"
         rescinded: "הזמנה הוסרה"
+        rescind_all: "הסירו את כל ההזמנות"
+        rescinded_all: "כל ההזמנות הוסרו!"
+        rescind_all_confirm: "האם אתם בטוחים שאתם מעוניינים להסיר את כל ההזמנות?"
         reinvite: "משלוח חוזר של הזמנה"
         reinvite_all: "שלח מחדש את כל ההזמנות"
         reinvite_all_confirm: "האם אתם בטוחים שאתם מעוניינים לשלוח מחדש את כל ההזמנות?"
@@ -930,6 +943,8 @@ he:
       complete_email_found: "מצאנו חשבון תואם ל<b>%{email}</b>. בתוך זמן קצר תקבלו אליו דוא\"ל עם הנחיות כיצד לאתחל את הסיסמה שלכם."
       complete_username_not_found: "שום חשבון אינו תואם לשם המשתמש  <b>%{username}</b>"
       complete_email_not_found: "שום חשבון אינו תואם ל <b>%{email}</b>"
+      button_ok: "או קיי"
+      button_help: "עזרה"
     login:
       title: "התחברות"
       username: "משתמש"
@@ -989,6 +1004,8 @@ he:
       accept_invite: "קבלת הזמנה"
       success: "החשבון שלכם נוצר ואתם מחוברים עכשיו."
       name_label: "שם"
+      password_label: "קביעת סיסמה"
+      optional_description: "(אופציונלי)"
     password_reset:
       continue: "המשיכו ל-%{site_name}"
     emoji_set:
@@ -1005,6 +1022,20 @@ he:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: חיפוש אחר אימוג׳י
+      people: אנשים
+      nature: טבע
+      food: אוכל
+      activity: פעילות
+      custom: אימוג׳יז מותאמים
+      recent: בשימוש לאחרונה
+      default_tone: ללא גוון עור
+      light_tone: גוון עור בהיר
+      medium_light_tone: גוון עור בהיר בינוני
+      medium_tone: גוון עור בינוני
+      medium_dark_tone: גוון עור כהה בינוני
+      dark_tone: גוון עור כהה
     composer:
       emoji: "אמוג׳י :)"
       more_emoji: "עוד..."
@@ -1168,8 +1199,8 @@ he:
       clear_all: "נקוי של הכל"
       too_short: "מילת החיפוש שלכם קצרה מידי."
       result_count:
-        one: "תוצאה אחת ל <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} תוצאות ל <span class='term'>\"{{term}}\"</span>"
+        one: "1 תוצאה עבור <span class='term'>{{term}}</span>"
+        other: "{{count}} תוצאות עבור <span class='term'>{{term}}</span>"
       title: "חיפוש נושאים, פוסטים, משתמשים או קטגוריות"
       no_results: "אין תוצאות."
       no_more_results: "לא נמצאו עוד תוצאות."
@@ -1207,6 +1238,7 @@ he:
           seen: קראתי
           unseen: לא קראתי
           wiki: הם ויקי
+          all_tags: מכיל את כל התגים
         statuses:
           label: כאשר נושאים
           open: פתוחים
@@ -1655,6 +1687,7 @@ he:
         has_liked: "אהבת פוסט זה"
         undo_like: "בטל 'אהוב'"
         edit: "עירכו פוסט זה"
+        edit_action: "עריכה"
         edit_anonymous: "מצטערים, אך עליכם להיות מחוברים בכדי לערוך פוסט זה."
         flag: "דגלו פוסט זה באופן פרטי לתשומת לב או שלחו התראה פרטית עליו"
         delete: "מחק פוסט זה"
@@ -2867,6 +2900,24 @@ he:
             title: "יוצר ערכי איסור משנה חדשים, אם יש לפחות 'min_ban_entries_for_roll_up' ערכים."
         logster:
           title: "רישום תקלות"
+      watched_words:
+        search: "חיפוש"
+        clear_filter: "ניקוי"
+        show_words: "הצגת מילים"
+        actions:
+          block: 'חסימה'
+          censor: 'צינזור'
+          require_approval: 'דרישת אישור'
+          flag: 'דגל'
+        action_descriptions:
+          require_approval: 'פוסטים שמכילים מילים אלו ידרשו אישור על ידי הצוות לפני שניתן יהיה לראות אותם.'
+          flag: 'אפשרו פוסטים שמכילים אלו, אך דגלו אותם כלא-ראויים כדי שמנחים יוכלו לסקור אותם.'
+        form:
+          label: 'מילה חדשה:'
+          add: 'הוספה'
+          success: 'הצלחה'
+          upload: "העלאה"
+          upload_successful: "העלאה הצליחה. מילים נוספו."
       impersonate:
         title: "התחזות"
         help: "השתמשו בכלי זה כדי להתחזות לחשבון משתמש לצרכי דיבוג. עליכם להתנתק ברגע שתסיימו."
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 80bff180e5..edb2c2dc09 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -121,19 +121,19 @@ id:
     bootstrap_mode_disabled: "Mode bootstrap akan di non aktifkan pada 24 jam berikutnya."
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pasifik (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pasifik (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Cina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'Ubah judul dan kategori topik ini'
     not_implemented: "Maaf, fitur ini belum diimplementasikan."
     no_value: "Tidak"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index ec9c59bd37..4d00424ef1 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -148,20 +148,21 @@ it:
       default_description: "Default"
     s3:
       regions:
-        us_east_1: "Stati Uniti Est (Virginia del Nord)"
-        us_west_1: "Stati Uniti Ovest (California del Nord)"
-        us_west_2: "Stati Uniti Ovest (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "Europa (Irlanda)"
-        eu_west_2: "EU (Londra)"
-        eu_central_1: "Europa (Francoforte)"
-        ap_southeast_1: "Asia Pacifico (Singapore)"
-        ap_southeast_2: "Asia Pacifico (Sidney)"
-        ap_south_1: "Asia Pacifico (Mumbai)"
         ap_northeast_1: "Asia Pacifico (Tokyo)"
         ap_northeast_2: "Asia Pacifico (Seoul)"
-        sa_east_1: "America del Sud (San Paolo)"
+        ap_south_1: "Asia Pacifico (Mumbai)"
+        ap_southeast_1: "Asia Pacifico (Singapore)"
+        ap_southeast_2: "Asia Pacifico (Sidney)"
         cn_north_1: "Cina (Beijing)"
+        eu_central_1: "Europa (Francoforte)"
+        eu_west_1: "Europa (Irlanda)"
+        eu_west_2: "EU (Londra)"
+        sa_east_1: "America del Sud (San Paolo)"
+        us_east_1: "Stati Uniti Est (Virginia del Nord)"
+        us_east_2: "USA Est (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "Stati Uniti Ovest (California del Nord)"
+        us_west_2: "Stati Uniti Ovest (Oregon)"
     edit: 'modifica titolo e categoria dell''argomento'
     not_implemented: "Spiacenti! Questa funzione non è stata ancora implementata."
     no_value: "No"
@@ -352,6 +353,8 @@ it:
         add_members: "Aggiungi Membri"
         delete_member_confirm: "Rimuovere '%{username}' dal gruppo '%{group}'?"
       name_placeholder: "Nome del gruppo, senza spazi, stesse regole del nome utente"
+      public_admission: "Consenti agli utenti di unirsi al gruppo liberamente (Richiede che il gruppo sia visibile a tutti)"
+      public_exit: "Consenti agli utenti di lasciare il gruppo liberamente"
       empty:
         posts: "Non ci sono messaggi da membri di questo gruppo."
         members: "Non ci sono membri in questo gruppo."
@@ -363,6 +366,7 @@ it:
       join: "Partecipa al Gruppo"
       leave: "Abbandona il Gruppo"
       request: "Richiedi di partecipare al gruppo"
+      message: "Messaggio"
       automatic_group: Gruppo Automatico
       closed_group: Gruppo Chiuso
       is_group_user: "Sei un membro di questo gruppo"
@@ -386,6 +390,12 @@ it:
       mentions: "Menzioni"
       messages: "Messaggi"
       notification_level: "Livello di notifica predefinito per i messaggi di gruppo"
+      visibility_levels:
+        title: "Chi può vedere questo gruppo?"
+        public: "Chiunque"
+        members: "Proprietari del gruppo, membri e amministratori"
+        staff: "Proprietari del gruppo e staff"
+        owners: "Proprietari del gruppo e amministratori"
       alias_levels:
         title: "Chi può inviare @menzionare e inviare messaggi a questo gruppo?"
         nobody: "Nessuno"
@@ -748,6 +758,9 @@ it:
         expired: "L'invito è scaduto."
         rescind: "Rimuovi"
         rescinded: "Invito revocato"
+        rescind_all: "Rimuovi tutti gli Inviti"
+        rescinded_all: "Tutti gli inviti sono stati rimossi!"
+        rescind_all_confirm: "Sei sicuro di voler rimuovere tutti gli inviti?"
         reinvite: "Rinvia Invito"
         reinvite_all: "Rispedisci tutti gli Inviti"
         reinvite_all_confirm: "Sei sicuro di voler inviare nuovamente tutti gli inviti?"
@@ -761,10 +774,10 @@ it:
         link_generated: "Collegamento di invito generato con successo!"
         valid_for: "Questo collegamento di invito è valido solamente per il seguente indirizzo email: %{email}"
         bulk_invite:
-          none: "Non hai ancora invitato nessuno. Manda degli inviti individuali o invita più persone alla volta <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>caricando un file CVS</a>."
+          none: "Non hai ancora invitato nessuno. Puoi inviare degli inviti individuali o più persone alla volta <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>caricando un file CSV</a>."
           text: "Invito di Massa da File"
           success: "Il file è stato caricato con successo, riceverai un messaggio di notifica quando il processo sarà completato."
-          error: "Spiacente, il file deve essere in formato CSV."
+          error: "Spiacenti, il file deve essere in formato CSV."
       password:
         title: "Password"
         too_short: "La password è troppo breve."
@@ -1002,6 +1015,8 @@ it:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Solo Categorie"
       categories_with_featured_topics: "Categorie con argomenti in evidenza"
@@ -1010,12 +1025,30 @@ it:
       shift: 'Maiusc'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Ricerca per emoji
+      people: Persone
+      nature: Natura
+      food: Cibo
+      activity: Attività
+      travel: Viaggio
+      objects: Oggetti
+      celebration: Celebrazione
+      custom: Emoji personalizzate
+      recent: Usate recentemente
+      default_tone: Nessun tono della pelle
+      light_tone: Tono della pelle chiaro
+      medium_light_tone: Tono della pelle medio chiaro
+      medium_tone: Tono della pelle medio
+      medium_dark_tone: Tono della pelle medio scuro
+      dark_tone: Tono della pelle scuro
     composer:
       emoji: "Emoji :)"
       more_emoji: "altro..."
       options: "Opzioni"
       whisper: "sussurra"
       unlist: "invisibile"
+      blockquote_text: "Citazione"
       add_warning: "Questo è un avvertimento ufficiale."
       toggle_whisper: "Attiva/Disattiva Sussurri"
       toggle_unlisted: "Rendi Invisibile"
@@ -1121,6 +1154,7 @@ it:
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> ha spostato {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Guadagnato '{{description}}'</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nuovo Argomento</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} messaggio nella tua casella {{group_name}}</p>"
@@ -1204,13 +1238,13 @@ it:
           posted: ho pubblicato in
           watching: sto osservando
           tracking: sto seguendo
-          private: sono messaggi scritti da me
+          private: messaggi privati
           bookmarks: ho aggiunto ai segnalibri
           first: sono il primissimo post
           pinned: sono appuntati
           unpinned: non sono appuntati
-          seen: Ho letto
-          unseen: Non ho letto
+          seen: ho letto
+          unseen: non ho letto
           wiki: sono wiki
           all_tags: Contiene tutte le etichette
         statuses:
@@ -1238,6 +1272,7 @@ it:
         select_all: "Seleziona Tutti"
         clear_all: "Deseleziona Tutto"
         unlist_topics: "Deselezione Topics"
+        relist_topics: "Ripubblica Argomenti"
         reset_read: "Reimposta Lettura"
         delete: "Elimina Argomenti"
         dismiss: "Chiudi"
@@ -1541,6 +1576,7 @@ it:
         success_email: "Abbiamo inviato un invito via email a <b>{{emailOrUsername}}</b>. Ti avvertiremo quando l'invito verrà riscattato. Controlla la sezione \"inviti\" sulla tua pagina utente per tracciarne lo stato."
         success_username: "Abbiamo invitato l'utente a partecipare all'argomento."
         error: "Spiacenti, non siamo riusciti ad invitare questa persona. E' stata per caso già invitata (gli inviti sono limitati)? "
+        success_existing_email: "Esiste già un utente con email <b>{{emailOrUsername}}</b>. Lo abbiamo invitato a partecipare a questo argomento."
       login_reply: 'Connettiti per Rispondere'
       filters:
         n_posts:
@@ -1763,6 +1799,10 @@ it:
         confirm:
           one: "Sei sicuro di voler cancellare questo messaggio?"
           other: "Sei sicuro di voler cancellare tutti questi messaggi?"
+      merge:
+        confirm:
+          one: "Sicuro di voler unire questi messaggi?"
+          other: "Sicuro di voler unire questi {{count}} messaggi?"
       revisions:
         controls:
           first: "Prima revisione"
@@ -1902,6 +1942,7 @@ it:
       notify_action: 'Messaggio'
       official_warning: 'Avvertimento Ufficiale'
       delete_spammer: "Cancella Spammer"
+      delete_confirm_MF: "Stai per cancellare {POSTS, plural, one {<b>1</b> messaggio} other {<b>#</b> messaggi}} e {TOPICS, plural, one {<b>1</b> argomento} other {<b>#</b> argomenti}} di questo utente, rimuovere il suo account, bloccare l'iscrizione dall'indirizzo IP<b>{ip_address}</b>, e aggiungere il suo indirizzo email <b>{email}</b> ad un elenco nero permanente. Sei veramente sicuro che questo utente sia uno spammer?"
       yes_delete_spammer: "Sì, cancella lo spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(nascosto)"
@@ -2626,6 +2667,9 @@ it:
           updating: "Aggiornamento..."
           up_to_date: "Il tema è aggiornato, ultima verifica:"
           add: "Aggiungi"
+          commits_behind:
+            one: "Il tema è indietro di 1 aggiornamento!"
+            other: "Il tema è indietro di {{count}} aggiornamenti!"
           scss:
             text: "CSS"
             title: "Inserire il CSS personalizzato, accettiamo tutti gli stili validi di CSS e SCSSpersonalizzato"
@@ -2861,6 +2905,27 @@ it:
             title: "Crea nuovi elenchi di indirizzi IP interdetti se ci sono almeno 'min_ban_entries_for_roll_up' elementi."
         logster:
           title: "Log Errori"
+      watched_words:
+        title: "Parole Osservate"
+        search: "ricerca"
+        clear_filter: "Pulisci"
+        show_words: "mostra le parole"
+        actions:
+          block: 'Blocca'
+          censor: 'Censura'
+          require_approval: 'Richiede Approvazione'
+          flag: 'Segnala'
+        action_descriptions:
+          block: 'Impedisci che i messaggi contenenti queste parole siano pubblicati. L''utente visualizzerà un messaggio di errore quando cercherà di pubblicare il messaggio.'
+          censor: 'Consenti i messaggi contenenti queste parole, ma sostituiscile con caratteri che nascondono le parole censurate.'
+          require_approval: 'I messaggi contenenti queste parole richiederanno l''approvazione dello staff prima di poter essere visualizzati.'
+          flag: 'Consenti i messaggi contenenti queste parole, ma segnalale come inappropriate in modo che i moderatori possano revisionarle.'
+        form:
+          label: 'Nuova Parola:'
+          add: 'Aggiungi'
+          success: 'Successo'
+          upload: "Carica"
+          upload_successful: "Caricamento andato a buon fine. Le parole sono state aggiunte."
       impersonate:
         title: "Impersona"
         help: "Usa questo strumento per impersonare un account utente ai fini del debugging. Una volta finito dovrai disconnetterti."
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index e3301c1ffb..2eec19dbe9 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -25,28 +25,28 @@ ja:
         thousands: "{{number}}k"
         millions: "{{number}}M"
     dates:
-      time: "h:mm a"
+      time: "a h:mm"
       timeline_date: "YYYY MMM"
-      long_no_year: "MMM D h:mm a"
+      long_no_year: "MMM D a h:mm"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
-      long_with_year: "YYYY, MMM D h:mm a"
-      long_with_year_no_time: "YYYY, MMM D"
-      full_with_year_no_time: "MMMM Do, YYYY"
-      long_date_with_year: "MMM D, 'YY LT"
-      long_date_without_year: "MMM D, LT"
-      long_date_with_year_without_time: "MMM D, 'YY"
+      long_with_year: "YYYY MMM D a h:mm"
+      long_with_year_no_time: "YYYY MMM D"
+      full_with_year_no_time: "YYYY MMMM Do"
+      long_date_with_year: "'YY MMM D LT"
+      long_date_without_year: "MMM D LT"
+      long_date_with_year_without_time: "'YY MMM D"
       long_date_without_year_with_linebreak: "MMM D <br/>LT"
-      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      long_date_with_year_with_linebreak: "'YY MMM D <br/>LT"
       wrap_ago: "%{date}前"
       tiny:
-        half_a_minute: "1分前"
+        half_a_minute: "1分未満"
         less_than_x_seconds:
-          other: "%{count}秒前"
+          other: "%{count}秒未満"
         x_seconds:
           other: "%{count}秒"
         x_minutes:
-          other: "%{count}分前"
+          other: "%{count}分"
         about_x_hours:
           other: "%{count}時間"
         x_days:
@@ -54,11 +54,11 @@ ja:
         about_x_years:
           other: "%{count}年"
         over_x_years:
-          other: "%{count}年以上前"
+          other: "%{count}年以上"
         almost_x_years:
           other: "%{count}年"
-        date_month: "MMM D日"
-        date_year: "MMM 'YY"
+        date_month: "MMM D"
+        date_year: "'YY MMM"
       medium:
         x_minutes:
           other: "%{count}分"
@@ -95,8 +95,11 @@ ja:
     action_codes:
       public_topic: "トピックを公開しました: %{when} "
       private_topic: "トピックを非公開にしました: %{when}"
+      split_topic: "%{when} このトピックは分割されました"
       invited_user: "%{who} から招待されました: %{when}"
+      invited_group: "%{when} %{who}に招待されました"
       removed_user: "%{who}が %{when}に削除しました"
+      removed_group: "%{when} %{who}に取り除かれました"
       autoclosed:
         enabled: 'クローズされました: %{when}'
         disabled: '%{when}にオープンしました'
@@ -115,7 +118,11 @@ ja:
       visible:
         enabled: 'リストに表示: %{when}'
         disabled: 'リストから非表示: %{when}'
+      banner:
+        enabled: 'この広告%{when}を作成して下さい。ユーザーが拒否するまで各ページの上部に表示されます。'
+        disabled: 'このバナー%{when}を削除すると、各ページの最上部に表示しません。'
     topic_admin_menu: "トピックの管理"
+    wizard_required: "ディスコースへようこそ!さあ<a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
     emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません"
     bootstrap_mode_enabled: "かんたんにサイトを立ち上げられるようにするため、ブートストラップモードが有効になっています。新しいユーザーは全員、トラストレベル1を付与し、毎日更新がメールで届けられます。これらの機能は総ユーザー数が%{min_users}を超えた時にオフになります。"
     bootstrap_mode_disabled: "ブートストラップモードは24時間後に無効化されます。"
@@ -123,20 +130,21 @@ ja:
       default_description: "デフォルト"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "EU(ロンドン)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "アジア(ムンバイ)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "アジア(ムンバイ)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "中国(北京)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU(ロンドン)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "US East"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'このトピックのタイトル/カテゴリを編集'
     not_implemented: "この機能はまだ実装されていません！"
     no_value: "いいえ"
@@ -165,11 +173,11 @@ ja:
     or: "あるいは"
     now: "たった今"
     read_more: 'もっと読む'
-    more: "もっと見る"
-    less: "Less"
+    more: "増やす"
+    less: "減らす"
     never: "never"
     every_30_minutes: "30分毎"
-    every_hour: "1時間毎"
+    every_hour: "毎時"
     daily: "毎日"
     weekly: "毎週"
     every_two_weeks: "隔週"
@@ -311,12 +319,22 @@ ja:
         target_user: "対象ユーザー"
         subject: "対象"
         details: "詳細"
+        from: "差出人"
+        to: "宛先"
       edit:
         title: 'グループの編集'
         full_name: 'フルネーム'
         add_members: "メンバーを追加"
-        delete_member_confirm: "'%{username}' を '%{group}' から削除してもよろしいですか？"
+        delete_member_confirm: "%{group}から%{username}を削除しますか?"
       name_placeholder: "グループネームはユーザー名と同様にスペース無し"
+      public: "自由なグループへの加入・脱退をユーザーに許可する (一般公開グループである必要があります)"
+      empty:
+        posts: "このグループのメンバーによる投稿はありません。"
+        members: "このグループにはメンバーがいません。"
+        mentions: "このグループに対するメンションはありません。"
+        messages: "このグループへのメッセージはありません。"
+        topics: "このグループのメンバーによるトピックはありません。"
+        logs: "このグループに関するログはありません。"
       add: "追加"
       join: "グループに参加"
       leave: "グループから離脱"
@@ -342,6 +360,13 @@ ja:
       posts: "投稿"
       mentions: "メンション"
       messages: "メッセージ"
+      notification_level: "グループメッセージのデフォルト通知レベル"
+      visibility_levels:
+        title: "誰がこのグループを見ることができますか?"
+        public: "誰でも"
+        members: "グループのオーナー、メンバーおよび管理者"
+        staff: "グループオーナーとスタッフのみ"
+        owners: "グループオーナーと管理者のみ"
       alias_levels:
         title: "誰がこのグループにメッセージや@メンションが送れますか?"
         nobody: "無し"
@@ -354,13 +379,24 @@ ja:
         none: "なし"
       notifications:
         watching:
-          title: "ウォッチ中"
+          title: "待機中"
+          description: "メッセージ内の新規投稿はあなただけに通知され、新規返信数が表示されます。"
+        watching_first_post:
+          title: "最初の投稿に注意"
+          description: "グループ内新規トピック欄における最初の投稿はあなただけに通知されます。"
         tracking:
           title: "追跡中"
+          description: "誰かがあなた宛に返信をすると通知があり、新規返信数が表示されます。"
         regular:
           title: "デフォルト"
         muted:
           title: "ミュート"
+          description: "グループ内の新規トピックについては何も通知されません。"
+      flair_url: "アバター画像"
+      flair_bg_color: "アバターの背景色"
+      flair_color: "アバター色"
+      flair_preview_icon: "アイコンプレビュー"
+      flair_preview_image: "画像プレビュー"
     user_action_groups:
       '1': "「いいね！」 "
       '2': "「いいね！」 された"
@@ -384,6 +420,7 @@ ja:
         title: "カテゴリの並び替え"
         title_long: "カテゴリリストを並べ直します"
         fix_order: "位置を修正"
+        fix_order_tooltip: "全てのカテゴリーは唯一である番地を持っていないので、予期せぬ結果を引き起こすかもしれません。"
         save: "順番を保存"
         apply_all: "適用"
         position: "位置"
@@ -393,6 +430,8 @@ ja:
       latest_by: "最新投稿: "
       toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ:"
+      topic_sentence:
+        other: "%{count}トピック群"
       topic_stat_sentence:
         other: "過去 %{unit} 間 %{count} 個の新着トピック。"
     ip_lookup:
@@ -419,6 +458,9 @@ ja:
       edit: "プロフィールを編集"
       download_archive:
         button_text: "すべてダウンロード"
+        confirm: "本当にご自身の投稿をダウンロードしたいですか。"
+        success: "ダウンロードが始まると、処理完了時に通知されます。"
+        rate_limit_error: "投稿者は1日1回ダウンロードすることが可能です、明日再度お試しください。"
       new_private_message: "メッセージを作成"
       private_message: "メッセージ"
       private_messages: "メッセージ"
@@ -442,8 +484,10 @@ ja:
         each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります"
       dismiss_notifications: "すべて既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
+      first_notification: "最初の通知です! 始めるために選択してください。"
       disable_jump_reply: "返信した後に投稿へ移動しない"
       dynamic_favicon: "新規/更新トピックの件数をブラウザのアイコンに表示する"
+      theme_default_on_all_devices: "ご自身の全てのデバイス上で初期テーマを作成して下さい。"
       external_links_in_new_tab: "外部リンクをすべて別のタブで開く"
       enable_quoting: "選択したテキストを引用して返信する"
       change: "変更"
@@ -463,9 +507,22 @@ ja:
           この設定は、アクティビティの情報機能を無効化します。<br />
           ミュートしているトピックやカテゴリはこれらのメールには含まれません。
         individual: "新しい投稿がある場合にメールで送る"
+        individual_no_echo: "自分自身を除いて新規投稿関連のメールを送信してください。"
+        few_per_day: "新規投稿に関連するメッセージを送信してください。(大体2日おき)"
+      tag_settings: "タグ"
+      watched_tags: "閲覧済み"
+      muted_tags: "通知しない"
       watched_categories: "ウォッチ中"
+      watched_categories_instructions: "自動的にカテゴリー内の全てのトピックを監視します。全ての新規投稿と新規トピックが通知されまた、新規投稿数がトピックの隣に表示されます。"
       tracked_categories: "追跡中"
-      muted_categories: "ミュート中"
+      tracked_categories_instructions: "自動的にカテゴリー内の全てのトピックを追跡します。新規投稿数がトピックの隣に表示されます。"
+      watched_first_post_categories: "新規投稿を監視中"
+      watched_first_post_categories_instructions: "カテゴリー内の新規トピックに対する新規投稿について通知されます。"
+      watched_first_post_tags: "新規投稿を監視中"
+      watched_first_post_tags_instructions: "これらのタグの新規トピック内の新規投稿は通知されます。"
+      muted_categories: "通知しない"
+      muted_categories_instructions: "カテゴリー内の新規トピックについて何も通知せず、また最新を表示しません。"
+      no_category_access: "モデレータとしてカテゴリーへのアクセスが制限されたので、保存できませんでした。"
       delete_account: "アカウントを削除する"
       delete_account_confirm: "アカウントを削除してもよろしいですか？削除されたアカウントは復元できません。"
       deleted_yourself: "あなたのアカウントは削除されました。"
@@ -476,6 +533,10 @@ ja:
       muted_users: "ミュート"
       muted_users_instructions: "ユーザーからの通知をすべて行いません"
       muted_topics_link: "ミュートしたトピックを表示する"
+      watched_topics_link: "監視トピックを表示"
+      tracked_topics_link: "追跡トピックを表示"
+      api_approved: "承認されました:"
+      theme: "テーマ"
       staff_counters:
         flags_given: "役に立った通報"
         flagged_posts: "通報した投稿"
@@ -506,11 +567,14 @@ ja:
         error: "(エラー)"
         action: "パスワードリセット用メールを送信する"
         set_password: "パスワードを設定する"
+        choose_new: "新規パスワードを決定"
+        choose: "パスワードを決定"
       change_about:
         title: "プロフィールを変更"
         error: "変更中にエラーが発生しました。"
       change_username:
         title: "ユーザー名を変更"
+        confirm: "ユーザー名を変更すると、全ての投稿内容とユーザー発言に支障が出ます。本当に実行したいですか?"
         taken: "このユーザー名は既に使われています。"
         invalid: "このユーザー名は無効です。英数字のみ利用可能です。"
       change_email:
@@ -538,6 +602,7 @@ ja:
         instructions: "背景画像は、幅590pxで中央揃えになります"
       email:
         title: "メールアドレス"
+        instructions: "外部には公開しない"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
         authenticated: "あなたのメールアドレスは {{provider}} によって認証されています"
@@ -545,6 +610,7 @@ ja:
           other: "最後に利用されてから{{count}}分以上経過した場合にメールを送ります。"
       name:
         title: "名前"
+        instructions: "氏名(任意)"
         instructions_required: "氏名"
         too_short: "名前が短いです"
         ok: "問題ありません"
@@ -580,6 +646,7 @@ ja:
         title: "メールの文章の下部に以前の返信を含める"
         always: "常に"
       email_digests:
+        title: "ここを訪れないときは、人気トピックと返信の要約を私宛にメールで送信して下さい。"
         every_30_minutes: "30分毎"
         every_hour: "1時間毎"
         daily: "毎日"
@@ -627,16 +694,24 @@ ja:
         expired: "この招待の有効期限が切れました。"
         rescind: "削除"
         rescinded: "取り消された招待"
+        rescind_all: "全ての招待の取り消し"
+        rescinded_all: "全ての招待を取り消しました!"
+        rescind_all_confirm: "本当にすべての招待を取り消したいですか？"
         reinvite: "招待を再送信する"
+        reinvite_all: "全招待の再送信"
+        reinvite_all_confirm: "本当に全ての招待を再送したいですか?"
         reinvited: "招待を再度送りました。"
+        reinvited_all: "全ての招待が再送されました!"
         time_read: "リード時間"
         days_visited: "訪問日数"
         account_age_days: "アカウント有効日数"
         create: "招待を送る"
         generate_link: "招待リンクをコピー"
+        valid_for: "招待リンクはこのEメールアドレスにだけ有効です。%{email}"
         bulk_invite:
           text: "ファイルからまとめて招待をする"
           success: "ファイルは無事にアップロードされました。完了されましたらメッセージでお知らせをさせていただきます。"
+          error: "すみません、ファイルはCSV形式です。"
       password:
         title: "パスワード"
         too_short: "パスワードが短すぎます。"
@@ -667,6 +742,7 @@ ja:
         top_badges: "最近ゲットしたバッジ"
         no_badges: "まだバッジはありません。"
         more_badges: "バッジをもっと見る"
+        no_likes: "好きなものはまだ有りません。"
       associated_accounts: "関連アカウント"
       ip_address:
         title: "最後のIPアドレス"
@@ -728,7 +804,9 @@ ja:
       other: 返信
     signup_cta:
       sign_up: "新しいアカウントを作成"
+      hide_session: "明日私に思い出させてください。"
       hide_forever: "いいえ、結構です"
+      hidden_for_session: "わかりました明日お尋ねします。アカウントを作っていつでもログインできます。"
       intro: "こんにちは！ :heart_eyes: エンジョイしていますね。 ですが、サインアップしていないようです。"
       value_prop: "アカウントを作成した後、いま読んでいるページへ戻ります。また、新しい投稿があった場合はこことメールにてお知らせします。 いいね！を使って好きな投稿をみんなに教えましょう。 :heartbeat:"
     summary:
@@ -745,6 +823,7 @@ ja:
       title: "メッセージ"
       invite: "他の人を招待する..."
       remove_allowed_user: "このメッセージから {{name}} を削除してもよろしいですか？"
+      remove_allowed_group: "あなたは本当にこのメッセージからnameを削除したいですか？"
     email: 'メール'
     username: 'ユーザ名'
     last_seen: '最終アクティビティ'
@@ -753,6 +832,7 @@ ja:
     trust_level: 'トラストレベル'
     search_hint: 'ユーザ名、メールアドレスまたはIPアドレス'
     create_account:
+      disclaimer: "登録すると<a href='{{privacy_link}}'>プライバシーポリシー</a>と<a href='{{tos_link}}'>利用規約</a>に同意することになります。"
       title: "アカウントの作成"
       failed: "エラーが発生しました。既にこのメールアドレスは使用中かもしれません。「パスワードを忘れました」リンクを試してみてください"
     forgot_password:
@@ -766,6 +846,8 @@ ja:
       complete_email_found: "<b>%{email}</b>宛にパスワード再設定メールを送信しました。"
       complete_username_not_found: " <b>%{username}</b>は見つかりませんでした"
       complete_email_not_found: "<b>%{email}</b>で登録したアカウントがありません。"
+      button_ok: "OK"
+      button_help: "ヘルプ"
     login:
       title: "ログイン"
       username: "ユーザ名"
@@ -785,6 +867,8 @@ ja:
       not_allowed_from_ip_address: "このIPアドレスでログインできません"
       admin_not_allowed_from_ip_address: "そのIPアドレスからは管理者としてログインできません"
       resend_activation_email: "再度アクティベーションメールを送信するにはここをクリックしてください。"
+      resend_title: "アクティベーションメールの再送"
+      change_email: "メールアドレスの変更"
       sent_activation_email_again: "<b>{{currentEmail}}</b> にアクティベーションメールを再送信しました。メールが届くまで数分掛かることがあります。 (メールが届かない場合は、迷惑メールフォルダの中をご確認ください)。"
       to_continue: "ログインしてください"
       preferences: "ユーザ設定を変更するには、ログインする必要があります。"
@@ -809,6 +893,19 @@ ja:
       github:
         title: "with GitHub"
         message: "Github による認証 (ポップアップがブロックされていないことを確認してください)"
+    invites:
+      accept_title: "招待"
+      welcome_to: "%{site_name}へようこそ!"
+      invited_by: "あなたは招待されました:"
+      accept_invite: "招待に応じる"
+      success: "あなたのアカウントは作成されて、ログインされました。"
+      name_label: "氏名"
+      password_label: "パスワードを設定"
+      optional_description: "(任意)"
+    emoji_set:
+      google: "Google"
+      twitter: "Twitter"
+      facebook_messenger: "Facebookメッセンジャー"
     category_page_style:
       categories_only: "カテゴリのみ"
     shortcut_modifier_key:
@@ -883,6 +980,8 @@ ja:
       modal_ok: "OK"
       modal_cancel: "キャンセル"
       cant_send_pm: "%{username}へメッセージを送ることはできません。"
+      yourself_confirm:
+        body: "たった今このメッセージはあなただけに送られました。"
       admin_options_title: "このトピックの詳細設定"
     notifications:
       title: "@ユーザ名 のメンション、投稿やトピックへの返信、メッセージなどの通知"
@@ -937,6 +1036,7 @@ ja:
       local_tip: "ローカルからアップロードする画像を選択"
       local_tip_with_attachments: "デバイスから画像/ファイルを選択する {{authorized_extensions}}"
       hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)"
+      hint_for_supported_browsers: "ドラッグ＆ドロップあるいはエディター内に画像を貼り付けてください。"
       uploading: "アップロード中"
       select_file: "ファイル選択"
       image_link: "イメージのリンク先"
@@ -944,20 +1044,34 @@ ja:
       sort_by: "並べ替え"
       relevance: "一番関連しているもの"
       latest_post: "最近の投稿"
+      latest_topic: "最近のトピック"
       most_viewed: "最も閲覧されている順"
       most_liked: "「いいね！」されている順"
       select_all: "すべて選択する"
       clear_all: "すべてクリア"
+      too_short: "検索文字が短すぎます。"
       title: "トピック、投稿、ユーザ、カテゴリを探す"
       no_results: "何も見つかりませんでした。"
       no_more_results: "検索結果は以上です。"
       searching: "検索中..."
       post_format: "#{{post_number}}  {{username}}から"
+      results_page: "検索結果"
       context:
         user: "@{{username}}の投稿を検索"
         category: "#{{category}} から検索する"
         topic: "このトピックを探す"
         private_messages: "メッセージ検索"
+      advanced:
+        posted_by:
+          label: 投稿者
+        in_category:
+          label: カテゴリー内
+        in_group:
+          label: グループ内
+        filters:
+          posted: 投稿済
+          bookmarks: ブックマーク済
+          seen: 既読
     hamburger_menu: "他のトピック一覧やカテゴリを見る"
     new_item: "新着"
     go_back: '戻る'
@@ -1052,6 +1166,9 @@ ja:
       jump_reply_up: 以前の返信へジャンプ
       jump_reply_down: 以後の返信へジャンプ
       deleted: "トピックは削除されました"
+      auto_update_input:
+        next_week: "来週"
+        next_month: "来月"
       auto_close_title: 'オートクローズの設定'
       timeline:
         back_description: "未読の最終投稿へ戻る"
@@ -1202,7 +1319,10 @@ ja:
           other: "この {{count}} つの投稿の新しいオーナーを選択してください。（前のオーナー：<b>{{old_user}}</b>）"
         instructions_warn: "この投稿についての通知が新しいユーザにさかのぼって移動されることはないので注意してください。<br>警告: 投稿の関連データの所有権は、新しいユーザに転送されません。 注意して使用してください。"
       change_timestamp:
+        title: "タイムスタンプを変更してください。"
         action: "タイムスタンプを変更"
+        invalid_timestamp: "タイムスタンプは未来時刻にすることが出来ません。"
+        error: "トピックのタイムスタンプ変更にエラーがありました。"
       multi_select:
         select: '選択'
         selected: '選択中 ({{count}})'
@@ -1216,6 +1336,7 @@ ja:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
+      quote_reply: "引用"
       edit: "編集中 {{link}} {{replyAvatar}} {{username}}"
       edit_reason: "理由: "
       post_number: "投稿{{number}}"
@@ -1238,11 +1359,16 @@ ja:
       has_likes_title:
         other: "{{count}}人のユーザがこの返信に「いいね！」しました"
       has_likes_title_only_you: "あなたがいいねした投稿"
+      has_likes_title_you:
+        other: "あなたと{{count}} 人の人がこの投稿に「いいね!」しました。"
       errors:
         create: "申し訳ありませんが、投稿中にエラーが発生しました。もう一度やり直してください。"
         edit: "申し訳ありませんが、投稿の編集中にエラーが発生しました。もう一度やり直してください。"
         upload: "申し訳ありません、ファイルのアップロード中にエラーが発生しました。再度お試しください。"
+        file_too_large: "すみません、ファイルが大きすぎます。(最大サイズは{{max_size_kb}}kbです。)サイズの大きいファイルを共有クラウドサービスにアップロードせず、リンクを共有する方法があります。"
         too_many_uploads: "申し訳ありませんが、複数のファイルは同時にアップロードできません。"
+        too_many_dragged_and_dropped_files: "すみません、一度に10ファイルだけアップロードすることが出来ます。"
+        upload_not_authorized: "すみません、アップロードしようとしているファイルは許可されていません。 (許可された拡張子は: {{authorized_extensions}}です。)"
         image_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザは画像のアップロードができません。"
         attachment_upload_not_allowed_for_new_user: "申し訳ありませんが、新規ユーザはファイルの添付ができません。"
         attachment_download_requires_login: "ファイルをダウンロードするには、ログインする必要があります"
@@ -1294,6 +1420,8 @@ ja:
           off_topic: "関係無い話題として通報"
           spam: "スパムとして通報"
           inappropriate: "不適切な発言として通報"
+          notify_user: "メッセージを送信しました。"
+          bookmark: "これをブックマークしました。"
         by_you:
           off_topic: "関係のない話題として通報しました"
           spam: "スパム報告として通報しました"
@@ -1340,6 +1468,9 @@ ja:
       delete:
         confirm:
           other: "これらの投稿を削除してもよろしいですか？"
+      merge:
+        confirm:
+          other: "これらの{{count}}の投稿を統合したいですか?"
       revisions:
         controls:
           first: "最初のリビジョン"
@@ -1616,6 +1747,7 @@ ja:
         mark_watching: '<b>m</b>, <b>w</b> トピックをウォッチする'
     badges:
       granted_on: "%{date}にゲット!"
+      others_count: "その他のバッジ所有者(%{count})"
       title: バッジ
       badge_count:
         other: "%{count}個のバッジ"
@@ -2199,7 +2331,7 @@ ja:
           title: "トラストレベル3の条件"
           value_heading: "値"
           requirement_heading: "条件"
-          visits: "訪問"
+          visits: "アクセス"
           days: "日"
           topics_replied_to: "返信したトピック"
           topics_viewed: "閲覧したトピックの数"
@@ -2377,6 +2509,12 @@ ja:
         edit: "編集"
         category: "カテゴリへ投稿"
         settings: "埋め込みの設定"
+        embed_whitelist_selector: "埋め込みで許可される要素のCSSセレクタ"
+        embed_blacklist_selector: "埋め込みから削除された要素のCSSセレクタ"
+        embed_classname_whitelist: "許可されたCSSクラス名"
+        feed_polling_enabled: "RSS / ATOM経由で投稿をインポートする"
+        feed_polling_url: "クロールするRSS / ATOMフィードのURL"
+        feed_polling_frequency_mins: "フィードの更新間隔 (分)"
         save: "埋め込みの設定を保存"
       permalink:
         title: "パーマリンク"
@@ -2393,3 +2531,21 @@ ja:
           label: "新規:"
           add: "追加"
           filter: "検索(URL または 外部URL)"
+  wizard_js:
+    wizard:
+      done: "完了"
+      back: "戻る"
+      next: "次へ"
+      step: "%{current} / %{total}"
+      upload: "アップロード"
+      uploading: "アップロード中..."
+      quit: "後で"
+      staff_count:
+        other: "コミュニティには%{count}名のスタッフがいます。"
+      invites:
+        add_user: "追加"
+        none_added: "あなたはスタッフを招待していません。 続行してもよろしいですか？"
+        roles:
+          admin: "管理者"
+          moderator: "モデレータ"
+          regular: "正規ユーザー"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index e1252bb25e..50ec18efed 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -95,7 +95,7 @@ ko:
     action_codes:
       public_topic: "이 토픽을 %{when} 에 공개"
       private_topic: "이 토픽을 %{when} 에 비공개"
-      split_topic: "이 주제를 ${when}에 분리"
+      split_topic: "이 토픽을 %{when}에 분리"
       invited_user: "%{who}이(가) %{when}에 초대됨"
       invited_group: "%{who} 이(가) %{when} 에 초대됨"
       removed_user: "%{who}이(가) %{when}에 삭제됨"
@@ -121,7 +121,7 @@ ko:
       banner:
         enabled: 'made this a banner %{when}. It will appear at the top of every page until it is dismissed by the user.'
         disabled: '이 배너를 제거했습니다 %{when}. 더 이상 모든 페이지의 상단에 표시되지 않습니다.'
-    topic_admin_menu: "주제 관리자 기능"
+    topic_admin_menu: "토픽 관리"
     wizard_required: "새로운 Discourse에 오신것을 환영합니다! <a href='%{url}' data-auto-route='true'>설치 마법사</a> 로 시작해봅시다✨"
     emails_are_disabled: "관리자가 이메일 송신을 전체 비활성화 했습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다."
     bootstrap_mode_enabled: "쉬운 시작을 위해 부트스트랩 모드로 구동 되었습니다. 모든 새로운 사용자에게 신뢰 수준 1이 부여되고 매일 이메일 다이제스트가 보내집니다. 이 기능은 총 사용자 수가 %{min_users}를 초과 할 때 자동으로 꺼집니다."
@@ -130,21 +130,22 @@ ko:
       default_description: "기본값"
     s3:
       regions:
-        us_east_1: "미국 동부 (N. 버지니아)"
-        us_west_1: "미국 서부 (N. 캘리포니아)"
-        us_west_2: "미국 서부 (오레곤)"
-        us_gov_west_1: "AWS GovCloud(US)"
-        eu_west_1: "유럽연합 (아일랜드)"
-        eu_west_2: "EU (런던)"
-        eu_central_1: "유럽연합 (프랑크푸르트)"
-        ap_southeast_1: "아시아 태평양 (싱가폴)"
-        ap_southeast_2: "아시아 태평양 (시드니)"
-        ap_south_1: "아시아 태평양 (뭄바이)"
         ap_northeast_1: "아시아 태평양 (토쿄)"
         ap_northeast_2: "아시아 태평양 (서울)"
-        sa_east_1: "남 아메리카 (상파울로)"
+        ap_south_1: "아시아 태평양 (뭄바이)"
+        ap_southeast_1: "아시아 태평양 (싱가폴)"
+        ap_southeast_2: "아시아 태평양 (시드니)"
         cn_north_1: "중국 (북경)"
-    edit: '이 주제의 제목과 카테고리 편집'
+        eu_central_1: "유럽연합 (프랑크푸르트)"
+        eu_west_1: "유럽연합 (아일랜드)"
+        eu_west_2: "EU (런던)"
+        sa_east_1: "남 아메리카 (상파울로)"
+        us_east_1: "미국 동부 (N. 버지니아)"
+        us_east_2: "미국 동부 (오하이오)"
+        us_gov_west_1: "AWS GovCloud(US)"
+        us_west_1: "미국 서부 (N. 캘리포니아)"
+        us_west_2: "미국 서부 (오레곤)"
+    edit: '이 토픽의 제목과 카테고리 편집'
     not_implemented: "죄송합니다. 아직 사용할 수 없는 기능입니다."
     no_value: "아니오"
     yes_value: "예"
@@ -186,7 +187,7 @@ ko:
     character_count:
       other: "{{count}} 자"
     suggested_topics:
-      title: "추천 주제"
+      title: "추천 토픽"
       pm_title: "추천 메세지"
     about:
       simple_title: "About"
@@ -199,7 +200,7 @@ ko:
         last_7_days: "지난 7일"
         last_30_days: "최근 30일"
       like_count: "좋아요"
-      topic_count: "주제"
+      topic_count: "토픽"
       post_count: "게시글"
       user_count: "사용자"
       active_user_count: "활성화된 사용자"
@@ -209,21 +210,21 @@ ko:
       title: "북마크"
       clear_bookmarks: "북마크 제거"
       help:
-        bookmark: "북마크하려면 이 주제의 첫번째 게시글을 클릭하세요"
-        unbookmark: "북마크를 제거하려면 이 주제의 첫 번째 게시글을 클릭하세요"
+        bookmark: "클릭하면 이 토픽의 첫번째 포스트가 북마크됩니다"
+        unbookmark: "클릭하면 이 토픽에 속한 모든 북마크가 제거됩니다"
     bookmarks:
       not_logged_in: "죄송합니다. 게시물을 즐겨찾기에 추가하려면 로그인을 해야 합니다."
       created: "이 게시글을 북마크 하였습니다."
       not_bookmarked: "이 게시물을 읽으셨습니다. 즐겨찾기에 추가하려면 클릭하세요."
       last_read: "마지막으로 읽으신 게시물입니다. 즐겨찾기에 추가하려면 클릭하세요."
       remove: "북마크 삭제"
-      confirm_clear: "정말 이 주제의 모든 북마크를 제거하시겠습니까?"
+      confirm_clear: "정말로 이 토픽의 모든 북마크를 제거할까요?"
     topic_count_latest:
-      other: "{{count}} 새 주제 혹은 업데이트된 주제"
+      other: "{{count}}개의 새 토픽이나 업데이트된 토픽"
     topic_count_unread:
-      other: "{{count}} 읽지 않은 주제"
+      other: "{{count}}개의 읽지 않은 토픽"
     topic_count_new:
-      other: "{{count}}개의 새로운 주제"
+      other: "{{count}}개의 새로운 토픽"
     click_to_show: "보려면 클릭하세요."
     preview: "미리보기"
     cancel: "취소"
@@ -245,12 +246,12 @@ ko:
       close: "배너 닫기"
       edit: "이 배너 수정 >>"
     choose_topic:
-      none_found: "주제를 찾을 수 없습니다."
+      none_found: "토픽을 찾을 수 없습니다."
       title:
-        search: "이름, url, ID로 주제 검색"
-        placeholder: "여기에 주제 제목을 입력하세요"
+        search: "이름, url, ID로 토픽 검색"
+        placeholder: "토픽 제목을 입력하세요"
     queue:
-      topic: "주제:"
+      topic: "토픽:"
       approve: '승인'
       reject: '거절'
       delete_user: '사용자 삭제'
@@ -260,7 +261,7 @@ ko:
       cancel: "취소"
       view_pending: "대기중인 게시글"
       has_pending_posts:
-        other: "이 주제에는 <b>{{count}}</b>개의 승인 대기중인 게시글이 있습니다."
+        other: "이 토픽에는 <b>{{count}}</b>개의 승인 대기중인 포스트가 있습니다"
       confirm: "변경사항 저장"
       delete_prompt: "정말로 <b>%{username}</b>; 회원을 삭제하시겠습니까? 게시글이 모두 삭제되고 IP와 이메일이 차단됩니다."
       approval:
@@ -270,12 +271,12 @@ ko:
           other: "대기중인 게시글이 <strong>{{count}}</strong>개 있습니다."
         ok: "확인"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>주제</a>를 게시함"
-      you_posted_topic: "<a href='{{userUrl}}'>내</a>가 <a href='{{topicUrl}}'>주제</a>를 게시함"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>토픽</a>을 게시했습니다"
+      you_posted_topic: "<a href='{{userUrl}}'>회원님</a>이 <a href='{{topicUrl}}'>토픽</a>을 게시했습니다"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a>님이  <a href='{{postUrl}}'>{{post_number}}</a> 게시글에 답글 올림"
       you_replied_to_post: "<a href='{{userUrl}}'>내</a>가 <a href='{{postUrl}}'>{{post_number}}</a> 게시글에 답글 올림"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>주제</a>에 답글 올림"
-      you_replied_to_topic: "<a href='{{userUrl}}'>내</a>가 <a href='{{topicUrl}}'>주제</a>에 답글 올림"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>님이 <a href='{{topicUrl}}'>토픽</a>에 답글을 올렸습니다"
+      you_replied_to_topic: "<a href='{{userUrl}}'>회원님</a>이 <a href='{{topicUrl}}'>토픽</a>에 댓글을 달았습니다"
       user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a>님이 <a href='{{user2Url}}'>{{another_user}}</a>를 멘션함"
       user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a>님이 <a href='{{user2Url}}'>나</a>를 멘션함"
       you_mentioned_user: "<a href='{{user1Url}}'>내</a>가 <a href='{{user2Url}}'>{{another_user}}</a>님을 멘션함"
@@ -289,10 +290,10 @@ ko:
       likes_given: "제공한"
       likes_received: "받은"
       topics_entered: "읽음"
-      topics_entered_long: "읽은 주제"
+      topics_entered_long: "읽은 토픽 수"
       time_read: "읽은 시간"
-      topic_count: "주제"
-      topic_count_long: "생성된 주제"
+      topic_count: "토픽"
+      topic_count_long: "생성된 토픽"
       post_count: "답글"
       post_count_long: "답글"
       no_results: "결과가 없습니다."
@@ -316,7 +317,7 @@ ko:
         action: "액션"
         acting_user: "활동하는 사용자"
         target_user: "대상 사용자"
-        subject: "주제"
+        subject: "제목"
         details: "자세한 내용"
         from: "부터"
         to: "까지"
@@ -332,7 +333,7 @@ ko:
         members: "이 그룹에는 구성원이 없습니다."
         mentions: "이 그룹에서는 언급이 없습니다."
         messages: "이 그룹에 대한 메시지는 없습니다."
-        topics: "이 그룹의 구성원이 작성한 주제글이 없습니다."
+        topics: "이 그룹의 멤버가 작성한 토픽이 없습니다."
         logs: "이 그룹에 대한 기록이 없습니다."
       add: "추가"
       join: "그룹 참여하기"
@@ -355,7 +356,7 @@ ko:
         other: "그룹"
       activity: "활동"
       members: "멤버"
-      topics: "주제"
+      topics: "토픽"
       posts: "게시글"
       mentions: "멘션"
       messages: "메시지"
@@ -405,7 +406,7 @@ ko:
       '1': "선사한 '좋아요'"
       '2': "받은 '좋아요'"
       '3': "북마크"
-      '4': "주제"
+      '4': "토픽"
       '5': "답글"
       '6': "응답"
       '7': "멘션"
@@ -435,9 +436,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
@@ -520,7 +521,7 @@ ko:
       tracked_tags: "추적하기"
       tracked_tags_instructions: "이 태그가 붙은 모든 토픽을 추적하도록 자동설정됩니다. 새로운 게시글의 수가 토픽 옆에 표시됩니다."
       muted_tags: "알람 끄기"
-      muted_tags_instructions: "이 태그의 새 주제에 대해 어떠한 알림도 받을 수 없으며, 최근의 주제도 나타나지 않습니다."
+      muted_tags_instructions: "이 태그가 달린 토픽에 대해 알림을 받지 않으며, 최근 토픽란에도 나타나지 않습니다."
       watched_categories: "지켜보기"
       watched_categories_instructions: "이 카테고리의 모든 토픽을 주시하도록 자동 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게 되며, 토픽 옆에 새로운 게시글의 수가 표시됩니다."
       tracked_categories: "추적하기"
@@ -530,7 +531,7 @@ ko:
       watched_first_post_tags: "첫번째 글 보기"
       watched_first_post_tags_instructions: "이 태그가 달린 토픽이 생길 때마다 알림을 받습니다."
       muted_categories: "알림 끄기"
-      muted_categories_instructions: "이 카테고리 내의 새 주제에 대해 어떠한 알림도 받을 수 없으며, 최근의 주제도 나타나지 않습니다."
+      muted_categories_instructions: "이 카테고리 내의 새 토픽에 대해 알림을 받지 않으며, 최근 토픽란에도 나타나지 않습니다."
       no_category_access: "운영자는 이 카테고리 접근에 제약을 받습니다. 저장이 해제 됩니다."
       delete_account: "내 계정 삭제"
       delete_account_confirm: "정말로 계정을 삭제할까요? 이 작업은 되돌릴 수 없습니다."
@@ -541,10 +542,10 @@ ko:
       users: "회원"
       muted_users: "알람 끄기"
       muted_users_instructions: "이 회원이 보낸 알림 모두 숨김"
-      muted_topics_link: "알림을 끈 주제 보기"
+      muted_topics_link: "알림을 끈 토픽 보기"
       watched_topics_link: "읽은 토픽 보기"
       tracked_topics_link: "관심있는 토픽 보기"
-      automatically_unpin_topics: "글 끝에 다다르면 자동으로 주제 고정을 해제합니다."
+      automatically_unpin_topics: "글 끝에 다다르면 자동으로 토픽 고정을 해제합니다."
       apps: "앱"
       revoke_access: "접근권한 회수"
       undo_revoke_access: "접근권환 회수 취소"
@@ -719,7 +720,7 @@ ko:
         pending: "초대를 보류합니다."
         pending_tab: "보류"
         pending_tab_with_count: "지연 ({{count}})"
-        topics_entered: "읽은 주제"
+        topics_entered: "읽은 토픽"
         posts_read_count: "글 읽기"
         expired: "이 초대장의 기한이 만료되었습니다."
         rescind: "삭제"
@@ -773,7 +774,7 @@ ko:
         top_replies: "인기 댓글"
         no_replies: "아직 답글이 없습니다."
         more_replies: "답글 더 보기"
-        top_topics: "인기 주제"
+        top_topics: "인기 토픽"
         no_topics: "아직 주제가 없습니다."
         more_topics: "주제 더 보기"
         top_badges: "인기 배지"
@@ -972,7 +973,7 @@ ko:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
-      google_classic: "Google Classic"
+      google_classic: "Google 클래식"
       facebook_messenger: "Facebook 메신저"
     category_page_style:
       categories_only: "카테고리만"
@@ -982,6 +983,15 @@ ko:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      people: 인물
+      nature: 자연
+      food: 음식
+      activity: 활동
+      travel: 여행
+      objects: 사물
+      celebration: 축하
+      custom: 커스텀 emoji
     composer:
       emoji: "이모지 :)"
       more_emoji: "더보기..."
@@ -1303,7 +1313,7 @@ ko:
       toggle_information: "주제의 세부 정보를 토글합니다."
       read_more_in_category: "더 읽을거리가 필요하신가요? {{catLink}} 또는 {{latestLink}}를 살펴보세요."
       read_more: "{{catLink}} 또는 {{latestLink}}에서 더 많은 토픽들을 찾으실 수 있습니다"
-      read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is <a href='/unread'>1개의 안 읽은</a> } other { are <a href='/unread'>#개의 안 읽은</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1개의 새로운</a> 주제가} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># 새로운</a> 주제가} } 남아 있고, {CATEGORY, select, true {{catLink} 주제도 확인해보세요.} false {{latestLink}} other {}}"
+      read_more_MF: "이 카테고리에 { UNREAD, plural, =0 {} one { is <a href='/unread'>1개의 안 읽은</a> } other { <a href='/unread'>#개의 안 읽은</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ 그리고 } false {} other{}} <a href='/new'>1개의 새로운</a> 토픽이} other { {BOTH, select, true{ 그리고 } false {} other{}} <a href='/new'># 새로운</a> 토픽이} } 남아 있습니다. {CATEGORY, select카테고리, true {{catLink} 카테고리의 다른 토픽도 확인해보세요.} false {{latestLink}} 다른 토픽도 확인해 보세요 {}}"
       browse_all_categories: 모든 카테고리 보기
       view_latest_topics: 최신 주제 보기
       suggest_create_topic: 새 주제를 작성 해 보실래요?
@@ -1501,6 +1511,7 @@ ko:
         success_email: "<b>{{emailOrUsername}}</b>로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요."
         success_username: "사용자가 이 주제에 참여할 수 있도록 초대했습니다."
         error: "그 사람을 초대할 수 없습니다. 혹시 이미 초대하진 않았나요?  (Invites are rate limited)"
+        success_existing_email: "해당 email을 사용하고 있는 사용자 <b>{{emailOrUsername}}</b> 가 이미 존재합니다. 그 사용자를 이 토픽에 참여하도록 초청했습니다."
       login_reply: '로그인하고 답글 쓰기'
       filters:
         n_posts:
@@ -1895,12 +1906,6 @@ ko:
         help: "이 주제는 목록에서 제외됩니다. 주제 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다."
     posts: "글"
     posts_long: "이 주제의 글 수는 {{number}}개 입니다."
-    posts_likes_MF: |
-      This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-      low {with a high like to post ratio}
-      med {with a very high like to post ratio}
-      high {with an extremely high like to post ratio}
-      other {}}
     original_post: "원본 글"
     views: "조회수"
     views_lowercase:
@@ -2169,7 +2174,7 @@ ko:
   admin_js:
     type_to_filter: "필터를 입력하세요"
     admin:
-      title: 'Discourse 운영'
+      title: 'Discourse 관리자'
       moderator: '운영자'
       dashboard:
         title: "대시보드"
@@ -2253,8 +2258,8 @@ ko:
         clear_topic_flags_title: "주제 조사를 끝냈고 이슈를 해결했습니다. 신고를 지우기 위해 완료를 클릭하세요"
         more: "(더 많은 답글...)"
         dispositions:
-          agreed: "agreed"
-          disagreed: "disagreed"
+          agreed: "동의"
+          disagreed: "반대"
           deferred: "유예 중인"
         flagged_by: "신고 한 사람"
         resolved_by: "해결 by"
@@ -2303,7 +2308,7 @@ ko:
         automatic: "자동화"
         automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이  등록한 이메일 도메인이 일치할때 이 그룹에 포함"
         automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기"
-        default_title: "Default title for all users in this group"
+        default_title: "이 그룹의 모든 사용자를 위한 기본 제목"
         primary_group: "Automatically set as primary group"
         group_owners: 소유자
         add_owners: 소유자 추가하기
@@ -2322,7 +2327,7 @@ ko:
         revoke: "폐지"
         confirm_regen: "API 키를 새로 발급 받으시겠습니까?"
         confirm_revoke: "API 키를 폐지하겠습니까?"
-        info_html: "당신의 API 키는 JSON콜을 이용하여 주제를 생성하거나 수정할 수 있습니다."
+        info_html: "당신의 API 키는 JSON호출을 이용하여 토픽을 생성하거나 수정할 수 있습니다."
         all_users: "전체 유저"
         note_html: "이 키의 <strong>보안에 특별히 주의</strong>하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 글을 작성할 수 있습니다."
       web_hooks:
@@ -2596,7 +2601,7 @@ ko:
             description: "사이트 헤더에 텍스트와 아이콘"
           highlight:
             name: '하이라이트'
-            description: '페이지 내에 강조된 글 및 주제 등의 배경색'
+            description: '포스트나 토픽과 같은 페이지 내에서 강조된 요소의 배경색'
           danger:
             name: '위험'
             description: '글 삭제 등에 사용되는 강조색'
@@ -2676,7 +2681,7 @@ ko:
         last_match_at: "마지막 방문"
         match_count: "방문"
         ip_address: "IP"
-        topic_id: "주제 ID"
+        topic_id: "토픽 ID"
         post_id: "글 ID"
         category_id: "카테고리 ID"
         delete: '삭제'
@@ -2716,7 +2721,7 @@ ko:
             grant_badge: "배지 부여"
             revoke_badge: "배지 회수"
             check_email: "이메일 확인"
-            delete_topic: "주제 삭제"
+            delete_topic: "토픽 삭제"
             delete_post: "글 삭제"
             impersonate: "대역"
             anonymize_user: "anonymize user"
@@ -2862,10 +2867,10 @@ ko:
         activity: 활동
         like_count: 준/받은 '좋아요'
         last_100_days: '지난 100일간'
-        private_topics_count: 비공개 주제 수
+        private_topics_count: 비공개 토픽
         posts_read_count: 글 읽은 수
         post_count: 글 수
-        topics_entered: 읽은 주제 수
+        topics_entered: 읽은 토픽 수
         flags_given_count: 작성한 신고
         flags_received_count: 받은 신고
         warnings_received_count: 받은 경고
@@ -2902,7 +2907,7 @@ ko:
         deactivate_failed: "사용자 비활성에 문제가 있습니다."
         unblock_failed: '사용자 언블락에 문제가 있습니다.'
         block_failed: '사용자 블락에 문제가 있습니다.'
-        block_confirm: '정말로 이 사용자를 차단하겠습니까? 차단된 사용자는 어떠한 주제나나 글도 작성할 수 없습니다.'
+        block_confirm: '정말로 이 사용자를 차단하겠습니까? 차단된 사용자는 토픽, 포스트 작성이 금지됩니다.'
         block_accept: '네, 이 사용자를 차단합니다.'
         bounce_score: "반송 스코어"
         reset_bounce_score:
@@ -2911,7 +2916,7 @@ ko:
         visit_profile: "<a href='%{url}'>사용자 환경설정 페이지</a>로 가서 프로필 수정하기"
         deactivate_explanation: "비활성화 사용자는 이메일 인증을 다시 받아야합니다."
         suspended_explanation: "접근 금지된 유저는 로그인 할 수 없습니다."
-        block_explanation: "차단된 사용자는 글을 작성하거나 주제를 작성할 수 없습니다."
+        block_explanation: "차단된 사용자는 글을 작성하거나 토픽을 작성할 수 없습니다."
         staged_explanation: "격리조치된 회원은 특정 토픽에 한해서 이메일로만 글을 쓸 수 있습니다."
         bounce_score_explanation:
           none: "최근 해당 이메일로부터 반송메일을 받은 내역이 없습니다."
@@ -2933,9 +2938,9 @@ ko:
           requirement_heading: "자격요건"
           visits: "방문횟수"
           days: "일"
-          topics_replied_to: "댓글 달은 주제 개수"
-          topics_viewed: "열어본 주제 개수"
-          topics_viewed_all_time: "열어본 주제 개수 (전체 기간)"
+          topics_replied_to: "댓글을 단 토픽 수"
+          topics_viewed: "열어본 토픽 수"
+          topics_viewed_all_time: "열어본 토픽 수 (전체 기간)"
           posts_read: "읽은 글 갯수"
           posts_read_all_time: "읽은 글 갯수 (전체 기간)"
           flagged_posts: "신고당한 글 갯수"
@@ -3052,7 +3057,7 @@ ko:
           modal_title: 배지 그룹으로 나누기
         granted_by: 배지 부여자
         granted_at: 배지 수여일
-        reason_help: (주제 또는 댓글로 가는 링크)
+        reason_help: (토픽이나 포스트로 가는 링크)
         save: 저장
         delete: 삭제
         delete_confirm: 정말로 이 배지를 삭제할까요?
@@ -3114,7 +3119,7 @@ ko:
       embedding:
         get_started: "다른 웹사이트에 Discourse를 임베드하려면 호스트 추가부터 하세요"
         confirm_delete: "정말로 host를 삭제할까요?"
-        sample: "Discourse 주제를 웨사이트에 삽입(embed)하기 위해 다음 HTML코드를 이용하세요. <b>REPLACE_ME</b> 부분을 당신이 삽입하려는 웹사이트의 정식URL로 교체 하면 됩니다."
+        sample: "Discourse 토픽을 웹사이트에 삽입(embed)하기 위해 다음 HTML코드를 이용하세요. <b>REPLACE_ME</b> 부분을 당신이 삽입하려는 웹사이트의 정식URL로 교체 하면 됩니다."
         title: "삽입(Embedding)"
         host: "허용 Host"
         class_name: "클래스 이름"
@@ -3127,7 +3132,7 @@ ko:
         feed_description: "당신 사이트의 RSS/ATOM 피드를 알려주시면 Discourse가 그 사이트 컨텐트를 더 잘 가져올 수 있습니다."
         crawling_settings: "크롤러 설정"
         crawling_description: "When Discourse creates topics for your posts, if no RSS/ATOM feed is present it will attempt to parse your content out of your HTML. Sometimes it can be challenging to extract your content, so we provide the ability to specify CSS rules to make extraction easier."
-        embed_by_username: "주제 생성 시 사용할 회원 이름"
+        embed_by_username: "토픽을 만들 때 사용할 아이디"
         embed_post_limit: "삽입(embed)할 글 최대갯수"
         embed_username_key_from_feed: "피드에서 discourse usename을 꺼내오기 위한 키(key)"
         embed_title_scrubber: "게시글의 제목을 긁어오기 위해 정규표현식이 사용되었습니다"
@@ -3142,8 +3147,8 @@ ko:
       permalink:
         title: "고유링크"
         url: "URL"
-        topic_id: "주제 ID"
-        topic_title: "주제"
+        topic_id: "토픽 ID"
+        topic_title: "토픽"
         post_id: "글 ID"
         post_title: "글"
         category_id: "카테고리 ID"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index a9a95233dd..6a900ca6fd 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -148,20 +148,21 @@ nb_NO:
       default_description: "Forvalg"
     s3:
       regions:
-        us_east_1: "USA øst (N. Virginia)"
-        us_west_1: "USA vest (N. California)"
-        us_west_2: "USA vest (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Irland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia/Stillehavsregionen (Singapore)"
-        ap_southeast_2: "Asia/Stillehavsregionen (Sydney)"
-        ap_south_1: "Asia/Stillehavsregionen (Mumbai)"
         ap_northeast_1: "Asia/Stillehavsregionen (Tokyo)"
         ap_northeast_2: "Asia/Stillehavsregionen (Seoul)"
-        sa_east_1: "Asia/Stillehavsregionen (Sao Paulo)"
+        ap_south_1: "Asia/Stillehavsregionen (Mumbai)"
+        ap_southeast_1: "Asia/Stillehavsregionen (Singapore)"
+        ap_southeast_2: "Asia/Stillehavsregionen (Sydney)"
         cn_north_1: "Kina (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Asia/Stillehavsregionen (Sao Paulo)"
+        us_east_1: "USA øst (N. Virginia)"
+        us_east_2: "USA øst (Ohio)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "USA vest (N. California)"
+        us_west_2: "USA vest (Oregon)"
     edit: 'rediger tittelen og kategorien til dette emnet'
     not_implemented: "Beklager, denne funksjonen har ikke blitt implementert enda."
     no_value: "Nei"
@@ -352,6 +353,8 @@ nb_NO:
         add_members: "Legg til medlemmer"
         delete_member_confirm: "Fjern '%{username}' fra gruppen '%{group}'?"
       name_placeholder: "Gruppenavn, ingen mellomrom, samme regler som for brukernavn"
+      public_admission: "Tillat brukere å ta del i gruppen fritt (krever offentlig synlig gruppe)"
+      public_exit: "Tillat brukere å fritt forlate gruppen"
       empty:
         posts: "Det er ingen innlegg av medlemmer i denne gruppen."
         members: "Det er ingen medlemmer av denne gruppen."
@@ -363,6 +366,7 @@ nb_NO:
       join: "Bli medlem av gruppe"
       leave: "Forlat gruppe"
       request: "Be om gruppemedlemskap"
+      message: "Melding"
       automatic_group: Automatisk gruppe
       closed_group: Lukket gruppe
       is_group_user: "Du er medlem av denne gruppen"
@@ -386,6 +390,12 @@ nb_NO:
       mentions: "Omtalelser"
       messages: "Meldinger"
       notification_level: "Forvalgt merknadsnivå for gruppemeldinger"
+      visibility_levels:
+        title: "Hvem kan se denne gruppen?"
+        public: "Alle"
+        members: "Gruppeeiere, medlemmer og administratorer"
+        staff: "Gruppemedlemmer og personale"
+        owners: "Gruppeeiere og administratorer"
       alias_levels:
         title: "Hvem kan sende meldinger til og @nevne denne gruppen?"
         nobody: "Ingen"
@@ -1005,6 +1015,8 @@ nb_NO:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Klassisk Google"
+      facebook_messenger: "Facebook Meldingstjeneste"
     category_page_style:
       categories_only: "Kun kategorier"
       categories_with_featured_topics: "Kategorier med framhevede emner"
@@ -1013,6 +1025,23 @@ nb_NO:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Søk etter emoji
+      people: Folk
+      nature: Natur
+      food: Mat
+      activity: Aktivitet
+      travel: Reise
+      objects: Objekter
+      celebration: Feiring
+      custom: Egendefinerte emoji-er
+      recent: Nylig brukt
+      default_tone: Ingen hudtone
+      light_tone: Lys hudtone
+      medium_light_tone: Middels lys hudtone
+      medium_tone: Middels hudtone
+      medium_dark_tone: Middels mørk hudtone
+      dark_tone: Mørk hudtone
     composer:
       emoji: "Emoji :)"
       more_emoji: "mer…"
@@ -1178,8 +1207,8 @@ nb_NO:
       clear_all: "Fjern Alle"
       too_short: "Din søketekst er for kort."
       result_count:
-        one: "Ett resultat for <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} resultater for <span class='term'>\"{{term}}\"</span>"
+        one: "1 resultat for <span class='term'>{{term}}</span>"
+        other: "{{count}} resultater for <span class='term'>{{term}}</span>"
       title: "søk etter emner, innlegg, brukere eller kategorier"
       no_results: "Ingen resultater funnet."
       no_more_results: "Ingen flere resultater funnet."
@@ -1547,6 +1576,7 @@ nb_NO:
         success_email: "Vi har sendt ut en invitasjon til <b>{{emailOrUsername}}</b>. Vi varsler deg når invitasjonen er godtatt. Sjekk invitiasjonsfanen på brukersiden din for å beholde oversikten over invitasjonene dine."
         success_username: "Vi har invitert brukeren til å delta i dette emnet."
         error: "Beklager, vi kunne ikke invitere den brukeren. De har muligens allerede blitt invitert?"
+        success_existing_email: "En bruker med e-posten <b>{{emailOrUsername}}</b> finnes allerede. Vi har invitert den brukeren til å ta del i emnet."
       login_reply: 'Logg Inn for å svare'
       filters:
         n_posts:
@@ -2879,6 +2909,30 @@ nb_NO:
             title: "Lager nye blokkeringsoppføringer for subnett hvis det er minst 'min_ban_entries_for_roll_up' oppføringer."
         logster:
           title: "Feillogg"
+      watched_words:
+        title: "Ord som holdes oppsyn med"
+        search: "søk"
+        clear_filter: "Tøm"
+        show_words: "vis ord"
+        word_count:
+          one: "ett ord"
+          other: "%{count} ord"
+        actions:
+          block: 'Blokker'
+          censor: 'Sensurer'
+          require_approval: 'Krev godkjenning'
+          flag: 'Flagg'
+        action_descriptions:
+          block: 'Forhindre innlegg som inneholder disse ordene fra å bli postet. Brukeren vil se en feilmelding når vedkommende prøver å sende inn innlegget sitt.'
+          censor: 'Tillat innlegg som inneholder disse ordene, men erstatt dem med bokstaver som skjuler de sensurerte ordene.'
+          require_approval: 'Det kreves at innlegg som inneholder disse ordene godkjennes av staben før de kan ses.'
+          flag: 'Tillat innlegg som inneholder disse ordene, men flagg dem som upassende slik at moderatorer kan se over dem.'
+        form:
+          label: 'Nytt ord:'
+          add: 'Legg til'
+          success: 'Suksess'
+          upload: "Last opp"
+          upload_successful: "Opplastet. Ord lagt til."
       impersonate:
         title: "Fremstå som"
         help: "Bruk dette verktøyet for å fremstå som en annen bruker for feilsøking. Du må logge ut når du er ferdig."
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index c705af7c16..1d99a5b67a 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -28,14 +28,14 @@ nl:
     dates:
       time: "HH:mm"
       timeline_date: "MMM YYYY"
-      long_no_year: "D MMM [om] HH:mm"
+      long_no_year: "D MMM HH:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "D MMMM"
-      long_with_year: "D MMM YYYY [om] HH:mm"
+      long_with_year: "D MMM YYYY HH:mm"
       long_with_year_no_time: "D MMM YYYY"
       full_with_year_no_time: "D MMMM YYYY"
-      long_date_with_year: "D MMM 'YY [om] HH:mm"
-      long_date_without_year: "D MMM [om] HH:mm"
+      long_date_with_year: "D MMM 'YY HH:mm"
+      long_date_without_year: "D MMM HH:mm"
       long_date_with_year_without_time: "D MMM 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>HH:mm"
       long_date_with_year_with_linebreak: "D MMM 'YY <br/>HH:mm"
@@ -140,36 +140,37 @@ nl:
         enabled: 'heeft deze banner gemaakt op %{when}. De banner verschijnt bovenaan elke pagina, totdat de gebruiker deze verbergt.'
         disabled: 'heeft deze banner verwijderd op %{when}. De banner zal niet meer bovenaan elke pagina verschijnen.'
     topic_admin_menu: "beheeracties voor topic"
-    wizard_required: "Welkom bij uw nieuwe Discourse! Laten we beginnen met <a href='%{url}' data-auto-route='true'>de configuratiewizard</a> ✨"
+    wizard_required: "Welkom bij je nieuwe Discourse! Laten we beginnen met <a href='%{url}' data-auto-route='true'>de configuratiewizard</a> ✨"
     emails_are_disabled: "Alle uitgaande e-mail is uitgeschakeld door een beheerder. Er zal geen enkele e-mailmelding worden verstuurd."
-    bootstrap_mode_enabled: "Om het lanceren van uw website makkelijker te maken, bevindt u zich in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend, en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld wanneer het totale gebruikersaantal %{min_users} gebruikers overschrijdt."
+    bootstrap_mode_enabled: "Om het lanceren van je website makkelijker te maken, bevind je je in bootstrapmodus. Aan alle nieuwe gebruikers wordt vertrouwensniveau 1 toegekend en dagelijkse e-mailsamenvattingen zijn voor hen ingeschakeld. Dit wordt automatisch uitgeschakeld wanneer het totale gebruikersaantal %{min_users} gebruikers overschrijdt."
     bootstrap_mode_disabled: "De bootstrapmodus zal in de komende 24 uur worden uitgeschakeld."
     themes:
       default_description: "Standaard"
     s3:
       regions:
-        us_east_1: "VS Oost (N. Virginia)"
-        us_west_1: "VS West (N. Californië)"
-        us_west_2: "VS West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (VS)"
-        eu_west_1: "EU (Ierland)"
-        eu_west_2: "EU (Londen)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Azië Pacifisch (Singapore)"
-        ap_southeast_2: "Azië Pacifisch (Sydney)"
-        ap_south_1: "Azië Pacifisch (Bombay)"
         ap_northeast_1: "Azië Pacifisch (Tokio)"
         ap_northeast_2: "Azië Pacifisch (Seoel)"
-        sa_east_1: "Zuid-Amerika (Sao Paulo)"
+        ap_south_1: "Azië Pacifisch (Bombay)"
+        ap_southeast_1: "Azië Pacifisch (Singapore)"
+        ap_southeast_2: "Azië Pacifisch (Sydney)"
         cn_north_1: "China (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ierland)"
+        eu_west_2: "EU (Londen)"
+        sa_east_1: "Zuid-Amerika (Sao Paulo)"
+        us_east_1: "VS Oost (N. Virginia)"
+        us_east_2: "VS Oost (Ohio)"
+        us_gov_west_1: "AWS GovCloud (VS)"
+        us_west_1: "VS West (N. Californië)"
+        us_west_2: "VS West (Oregon)"
     edit: 'de titel en categorie van dit topic bewerken'
-    not_implemented: "Die functie is nog niet geïmplementeerd, sorry!"
+    not_implemented: "Deze functie is helaas nog niet beschikbaar, sorry!"
     no_value: "Nee"
     yes_value: "Ja"
     generic_error: "Sorry, er is iets fout gegaan."
     generic_error_with_reason: "Er is iets fout gegaan: %{error}"
     sign_up: "Registreren"
-    log_in: "Aanmelden"
+    log_in: "Inloggen"
     age: "Leeftijd"
     joined: "Lid sinds"
     admin_title: "Beheer"
@@ -184,10 +185,10 @@ nl:
     guidelines: "Richtlijnen"
     privacy_policy: "Privacybeleid"
     privacy: "Privacy"
-    terms_of_service: "Servicevoorwaarden"
+    terms_of_service: "Algemene Voorwaarden"
     mobile_view: "Mobiele weergave"
     desktop_view: "Desktopweergave"
-    you: "U"
+    you: "Jij"
     or: "of"
     now: "zojuist"
     read_more: 'meer info'
@@ -232,12 +233,12 @@ nl:
         bookmark: "Klik om een bladwijzer voor het eerste bericht van dit topic te maken"
         unbookmark: "Klik om alle bladwijzers in dit topic te verwijderen"
     bookmarks:
-      not_logged_in: "sorry, u moet aangemeld zijn om bladwijzers voor berichten te maken"
-      created: "u hebt een bladwijzer voor dit bericht gemaakt"
-      not_bookmarked: "u hebt dit bericht gelezen; klik om er een bladwijzer voor te maken"
-      last_read: "dit is het laatste bericht dat u hebt gelezen; klik om er een bladwijzer voor te maken"
+      not_logged_in: "sorry, je moet ingelogd zijn om berichten aan je favorieten toe te kunnen voegen"
+      created: "je hebt een bladwijzer voor dit bericht gemaakt"
+      not_bookmarked: "je hebt dit bericht gelezen; klik om er een bladwijzer voor te maken"
+      last_read: "dit is het laatste bericht dat je hebt gelezen; klik om er een bladwijzer voor te maken"
       remove: "Bladwijzer verwijderen"
-      confirm_clear: "Weet u zeker dat u alle bladwijzers van dit topic wilt verwijderen?"
+      confirm_clear: "Weet je zeker dat je alle bladwijzers van dit topic wilt verwijderen?"
     topic_count_latest:
       one: "{{count}} nieuwe of aangepaste discussie."
       other: "{{count}} nieuwe of bijgewerkte topics."
@@ -249,7 +250,7 @@ nl:
       other: "{{count}} nieuwe topics."
     click_to_show: "Klik om te bekijken."
     preview: "voorbeeld"
-    cancel: "annuleren"
+    cancel: "annuleer"
     save: "Wijzigingen opslaan"
     saving: "Opslaan..."
     saved: "Opgeslagen!"
@@ -352,6 +353,7 @@ nl:
         add_members: "Leden toevoegen"
         delete_member_confirm: "'%{username}' uit de groep '%{group}' verwijderen?"
       name_placeholder: "Groepsnaam, geen spaties, hetzelfde als gebruikersnaamregel"
+      public: "Gebruikers toestaan om bij groepen aan te melden of deze te verlaten (Groep moet hiervoor publiekelijk zichtbaar zijn)"
       empty:
         posts: "Er zijn geen berichten van leden van deze groep."
         members: "Er zijn geen leden in deze groep."
@@ -386,6 +388,12 @@ nl:
       mentions: "Vermeldingen"
       messages: "Berichten"
       notification_level: "Standaard meldingsniveau voor groepsberichten"
+      visibility_levels:
+        title: "Voor wie is deze groep zichtbaar?"
+        public: "Iedereen"
+        members: "Groepseigenaars, -beheerders en -leden"
+        staff: "Groepseigenaars en -personeel"
+        owners: "Groepeigenaars en -beheerders"
       alias_levels:
         title: "Wie kan deze groep een bericht sturen en taggen?"
         nobody: "Niemand"
@@ -483,6 +491,7 @@ nl:
       mute: "Negeren"
       edit: "Voorkeuren bewerken"
       download_archive:
+        button_text: "Alles downloaden"
         confirm: "Weet u zeker dat u uw berichten wilt downloaden?"
         success: "Downloaden is gestart; u ontvangt een melding zodra het proces is voltooid."
         rate_limit_error: "Berichten kunnen maar één keer per dag worden gedownload; probeer het morgen opnieuw."
@@ -552,6 +561,7 @@ nl:
       watched_first_post_tags_instructions: "U ontvangt een melding bij het eerste bericht in elk nieuw topic met deze tags."
       muted_categories: "Genegeerd"
       muted_categories_instructions: "U ontvangt geen melding over nieuwe topics en berichten in deze categorieën, en ze verschijnen niet in Nieuwste."
+      no_category_access: "Als een beheerder heeft u beperkte toegang tot categorieën, opslaan is uitgeschakeld."
       delete_account: "Mijn account verwijderen"
       delete_account_confirm: "Weet u zeker dat u uw account definitief wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt!"
       deleted_yourself: "Uw account is met succes verwijderd."
@@ -746,6 +756,9 @@ nl:
         expired: "Deze uitnodiging is verlopen."
         rescind: "Verwijderen"
         rescinded: "Uitnodiging verwijderd"
+        rescind_all: "Verwijder alle uitnodigingen"
+        rescinded_all: "Alle uitnodigingen verwijderd!"
+        rescind_all_confirm: "Weet u zeker dat u alle uitnodigingen wilt verwijderen?"
         reinvite: "Uitnodiging opnieuw versturen"
         reinvite_all: "Alle uitnodigingen opnieuw versturen"
         reinvite_all_confirm: "Weet u zeker dat u alle uitnodigingen opnieuw wilt versturen?"
@@ -928,6 +941,8 @@ nl:
       complete_email_found: "We hebben een account gevonden met het e-mailadres <b>%{email}<b/>. U zou spoedig een e-mail moeten ontvangen met instructies om uw wachtwoord opnieuw in te stellen."
       complete_username_not_found: "Geen account met de gebruikersnaam <b>%{username}</b> gevonden"
       complete_email_not_found: "Geen account met het e-mailadres <b>%{email}</b> gevonden"
+      button_ok: "OK"
+      button_help: "Help"
     login:
       title: "Aanmelden"
       username: "Gebruiker"
@@ -986,6 +1001,9 @@ nl:
       your_email: "Het e-mailadres van uw account is <b>%{email}</b>."
       accept_invite: "Uitnodiging accepteren"
       success: "Uw account is gemaakt en u bent nu aangemeld."
+      name_label: "Naam"
+      password_label: "Wachtwoord instellen"
+      optional_description: "(optioneel)"
     password_reset:
       continue: "Doorgaan naar %{site_name}"
     emoji_set:
@@ -994,6 +1012,8 @@ nl:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Klassiek"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Alleen categorieën"
       categories_with_featured_topics: "Categorieën met aanbevolen topics"
@@ -1002,12 +1022,24 @@ nl:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Zoek naar emoji
+      people: Mensen
+      nature: Natuur
+      food: Voeding
+      activity: Activiteit
+      travel: Reizen
+      objects: Objecten
+      celebration: Viering
+      custom: Eigen emojis
+      recent: Recent gebruikt
     composer:
       emoji: "Emoji :)"
       more_emoji: "meer..."
       options: "Opties"
       whisper: "fluisteren"
       unlist: "onzichtbaar"
+      blockquote_text: "Citaat"
       add_warning: "Dit is een officiële waarschuwing."
       toggle_whisper: "Fluistermodus in-/uitschakelen"
       toggle_unlisted: "Onzichtbaar in-/uitschakelen"
@@ -1205,6 +1237,7 @@ nl:
           seen: die ik heb gelezen
           unseen: die ik niet heb gelezen
           wiki: die een wiki zijn
+          all_tags: Bevat alle tags
         statuses:
           label: Waarin topics
           open: open zijn
@@ -1534,6 +1567,7 @@ nl:
         success_email: "Er is een uitnodiging naar <b>{{emailOrUsername}}</b> gemaild. We stellen u op de hoogte als op de uitnodiging is ingegaan. Controleer het uitnodigingentabblad op uw gebruikerspagina om uw uitnodigingen bij te houden."
         success_username: "We hebben die gebruiker uitgenodigd om aan dit topic deel te nemen."
         error: "Sorry, we konden deze persoon niet uitnodigen. Misschien is deze al uitgenodigd? (Uitnodigingen zijn in aantal beperkt)"
+        success_existing_email: "Een gebruiker met de e-mail <b>{{emailOrUsername}}</b> bestaat al. We hebben deze gebruiker uitgenodigd om aan dit topic deel te nemen."
       login_reply: 'Meld u aan om te antwoorden'
       filters:
         n_posts:
@@ -1651,6 +1685,7 @@ nl:
         has_liked: "u hebt dit bericht geliket"
         undo_like: "like ongedaan maken"
         edit: "dit bericht bewerken"
+        edit_action: "Bewerken"
         edit_anonymous: "Sorry, maar u dient aangemeld te zijn om dit bericht te bewerken."
         flag: "een privémarkering aan dit topic geven of er een privébericht over sturen"
         delete: "dit bericht verwijderen"
@@ -1800,6 +1835,7 @@ nl:
       settings: 'Instellingen'
       topic_template: "Topic-sjabloon"
       tags: "Tags"
+      tags_allowed_tags: "Tags die in deze categorie kunnen worden gebruikt:"
       tags_placeholder: "(Optioneel) lijst van toegestane tags"
       tag_groups_placeholder: "(Optioneel) lijst van toegestane tag-groepen"
       topic_featured_link_allowed: "Aanbevolen koppelingen in deze categorie toestaan"
@@ -2767,6 +2803,8 @@ nl:
           block: "blokkeren"
           do_nothing: "niets doen"
         staff_actions:
+          all: "alle"
+          filter: "Filter:"
           title: "Stafacties"
           clear_filters: "Alles tonen"
           staff_user: "Staflid"
@@ -2992,6 +3030,7 @@ nl:
         reset_bounce_score:
           label: "Terugzetten"
           title: "Bouncescore terugzetten naar 0"
+        visit_profile: "Ga naar <a href='%{url}'>de instellingen van deze gebruiker</a> om hun profiel te bewerken"
         deactivate_explanation: "Een gedeactiveerde gebruiker moet zijn of haar e-mailadres opnieuw valideren."
         suspended_explanation: "Een geschorste gebruiker kan zich niet aanmelden."
         block_explanation: "Een geblokkeerde gebruiker kan geen berichten plaatsen of topics maken."
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 885d939bd5..3f984d6bcd 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -173,10 +173,10 @@ pl_PL:
         enabled: 'wylistowanie %{when}'
         disabled: 'odlistowanie %{when}'
       banner:
-        enabled: 'Ten temat został ustawiony jako baner. Będzie widoczny na górze każdej strony, dopóki nie zostanie zamknięty przez użytkownika.'
-        disabled: 'Baner został usunięty. Nie będzie więcej widoczny na górze każdej strony.'
+        enabled: 'Ten temat został ustawiony jako baner %{when}. Będzie widoczny na górze każdej strony, póki nie zostanie ukryty przez użytkownika.'
+        disabled: 'Ten temat nie jest już banerem. Nie będzie dalej wyświetlany na górze każdej strony.'
     topic_admin_menu: "akcje administratora"
-    wizard_required: "Witaj na Twoim nowym Discourse! Zacznij od <a href='%{url}' data-auto-route='true'>kreatora konfiguracji</a> ✨"
+    wizard_required: "Witaj na Twoim na nowym forum opartym na Discourse! Rozpocznij konfigurację w <a href='%{url}' data-auto-route='true'>panelu konfiguracyjnym</a> ✨"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
     bootstrap_mode_enabled: "Aby ułatwić uruchomienie Twojego nowego serwisu, znajdujesz się w trybie bootstrap. Wszyscy nowi użytkownicy otrzymają 1. poziom zaufania i będą otrzymywać codzienne podsumowania drogą mailową. To się zmieni, gdy liczba użytkowników przekroczy liczbę %{min_users}."
     bootstrap_mode_disabled: "Tryb Bootstrap zostanie wyłączony w ciągu najbliższych 24 godzin."
@@ -184,20 +184,21 @@ pl_PL:
       default_description: "Domyślny"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irlandia)"
-        eu_west_2: "EU (Londyn)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "Ameryka Południowa (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Chiny (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlandia)"
+        eu_west_2: "Europa (Londyn)"
+        sa_east_1: "Ameryka Południowa (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_east_2: "Wschodnie USA (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'edytuj tytuł i kategorię tego tematu'
     not_implemented: "Bardzo nam przykro, ale ta funkcja nie została jeszcze zaimplementowana."
     no_value: "Nie"
@@ -404,6 +405,8 @@ pl_PL:
         add_members: "Dodaj użytkowników"
         delete_member_confirm: "Czy usunąć użytkownika '%{username}' z grupy '%{group}'?"
       name_placeholder: "Nazwa grupy, bez spacji, takie same zasady jak przy nazwie użytkownika"
+      public_admission: "Zezwól wszystkim użytkownikom na dołączanie do tej grupy (widoczność grupy musi być ustawiona na publiczną)"
+      public_exit: "Zezwól wszystkim użytkownikom na opuszczanie tej grupy"
       empty:
         posts: "Członkowie tej grupy nie opublikowali żadnych postów."
         members: "Nie ma użytkowników w tej grupie"
@@ -415,6 +418,7 @@ pl_PL:
       join: "Dołącz do grupy"
       leave: "Opuść grupę"
       request: "Żądanie dołączenia do grupy"
+      message: "Wiadomość"
       automatic_group: Automatyczna grupa
       closed_group: Zamknięta grupa
       is_group_user: "Jesteś członkiem tej grupy"
@@ -440,6 +444,12 @@ pl_PL:
       mentions: "Wzmianki"
       messages: "Wiadomości"
       notification_level: "Domyślny poziom powiadomień dla wiadomości grupy."
+      visibility_levels:
+        title: "Kto może widzieć grupę?"
+        public: "Wszyscy"
+        members: "Właściciele grupy, członkowie i administratorzy"
+        staff: "Właściciele grupy i zespół"
+        owners: "Właściciele grupy i administratorzy"
       alias_levels:
         title: "Kto może wysyłać wiadomości i używać @aliasu tej grupy?"
         nobody: "Nikt"
@@ -541,6 +551,7 @@ pl_PL:
       mute: "Wycisz"
       edit: "Edytuj ustawienia"
       download_archive:
+        button_text: "Pobierz Wszystko"
         confirm: "Czy na pewno chcesz pobrać swoje wszystkie wpisy?"
         success: "Rozpoczęto eksport: otrzymasz wiadomość, gdy proces zostanie zakończony."
         rate_limit_error: "Wpisy mogą być pobierane raz dziennie, spróbuj ponownie jutro."
@@ -570,6 +581,7 @@ pl_PL:
       first_notification: "Twoje pierwsze powiadomienie! Kliknij aby zacząć."
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
+      theme_default_on_all_devices: "Ustaw ten motyw jako domyślny na wszystkich moich urządzeniach"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       change: "zmień"
@@ -608,6 +620,7 @@ pl_PL:
       watched_first_post_tags_instructions: "Zostaniesz powiadomiony tylko o pierwszym wpisie w każdym nowym temacie oznaczonym tymi tagami."
       muted_categories: "Wyciszone"
       muted_categories_instructions: "Nie będziesz powiadamiany o nowych tematach w tych kategoriach. Nie pojawią się na liście nieprzeczytanych."
+      no_category_access: "Jako moderator masz limitowany dostęp do kategorii, możliwość zapisu jest wyłączona."
       delete_account: "Usuń moje konto"
       delete_account_confirm: "Czy na pewno chcesz usunąć swoje konto? To nieodwracalne!"
       deleted_yourself: "Twoje konto zostało usunięte."
@@ -806,8 +819,12 @@ pl_PL:
         expired: "To zaproszenie wygasło."
         rescind: "Usuń"
         rescinded: "Zaproszenie usunięte"
+        rescind_all: "Usuń wszystkie Zaproszenia"
+        rescinded_all: "Wszystkie Zaproszenia usunięte!"
+        rescind_all_confirm: "Jesteś pewny, że chcesz usunąć wszystkie zaproszenia?"
         reinvite: "Ponów zaproszenie"
         reinvite_all: "Wyślij ponownie wszystkie zaproszenia"
+        reinvite_all_confirm: "Jesteś pewny, że chcesz ponownie wysłać wszystkie zaproszenia?"
         reinvited: "Ponowne wysłanie zaproszenia"
         reinvited_all: "Wszystkie zaproszenia zostały ponownie wysłane!"
         time_read: "Czas odczytu"
@@ -1004,6 +1021,9 @@ pl_PL:
       complete_email_found: "Znaleziono konto przypisane do adresu <b>%{email}</b>,  wkrótce otrzymasz email z instrukcjami opisującymi reset hasła."
       complete_username_not_found: "Nie znaleziono konta o nazwie <b>%{username}</b>"
       complete_email_not_found: "Nie znaleziono konta przypisanego do <b>%{email}</b>"
+      help: "Email nie dotarł? Upewnij się najpierw czy sprawdziłeś folder spam.<p>Nie jesteś pewny jaki email został użyty? Wprowadz adres tutaj, a dowiemy się czy taki istnieje.</p><p>Jeśli nie masz już dostępu do adresu email zapisanego na twoim koncie, skontaktuj się z <a href='/about'>naszym pomocnym zespołem.</a></p>"
+      button_ok: "OK"
+      button_help: "Pomoc"
     login:
       title: "Logowanie"
       username: "Użytkownik"
@@ -1058,10 +1078,13 @@ pl_PL:
       accept_title: "Zaproszenie"
       welcome_to: "Witaj na %{site_name}!"
       invited_by: "Zostałeś zaproszony przez:"
+      social_login_available: "Będziesz mógł zalogować się za pomocą dowolnej platformy społecznościowej używając tego adresu e-mail."
       your_email: "Adres e-mail przypisany do twojego konta to <b>%{email}</b>."
       accept_invite: "Akceptuj zaproszenie"
       success: "Twje konto zostało utworzone i zostałeś zalogowany."
       name_label: "Nazwa"
+      password_label: "Ustaw hasło"
+      optional_description: "(opcjonalne)"
     password_reset:
       continue: "Przejdź do %{site_name}"
     emoji_set:
@@ -1070,6 +1093,8 @@ pl_PL:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Tylko kategorie"
       categories_with_featured_topics: "Kategorie z wybranymi tematami"
@@ -1078,12 +1103,30 @@ pl_PL:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      filter_placeholder: Szukaj emoji
+      people: Ludzie
+      nature: Natura
+      food: Jedzenie
+      activity: Aktywność
+      travel: Podróż
+      objects: Obiekty
+      celebration: Celebracja
+      custom: Spersonalizowane emoji
+      recent: Ostatnio używane
+      default_tone: Brak koloru skóry
+      light_tone: Jasny kolor skóry
+      medium_light_tone: Średnio jasny kolor skóry
+      medium_tone: Średni kolor skóry
+      medium_dark_tone: Średnio ciemny kolor skóry
+      dark_tone: Ciemny kolor skóry
     composer:
       emoji: "Emoji :)"
       more_emoji: "więcej…"
       options: "Opcje"
       whisper: "szept"
       unlist: "nie widoczny"
+      blockquote_text: "Cytat"
       add_warning: "To jest oficjalne ostrzeżenie."
       toggle_whisper: "Przełącz szept"
       toggle_unlisted: "Przycisk ukrywania"
@@ -1100,6 +1143,7 @@ pl_PL:
       cannot_see_mention:
         category: "Wspomniałeś o {{username}} lecz nie zostaną oni powiadomieni ponieważ nie mają dostępu do tej kategorii. Dodaj ich do grupy która ma dostęp do tej kategorii."
         private: "Wspomniałeś o {{username}} lecz nie zostaną powiadomieni ponieważ nie mogą odczytać tej wiadomości . Będziesz musiał ich zaprosić do odczytania tej wiadomości "
+      duplicate_link: "Wygląda na to, że Twój link do <b>{{domain}}</b> został już wcześniej przesłany w tym wątku przez <b>@{{username}}</b> w <a href='{{post_url}}'>odpowiedzi przesłanej {{ago}}</a> - jesteś pewien, że chcesz go wysłać ponownie?"
       error:
         title_missing: "tytuł jest wymagany"
         title_too_short: "tytuł musi zawierać co najmniej {{min}} znaków"
@@ -1191,6 +1235,7 @@ pl_PL:
       moved_post: "<i title='przeniesienie wpisu' class='fa fa-sign-out'></i><p><span>{{username}}</span> przenosi {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='otrzymano odznakę' class='fa fa-certificate'></i><p>Otrzymujesz '{{description}}'</p>"
+      topic_reminder: "<i title='topic reminder' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nowy temat</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> masz {{count}} wiadomość w skrzynce odbiorczej {{group_name}} </p>"
@@ -1245,10 +1290,10 @@ pl_PL:
       clear_all: "Wyczyść wszystkie"
       too_short: "Wyszukiwane określenie jest zbyt krótkie."
       result_count:
-        one: "1 wynik dla <span class='term'>\"{{term}}\"</span>"
-        few: "{{count}} wyniki dla <span class='term'>\"{{term}}\"</span>"
-        many: "{{count}} wyników dla <span class='term'>\"{{term}}\"</span>"
-        other: "{{count}} wyników dla <span class='term'>\"{{term}}\"</span>"
+        one: "1 wynik dla <span class='term'>{[count}}</span>"
+        few: "1 wynik dla <span class='term'>{{term}}</span>"
+        many: "1 wynik dla <span class='term'>{{term}}</span>"
+        other: "{{count}} wyników dla <span class='term'>{{term}}</span>"
       title: "szukaj tematów, wpisów, użytkowników lub kategorii"
       no_results: "Brak wyników wyszukiwania"
       no_more_results: "Nie znaleziono więcej wyników."
@@ -1286,6 +1331,7 @@ pl_PL:
           seen: Przeczytałem
           unseen: Nie przeczytałem
           wiki: są postami wiki
+          all_tags: Zawiera wszystkie tagi
         statuses:
           label: Tematy gdzie
           open: są otwarte
@@ -1311,6 +1357,7 @@ pl_PL:
         select_all: "Zaznacz wszystkie"
         clear_all: "Wyczyść wszystko"
         unlist_topics: "Ukryj tematy"
+        relist_topics: "Odśwież listę tematów"
         reset_read: "Wyzeruj przeczytane"
         delete: "Usuń tematy"
         dismiss: "Wyczyść"
@@ -1321,6 +1368,7 @@ pl_PL:
         dismiss_new: "Wyczyść nowe"
         toggle: "włącz grupowe zaznaczanie tematów"
         actions: "Operacje grupowe"
+        change_category: "Ustaw kategorię"
         close_topics: "Zamknij wpisy"
         archive_topics: "Zarchiwizuj tematy"
         notification_level: "Powiadomienia"
@@ -1449,6 +1497,7 @@ pl_PL:
         next_week: "Następny tydzień"
         next_month: "Następny miesiąc"
         pick_date_and_time: "Wybierz datę i czas"
+        set_based_on_last_post: "Zamknij na podstawie ostatniego postu"
       publish_to_category:
         title: "Zaplanuj publikację"
       temp_open:
@@ -1461,11 +1510,18 @@ pl_PL:
         title: "Automatycznie zamknij wątek"
         label: "Godziny automatycznego zamknięcia:"
         error: "Wprowadź poprawną wartość."
+        based_on_last_post: "Nie zamykaj tematu dopóki od ostatniego wpisu nie upłynie przynajmniej tyle czasu."
+      auto_delete:
+        title: "Automatycznie usuń wątek"
+      reminder:
+        title: "Przypomnij mi"
       status_update_notice:
         auto_open: "Ten wątek zostanie automatycznie otwarty po %{timeLeft}."
         auto_close: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
         auto_publish_to_category: "Wątek zostanie opublikowany w <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_based_on_last_post: "Ten watek zostanie automatycznie zamknięty po %{count} minutach od ostatniego wpisu."
+        auto_delete: "Ten wątek zostanie automatycznie zamknięty po %{timeLeft}."
+        auto_reminder: "Otrzymasz przypomnienie o tym temacie %{timeLeft}."
       auto_close_title: 'Ustawienia automatycznego zamykania'
       auto_close_immediate:
         one: "Ostatni wpis w tym temacie został zamieszczony 1 godzinę temu, więc zostanie on natychmiastowo zamknięty."
@@ -1625,6 +1681,7 @@ pl_PL:
         success_email: "Wysłaliśmy zaproszenie do <b>{{emailOrUsername}}</b>. Otrzymasz powiadomienie, gdy zaproszenie zostanie przyjęte. Sprawdź zakładkę zaproszenia w swoim profilu, aby śledzić status tego i innych zaproszeń."
         success_username: "Wskazany użytkownik został zaproszony do udziału w tym temacie."
         error: "Przepraszamy, nie udało się zaprosić wskazanej osoby. Być może została już zaproszona? (Lub wysyłasz zbyt wiele zaproszeń)"
+        success_existing_email: "Użytkownik o e-mailu <b>{{emailOrUsername}}</b> już istnieje. Zaprosiliśmu tego użytkownika do udziału w tym temacie."
       login_reply: 'Zaloguj się, aby odpowiedzieć'
       filters:
         n_posts:
@@ -1764,6 +1821,7 @@ pl_PL:
         has_liked: "lajkujesz ten wpis"
         undo_like: "wycofaj lajka"
         edit: "edytuj ten wpis"
+        edit_action: "Edytuj"
         edit_anonymous: "Przykro nam, ale musisz być zalogowany aby edytować ten wpis."
         flag: "oflaguj ten wpis lub wyślij powiadomienie o nim do moderatorów"
         delete: "usuń ten wpis"
@@ -1906,6 +1964,12 @@ pl_PL:
           few: "Jesteś pewny(-a), że chcesz usunąć te wszystkie wpisy?"
           many: "Czy na pewno chcesz usunąć te wszystkie wpisy?"
           other: "Czy na pewno chcesz usunąć te wszystkie wpisy?"
+      merge:
+        confirm:
+          one: "Czy na pewno chcesz 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"
@@ -1951,6 +2015,8 @@ pl_PL:
       settings: 'Ustawienia'
       topic_template: "Szablon tematu"
       tags: "Tagi"
+      tags_allowed_tags: "Zezwól jedynie na użycie następujących tagów w tej kategorii:"
+      tags_allowed_tag_groups: "Zezwól jedynie na użycie tagów z następujących grup w tej kategorii:"
       tags_placeholder: "(Opcjonalnie) lista dozwolonych tagów"
       tag_groups_placeholder: "(Opcjonalnie) lista dozwolonych grup tagów"
       topic_featured_link_allowed: "Zezwól na wybrane linki w tej kategorii"
@@ -1993,6 +2059,7 @@ pl_PL:
       subcategory_list_style: "Styl listy podkategorii:"
       sort_order: "Sortuj listę wątków po:"
       default_view: "Domyślna lista wątków:"
+      default_top_period: "Domyślny okres wyświetlania najlepszych postów:"
       allow_badges_label: "Włącz przyznawanie odznak na podstawie aktywności w tej kategorii"
       edit_permissions: "Edytuj uprawnienia"
       add_permission: "Dodaj uprawnienie"
@@ -2306,6 +2373,8 @@ pl_PL:
       granted_on: "Przyznano %{date}"
       others_count: "Inni użytkownicy z tą odznaką (%{count})"
       title: Odznaki
+      allow_title: "Możesz użyc tej odznaki jako tytułu"
+      multiple_grant: "Możesz zdobyć tą odznakę wiele razy"
       badge_count:
         one: "1 odznaka"
         few: "%{count} odznak"
@@ -2617,6 +2686,7 @@ pl_PL:
         event_type_missing: "Musisz ustawić co najmniej jeden typ wydarzenia."
         content_type: "Typ zawartości "
         secret: "Tajemnica"
+        event_chooser: "Jakie zdarzenia powinny wywołać uruchomienie tego webhooka?"
         wildcard_event: "Wysyłaj mi wszystko."
         individual_event: "Wybierz indywidualne zdarzenia"
         verify_certificate: "Sprawdź certyfikat TLS zawarty w url"
@@ -2765,6 +2835,7 @@ pl_PL:
         copy_to_clipboard: "Skopiuj do schowka"
         copied_to_clipboard: "Tekst skopiowany do schowka."
         copy_to_clipboard_error: "Wystąpił błąd w trakcie kopiowania do schowka."
+        theme_owner: "Nie możliwe do edycji, należy do:"
         email_templates:
           title: "Szablony email"
           subject: "Temat"
@@ -2777,8 +2848,10 @@ pl_PL:
           import_theme: "Importuj motyw"
           customize_desc: "Personalizacja:"
           title: "Motywy"
+          long_title: "Zmodyfikuj kolory, kod CSS i kod HTML zawartości Twojej strony"
           edit: "Edytuj"
           edit_confirm: "To jest zdalny styl. Jeśli edytujesz CSS/HTML, twoje zmiany zostaną usunięte po ponownej aktualizacji motywu."
+          common: "Częste"
           desktop: "Komputer"
           mobile: "Mobilnie"
           preview: "Podgląd"
@@ -2786,19 +2859,34 @@ pl_PL:
           user_selectable: "Motyw może być ustawiany przez użytkowników"
           color_scheme: "Schemat kolorów"
           color_scheme_select: "Wybierz kolory, jakie mają być użyte w motywie"
+          custom_sections: "Spersonalizowane sekcje:"
           theme_components: "Komponenty motywu"
+          uploads: "Pliki"
           no_uploads: "Możesz załadować zasoby do swojego motywu np. fonty lub obrazy"
+          add_upload: "Dodaj plik"
+          upload_file_tip: "Wybierz plik do wysłania (png, woff2, itp.)"
+          variable_name: "Nazwa zmiennej SCSS:"
+          upload: "Plik"
+          child_themes_check: "Motyw importuje zawartość innych motywów"
           css_html: "Własny CSS/HTML"
           edit_css_html: "Edytuj CSS/HTML"
           edit_css_html_help: "Nie modyfikowałeś CSS ani HTML"
           delete_upload_confirm: "Czy usunąć ten plik? (CSS motywu może przestać działać!)"
+          import_web_tip: "Repozytorium zawierające motyw"
+          import_file_tip: "Plik .dcstyle.json zawierający motyw"
           about_theme: "O motywie"
           license: "Licencja"
+          component_of: "Motyw jest częścią:"
           update_to_latest: "Aktualizuj do najnowszego"
           check_for_updates: "Sprawdź dostępność aktualizacji"
           updating: "Trwa proces aktualizacji..."
           up_to_date: "Motyw jest aktualny. Ostatnio sprawdzano:"
           add: "Dodaj"
+          commits_behind:
+            one: "Motyw jest 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"
@@ -2813,6 +2901,7 @@ pl_PL:
             title: "Wstaw kod HTML do wyświetlenia w stopce strony"
           embedded_scss:
             text: "Osadzony CSS"
+            title: "Podaj spersonalizowany kod CSS dostarczany w ramkowej wersji komentarzy"
           head_tag:
             text: "</head>"
             title: "HTML, który zostanie umieszczony przed tagiem </head>"
@@ -2944,6 +3033,8 @@ pl_PL:
           block: "blok"
           do_nothing: "nic nie rób"
         staff_actions:
+          all: "wszystkie"
+          filter: "Filtruj:"
           title: "Działania obsługi"
           clear_filters: "Pokaż wszystko"
           staff_user: "Użytkownik obsługi"
@@ -2997,6 +3088,8 @@ pl_PL:
             change_readonly_mode: "Zmień tryb tylko do otczytu"
             backup_download: "Pobierz kopię zapasową"
             backup_destroy: "Zniszcz kopię zapasową "
+            reviewed_post: "przejrzane posty"
+            custom_staff: "spersonalizowana akcja wtyczki"
         screened_emails:
           title: "Ekranowane emaile"
           description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana."
@@ -3029,6 +3122,32 @@ pl_PL:
             title: "Tworzy nowy ban dla podsieci jeśli jest co najmniej  'min_ban_entries_for_roll_up' pozycji."
         logster:
           title: "Logi błędów"
+      watched_words:
+        title: "Obserwowane słowa"
+        search: "szukaj"
+        clear_filter: "Wyczyść"
+        show_words: "pokaż słowa"
+        word_count:
+          one: "1 słowo"
+          few: "%{count} słów"
+          many: "%{count} słów"
+          other: "%{count} słów"
+        actions:
+          block: 'Zablokuj'
+          censor: 'Cenzuruj'
+          require_approval: 'Wymaga zatwierdzenia'
+          flag: 'Oflaguj'
+        action_descriptions:
+          block: 'Zapobiegaj publikacji postów zawierających te słowa. Użytkownicy zobaczą błąd próbując wysłać taki post.'
+          censor: 'Zezwalaj na wysyłanie postów zawierających te słowa, ale zamień na znaki ukrywające ocenzurowane słowa.'
+          require_approval: 'Posty zawierające te słowa będą wymagały zatwierdzenia przez moderatora zanim zostaną opublikowane.'
+          flag: 'Zezwalaj na publikację takich postów, ale oflaguj je jako nieodpowiednie, aby moderatorzy mogli przejrzeć ich zawartość.'
+        form:
+          label: 'Nowe słowo:'
+          add: 'Dodaj'
+          success: 'Sukces'
+          upload: "Prześlij"
+          upload_successful: "Przesyłanie zakończone sukcesem. Słowa zostały dodane."
       impersonate:
         title: "Zaloguj się na to konto"
         help: "Użyj tego narzędzia, aby logować się jako dowolny użytkownik w celach diagnozy problemów."
@@ -3183,6 +3302,7 @@ pl_PL:
         reset_bounce_score:
           label: "Przywróć"
           title: "Przywróć stan licznika zwrotów z powrotem do wartości 0"
+        visit_profile: "Odwiedź <a href='%{url}'>ustawienia tego użytkownika</a>, aby zedytować jego profil."
         deactivate_explanation: "Wymusza ponowne potwierdzenie adresu email tego konta."
         suspended_explanation: "Zawieszony użytkownik nie może się logować."
         block_explanation: "Zablokowany użytkownik nie może tworzyć wpisów ani zaczynać tematów."
@@ -3397,6 +3517,7 @@ pl_PL:
         sample: "Użyj poniższego kodu HTML na swojej stronie, aby osadzić tematy z Discourse. Zastąp <b>REPLACE_ME</b> domyślnym adresem URL strony na której osadzasz."
         title: "Osadzanie"
         host: "Dozwolone hosty"
+        class_name: "Nazwa klasy"
         path_whitelist: "Ścieżka białej listy"
         edit: "edytuj"
         category: "Publikuj w kategorii"
@@ -3416,6 +3537,7 @@ pl_PL:
         embed_classname_whitelist: "Dozwolone nazwy klas CSS"
         feed_polling_enabled: "Importowanie wpisów via RSS/ATOM"
         feed_polling_url: "URL kanału RSS/ATOM"
+        feed_polling_frequency_mins: "Częstotliwość aktualizacji strony (w minutach)"
         save: "Zapisz"
       permalink:
         title: "Permalinki"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 0a25b9cffa..f627ad361f 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -145,20 +145,20 @@ pt:
       default_description: "Predefinido"
     s3:
       regions:
-        us_east_1: "Este dos E.U.A. (Virgínia do Norte)"
-        us_west_1: "Oeste dos E.U.A. (California do Norte)"
-        us_west_2: "Oeste dos E.U.A. (Óregon)"
-        us_gov_west_1: "AWS GovCloud (E.U.A.)"
-        eu_west_1: "U.E. (Irlanda)"
-        eu_west_2: "EU (Londres)"
-        eu_central_1: "U.E. (Francoforte)"
-        ap_southeast_1: "Ásia-Pacífico (Singapura)"
-        ap_southeast_2: "Ásia-Pacífico (Sydney)"
-        ap_south_1: "Ásia Pacifico (Bombaim)"
         ap_northeast_1: "Ásia-Pacífico (Tóquio)"
         ap_northeast_2: "Ásia-Pacífico (Seoul)"
-        sa_east_1: "América do Sul (São Paulo)"
+        ap_south_1: "Ásia Pacifico (Bombaim)"
+        ap_southeast_1: "Ásia-Pacífico (Singapura)"
+        ap_southeast_2: "Ásia-Pacífico (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "U.E. (Francoforte)"
+        eu_west_1: "U.E. (Irlanda)"
+        eu_west_2: "UE (Londres)"
+        sa_east_1: "América do Sul (São Paulo)"
+        us_east_1: "Este dos E.U.A. (Virgínia do Norte)"
+        us_gov_west_1: "AWS GovCloud (E.U.A.)"
+        us_west_1: "Oeste dos E.U.A. (California do Norte)"
+        us_west_2: "Oeste dos E.U.A. (Óregon)"
     edit: 'editar o título e a categoria deste tópico'
     not_implemented: "Essa funcionalidade ainda não foi implementada, pedimos desculpa!"
     no_value: "Não"
@@ -352,22 +352,22 @@ pt:
       empty:
         posts: "Não existem publicações por membros deste grupo."
         members: "Não existem membros neste grupo."
-        mentions: "Não há menções deste grupo."
+        mentions: "Não existem menções deste grupo."
         messages: "Não existem mensagens para este grupo."
         topics: "Não existem tópicos por membros deste grupo."
         logs: "Não existem registos para este grupo."
       add: "Adicionar"
-      join: "Juntar ao Grupo"
+      join: "Aderir ao Grupo"
       leave: "Sair do Grupo"
-      request: "Pedir para Entrar no Grupo."
+      request: "Pedir para Aderir ao Grupo"
       automatic_group: Grupo Automático
       closed_group: Grupo fechado
-      is_group_user: "Você é membro deste grupo"
-      allow_membership_requests: "Permitir aos utilizadores enviar pedidos de adesão aos donos do grupo"
+      is_group_user: "É um membro deste grupo"
+      allow_membership_requests: "Permitir que os utilizadores enviem pedidos de adesão aos donos do grupo"
       membership: "Adesão"
       name: "Nome"
-      user_count: "Numero de Membros"
-      bio: "Acerca do Grupo"
+      user_count: "Número de Membros"
+      bio: "Sobre o Grupo"
       selector_placeholder: "Adicionar membros"
       owner: "proprietário"
       index:
@@ -376,13 +376,19 @@ pt:
       title:
         one: "grupo"
         other: "grupos"
-      activity: "Actividade"
+      activity: "Atividade"
       members: "Membros"
       topics: "Tópicos"
       posts: "Publicações"
       mentions: "Menções"
       messages: "Mensagens"
-      notification_level: "Nível de notificação por omissão para mensagens de grupo"
+      notification_level: "Nível de notificação predefinido para mensagens de grupo"
+      visibility_levels:
+        title: "Quem pode ver este grupo?"
+        public: "Toda a gente"
+        members: "Donos do grupo, membros e administradores"
+        staff: "Donos do grupo e equipa"
+        owners: "Donos do grupo e administradores"
       alias_levels:
         title: "Quem pode mandar mensagens e @mencionar este grupo?"
         nobody: "Ninguém"
@@ -411,9 +417,11 @@ pt:
           description: "Não será notificado de nada relacionado com novos tópicos neste grupo."
       flair_url: "Imagem da Marca de Avatar"
       flair_bg_color: "Cor de Fundo da Marca de Avatar"
-      flair_bg_color_placeholder: "(Opcional) Valor hexadecimal de cor"
+      flair_bg_color_placeholder: "(Opcional) Valor hexadecimal da cor"
       flair_color: "Cor da Marca de Avatar"
-      flair_color_placeholder: "(Opcional) Valor hexadecimal de cor"
+      flair_color_placeholder: "(Opcional) Valor hexadecimal da cor"
+      flair_preview_icon: "Pré-visualizar Ícone"
+      flair_preview_image: "Pré-visualizar Imagem"
     user_action_groups:
       '1': "Gostos Dados"
       '2': "Gostos Recebidos"
@@ -476,6 +484,7 @@ pt:
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive:
+        button_text: "Transferir Tudo"
         confirm: "Tem a certeza que deseja descarregar as suas publicações?"
         success: "Descarregamento iniciado, será notificado via mensagem assim que o processo estiver concluído."
         rate_limit_error: "As publicações podem ser descarregadas uma vez por dia, por favor, tente novamente amanhã."
@@ -1303,7 +1312,7 @@ pt:
         go_bottom: "fim"
         go: "ir"
         jump_bottom: "ir para a última publicação"
-        jump_prompt: "saltar para..."
+        jump_prompt: "ir para..."
         jump_prompt_of: "de %{count} publicações"
         jump_prompt_long: "Para que publicação gostaria de ir?"
         jump_bottom_with_number: "ir para a publicação %{post_number}"
@@ -1662,7 +1671,7 @@ pt:
           show: "Mostrar revisão"
           revert: "Reverter para esta revisão"
           edit_wiki: "Editar Wiki"
-          edit_post: "Editar publicação"
+          edit_post: "Editar Publicação"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 787cd28d3c..187dcfe91a 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -148,20 +148,20 @@ pt_BR:
       default_description: "Padrão"
     s3:
       regions:
-        us_east_1: "Leste dos EUA (N. da Virgínia)"
-        us_west_1: "Oeste dos EUA (N. da Califórnia)"
-        us_west_2: "Leste dos EUA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (EUA)"
-        eu_west_1: "EU (Irlanda)"
-        eu_west_2: "UE (Londres)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Ásia Pacífico (Singapura)"
-        ap_southeast_2: "Ásia Pacífico (Sidney)"
-        ap_south_1: "Ásia-Pacífico (Mumbai)"
         ap_northeast_1: "Ásia Pacífico (Tóquio)"
         ap_northeast_2: "Ásia Pacífico (Seul)"
-        sa_east_1: "América do Sul (São Paulo)"
+        ap_south_1: "Ásia-Pacífico (Mumbai)"
+        ap_southeast_1: "Ásia Pacífico (Singapura)"
+        ap_southeast_2: "Ásia Pacífico (Sidney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
+        eu_west_2: "UE (Londres)"
+        sa_east_1: "América do Sul (São Paulo)"
+        us_east_1: "Leste dos EUA (N. da Virgínia)"
+        us_gov_west_1: "AWS GovCloud (EUA)"
+        us_west_1: "Oeste dos EUA (N. da Califórnia)"
+        us_west_2: "Leste dos EUA (Oregon)"
     edit: 'edite o título e a categoria deste tópico'
     not_implemented: "Esse recurso ainda não foi implementado, desculpe!"
     no_value: "Não"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 67e28fbb75..824e1add24 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -161,19 +161,19 @@ ro:
       default_description: "Implicit"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irlanda)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irlanda)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'Editează titlul și categoria acestui subiect'
     not_implemented: "Această funcționalitate nu a fost implementată încă."
     no_value: "Nu"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index cc96fa19b4..d60bb7e4de 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -181,20 +181,20 @@ ru:
       default_description: "По умолчанию"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'отредактировать название и раздел темы'
     not_implemented: "Извините, эта функция еще не реализована!"
     no_value: "Нет"
@@ -434,6 +434,11 @@ ru:
       posts: "Сообщения"
       mentions: "Упоминания"
       messages: "Сообщения"
+      visibility_levels:
+        title: "Кто может видеть эту группу?"
+        public: "Все"
+        members: "Владельцы группы, участники и администраторы"
+        owners: "Владельцы группы и администраторы"
       alias_levels:
         title: "Кто может отправлять сообщения и @упоминать эту группу?"
         nobody: "Никто"
@@ -803,6 +808,9 @@ ru:
         expired: "Это приглашение истекло."
         rescind: "Отозвать"
         rescinded: "Приглашение отозвано"
+        rescind_all: "Удалить все приглашения"
+        rescinded_all: "Все приглашения были удалены!"
+        rescind_all_confirm: "Вы уверены, что хотите удалить все приглашения?"
         reinvite: "Повторить приглашение"
         reinvite_all: "Повторить все приглашения"
         reinvite_all_confirm: "Вы действительно хотите отправить все приглашения повторно?"
@@ -1074,6 +1082,8 @@ ru:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+      google_classic: "Google Classic"
+      facebook_messenger: "Facebook Messenger"
     category_page_style:
       categories_only: "Только разделы"
       categories_with_featured_topics: "Разделы и их лучшие темы"
@@ -1082,12 +1092,21 @@ ru:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
+    emoji_picker:
+      people: People
+      nature: Nature
+      food: Food
+      activity: Activity
+      travel: Travel
+      objects: Objects
+      celebration: Celebration
     composer:
       emoji: "Смайлики :)"
       more_emoji: "еще..."
       options: "Дополнительные опции"
       whisper: "внутреннее сообщение"
       unlist: "исключена из списков тем"
+      blockquote_text: "Цитата"
       add_warning: "Это официальное предупреждение."
       toggle_whisper: "Внутреннее сообщение"
       toggle_unlisted: "Спрятать из списков тем"
@@ -1332,6 +1351,7 @@ ru:
         change_category: "Задать раздел"
         close_topics: "Закрыть темы"
         archive_topics: "Архивировать темы"
+        notification_level: "Уведомления"
         choose_new_category: "Выберите новый раздел для этих тем:"
         selected:
           one: "Вы выбрали <b>{{count}}</b> тему."
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 7404b3376e..e1bd460e66 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -156,18 +156,18 @@ sk:
     bootstrap_mode_disabled: "Zavádzací režim bude zrušený v priebehu nasledujúcich 24 hodín."
     s3:
       regions:
-        us_east_1: "USA Východ (S. Virginia)"
-        us_west_1: "USA Západ (S. Kalifornia)"
-        us_west_2: "USA Západ (Oregon)"
-        us_gov_west_1: "AWS GovCloud (USA)"
-        eu_west_1: "EU (Írsko)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Ázia Tichomorie (Singapur)"
-        ap_southeast_2: "Ázia Tichomorie (Sydney)"
         ap_northeast_1: "Ázia Tichomorie (Tokio)"
         ap_northeast_2: "Asia Pacific (Soul)"
-        sa_east_1: "Južná Amerika (Sao Paulo)"
+        ap_southeast_1: "Ázia Tichomorie (Singapur)"
+        ap_southeast_2: "Ázia Tichomorie (Sydney)"
         cn_north_1: "Čína (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Írsko)"
+        sa_east_1: "Južná Amerika (Sao Paulo)"
+        us_east_1: "USA Východ (S. Virginia)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        us_west_1: "USA Západ (S. Kalifornia)"
+        us_west_2: "USA Západ (Oregon)"
     edit: 'upraviť názov a kategóriu témy'
     not_implemented: "Ľutujeme, táto funkcia ešte nie je implementovaná."
     no_value: "Nie"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index f249f3086f..62e66bb492 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -144,20 +144,20 @@ sq:
       default_description: "Paracaktuar"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "BE (Londër)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "BE (Londër)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'redakto titullin dhe kategorinë e kësaj teme'
     not_implemented: "Kjo veçori nuk është implementuar akoma, na vjen keq!"
     no_value: "Jo"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 81c6da8c00..3384e8d34a 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -142,21 +142,25 @@ sv:
     emails_are_disabled: "All utgående e-post har blivit globalt inaktiverad av en administratör. Inga e-postnotifikationer av något slag kommer att skickas ut."
     bootstrap_mode_enabled: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när det totala antalet användare överstiger %{min_users}."
     bootstrap_mode_disabled: "Bootstrap-läge otillgängliggörs i 24 timmar."
+    themes:
+      default_description: "Standard"
     s3:
       regions:
-        us_east_1: "Östra USA (N. Virginia)"
-        us_west_1: "Västra USA (N. Kalifornien)"
-        us_west_2: "Västra USA (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Irland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asien Stillahavsområdet (Singapore)"
-        ap_southeast_2: "Asien Stillahavsområdet (Sydney)"
-        ap_south_1: "Asien Stillahavsområdet (Mumbai)"
         ap_northeast_1: "Asien Stillahavsområdet (Tokyo)"
         ap_northeast_2: "Asien Stillahavsområdet (Seoul)"
-        sa_east_1: "Sydamerika (Sao Paulo)"
+        ap_south_1: "Asien Stillahavsområdet (Mumbai)"
+        ap_southeast_1: "Asien Stillahavsområdet (Singapore)"
+        ap_southeast_2: "Asien Stillahavsområdet (Sydney)"
         cn_north_1: "Kina (Peking)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Irland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "Sydamerika (Sao Paulo)"
+        us_east_1: "Östra USA (N. Virginia)"
+        us_east_2: "Öster USA (Ohio)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "Västra USA (N. Kalifornien)"
+        us_west_2: "Västra USA (Oregon)"
     edit: 'redigera rubrik och kategori för det här ämnet'
     not_implemented: "Denna funktion har inte implementerats än, vi beklagar!"
     no_value: "Nej"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index c07bcc2704..7702482e41 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -123,19 +123,19 @@ tr_TR:
     bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde edilgen olacaktır."
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Asia Pacific (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "China (Beijing)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'bu konunun başlığını ve kategorisini düzenleyin'
     not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
     no_value: "Hayır"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index f772a81237..8064e201e9 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -55,6 +55,7 @@ uk:
           other: "%{count} днів тому"
       previous_month: 'Попередній місяць'
       next_month: 'Наступний місяць'
+      placeholder: Виберіть дату
     share:
       topic: 'поширити посилання на цю тему'
       post: 'допис #%{postNumber}'
@@ -67,16 +68,16 @@ uk:
     emails_are_disabled: "Надсилання повідомлень електронною поштою було глобально вимкнено адміністратором. Жодне сповіщення електронною поштою не буде надіслано."
     s3:
       regions:
-        us_west_2: "США Захід (Орегон)"
-        eu_west_1: "ЄС (Ірландія)"
-        eu_central_1: "ЄС (Франкфурт)"
-        ap_southeast_1: "Азія (Сингапур)"
-        ap_southeast_2: "Азія (Сідней)"
-        ap_south_1: "Азія (Мумбай)"
         ap_northeast_1: "Азія (Токіо)"
         ap_northeast_2: "Азія (Сеул)"
-        sa_east_1: "Південна Америка (Сан Паоло)"
+        ap_south_1: "Азія (Мумбай)"
+        ap_southeast_1: "Азія (Сингапур)"
+        ap_southeast_2: "Азія (Сідней)"
         cn_north_1: "Китай (Пекін)"
+        eu_central_1: "ЄС (Франкфурт)"
+        eu_west_1: "ЄС (Ірландія)"
+        sa_east_1: "Південна Америка (Сан Паоло)"
+        us_west_2: "США Захід (Орегон)"
     edit: 'редагувати назву та категорію цієї теми'
     not_implemented: "Цей функціонал ще не реалізовано, даруйте!"
     no_value: "Ні"
@@ -1320,6 +1321,18 @@ uk:
           body: "Тіло"
           revert: "Повернути зміни"
           revert_confirm: "Чи впевнені ви, що хочете повернути ваші зміни?"
+        theme:
+          upload: "Завантажити"
+          about_theme: "Про тему"
+          license: "Ліцензія"
+          update_to_latest: "Оновити до останьої"
+          add: "Додати"
+          scss:
+            text: "CSS"
+          head_tag:
+            text: "</head>"
+          body_tag:
+            text: "</body>"
         colors:
           title: "Кольори"
           long_title: "Схеми Кольорів"
@@ -1328,6 +1341,7 @@ uk:
           delete_confirm: "Видалити цю кольорову схему?"
           undo: "скасувати"
           undo_title: "Скасувати ваші зміни цього кольору з часу останнього збереження."
+          revert: "Повернути"
           primary:
             name: 'основний'
           secondary:
@@ -1345,6 +1359,7 @@ uk:
           success:
             name: 'успіх'
           love:
+            name: 'любов'
             description: "Колір кнопки \"Подобається\"."
       email:
         title: "Листів"
@@ -1415,6 +1430,8 @@ uk:
           block: "block"
           do_nothing: "do nothing"
         staff_actions:
+          all: "всі"
+          filter: "Filter:"
           title: "Дії персоналу"
           clear_filters: "Показати все"
           staff_user: "Член персоналу"
@@ -1453,6 +1470,8 @@ uk:
             revoke_admin: "відкликати адміністраторство"
             grant_moderation: "зробити модератором"
             revoke_moderation: "відкликати модераторство"
+            deleted_tag: "видалити тег"
+            lock_trust_level: "заблокувати рівень довіри"
         screened_emails:
           title: "Screened Emails"
           description: "Коли хтось намагатиметься створити новий обліковий запис, наступні електронні скриньки буде перевірено, і реєстрацію заблоковано, або вжито якихось інших дій."
@@ -1609,6 +1628,7 @@ uk:
           confirm: 'Підтвердження'
       site_text:
         edit: 'редагувати'
+        revert: "Повернути зміни"
         go_back: "Повернутись до пошуку"
         show_overriden: 'Показувати тільки перевизначені'
       site_settings:
@@ -1639,9 +1659,14 @@ uk:
           uncategorized: 'Інше'
           backups: "Backups"
           login: "Вхід"
+          plugins: "Плагіни"
           user_preferences: "Налаштування"
+          tags: "Теги"
           search: "Пошук"
+          groups: "Групи"
       badges:
+        title: Значки
+        new_badge: Новий значок
         new: Новий
         name: Ім'я
         badge: Значок
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 877e03260c..324705cd3b 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -132,19 +132,19 @@ ur:
     bootstrap_mode_disabled: "بوٹسٹریپ کا موڈ اگلے 24 گھنٹوں میں غیر فعال کر دیا جائے گا۔"
     s3:
       regions:
-        us_east_1: "امریکی مشرق (شمالی ورجینیا)"
-        us_west_1: "امریکی مغرب (شمالی کیلی فورنیا)"
-        us_west_2: "امریکی مغرب (اوریگن)"
-        us_gov_west_1: "اے ڈبلیو ایس گَو کلاوڈ (امریکہ)"
-        eu_west_1: "یورپی یونین (آئر لینڈ)"
-        eu_central_1: "یورپی یونین (فرینکفرٹ)"
-        ap_southeast_1: "ایشیا پیسفک (سنگاپور)"
-        ap_southeast_2: "ایشیا پیسفک (سڈنی)"
-        ap_south_1: "ایشیا پیسفک (ممبئی)"
         ap_northeast_1: "ایشیا پیسفک (ٹوکیو)"
         ap_northeast_2: "ایشیا پیسفک (سیول)"
-        sa_east_1: "ایشیا پیسفک (ساؤ پالو)"
+        ap_south_1: "ایشیا پیسفک (ممبئی)"
+        ap_southeast_1: "ایشیا پیسفک (سنگاپور)"
+        ap_southeast_2: "ایشیا پیسفک (سڈنی)"
         cn_north_1: "چین (بیجنگ)"
+        eu_central_1: "یورپی یونین (فرینکفرٹ)"
+        eu_west_1: "یورپی یونین (آئر لینڈ)"
+        sa_east_1: "ایشیا پیسفک (ساؤ پالو)"
+        us_east_1: "امریکی مشرق (شمالی ورجینیا)"
+        us_gov_west_1: "اے ڈبلیو ایس گَو کلاوڈ (امریکہ)"
+        us_west_1: "امریکی مغرب (شمالی کیلی فورنیا)"
+        us_west_2: "امریکی مغرب (اوریگن)"
     edit: 'اس ٹاپک کے عنوان اور زمرے میں ترمیم کریں'
     not_implemented: "یہ خصوصیت ابھی تک لاگو نہیں کی گئی، معضرت!"
     no_value: "نہیں "
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 52935a2e79..9a29d1b349 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -130,20 +130,20 @@ vi:
       default_description: "Mặc định"
     s3:
       regions:
-        us_east_1: "US East (N. Virginia)"
-        us_west_1: "US West (N. California)"
-        us_west_2: "US West (Oregon)"
-        us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
-        eu_west_2: "EU (London)"
-        eu_central_1: "EU (Frankfurt)"
-        ap_southeast_1: "Asia Pacific (Singapore)"
-        ap_southeast_2: "Asia Pacific (Sydney)"
-        ap_south_1: "Châu Á Thái Bình Dương (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        ap_south_1: "Châu Á Thái Bình Dương (Mumbai)"
+        ap_southeast_1: "Asia Pacific (Singapore)"
+        ap_southeast_2: "Asia Pacific (Sydney)"
         cn_north_1: "Trung Quốc (Bắc Kinh)"
+        eu_central_1: "EU (Frankfurt)"
+        eu_west_1: "EU (Ireland)"
+        eu_west_2: "EU (London)"
+        sa_east_1: "South America (Sao Paulo)"
+        us_east_1: "US East (N. Virginia)"
+        us_gov_west_1: "AWS GovCloud (US)"
+        us_west_1: "US West (N. California)"
+        us_west_2: "US West (Oregon)"
     edit: 'sửa tiêu đề và chuyên mục của chủ đề'
     not_implemented: "Tính năng này chưa được hoàn thiện hết, xin lỗi!"
     no_value: "Không"
@@ -370,7 +370,7 @@ vi:
         none: "Không có gì"
       notifications:
         watching:
-          title: "Đang xem"
+          title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo khi có bài viết mới trong mỗi tin nhắn, và số lượng trả lời mới sẽ được hiển thị"
         watching_first_post:
           title: "Theo dõi chủ đề đầu tiên"
@@ -458,7 +458,7 @@ vi:
         rate_limit_error: "Bài viết chỉ được tải về một lần mỗi người, hãy thử lại vào ngày mai."
       new_private_message: "Tin nhắn mới"
       private_message: "Tin nhắn"
-      private_messages: "Các tin nhắn"
+      private_messages: "Tin nhắn"
       activity_stream: "Hoạt động"
       preferences: "Tùy chỉnh"
       expand_profile: "Mở"
@@ -482,6 +482,7 @@ vi:
       first_notification: "Thông báo đầu tiên của bạn! Chọn để bắt đầu"
       disable_jump_reply: "Đừng tới bài viết của tôi sau khi tôi trả lời"
       dynamic_favicon: "Hiện số chủ đề mới / cập nhật vào biểu tượng trình duyệt"
+      theme_default_on_all_devices: "Đặt giao diện này làm giao diện mặc định trên tất cả thiết bị của tôi"
       external_links_in_new_tab: "Mở tất cả liên kết bên ngoài trong thẻ mới"
       enable_quoting: "Bật chế độ làm nổi bật chữ trong đoạn trích dẫn trả lời"
       change: "thay đổi"
@@ -511,7 +512,8 @@ vi:
       tracked_tags_instructions: "Chế độ theo dõi sẽ tự động bật với những chủ đề được gắn thẻ này. Số lượng bài viết mới sẽ xuất hiện bên cạnh chủ đề."
       muted_tags: "Im lặng"
       muted_tags_instructions: "Bạn sẽ không được thông báo về bất kì hoạt động nào ở những chủ đề có thẻ này, chúng cũng sẽ không xuất hiện như là những chủ đề mới nhất."
-      watched_categories: "Xem"
+      watched_categories: "Đã theo dõi"
+      watched_categories_instructions: "Bạn sẽ tự động theo dõi tất cả các chủ đề trong những chuyên mục này. Bạn sẽ nhận được tin báo về những bài viết và chủ đề mới, cùng với số lượng bài viết mới cũng sẽ xuất hiện kế bên chủ đề đó."
       tracked_categories: "Theo dõi"
       watched_first_post_categories: "Xem bài viết đầu tiên"
       watched_first_post_categories_instructions: "Bạn sẽ nhận được thông báo khi có ai đó đăng chủ đề mới trong thư mục này."
@@ -529,7 +531,7 @@ vi:
       muted_users: "Im lặng"
       muted_users_instructions: "Ngăn chặn tất cả các thông báo từ những thành viên."
       muted_topics_link: "Hiển thị chủ đề Im Lặng"
-      watched_topics_link: "HIển thị chủ đề đã xem"
+      watched_topics_link: "HIển thị các chủ đề đã theo dõi."
       automatically_unpin_topics: "Tự động bỏ ghim chủ đề khi tôi xuống cuối trang."
       apps: "Ứng dụng"
       revoke_access: "Lấy lại quyền"
@@ -558,7 +560,9 @@ vi:
         profile: "Hồ sơ"
         emails: "Email"
         notifications: "Thông báo"
+        categories: "Chuyên mục"
         tags: "Thẻ"
+        interface: "Giao diện"
         apps: "Ứng dụng"
       change_password:
         success: "(email đã gửi)"
@@ -853,6 +857,7 @@ vi:
     trust_level: 'Độ tin tưởng'
     search_hint: 'username, email or IP address'
     create_account:
+      disclaimer: "Với việc đăng ký, tức là bạn đồng ý với <a href='{{privacy_link}}'>chính sách riêng tư</a> và <a href='{{tos_link}}'>điều khoản dịch vụ</a>."
       title: "Tạo tài khoản mới"
       failed: "Có gì đó không đúng, có thể email này đã được đăng ký, thử liên kết quên mật khẩu"
     forgot_password:
@@ -966,6 +971,7 @@ vi:
       title: "Hoặc nhất Ctrl+Enter"
       users_placeholder: "Thêm thành viên "
       title_placeholder: "Tóm tắt lại thảo luận này trong một câu ngắn gọn"
+      title_or_link_placeholder: "Nhập tiêu đề, hoặc dán đường dẫn vào đây"
       edit_reason_placeholder: "Tại sao bạn sửa"
       show_edit_reason: "(thêm lý do sửa)"
       reply_placeholder: "Gõ ở đây. Sử dụng Markdown, BBCode, hoặc HTML để định dạng. Kéo hoặc dán ảnh."
@@ -1251,6 +1257,7 @@ vi:
       auto_close_title: 'Tự động-Đóng các Cài đặt'
       timeline:
         back: "Quay lại"
+        replies_short: "%{current} / %{total}"
       progress:
         title: tiến trình của chủ đề
         go_top: "trên cùng"
@@ -1264,21 +1271,23 @@ vi:
         current: bài viết hiện tại
       notifications:
         reasons:
-          '3_6': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chuyên mục nàyotification'
-          '3_5': 'Bạn sẽ nhận được các thông báo bởi vì bạn đã bắt đầu xem chủ đề này một cách tự động'
-          '3_2': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
-          '3_1': 'Bạn sẽ được nhận thông báo bởi bạn đã tạo chủ để này.'
-          '3': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
-          '1_2': 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
-          '1': 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
-          '0_7': 'Bạn đang bỏ qua tất cả các thông báo trong chuyên mục này'
+          '3_6': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chuyên mục này.'
+          '3_5': 'Bạn sẽ nhận được tin báo bởi vì bạn đã bắt đầu theo dõi chủ đề này một cách tự động.'
+          '3_2': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
+          '3_1': 'Bạn sẽ được nhận các tin báo bởi bạn đã tạo chủ để này.'
+          '3': 'Bạn sẽ nhận được các tin báo bởi vì bạn đang theo dõi chủ đề này.'
+          '2_8': 'Bạn sẽ thấy được 1 số lượng bài viết mới bởi vì bạn đang theo dấu chuyên mục này.'
+          '2': 'Bạn sẽ xem được các bài trả lời bởi vì bạn <a href="/u/{{username}}/preferences">đọc chủ đề này</a>.'
+          '1_2': 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
+          '1': 'Bạn sẽ được tin báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn.'
+          '0_7': 'Bạn đang bỏ qua tất cả các tin báo trong chuyên mục này.'
           '0_2': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
           '0': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
         watching_pm:
-          title: "Đang xem"
+          title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo về từng trả lời mới trong tin nhắn này, và một số trả lời mới sẽ được hiển thị"
         watching:
-          title: "Dang theo dõi"
+          title: "Đang theo dõi"
           description: "Bạn sẽ được thông báo về từng trả lời mới trong tin nhắn này, và một số trả lời mới sẽ được hiển thị"
         tracking_pm:
           title: "Đang theo dõi"
@@ -1659,7 +1668,7 @@ vi:
       sort_options:
         default: "mặc định"
         likes: "Thích"
-        views: "Xem"
+        views: "Lượt xem"
         posts: "Bài viết"
         activity: "Hoạt động"
         posters: "Người gửi"
@@ -1805,7 +1814,7 @@ vi:
           other: "{{categoryName}} ({{count}})"
         help: "Những chủ đề mới nhất trong chuyên mục{{categoryName}} "
       top:
-        title: "Trên"
+        title: "Top"
         help: "Các chủ đề tích cực nhất trong năm, tháng, tuần, hoặc ngày trước"
         all:
           title: "Từ trước tới nay"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index a482f16dde..aee14c49ca 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -9,7 +9,7 @@ zh_CN:
   js:
     number:
       format:
-        separator: "."
+        separator: ".暂无链接"
         delimiter: ","
       human:
         storage_units:
@@ -130,20 +130,20 @@ zh_CN:
       default_description: "默认"
     s3:
       regions:
-        us_east_1: "美国东部（N. Virginia）"
-        us_west_1: "美国西部（N. California）"
-        us_west_2: "美国西部（Oregon）"
-        us_gov_west_1: "政府专用（US）"
-        eu_west_1: "欧洲（Ireland）"
-        eu_west_2: "欧洲（London）"
-        eu_central_1: "欧洲（Frankfurt）"
-        ap_southeast_1: "亚太地区（Singapore）"
-        ap_southeast_2: "亚太地区（Sydney）"
-        ap_south_1: "亚太地区（Mumbai）"
         ap_northeast_1: "亚太地区（Tokyo）"
         ap_northeast_2: "亚太地区（Seoul）"
-        sa_east_1: "南美（Sao Paulo）"
+        ap_south_1: "亚太地区（Mumbai）"
+        ap_southeast_1: "亚太地区（Singapore）"
+        ap_southeast_2: "亚太地区（Sydney）"
         cn_north_1: "中国（Beijing）"
+        eu_central_1: "欧洲（Frankfurt）"
+        eu_west_1: "欧洲（Ireland）"
+        eu_west_2: "欧洲（London）"
+        sa_east_1: "南美（Sao Paulo）"
+        us_east_1: "美国东部（N. Virginia）"
+        us_gov_west_1: "政府专用（US）"
+        us_west_1: "美国西部（N. California）"
+        us_west_2: "美国西部（Oregon）"
     edit: '编辑标题和分类'
     not_implemented: "非常抱歉，这个功能仍在开发中！"
     no_value: "否"
@@ -322,7 +322,7 @@ zh_CN:
         to: "发至"
       edit:
         title: '编辑群组'
-        full_name: '名字'
+        full_name: '群组名'
         add_members: "增加组员"
         delete_member_confirm: "从“%{group}”群组中移除用户“%{username}'？"
       name_placeholder: "群组名，没有空格，和用户名一样的规则"
@@ -337,12 +337,13 @@ zh_CN:
       join: "加入群组"
       leave: "离开群组"
       request: "请求加入群组"
+      message: "信息"
       automatic_group: 自动群组
       closed_group: 封闭群组
       is_group_user: "你是该群组的一个成员"
       allow_membership_requests: "允许用户向小组拥有者发送\b\b成员请求"
       membership: "成员资格"
-      name: "名字"
+      name: "群组ID"
       user_count: "成员数目"
       bio: "关于群组"
       selector_placeholder: "添加成员"
@@ -359,6 +360,9 @@ zh_CN:
       mentions: "提及"
       messages: "私信"
       notification_level: "小组私信的默认通知等级"
+      visibility_levels:
+        public: "所有人"
+        members: "小组创建人，成员和管理员"
       alias_levels:
         title: "谁能@该群组和发送私信？"
         nobody: "没有人"
@@ -770,11 +774,11 @@ zh_CN:
         no_badges: "暂无徽章。"
         more_badges: "更多徽章"
         top_links: "热门链接"
-        no_links: "暂无链接"
+        no_links: "暂无链接。"
         most_liked_by: "谁赞最多"
         most_liked_users: "赞谁最多"
         most_replied_to_users: "最多回复至"
-        no_likes: "暂无赞"
+        no_likes: "暂无赞。"
       associated_accounts: "登录"
       ip_address:
         title: "最后使用的 IP 地址"
@@ -2376,7 +2380,7 @@ zh_CN:
       plugins:
         title: "插件"
         installed: "安装的插件"
-        name: "名字"
+        name: "插件名"
         none_installed: "你没有安装任何插件。"
         version: "版本"
         enabled: "启用？"
@@ -2755,6 +2759,15 @@ zh_CN:
             title: "如果有至少 'min_ban_entries_for_roll_up' 个记录，创建一个子网封禁记录"
         logster:
           title: "错误日志"
+      watched_words:
+        search: "搜索"
+        clear_filter: "清除"
+        actions:
+          flag: '旗标'
+        form:
+          add: '新增'
+          success: '成功'
+          upload: "上传"
       impersonate:
         title: "检视用户视角"
         help: "使用此工具来检视其他用户的帐号以方便调试。你应该在完成后立即退出。"
@@ -2935,7 +2948,7 @@ zh_CN:
           title: "单点登录"
           external_id: "外部 ID"
           external_username: "用户名"
-          external_name: "名字"
+          external_name: "外部系统中的名字"
           external_email: "电子邮件"
           external_avatar_url: "头像URL"
       user_fields:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 3749292d44..0e63b67de4 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -123,19 +123,19 @@ zh_TW:
     bootstrap_mode_disabled: "初始化模式將會在24小時後關閉。"
     s3:
       regions:
-        us_east_1: "美國東部 (北維珍尼亞州)"
-        us_west_1: "美國西部 (北加州)"
-        us_west_2: "美國西部 (奧勒岡州)"
-        us_gov_west_1: "AWS GovCloud (美國)"
-        eu_west_1: "歐洲 (愛爾蘭)"
-        eu_central_1: "歐洲 (法蘭克福)"
-        ap_southeast_1: "亞太地區 (新加坡)"
-        ap_southeast_2: "亞太地區 (悉尼)"
-        ap_south_1: "亞太地區 (孟買)"
         ap_northeast_1: "亞太地區 (東京)"
         ap_northeast_2: "亞太地區 (首爾)"
-        sa_east_1: "南美洲 (聖保羅)"
+        ap_south_1: "亞太地區 (孟買)"
+        ap_southeast_1: "亞太地區 (新加坡)"
+        ap_southeast_2: "亞太地區 (悉尼)"
         cn_north_1: "中國 (北京)"
+        eu_central_1: "歐洲 (法蘭克福)"
+        eu_west_1: "歐洲 (愛爾蘭)"
+        sa_east_1: "南美洲 (聖保羅)"
+        us_east_1: "美國東部 (北維珍尼亞州)"
+        us_gov_west_1: "AWS GovCloud (美國)"
+        us_west_1: "美國西部 (北加州)"
+        us_west_2: "美國西部 (奧勒岡州)"
     edit: '編輯此討論話題的標題與分類'
     not_implemented: "抱歉，此功能尚未開放。"
     no_value: "否"
diff --git a/config/locales/plurals.rb b/config/locales/plurals.rb
index 9e6ea0b56e..ad223446ff 100644
--- a/config/locales/plurals.rb
+++ b/config/locales/plurals.rb
@@ -2,115 +2,115 @@
 # source: https://github.com/svenfuchs/i18n/blob/master/test/test_data/locales/plurals.rb
 
 {
-  :af => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :am => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :ar => { :i18n => { :plural => { :keys => [:zero, :one, :two, :few, :many, :other], :rule => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99].include?(n % 100) ? :many : :other } } } },
-  :az => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :be => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :bg => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :bh => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :bn => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :bo => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :bs => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :ca => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :cs => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
-  :cy => { :i18n => { :plural => { :keys => [:one, :two, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } } },
-  :da => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :de => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :dz => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :el => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :en => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :eo => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :es => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :et => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :eu => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fa_IR => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :fi => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fil => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :fo => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fr => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n.between?(0, 2) && n != 2 ? :one : :other } } } },
-  :fur => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :fy => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ga => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :gl => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :gu => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :guw => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :ha => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :he => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :hi => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :hr => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :hu => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :id => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :is => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :it => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :iw => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ja => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :jv => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ka => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :km => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :kn => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ko => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ku => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :lb => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ln => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :lt => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :one : [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : :other } } } },
-  :lv => { :i18n => { :plural => { :keys => [:zero, :one, :other], :rule => lambda { |n| n == 0 ? :zero : n % 10 == 1 && n % 100 != 11 ? :one : :other } } } },
-  :mg => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :mk => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n % 10 == 1 ? :one : :other } } } },
-  :ml => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :mn => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :mo => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } } },
-  :mr => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ms => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :mt => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 || [2, 3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :many : :other } } } },
-  :my => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :nah => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nb_NO => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ne => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nl => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nn => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :no => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :nso => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :om => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :or => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pa => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pap => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pl_PL => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
-  :ps => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :pt => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :pt_BR => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ro => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : n == 0 || ((n % 100) >= 1 && (n % 100) <= 19) ? :few : :other } } } },
-  :ru => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
-  :se => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :sh => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :sk => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
-  :sl => { :i18n => { :plural => { :keys => [:one, :two, :few, :other], :rule => lambda { |n| n % 100 == 1 ? :one : n % 100 == 2 ? :two : [3, 4].include?(n % 100) ? :few : :other } } } },
-  :sma => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :smi => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :smj => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :smn => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :sms => { :i18n => { :plural => { :keys => [:one, :two, :other], :rule => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
-  :so => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :sq => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :sr => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :sv => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :sw => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :ta => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :te => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :th => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :ti => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :tk => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :tl => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :to => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :tr_TR => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
+  af: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  am: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  ar: { i18n: { plural: { keys: [:zero, :one, :two, :few, :many, :other], rule: lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : [3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99].include?(n % 100) ? :many : :other } } } },
+  az: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  be: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  bg: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  bh: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  bn: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  bo: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  bs: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  ca: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  cs: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
+  cy: { i18n: { plural: { keys: [:one, :two, :many, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } } },
+  da: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  de: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  dz: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  el: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  en: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  eo: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  es: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  et: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  eu: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fa_IR: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  fi: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fil: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  fo: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fr: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n.between?(0, 2) && n != 2 ? :one : :other } } } },
+  fur: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  fy: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ga: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  gl: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  gu: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  guw: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  ha: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  he: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  hi: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  hr: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  hu: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  id: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  is: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  it: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  iw: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ja: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  jv: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ka: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  km: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  kn: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ko: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ku: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  lb: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ln: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  lt: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :one : [2, 3, 4, 5, 6, 7, 8, 9].include?(n % 10) && ![11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :few : :other } } } },
+  lv: { i18n: { plural: { keys: [:zero, :one, :other], rule: lambda { |n| n == 0 ? :zero : n % 10 == 1 && n % 100 != 11 ? :one : :other } } } },
+  mg: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  mk: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n % 10 == 1 ? :one : :other } } } },
+  ml: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  mn: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  mo: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } } },
+  mr: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ms: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  mt: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n == 1 ? :one : n == 0 || [2, 3, 4, 5, 6, 7, 8, 9, 10].include?(n % 100) ? :few : [11, 12, 13, 14, 15, 16, 17, 18, 19].include?(n % 100) ? :many : :other } } } },
+  my: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  nah: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nb_NO: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ne: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nl: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nn: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  no: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  nso: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  om: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  or: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pa: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pap: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pl_PL: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
+  ps: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  pt: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  pt_BR: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ro: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : n == 0 || ((n % 100) >= 1 && (n % 100) <= 19) ? :few : :other } } } },
+  ru: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : :other } } } },
+  se: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  sh: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  sk: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n == 1 ? :one : [2, 3, 4].include?(n) ? :few : :other } } } },
+  sl: { i18n: { plural: { keys: [:one, :two, :few, :other], rule: lambda { |n| n % 100 == 1 ? :one : n % 100 == 2 ? :two : [3, 4].include?(n % 100) ? :few : :other } } } },
+  sma: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  smi: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  smj: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  smn: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  sms: { i18n: { plural: { keys: [:one, :two, :other], rule: lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } } },
+  so: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  sq: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  sr: { i18n: { plural: { keys: [:one, :few, :many, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
+  sv: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  sw: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  ta: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  te: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  th: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  ti: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  tk: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  tl: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  to: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  tr_TR: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
   # TODO put this back when translations are correct: :uk => { :i18n => { :plural => { :keys => [:one, :few, :many, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :many : :other } } } },
-  :uk => { :i18n => { :plural => { :keys => [:one, :few, :other], :rule => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :other : :other } } } },
-  :ur => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } },
-  :vi => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :wa => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
-  :yo => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zh => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zh_CN => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zh_TW => { :i18n => { :plural => { :keys => [:other], :rule => lambda { |n| :other } } } },
-  :zu => { :i18n => { :plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } }
+  uk: { i18n: { plural: { keys: [:one, :few, :other], rule: lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : [2, 3, 4].include?(n % 10) && ![12, 13, 14].include?(n % 100) ? :few : n % 10 == 0 || [5, 6, 7, 8, 9].include?(n % 10) || [11, 12, 13, 14].include?(n % 100) ? :other : :other } } } },
+  ur: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } },
+  vi: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  wa: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| [0, 1].include?(n) ? :one : :other } } } },
+  yo: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zh: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zh_CN: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zh_TW: { i18n: { plural: { keys: [:other], rule: lambda { |n| :other } } } },
+  zu: { i18n: { plural: { keys: [:one, :other], rule: lambda { |n| n == 1 ? :one : :other } } } }
 }
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index bff1fc2adf..eda44f9408 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -27,11 +27,15 @@ ar:
   topics: "المواضيع"
   posts: "المشاركات"
   loading: "يحمّل"
+  powered_by_html: 'تدعمه <a href="http://www.discourse.org">دسكورس </a>، يفضّل عرضه وجافاسكربت مفعّل'
   log_in: "لِج"
   purge_reason: "حُذف آليًّا باعتباره حسابًا إمّا مهجورًا أو غير مفعّل"
   disable_remote_images_download_reason: "عُطّل تنزيل الصور عن بعد بسبب نفاذ مساحة القرص الحرّة."
   anonymous: "مجهول"
   remove_posts_deleted_by_author: "حذفها الكاتب"
+  themes:
+    bad_color_scheme: "لا يمكن تحديث السمة ، مخطط ألوان غير صحيح"
+    other_error: "حصل خطأ لتحديث السمة"
   emails:
     incoming:
       default_subject: "يحتاج هذا الموضوع عنوانًا"
@@ -122,6 +126,7 @@ ar:
       default_categories_already_selected: "لا يمكنك تحديد فئة تستخدم في قائمة أخرى."
       s3_upload_bucket_is_required: "لا يمكنك تفعيل الرفع إلى S3 حتّى توفّر 's3_upload_bucket'."
   bulk_invite:
+    file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق csv . "
     error: "حدث عطل أثناء رفع الملفّ. رجاء أعد المحاولة لاحقًا."
   topic_invite:
     user_exists: "آسف، ذلك المستخدم قد تمت دعوته من قبل. تستطيع فقط أن تدعوا عضواً لموضوعِ مرة واحدة."
@@ -146,6 +151,8 @@ ar:
   embed:
     start_discussion: "ابدأ النّقاش"
     continue: "تابع النّقاش"
+    error: "خطأ في الدمج"
+    referer: "المرجع:"
     more_replies:
       zero: "لا ردود أخرى"
       one: "رد واحد آخر"
@@ -285,6 +292,12 @@ ar:
       -نرحب بالنقد البناء، ولكن انتقد الأفكار ولا تنتقد الأشخاص!
 
       للمزيد, [انظر إرشادات المجتمع](/guidelines). هذه اللوحة ستظهر فقط لأول %{education_posts_text} لك.
+    dominating_topic: |
+      ### دع الآخرون ينضمون للمحادثة
+
+      هذا الموضوع واضحٌ أنه مهم بالنسبة لك &ndash; قمت بمشاركة أكثر من %{percent}%  الردود هنا.
+
+      هل أنت متأكد من أنك أعطيت وقت كافٍ للآخرين لمشاركة نقاط نظرهم أيضاً ؟
   activerecord:
     attributes:
       category:
@@ -946,7 +959,6 @@ ar:
     notify_mods_when_user_blocked: "إذا تم حظر المستخدم تلقائيا، وإرسال رسالة الى جميع المشرفين."
     flag_sockpuppets: "إذا رد أحد المستخدمين جديد إلى موضوع من عنوان IP نفسه باسم المستخدم الجديد الذي بدأ هذا الموضوع، علم كل من مناصبهم كدعاية المحتملين."
     traditional_markdown_linebreaks: "استعمل السطور التالفه التقليديه في Markdown, التي تتطلب مساحتين بيضاوين للسطور التالفه"
-    allow_html_tables: "كل الجداول يجب ان تدخل ب لغة ال HTML مثال TABLE , THEAD , TD , TR , TH سوف يأوذن لهم ( تتطلب مراجعة لكل المقالات القديمة )"
     post_undo_action_window_mins: "عدد الدقائق التي يسمح فيها للأعضاء بالتراجع عن آخر إجراءاتهم على المنشور (إعجاب، اشارة، إلخ...)"
     must_approve_users: "يجب أن الموظفين يوافق على جميع حسابات المستخدم الجديدة قبل أن يتم السماح لهم للوصول إلى الموقع. تحذير: تمكين هذا لموقع الحية إلغاء وصول المستخدمين الحاليين غير الموظفين!"
     pending_users_reminder_delay: "نبه المشرفين إذا وجد اعضاء ينتظرون الموافقة لمدة اطول من الساعات ، قم بوضع الخيار -1 لايقاف التنبيهات ."
@@ -1240,6 +1252,7 @@ ar:
     default_categories_watching: "قائمة الفئات التي تشاهد إفتراضيا."
     default_categories_tracking: "قائمة الفئات التي تتابع إفتراضيا."
     default_categories_muted: "قائمة الفئات التي توضع صامتة إفتراضيا."
+    tagging_enabled: "فعّل الأوسمة على المواضيع."
     company_short_name: "اسم الشّركة (قصير)"
     company_full_name: "اسم الشّركة (الكامل)"
     company_domain: "نطاق الشّركة"
@@ -1364,7 +1377,7 @@ ar:
     errors: "%{errors}"
     not_available: "غير متاح. جرّب %{suggestion} ؟"
     something_already_taken: "حدث خطأ ما, ربما اسم المستخدم و البريد الالكتروني مسجل مسبقا, جرب رابط نسيان كلمة المرور."
-    omniauth_error: "نأسف, هناك خطأ في تصريح حسابك. ربما لم تعطي تصريح؟"
+    omniauth_error: "نأسف، حدث خطأ في استيثاق حسابك. لربمّا لم تقبل الاستيثاق؟"
     omniauth_error_unknown: "حدث خطأ ما في معالجة دخولك، الرجاء إعادة المحاولة."
     new_registrations_disabled: "لا يُسمح بتسجيل حساب جديد بهذا الوقت "
     password_too_long: "كلمة السّرّ مقصورة على 200 محرف."
@@ -1441,16 +1454,20 @@ ar:
     deferred: "نشكرك لإعلامنا بذلك. نحن ننظر في الأمر."
     deferred_and_deleted: "نشكرك لإعلامنا بذلك. لقد أزلنا المشاركة."
   system_messages:
+    contents_hidden: "يُرجى زيارة المشاركة لرؤية محتوياتها"
     post_hidden:
       title: "المشاركة مخفية"
       subject_template: "المشاركة مخفية بتصويت الاعضاء"
     welcome_user:
+      title: "ترحيب المستخدم"
       subject_template: "مرحبا بك في %{site_name}!"
     welcome_invite:
+      title: "ترحيب دعوة"
       subject_template: "مرحبا بك في %{site_name}!"
     backup_succeeded:
       subject_template: "اكتملت عملية النسخ الإحتياطي بنجاح"
     backup_failed:
+      title: "النسخة إحتياطية فشلت"
       subject_template: "فشل النسخ الإحتياطي"
     restore_succeeded:
       subject_template: "أكتملت الإستعادة بنجاح"
@@ -1465,7 +1482,8 @@ ar:
       subject_template: "اكتمل تصدير البيانات"
     csv_export_failed:
       subject_template: "فشل تصدير البيانات"
-      text_body_template: "نأسف، فشل تصدير البيانات. رجاء افحص السّجلّات أو راسل أحد أعضاء الطّاقم."
+    email_reject_blocked_user:
+      title: "رفض البريد حجب المستخدم"
     email_reject_empty:
       text_body_template: |
         آسفون، لكن رسالة البريد الالكتروني إلى %{destination} (titled %{former_title}) لم تنجح .
@@ -1494,6 +1512,10 @@ ar:
     download_remote_images_disabled:
       subject_template: "الغاء تفعيل تحميل الصور عن بعد "
       text_body_template: "تم تعطيل الإعداد 'download_remote_images_to_local' لأنه تم الوصول إلى حد مساحة القرص في 'download_remote_images_threshold'."
+  unsubscribe_mailing_list: |
+    استلمت هذا بسبب أنك قمت بتفعيل وضع القائمة البريدية.
+
+    لإلغاء الاشتراك من البريد الالكتروني ، [ انقر هنا](%{unsubscribe_url}).
   subject_re: "اعادة "
   user_notifications:
     previous_discussion: "الردود السابقة "
@@ -1501,6 +1523,8 @@ ar:
     unsubscribe:
       title: "غير مشترك "
       description: "لست مهتما في تلقي هذه الرسائل الالكترونيه؟ لا مشكله! اضغط تحت ليتم الغاء اشتركك فورا:"
+    reply_by_email: "[زيارة الموضوع](%{base_url}%{url}) أو بالرد على هذا البريد للإجابه."
+    visit_link_to_respond: "[زيارة الموضوع](%{base_url}%{url}) للرد."
     visit_link_to_respond_pm: "[زُر الرّسالة](%{base_url}%{url}) للرّدّ."
     posted_by: "مشاركة بواسطة %{username} على %{post_date}"
     user_posted_pm_staged:
@@ -1508,6 +1532,9 @@ ar:
     digest:
       why: "ملخص المؤجز من %{site_link} منذ زيارتك الاخيره في  %{last_seen_at}"
       click_here: "أنقر هنا"
+    account_created:
+      title: "الحساب أُنشئ"
+      subject_template: "حسابك الجديد [%{email_prefix}]"
     signup_after_approval:
       subject_template: "قد وافقت على %{site_name}!"
   page_not_found:
@@ -1744,6 +1771,8 @@ ar:
   performance_report:
     initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع '
     initial_topic_title: التبليغ عن اداء الموقع
+  tags:
+    title: "الأوسمة"
   finish_installation:
     congratulations: "تهانينا على تثبيت دسكورس!"
   wizard:
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 7251571b05..0dc576ad1f 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -164,6 +164,7 @@ cs:
       admins: "admins"
       moderators: "moderators"
       staff: "staff"
+      trust_level_0: "trust_level_0"
       trust_level_1: "trust_level_1"
       trust_level_2: "trust_level_2"
       trust_level_3: "trust_level_3"
@@ -187,6 +188,8 @@ cs:
     attributes:
       category:
         name: "Název kategorie"
+      topic:
+        title: 'Nadpis'
       post:
         raw: "Tělo"
       user_profile:
@@ -206,12 +209,17 @@ cs:
               common: "je jedno z 10 000 nejčastějších hesel. Použijte prosím bezpečnější heslo."
               same_as_username: "je stejné jako vaše uživatelské jméno. Zkuste vymyslet bezpečnější heslo."
               same_as_email: "je stejné jako váš email. Zkuste vymyslet bezpečnější heslo."
+              same_as_current: "je stejné jako vaše současné heslo."
+              unique_characters: "má příliš mnoho opakujících se znaků. Použijte prosím bezpečnější heslo."
             ip_address:
               signup_not_allowed: "Registrace z této adresy není povolena."
         color_scheme_color:
           attributes:
             hex:
               invalid: "není platná barva"
+        post_reply:
+          base:
+            different_topic: "Příspěvek a odpověď musí patřit ke stejnému tématu."
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} o sobě zatím žádné informace nevyplnil</div>"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index b8244744d0..5651d7964a 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -903,7 +903,6 @@ da:
     notify_mods_when_user_blocked: "Send en besked til alle moderatorer hvis en bruger blokeres automatisk"
     flag_sockpuppets: "Hvis en ny bruger svarer på et emne fra den samme IP adresse som den der startede emnet, så rapporter begge at deres indlæg potentielt er spam."
     traditional_markdown_linebreaks: "Brug traditionelle linjeskift i Markdown, som kræver 2 mellemrum i slutningen af sætningen."
-    allow_html_tables: "Tillad tabeller at blive oprettet i Markdown med brug af HTML tags. TABLE, THEAD, TD, TR, TH vil blive tilladt (kræver en fuld re-indeksering af gamle indlæg som benytter tabeller) "
     post_undo_action_window_mins: "Antal minutter som brugere er tilladt at fortryde handlinger på et indlæg (like, flag, etc)."
     must_approve_users: "Personale skal godkende alle nye bruger konti inden de kan tilgå sitet. ADVARSEL: aktivering af dette for et live site vil medføre en ophævning af adgang for eksisterende ikke-personale brugere."
     pending_users_reminder_delay: "Underret moderatorer hvis nye brugere har ventet på godkendelse i længere end så mange timer. Skriv -1 for at deaktivere notifikationer."
@@ -1151,40 +1150,8 @@ da:
 
   invite_mailer:
     subject_template: "%{invitee_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} inviterede dig til en debat om
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      på
-
-      > %{site_title} -- %{site_description}
-
-      Hvis du er interesseret, så klik på linket herunder:
-
-      %{invite_link}
   custom_invite_mailer:
     subject_template: "%{invitee_name} inviterede dig til '%{topic_title}' på %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} inviterede dig til en debat
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      på
-
-      > %{site_title} -- %{site_description}
-
-      Med denne besked
-
-      > %{user_custom_message}
-
-      Hvis du er interesseret, så klik på linket herunder:
-
-      %{invite_link}
   invite_forum_mailer:
     subject_template: "%{invitee_name} inviterede dig til at oprette dig på %{site_domain_name}"
   custom_invite_forum_mailer:
@@ -1301,16 +1268,6 @@ da:
 
         Den konto, der er knyttet til denne mailadresse, er blokeret.
 
-    email_reject_reply_user_not_matching:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Dit svar blev sendt fra en anden emailadresse end den forventede, så vi er ikke sikre på, at det er den samme person. Prøv at sende fra en anden emailadresse eller kontakt hjælperteamet.
-    email_reject_no_account:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Vi kan ikke finde nogen konto, der matcher din emailadresse. Prøv at sende fra en anden emailadresse eller kontakt hjælperteamet.
     email_reject_empty:
       text_body_template: |+
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
@@ -1324,16 +1281,6 @@ da:
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
 
         Vi kunne ikke finde dit svar i mailen. **Sørg for at dit svar står øverst i mailen** -- vi kan ikke behandle svar, der er indsat i den oprindelige tekst.
-    email_reject_invalid_access:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Din konto har ikke tilladelse til at oprette nye emner i kategorien. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_strangers_not_allowed:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Kategorien du sendte mailen til tillader kun svar fra brugere med gyldige kontoer og kendte emailadresser. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
     email_reject_invalid_post:
       text_body_template: |
         Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
@@ -1354,31 +1301,11 @@ da:
 
         Send-handlingen blev ikke genkendt. Prøv igen, eller send via websitet, hvis det fortsætter.
 
-    email_reject_reply_key:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Svarknappen i emailen er ugyldig eller ukendt, så vi ved ikke, hvad denne email er et svar til. Kontakt hjælpeteamet.
     email_reject_bad_destination_address:
       text_body_template: |
         Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
 
         Ingen af modtageradresserne kan genkendes. Dobbelttjek at du sender til den korrekte emailadresse fra hjælperteamet.
-    email_reject_topic_not_found:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Emnet du besvarer eksisterer ikke længere - Det er måske slettet? Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_topic_closed:
-      text_body_template: |
-        Desværre, din mail til %{destination} (titled %{former_title}) virkede ikke.
-
-        Emnet du besvarer er i øjeblikket lukket og modtager ikke længere svar. Hvis du mener, at det er en fejl, så kontakt hjælperteamet.
-    email_reject_auto_generated:
-      text_body_template: |
-        Vi beklager, men din mailbesked til %{destination} (titled %{former_title}) fungerede ikke.
-
-        Din mail blev markeret som "autogenereret", hvilket betyder, at den er blevet oprettet automastisk af en computer i stedet for at blive tastet ind af en peron; vi kan ikke acceptere den slags mails. Hvis du mener, det er en fejl, kan du kontakte et medlem af staben.
     too_many_spam_flags:
       title: "For Mange Flagmarkeringer for Spam"
       subject_template: "Nyoprettet konto sat på hold"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 024f52ccf2..a9703654f1 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -860,7 +860,6 @@ de:
     educate_until_posts: "Zeige das Hilfe-Panel im Editor sobald ein Benutzer einen seiner ersten (n) Beiträge zu schreiben beginnt."
     title: "Der Name dieser Site, wird für das Title-Tag verwendet."
     site_description: "Beschreibe diese Site in einem Satz. Wird für das \"description\" Meta-Tag verwendet."
-    contact_email: "Die E-Mail-Adresse des Hauptverantwortlichen dieser Site. Wird verwendet bei kritischen Benachrichtigungen wie beispielsweise unbearbeitete Meldungen, als auch solche die via /about Kontaktformular eintreffen. "
     contact_url: "URL für Kontaktanfragen bezüglich dieser Site. Wird unter /about im Kontaktformular für dringende Angelegenheiten verwendet."
     queue_jobs: "NUR FÜR ENTWICKLER! ACHTUNG! Benutze Sidekiq zur Ausführung von Jobs. Wenn dies abgeschaltet wird, dann wird die Site nicht mehr richtig funktionieren!"
     crawl_images: "Lade Bilder von fremden URLs herunter, um ihre Höhe und Breite zu bestimmen."
@@ -921,7 +920,6 @@ de:
     notify_mods_when_user_blocked: "Wenn ein Benutzer automatisch gesperrt wird, sende eine Nachricht an alle Moderatoren."
     flag_sockpuppets: "Wenn ein neuer Benutzer auf ein Thema antwortet, das von einem anderen neuen Benutzer aber mit der gleichen IP-Adresse begonnen wurde, markiere beide Beiträge als potenziellen Spam."
     traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, die zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen."
-    allow_html_tables: "Erlaube es, Tabellen in Markdown mit HTML-Tags einzugeben. TABLE, THEAD, TD, TR, TH werden erlaubt (alle Beiträge mit Tabellen müssen ihr HTML erneuern)"
     post_undo_action_window_mins: "Minuten, die ein Benutzer hat, um Aktionen auf einen Beitrag rückgängig zu machen (Gefällt mir, Meldung, usw.)."
     must_approve_users: "Team-Mitglieder müssen alle neuen Benutzerkonten freischalten, bevor diese Zugriff auf die Website erhalten. ACHTUNG: Das Aktivieren dieser Option für eine Live-Site entfernt den Zugriff auch für alle existierenden Benutzer außer für Team-Mitglieder!"
     pending_users_reminder_delay: "Benachrichtige die Moderatoren, falls neue Benutzer mehr als so viele Stunden auf ihre Genehmigung gewartet haben. Stelle -1 ein, um diese Benachrichtigungen zu deaktivieren."
@@ -1520,41 +1518,9 @@ de:
   invite_mailer:
     title: "Einladung zu einem Thema"
     subject_template: "%{invitee_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen"
-    text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
-
-      Wenn du interessiert bist, klicke auf den folgenden Link:
-
-      %{invite_link}
   custom_invite_mailer:
     title: "Einladung zu einem Thema (mit Nachricht)"
     subject_template: "%{invitee_name} hat dich eingeladen zu '%{topic_title}' auf %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} hat dich eingeladen zur Diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      bei
-
-      > %{site_title} -- %{site_description}
-
-      Mit dieser Notiz:
-
-      > %{user_custom_message}
-
-      Falls du Interesse hast, klicke auf den nachfolgenden Link:
-
-      %{invite_link}
   invite_forum_mailer:
     title: "Einladung zur Teilnahme"
     subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
@@ -1840,28 +1806,15 @@ de:
     csv_export_failed:
       title: "CSV-Export fehlgeschlagen"
       subject_template: "Datenexport fehlgeschlagen"
-      text_body_template: "Entschuldigung, beim Exportieren deiner Daten trat ein Fehler auf. Bitte kontaktiere ein Team-Mitglied oder überprüfe die Logdateien."
     email_reject_insufficient_trust_level:
       title: "E-Mail abgelehnt weil Vertrauensstufe unzureichend"
       subject_template: "[%{email_prefix}] E-Mail-Probme -- Vertrauensstufe nicht ausreichend"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (Titel: %{former_title}) konnte nicht zugestellt werden.
-
-        Du hast nicht die notwendige Vertrauensstufe, um neue Themen über diese E-Mail-Adresse zu erstellen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied.
     email_reject_user_not_found:
       title: "E-Mail abgelehnt weil Benutzer nicht gefunden"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer nicht gefunden"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Deine Antwort wurde von einer unbekannten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
     email_reject_screened_email:
       title: "E-Mail abgelehnt weil E-Mail-Adresse gesperrt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- E-Mail-Adresse blockiert"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
     email_reject_inactive_user:
       title: "E-Mail abgelehnt weil Benutzer inaktiv"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer inaktiv"
@@ -1879,17 +1832,9 @@ de:
     email_reject_reply_user_not_matching:
       title: "E-Mail abgelehnt weil E-Mail-Adresse abweichend"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwortadresse unerwartet"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Deine Antwort wurde von einer anderen E-Mail-Adresse versandt als wir erwartet haben, weshalb wir nicht sicher wissen ob das die gleiche Person ist. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
     email_reject_no_account:
       title: "E-Mail abgelehnt weil unbekanntes Konto"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Konto unbekannt"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Wir konnten kein Konto finden, das zu deiner E-Mail-Adresse passt. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied.
     email_reject_empty:
       title: "E-Mail abgelehnt weil kein Inhalt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Kein Inhalt"
@@ -1909,17 +1854,9 @@ de:
     email_reject_invalid_access:
       title: "E-Mail abgelehnt weil nicht erlaubt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Du hast nicht die notwendigen Zugriffsrechte, um neue Themen in dieser Kategorie zu erstellen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied.
     email_reject_strangers_not_allowed:
       title: "E-Mail abgelehnt weil Zugriff nicht erlaubt"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Die Kategorie, an die du die E-Mail geschickt hast, erlaubt nur Antworten von Benutzern mit gültigem Konto und von bekannten E-Mail-Adressen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied.
     email_reject_invalid_post:
       title: "E-Mail abgelehnt weil ungültiger Beitrag"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitrag fehlerhaft"
@@ -1948,10 +1885,6 @@ de:
     email_reject_reply_key:
       title: "E-Mail abgelehnt weil unbekannter Antwort-Schlüssel"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwortschlüssel unbekannt"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Der angegebene Antwort-Schlüssel ist ungültig oder unbekannt. Wir wissen daher nicht auf welchen Beitrag diese E-Mail antwortet. Bitte kontaktiere ein Team-Mitglied.
     email_reject_bad_destination_address:
       title: "E-Mail abgelehnt weil unbekannte Empfänger-Adresse"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Empfängeradresse unbekannt"
@@ -1962,24 +1895,12 @@ de:
     email_reject_topic_not_found:
       title: "E-Mail abgelehnt weil Thema nicht gefunden"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Thema nicht gefunden"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Das Thema, auf das du geantwortet hast, existiert nicht mehr -- vielleicht wurde es gelöscht? Wenn du glaubst, dass dies ein Irrtum ist, nimm Bitte Kontakt mit einem Team-Mitglied auf.
     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.
     email_reject_auto_generated:
       title: "E-Mail abgelehnt weil automatisch generierte Antwort"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwort automatisch generiert"
-      text_body_template: |
-        Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden.
-
-        Deine E-Mail wurde als „automatisch generiert“ markiert, was bedeutet, dass sie automatisch von einem Computer erstellt wurde statt von einem Menschen getippt; wir können diese Arten von E-Mails nicht akzeptieren. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem Team-Mitglied auf.
     email_error_notification:
       title: "Benachrichtigung zu E-Mail-POP-Authentifizierungsfehler"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- POP-Authentifizierungsfehler"
@@ -2101,26 +2022,6 @@ de:
     visit_link_to_respond: "[Rufe das Thema auf](%{base_url}%{url}), um zu antworten."
     visit_link_to_respond_pm: "[Rufe die Nachricht auf](%{base_url}%{url}), um zu antworten."
     posted_by: "Erstellt von %{username} am %{post_date}"
-    invited_to_private_message_body: |
-      %{username} hat dich zu einer Unterhaltung eingeladen
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      auf
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} hat dich zu einer Diskussion eingeladen
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      auf
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Benutzer zu Nachricht eingeladen"
       subject_template: "[%{email_prefix}] %{username} hat dich zu einer Unterhaltung '%{topic_title}' eingeladen"
@@ -2369,10 +2270,6 @@ de:
     see_more: "Mehr"
     search_title: "Diese Site durchsuchen"
     search_google: "Google"
-  login_required:
-    welcome_message: |
-      #[Wilkommen bei %{title}](#welcome)
-      Ein Benutzerkonto ist notwendig. Bitte registriere dich oder melde dich an.
   terms_of_service:
     title: "Nutzungsbedingungen"
     signup_form_message: 'Ich habe die <a href="/tos" target="_blank">Nutzungsbedingungen</a> gelesen und akzeptiert.'
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index ed8e3e7554..6e649499bd 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -27,11 +27,15 @@ el:
   topics: "Νήματα"
   posts: "αναρτήσεις"
   loading: "Φόρτωση"
+  powered_by_html: 'Powered by <a href="https://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
   log_in: "Σύνδεση"
   purge_reason: "Διεγράφη αυτόματα ως εγκαταλελειμμένος, μη ενεργοποιημένος λογαριασμός."
   disable_remote_images_download_reason: "Το κατέβασμα εικόνων απενεργοποιήθηκε επειδή δεν υπάρχει αρκετός χώρος στο δίσκο."
   anonymous: "Ανώνυμα"
   remove_posts_deleted_by_author: "Διαγράφηκε από τον συγγραφέα"
+  themes:
+    bad_color_scheme: "Το θέμα δεν μπόρεσε να ενημερωθεί, σφάλμα χρωματικής παλέτας"
+    other_error: "Κάτι πήγε στραβά κατά την ενημέρωση του θέματος"
   emails:
     incoming:
       default_subject: "Αυτό το θέμα χρειάζεται τίτλο"
@@ -109,6 +113,7 @@ el:
       s3_upload_bucket_is_required: "Δεν μπορείτε να ενεργοποιήσετε μεταφορτώσεις στο S3 εάν δεν παρέχετε το 's3_upload_bucket'."
   invite:
     not_found: "Η πρόσκληση δεν είναι έγγυρη. Παρακαλώ επικοινωνήστε με τον διαχειρηστή της ιστοσελίδας."
+    user_exists: "Δεν υπάρχει λόγος να προσκαλέσετε τον/την <b>%{email}</b>, έχει ήδη <a href='/u/%{username}/summary'>λογαριασμό χρήστη!</a>"
   bulk_invite:
     file_should_be_csv: "To ανεβασμένο αρχείο πρέπει να έχει μορφή csv."
     error: "Παρουσίαστηκε ένα σφάλμα κατά το ανέβασμα του αρχείου σας, Παρακαλώ δοκιμάστε αργότερα."
@@ -170,6 +175,7 @@ el:
   user_is_suspended: "Δεν επιτρέπεται να δημοσιεύσουν οι χρήστες που βρίσκονται σε κατάσταση αναστολής."
   topic_not_found: "Κάτι πήγε στραβά. Ίσως το νήμα έκλεισε ή διαγράφηκε ενώ το κοιτούσες;"
   not_accepting_pms: "Λυπούμαστε, ο/η %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
+  max_pm_recepients: "Λυπούμαστε, μπορείτε να στείλετε μήνυμα το μέγιστο σε %{recipients_limit} παραλήπτες."
   just_posted_that: "είναι παρόμοιο με αυτό που δημοσιεύσατε πρόσφατα"
   invalid_characters: "περιέχει μη έγκυρους χαρακτήρες"
   is_invalid: "φαίνεται ασαφές, είναι μια ολοκληρωμένη πρόταση;"
@@ -208,6 +214,8 @@ el:
   queue:
     delete_reason: "Διαγράφτηκαν μέσω της ουράς επανελέγχου "
   groups:
+    success:
+      bulk_add: "%{users_added} χρήστες προστέθηκαν στην ομάδα."
     errors:
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
       member_already_exist: "'%{username}' είναι ήδη μέλος της ομάδας."
@@ -215,6 +223,7 @@ el:
       invalid_incoming_email: "'%{email}' δεν είναι έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου."
       email_already_used_in_group: "'%{email}' χρησιμοποιείται ήδη από την ομάδα '%{group_name}'"
       email_already_used_in_category: "'%{email}' χρησιμοποιείται ήδη από την κατηγορία '%{category_name}'."
+      cant_allow_membership_requests: "Δεν μπορείτε να επιτρέψε τα αιτήματα μέλους σε μια ομάδα χωρίς ιδιοκτήτη."
     default_names:
       everyone: "όλοι"
       admins: "διαχειριστές"
@@ -225,6 +234,9 @@ el:
       trust_level_2: "επίπεδο_εμπιστοσύνης_2"
       trust_level_3: "επίπεδο_εμπιστοσύνης_3"
       trust_level_4: "επίπεδο_εμπιστοσύνης_4"
+    request_membership_pm:
+      title: "Αίτημα Μέλους για @%{group_name}"
+      body: "Θα ήθελα να υποβάλλω αίτημα μέλους για την ομάδα @%{group_name}."
   education:
     until_posts:
       one: "1 ανάρτηση"
@@ -271,6 +283,14 @@ el:
       Αυτό το νήμα φαίνεται να είναι σημαντικό για εσάς &ndash. Έχετε δημοσιεύσει περισσότερο από %{percent}% των απαντήσεων εδώ.
 
       Είστε σίγουρος ότι παρέχετε επαρκή χρόνο σε άλλους ανθρώπους να μοιραστούν κι εκείνοι τις δικές τους απόψεις;
+    get_a_room: |
+      ### Γιατί δεν δοκιμάζετε να απαντήσετε και σε άλλους χρήστες;
+
+      Έχετε ήδη απαντήσει  %{count} φορές προς @%{reply_username} στο συγκεκριμένο θέμα.
+
+      Σκεφτήκατε να απαντήσετε και σε άλλους συμμετέχοντες σε αυτή την συζήτηση; Μια σωστή συζήτηση πρέπει να περιλαμβάνει πολλές διαφορετικές φωνές και απόψεις.
+
+      Αν θέλετε να συνεχίσετε την συζήτηση με τον ίδιο χρήστη, θα ήταν ίσως προτιμότερο να [στείλετε ένα προσωπικό μήνυμα] (/u/%{reply_username}).
     too_many_replies: |
       ### Έχετε φτάσει το όριο απαντήσεων γι' αυτό το νήμα
 
@@ -320,12 +340,24 @@ el:
           attributes:
             hex:
               invalid: "δεν είναι ένα έγκυρο χρώμα"
+        post_reply:
+          base:
+            different_topic: "Η ανάρτηση και η απάντηση θα πρέπει να ανήκουν στο ίδιο νήμα."
         web_hook:
           attributes:
             payload_url:
               invalid: "Το URL δεν είναι έγκυρο. To URL πρέπει να συμπεριλαμβάνει http:// ή https://. Και δεν επιτρέπεται κανένα κενό."
+        custom_emoji:
+          attributes:
+            name:
+              taken: είναι ήδη σε χρήση από κάποιο άλλο emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "θα πρέπει να είναι στο μέλον."
       <<: *errors
   user_profile:
+    no_info_me: "</div>το πεδίο Σχετικά Με Μένα στο προφίλ σας είναι κενό, <a href='/u/%{username_lower}/preferences/about-me'>θα θέλατε να προσθέσετε κάποιες πληροφορίες;</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} δεν έχει εισάγει τίποτα στο πεδίο Σχετικά με Εμένα στο προφίλ του</div>"
   vip_category_name: "Σαλόνι"
   vip_category_description: "Κατηγορία αποκλειστικά για μέλη με επίπεδο εμπιστοσύνης (trust level) 3 ή υψηλότερο."
@@ -334,6 +366,7 @@ el:
   staff_category_name: "Προσωπικό"
   staff_category_description: "Ιδιωτική κατηγορία για συζητήσεις του προσωπικού. Τα θέματα είναι ορατά μόνο σε διαχειριστές και συντονιστές."
   assets_topic_title: "Στοιχεία/assets για τον σχεδιασμό της ιστοσελίδας"
+  assets_topic_body: "Αυτό το νήμα, το οποίο είναι ορατό μόνο στο προσωπικό, υπάρχει για να αποθηκεύετε εικόνες και αρχεία τα οποία θα χρησιμοποιήσετε στην σχεδίαση της σελίδας. Μήν το διαγράψετε!\n\n\nΟδηγίες:\n\n\n1. Απαντήστε στο νήμα.\n2. Ανεβάστε στο πεδίο απάντησης όλες τις εικόνες που θέλετε να χρησιμοποιήσετε. (Χρησιμοποιήστε το εικονίδιο μεταφόρτωσης στην μπάρα εργαλείων ή απλά σύρετε ή κάντε επικόλληση τις εικόνες στο πεδίο απάντησης.)\n3. Καταχωρήστε την απάντησή σας για να αναρτηθεί.\n4. Κάντε δεξί κλικ στις εικόνες της νέας σας ανάρτησης για να δείτε από τις πληροφορίες εικόνας την πλήρη διαδρομή προς το αποθηκευμένο αρχείο ή κάντε κλικ στο εικονίδιο επεξεργασίας για να επεξεργαστείτε την ανάρτησή σας και να πάρετε την πλήρη διαδρομή για όλες σας τις εικόνες. Αντιγράψτε την διαδρομή που θέλετε.\n5. Κάντε επικόλληση της διαδρομής στην σελίδα [βασικών ρυθμίσεων](/admin/site_settings/category/required).\n\n\nΑν θέλετε να ενεργοποιήσετε περισσότερους τύπους αρχείων, επεξεργαστείτε την ρύθμιση των `authorized_extensions` στο [file settings](/admin/site_settings/category/files)."
   discourse_welcome_topic:
     title: "Καλώς ήρθατε στο Discourse"
     body: |2+
@@ -385,7 +418,7 @@ el:
   category:
     topic_prefix: "Σχετικά με την κατηγορία %{category} "
     replace_paragraph: "(Αντικατέστησε αυτή την πρώτη παράγραφο με μια σύντομη περιγραφή της νέας σας κατηγορίας. Αυτή η οδηγία θα εμφανιστεί στην περιοχή επιλογής κατηγορίας, επομένως προσπάθησε να είναι κάτω απο 200 χαρακτήρες. **Μέχρι να επεξεργαστείς αυτή την περιγραφή ή να δημιουργήσεις θέματα, αυτή η κατηγορία δεν θα εμφανίζεται στην σελίδα κατηγοριών. **)"
-    post_template: "%{replace_paragraph}\n\nΧρησιμοποιήστε τις επόμενες παραγράφους για μια μεγαλύτερη περιγραφή, ή για να καθορίσεις οδηγίες και κανόνες για τις κατηγορίες:\n\n- Γιατί μπορεί να χρησιμοποιηθεί αυτή η κατηγορία? Ποιος είναι ο σκοπός της?\n\n- Αυτή η κατηγορία είναι διαφορετική από αυτές που έχουμε ήδη?\n\n- Τι πρέπει να περιέχουν τα θέματα αυτής της κατηγορίας γενικότερα?\n\n- Χρειαζόμαστε αυτή την κατηγορία? Μπορούμε να την ενώσουμε με άλλη κατηγορία, ή υποκατηγορία?\n\n\n"
+    post_template: "%{replace_paragraph}\n\nΧρησιμοποιήστε τις επόμενες παραγράφους για μια μεγαλύτερη περιγραφή ή για να ορίσεις οδηγίες και κανόνες για τις κατηγορίες:\n\n- Γιατί μπορεί να χρησιμοποιηθεί αυτή η κατηγορία; Ποιος είναι ο σκοπός της;\n\n- Αυτή η κατηγορία είναι διαφορετική από αυτές που έχουμε ήδη;\n\n- Τι πρέπει να περιέχουν τα θέματα αυτής της κατηγορίας γενικότερα;\n\n- Χρειαζόμαστε αυτή την κατηγορία; Μπορούμε να την ενώσουμε με άλλη κατηγορία ή υποκατηγορία;\n\n\n"
     errors:
       uncategorized_parent: "Μη κατηγοριοποιημένο δεν μπορεί να έχει κύρια κατηγορία"
       self_parent: "Η γονική κατηγορία μιας υποκατηγορίας δεν μπορεί να είναι ο εαυτός της"
@@ -393,6 +426,7 @@ el:
       invalid_email_in: "'%{email}' δεν είναι έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου."
       email_already_used_in_group: "'%{email}' χρησιμοποιείται ήδη από την ομάδα '%{group_name}'"
       email_already_used_in_category: "%{email}' χρησιμοποιείται ήδη από την κατηγορία '%{caregory_name}'."
+      description_incomplete: "Η ανάρτηση περιγραφής κατηγορίας θα πρέπει να έχει τουλάχιστον μία παράγραφο."
     cannot_delete:
       uncategorized: "Δεν μπορείτε να διαγράψετε την 'Mη κατηγοριοποιημένο'"
       has_subcategories: "Δεν είναι δυνατή η διαγραφή αυτής της κατηγορίας, επειδή έχει υπο-κατηγορίες."
@@ -538,43 +572,58 @@ el:
     approval_required: "Ένας συντονιστής πρέπει να εγκρίνει το νέο σας λογαριασμό πριν αποκτήσετε πρόσβαση σε αυτό το φόρουμ. Θα λάβετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου όταν ο λογαριασμός σας εγκριθεί!"
     missing_session: "Δεν μπορούμε να ανιχνεύσουμε αν δημιουργήθηκε ο λογαριασμός σας, παρακαλούμε βεβαιωθείτε ότι έχετε ενεργοποιήσει τα cookies."
     activated: "Λυπάμαι, αυτός ο λογαριασμός έχει ήδη ενεργοποιηθεί."
+    admin_confirm:
+      title: "Επιβεβαιώστε τον Λογαριασμό Διαχειριστή"
+      description: "Σίγουρα θέλετε να γίνει ο χρήστης <b>%{target_username}</b> διαχειριστής;"
+      grant: "Παραχώρηση Δικαιωμάτων Διαχειριστή"
+      complete: "<b>%{target_username}</b> είναι πλέον διαχειριστής."
+      back_to: "Επιστροφή σε %{title}"
   post_action_types:
     off_topic:
       title: 'Εκτός-Θέματος'
       description: 'Αυτή η δημοσίευση δεν είναι σχετική με την τρέχουσα συζήτηση όπως ορίζεται από τον τίτλο και την πρώτη δημοσίευση και θα πρέπει μάλλον να μετακινηθεί αλλού.'
+      short_description: 'Μη σχετικό με την συζήτηση'
       long_form: 'το επισήμαναν σαν εκτός θέματος'
     spam:
       title: 'Ανεπιθύμητα'
+      description: 'Αυτή η ανάρτηση είναι διαφήμιση ή δολιοφθορά. Δεν είναι σχετική με το παρόν νήμα.'
+      short_description: 'Αυτή είναι μια διαφήμιση ή δολιοφθορά'
       long_form: 'το επισήμαναν σαν ανεπιθύμητο'
       email_title: '"%{title}" επισημάνθηκε ως ανεπιθύμητο'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Ανάρμοστο'
       description: 'Το περιεχόμενο αυτής της δημοσίευσης θα θεωρούνταν από κάθε λογικό άνθρωπο, προσβλητικό, καταχρηστικό ή αντίθετο με τις  <a href="/guidelines">οδηγίες χρήσης της κοινότητάς μας</a>'
+      short_description: 'Παράβαση των <a href="/guidelines">Οδηγιών της Κοινότητας</a>'
       long_form: 'Επισημάνετέ το ως ανάρμοστο'
     notify_user:
       title: 'Αποστολή μηνύματος στον @{{username}} '
       description: 'Θέλω να μιλήσω με αυτό το άτομο άμεσα και ιδιωτικά σχετικά με αυτή τη δημοσίευση.'
+      short_description: 'Θα ήθελα να επικονωνήσω με αυτό το μέλος άμεσα και ιδιωτικά, σχετικά με αυτή την ανάρτηαη.'
       long_form: 'ειδοποιήσε το μέλος'
       email_title: 'Η δημοσίευση σας στο "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Κάτι άλλο"
       description: 'Η συγκεκριμένη ανάρτηση απαιτεί έλεγχο από το προσωπικό για έναν άλλον λόγο που δεν αναφέρεται παραπάνω.'
+      short_description: 'Χρειάζεται έλεγχο από το προσωπικό για διαφορετικό λόγο'
       long_form: 'αναφέρθηκε για έλεγχο από το προσωπικό.'
       email_title: 'Μια ανάρτηση στο "%{title}" απαιτεί έλεγχο από το προσωπικό.'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Σελιδοδείκτης'
       description: 'Τοποθετήστε σελιδοδείκτη σε αυτή την ανάρτηση'
+      short_description: 'Προσθήκη σελιδοδείκτη στην ανάρτηση'
       long_form: 'τοποθετήσατε σελιδοδείκτη σε αυτή την ανάρτηση'
     like:
       title: 'Σας αρέσει'
       description: 'Σας αρέσει αυτή η δημοσίευση'
+      short_description: 'Μου αρέσει η ανάρτηση'
       long_form: 'Μου άρεσε'
     vote:
       title: 'Ψηφίστε'
       description: 'Ψηφίστε για αυτή την δημοσίευση '
+      short_description: 'Ψηφίστε την ανάρτηση'
       long_form: 'ψηφίσατε για αυτή την δημοσίευση'
   user_activity:
     no_bookmarks:
@@ -595,8 +644,8 @@ el:
     notify_moderators:
       title: "Κάτι άλλο"
       description: 'Το θέμα απαιτεί την γενική προσοχή του προσωπικού, βασισμένη στα <a href="/guidelines">κατευθυντήριες γραμμές</a>,<a href="%{tos_url}">TOS</a> ή για άλλο λόγο που δεν αναφέρεται πιο πάνω.'
-      long_form: 'αναφέρθηκε για έλεγχο από το προσωπικό.'
-      email_title: 'Το θέμα "%{title}" χρειάζεται έλεγχο από διαμεσολαβητή'
+      long_form: 'αναφέρθηκε για έλεγχο από συντονιστή.'
+      email_title: 'Το θέμα "%{title}" χρειάζεται έλεγχο από συντονιστή'
       email_body: "%{link}\n\n%{message}"
   flagging:
     you_must_edit: '<p>Η δημοσίευσή σου έχει επισημανθεί από την κοινότητα. Παρακαλώ <a href="/my/messages">δες τα μηνύματά σου</a>.</p>'
@@ -611,6 +660,7 @@ el:
         remove: "Αυτό το νήμα δεν είναι πλέον διαφημιστικό. Δε θα εμφανίζεται πια στην κορυφή της κάθε σελίδας."
   unsubscribed:
     title: "Επιτυχής απεγγραφή!"
+    description: "<b>%{email}</b> έχει διαγραφτεί. Για να αλλάξετε τις ρυθμίσεις του email σας <a href='%{url}'>επισκεφθείτε την σελίδα ρυθμίσεων</a>."
     topic_description: "Για να εγγραφείτε ξανά στο %{link}, χρησιμοποιήστε τον έλεγχο ειδοποιήσεων στην κάτω ή στην δεξιά πλευρά του νήματος."
   unsubscribe:
     title: "Απεγγραφή"
@@ -887,13 +937,12 @@ el:
     num_users_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν num_spam_flags_to_block_new_user σήμανση ανεπιθύμητου από τόσους χρηστες, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποίηση."
     num_tl3_flags_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν τόσες πολλές σημάνσεις από num_tl3_users_to_block_new_user, διαφορετικούς χρήστες επιπέδου εμπιστοσύνης 3, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποίηση."
     num_tl3_users_to_block_new_user: "Αν οι αναρτήσεις ενός καινούριου χρήστη πάρουν num_tl3_flags_to_block_new_user σημάνσεις  από τόσους χρηστες επιπέδου εμπιστοσύνης 3, κρύψε όλες τις αναρτήσεις του χρήστη και εμπόδισε κάθε μελλοντική ανάρτηση. 0 για απενεργοποίηση."
-    notify_mods_when_user_blocked: "Εάν ένας χρήστης αυτόματα μπλοκαριστει, στείλε μήνυμα σε όλους τους συντονιστές."
+    notify_mods_when_user_blocked: "Εάν ένας χρήστης μπλοκαριστει αυτόματα, στείλε μήνυμα σε όλους τους συντονιστές."
     flag_sockpuppets: "Εάν ένας νέος χρήστης απαντήσει σε ένα νήμα από την ίδια διεύθυνση ΙP όπως ο νέος χρήστης, ο οποίος ξεκίνησε το νήμα, και οι δυο δημοσιεύσεις τους θα επισημανθούν ως δυνητικά ανεπιθύμητες."
     traditional_markdown_linebreaks: "Χρήση παραδοσιακών αλλαγών γραμμών στη Markdown, η οποία απαιτεί δύο κενά διαστήματα για μια αλλαγή γραμμής."
-    allow_html_tables: "Αποδοχή εισδοχής πινάκων στη Markdown με τη χρήση ετικετών HTML. TABLE, THEAD, TD, TR, TH θα μπαίνουν στη λίστα επιτρεπόμενων (απαιτείται πληρής αντιγραφή σε όλες τις αναρτήσεις που περιέχουν πίνακες)"
     post_undo_action_window_mins: "Αριθμός των λεπτών όπου οι χρήστες δικαιούνται να αναιρέσουν πρόσφατες ενέργειες πάνω σε ένα θέμα (μου αρέσει, επισήμανση, κτλ) "
     must_approve_users: "Το προσωπικό πρέπει να εγκρίνει όλους τους λογαριασμούς των νέων χρηστών προτού τους επιτραπεί να έχουν πρόσβαση στην ιστοσελίδα. Προειδοποίηση: ενεργοποιώντας το για μια ζωντανή ιστοσελίδα θα έχει ως αποτέλεσμα την ανάκληση για τους υπάρχοντες χρήστες που δεν ανήκουν στο προσωπικό!"
-    pending_users_reminder_delay: "Ειδοποίηση συντονιστών αν καινούργιοι χρήστες περιμένουν για αποδοχή για μεγαλύτερο απο αυτό το χρονικό διάστημα. Όρισέ το στο -1 για να απενεργοποιηθούν οι ειδοποιήσεις."
+    pending_users_reminder_delay: "Ειδοποίηση των συντονιστών αν υπάρχουν νέοι χρήστες που περιμένουν για αποδοχή του λογαριασμού τους για μεγαλύτερο απο αυτό το χρονικό διάστημα. Όρισέ το στο -1 για να απενεργοποιηθούν οι ειδοποιήσεις."
     maximum_session_age: "Ο χρήστης θα παραμείνει συνδεδεμένος για n ώρες από την τελευταία του επίσκεψη"
     ga_tracking_code: "ΠΑΡΩΧΗΜΕΝΟ: Google analytics (ga.js) tracking code code, eg: UA-12345678-9; βλέπε http://google.com/analytics"
     ga_domain_name: "ΠΑΡΩΧΗΜΕΝΟ: Google analytics (ga.js) όνομα τομέα , π.χ. eg: mysite.com, βλέπε http://google.com/analytics"
@@ -936,55 +985,55 @@ el:
     invite_expiry_days: "Για πόσο καιρό οι κύριες προσκλήσεις ισχύουν, σε μέρες "
     invite_passthrough_hours: "Για πόσο καιρό ο χρήστης μπορεί να χρησιμοποιήσει ένα ήδη εξαργυρωμένο κλειδί πρόσκλησης για να συνδεθεί, σε ώρες"
     login_required: "Απαιτήστε την επικύρωση για να διαβάσετε το περιεχόμενο σε αυτήν την ιστοσελίδα,  απαγορεύσετε την ανώνυμη πρόσβαση."
-    min_username_length: "Ελάχιστο μέγεθος όνομα χρήστη σε χαρακτήρες. ΠΡΟΣΟΧΗ: εάν ο όποιος δήποτε από τους χρήστες που είδη υπάρχουν ή από της ομάδες έχουν ονόματα πιο μικρά από αυτό, η ιστοσελίδα σου θα διακοπεί!"
-    max_username_length: "Μέγιστο μέγεθος όνομα χρήστη με χαρακτήρες. ΠΡΟΣΟΧΗ:\nαν υπάρχοντες χρήστες ή ομάδες έχουν ονόματα περισσότερο από αυτό, η ιστοσελίδα σας θα παραβιαστεί!"
+    min_username_length: "Ελάχιστο μέγεθος ονόματος χρήστη σε χαρακτήρες. ΠΡΟΣΟΧΗ: εάν υπάρχουν χρήστες ή ομάδες που έχουν ονόματα πιο μικρά από την ρύθμιση αυτή, θα δημιουργηθεί πρόβλημα στην λειτουργία της ιστοσελίδας!"
+    max_username_length: "Μέγιστο μέγεθος ονόματος χρήστη σε χαρακτήρες. ΠΡΟΣΟΧΗ: εάν υπάρχουν χρήστες ή ομάδες που έχουν ονόματα μεγαλύτερα από την ρύθμιση αυτή, θα δημιουργηθεί πρόβλημα στην λειτουργία της ιστοσελίδας!"
     min_password_length: "Ελάχιστο μήκος κωδικού πρόσβασης."
     min_admin_password_length: "Ελάχιστο μήκος κωδικού πρόσβασης για το διαχειριστή"
     password_unique_characters: "Ελάχιστος αριθμός μοναδικών χαρακτήρων που πρέπει να έχει ένας κωδικός."
     block_common_passwords: "Μην επιτρέπεις τους κωδικούς πρόσβασης που είναι ανάμεσα στους 10,000 πιο κοινούς κωδικούς πρόσβασης."
     enable_sso: "Ενεργοποίηση καθολικής σύνδεσης μέσω ενός εξωτερικού συνδέσμου (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ΟΙ ΔΙΕΥΘΥΝΣΕΙΣ ΗΛΕΚΤΡΟΝΙΚΟΥ ΤΑΧΥΔΡΟΜΕΙΟΥ ΤΩΝ ΧΡΗΣΤΩΝ ΘΑ ΠΡΕΠΕΙ ΝΑ ΕΠΙΚΥΡΩΘΟΥΝ ΑΠΟ ΤΟΝ ΕΞΩΤΕΡΙΚΟ ΣΥΝΔΕΣΜΟ!)"
-    verbose_sso_logging: "SSO λεπτομερούς καταγραφής διαγνωστικών σχετίζονται με /logs"
+    verbose_sso_logging: "Κατέγραψε αναλυτικά διαγνωστικά σχετικά με SSO στο /logs"
     enable_sso_provider: "Εφαρμογή πρωτοκόλλου παροχέα Discourse SSO στο τελικό σημείο του /session/sso_provider, απαιτεί να τεθει το sso_secret."
-    sso_url: "H διεύθυνση URL της ενιαίας σύνδεσης στο τέλος ( πρέπει να συμπεριλαμβάνει http:// or https://)"
+    sso_url: "URL του single sign on endpoint (πρέπει να περιέχει http:// or https://)"
     sso_secret: "Η μυστική συμβολοσειρά που χρησιμοποιείται για να πιστοποιήσει κρυπτογραφικά πληροφορίες SSO, σιγουρευτείτε οτι έχει 10 χαρακτήρες ή περισσότερους."
-    sso_overrides_bio: "Παρακάμπτει την βιογραφία του χρήστη στο προφίλ του χρήστη και τον αποτρέπει απ'το να την αλλάξει. "
+    sso_overrides_bio: "Παρακάμπτει την βιογραφία του χρήστη στο προφίλ του χρήστη και τον αποτρέπει να την αλλάξει. "
     sso_overrides_email: "Παράκαμψη τοπικής διεύθυνσης ηλεκτρονικού ταχυδρομείου με τη διεύθυνση ηλεκτρονικού ταχυδρομείου από τον εξωτερικό ιστότοπο με φορτίο SSO σε κάθε σύνδεση, και αποτροπή τοπικών αλλαγών. (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μπορεί να προκληθούν ασυμφωνίες λόγω της ομαλοποίησης των τοπικών διευθύνσεων ηλεκτρονικού ταχυδρομείου)"
     sso_overrides_username: "Παράκαμψη τοπικού ονόματος χρήστη με το όνομα χρήστη από τον εξωτερικό ιστότοπο SSO σε κάθε σύνδεση και αποτροπή τοπικών αλλαγών. (ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μπορεί να προκληθούν ασυμφωνίες λόγω των διαφορών μεταξύ των ονομάτων χρηστων όσο αναφορά το μάρκος/απαιτήσεις)"
     sso_overrides_name: "Παράκαμψη τοπικού ονόματεπώνυμου με το όνομα χρήστη από τον εξωτερικό ιστότοπο SSO σε κάθε σύνδεση και αποτροπή τοπικών αλλαγών. "
     sso_overrides_avatar: "Παράκαμψη τοπικού άβαταρ χρήστη με το άβαταρ από τον εξωτερικό ιστότοπο SSO Εάν ενεργοποιημένο, η αποσύνδεση του allow_uploaded_avatars συνιστάται."
     sso_not_approved_url: "Ανακατευθύνετε μη εγκεκριμένους λογαριασμούς SSO σε αυτό το URL"
     sso_allows_all_return_paths: "Μην αναχαιτίσεις το κυρίαρχο return_paths που παρέχεται από το SSO (από προεπιλογή η διαδρομή γυρισμόυ πρέπει να είναι στην τρεχούμενη ιστοσελίδα)"
-    enable_local_logins: "Ενεργοποίηση τοπικών λογαριασμών σύνδεσης με βάση το όνομα χρήστη και τον κωδικό πρόσβασης. (Σημείωση: αυτό πρέπει να είναι ενεργοποιημένο για καλέσματα στην εργασία)"
-    allow_new_registrations: "Επιτρέψτε τις νέες εγγραφές χρηστών.Καταργήστε την επιλογή αυτή για να αποτρέψετε σε οποιονδήποτε  να δημιουργήσει ένα νέο λογαριασμό"
+    enable_local_logins: "Ενεργοποίηση τοπικών λογαριασμών χρήστη με βάση το χρηστώνυμο και τον κωδικό πρόσβασης. (Σημείωση: αυτό πρέπει να είναι ενεργοποιημένο για να λειτουργούν οι προσκλήσεις)"
+    allow_new_registrations: "Επιτρέψτε τις νέες εγγραφές χρηστών. Απενεργοποιήστε την επιλογή αυτή για να αποτρέψετε σε οποιονδήποτε  να δημιουργήσει ένα νέο λογαριασμό"
     enable_signup_cta: "Δείξε μια ανακοίνωση στους ανώνυμους χρήστες που επιστρέφουν, η οποία να τους παροτρύνει να δημιουργήσουν λογαριασμό."
     enable_yahoo_logins: "Ενεργοποιήστε την επαλήθευση μέσω Yahoo"
-    enable_google_oauth2_logins: "Ενεργοποίησε την επαλήθευση μέσω Google Oauth2. Είναι μια μέθοδος επαλήθευσης που η Google υποστηρίζει προς το παρόν. Απαιτεί κλειδί και μυστικό."
-    google_oauth2_client_id: "Ταυτότητα πελάτη της εφαρμογής σας Google."
-    google_oauth2_client_secret: "Μυστικό πελάτη του λογαριασμού σας Google. "
-    enable_twitter_logins: "Επίτρεψε επαλήθευση μέσω Twitter, απαιτεί twitter_κλειδί_καταναλωτή και twitter_μυστικό_καταναλωτή"
-    twitter_consumer_key: "Κλειδί καταναλωτή για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
-    twitter_consumer_secret: "Μυστικό καταναλωτή για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
-    enable_instagram_logins: "Επίτρεψε επαλήθευση μέσω Instagram, απαιτεί Instagram_κλειδί_καταναλωτή και Instagram_μυστικό_καταναλωτή"
-    instagram_consumer_key: "Κλειδί καταναλωτή για επαλήθευση μέσω Instagram"
-    instagram_consumer_secret: "Μυστικό καταναλωτή για επαλήθευση μέσω Instagram"
-    enable_facebook_logins: "Επίτρεψε επαλήθευση μέσω Facebook, απαιτεί Facebook_ταυτότητα_εφαρμογής και Facebook_μυστικό_εφαρμογής"
-    facebook_app_id: "Ταυτότητα εφαρμογής για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
-    facebook_app_secret: "Μυστικό εφαρμογής για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
-    facebook_request_extra_profile_details: "Ζήτησε σχετικά με μένα, τοποθεσία και ιστοσελίδα του facebook. (απαιτείται έγκριση της αίτησης επαλήθευσής σου από το facebook)"
-    enable_github_logins: "Επίτρεψε επαλήθευση μέσω Github, απαιτεί Github_ταυτότητα_εφαρμογής και Github_μυστικό_εφαρμογής"
-    github_client_id: "Ταυτότητα καταναλωτή για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
-    github_client_secret: "Μυστικό καταναλωτή για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
+    enable_google_oauth2_logins: "Ενεργοποίησε την επαλήθευση μέσω Google Oauth2. Είναι η μέθοδος επαλήθευσης που η Google υποστηρίζει προς το παρόν. Απαιτεί κλειδί και μυστικό."
+    google_oauth2_client_id: "Client ID της Google εφαρμογής σας."
+    google_oauth2_client_secret: "Μυστικό πελάτη της Google εφαρμογής σας. "
+    enable_twitter_logins: "Ενεργοποίησε την επαλήθευση μέσω Twitter. Απαιτεί twitter_consumer_key και twitter_consumer_secret"
+    twitter_consumer_key: "Consumer key για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
+    twitter_consumer_secret: "Consumer secret για επαλήθευση μέσω Twitter, εγγεγραμμένο στο http://dev.twitter.com"
+    enable_instagram_logins: "Ενεργοποίησε την επαλήθευση μέσω Instagram, απαιτεί instagram_consumer_key και instagram_consumer_secret"
+    instagram_consumer_key: "Consumer key για επαλήθευση μέσω Instagram"
+    instagram_consumer_secret: "Consumer secret για επαλήθευση μέσω Instagram"
+    enable_facebook_logins: "Ενεργοποίησε την επαλήθευση μέσω Facebook, απαιτεί facebook_app_id και facebook_app_secret"
+    facebook_app_id: "App id για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
+    facebook_app_secret: "App secret για επαλήθευση μέσω Facebook, εγγεγραμμένο στο https://developers.facebook.com/apps"
+    facebook_request_extra_profile_details: "Ζήτησε σχετικά με μένα, τοποθεσία και ιστοσελίδα από το facebook. (απαιτείται έγκριση της εφαρμογής σου από το facebook)"
+    enable_github_logins: "Ενεργοποίησε την επαλήθευση μέσω Github, απαιτεί github_client_id και github_client_secret"
+    github_client_id: "Client id για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
+    github_client_secret: "Client secret για επαλήθευση μέσω Github, εγγεγραμμένο στο https://github.com/settings/applications"
     readonly_mode_during_backup: "Ενεργοποίηση της λειτουργίας \"μόνο-ανάγνωση\" κατά τη διάρκεια δημιουργίας αντίγραφου ασφαλείας"
     allow_restore: "Επίτρεψε επαναφορά, η οποία μπορεί να αντικαταστήσει ΟΛΑ τα δεδομένα του ιστότοπου! Αφήστε σφάλμα εκτός αν σχεδιάζεις να επαναφέρεις αντίγραφο ασφαλείας"
-    maximum_backups: "Το μέγιστο ποσό αντιγράφω ασφαλείας για να διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
-    automatic_backups_enabled: "Τρέξε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
+    maximum_backups: "Το μέγιστο ποσό αντιγράφω ασφαλείας το οποία θα διατηρηθούν στο δίσκο. Παλαιότερα αντίγραφα ασφαλείας διαγράφονται αυτόματα"
+    automatic_backups_enabled: "Πάρε αυτόματα αντίγραφα ασφαλείας όπως ορίζεται στη συχνότητα αντιγράφων ασφαλείας"
     backup_frequency: "Πόσο συχνά δημιουργούμε αντίγραφο ασφαλείας ιστοτόπου, σε ημέρες."
-    enable_s3_backups: "Ανέβασε αντίγραφα αφαλείας στο S3 όταν ολοκληρωθεί. ΣΗΜΑΝΤΙΚΟ: απαιτεί έγκυρα S3 πιστοποιητικά στις Ρυθμίσεις αρχείων."
-    s3_backup_bucket: "Απομακρυσμένος κουβάς για αντίγραφα ασφαλείας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Βεβαιωθείτε οτι είναι απόρρητος κουβάς."
-    s3_disable_cleanup: "Απενεργοποιήστε την αφαίρεση αντιγράφων ασφαλείας από την S3 όταν αφαιρεθεί σε τοπικό επίπεδο."
-    backup_time_of_day: "Ώρα της ημέρας σε ζώνη UTC που το αντίγραφο ασφαλείας πρέπει να πραγματοποιηθεί."
-    backup_with_uploads: "Συμπεριέλαβε μεταφορτώσεις σε προγραμματισμένα αντίγραφα ασφαλείας. Απενεργοποιώντας το θα δημιουργηθούν αντίγραφα ασφαλείας μόνο για τη βάση δεδομένων."
-    active_user_rate_limit_secs: "Πόσο συχνά ενημερώνουμε το 'τελευταία_εθεάθη_σε' πεδίο, σε δευτερόλεπτα"
+    enable_s3_backups: "Ανέβασε τα αντίγραφα αφαλείας στο S3 όταν ολοκληρωθούν. ΣΗΜΑΝΤΙΚΟ: απαιτεί έγκυρα διαπιστευτήρια S3 καταχωρημένα στις ρυθμίσεις αρχείων."
+    s3_backup_bucket: "Απομακρυσμένος αποθηκευτικός χώρος για τα αντίγραφα ασφαλείας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Βεβαιωθείτε οτι ο χώρος είναι προσωπικός."
+    s3_disable_cleanup: "Απενεργοποιήστε την αφαίρεση των αντιγράφων ασφαλείας από το S3 όταν αφαιρεθούν τοπικά"
+    backup_time_of_day: "Ώρα σε ζώνη UTC που το αντίγραφο ασφαλείας πρέπει να πραγματοποιηθεί."
+    backup_with_uploads: "Συμπεριέλαβε τις μεταφορτώσεις στα αντίγραφα ασφαλείας. Απενεργοποιώντας το θα δημιουργηθούν αντίγραφα ασφαλείας μόνο για τη βάση δεδομένων."
+    active_user_rate_limit_secs: "Πόσο συχνά ενημερώνουμε το 'last_seen_at' πεδίο, σε δευτερόλεπτα"
     verbose_localization: "Εμφάνιζε εκτεταμένες συμβουλές εντοπισμού στην διεπαφή χρήστη. "
     previous_visit_timeout_hours: "Πόσο διαρκεί μια επίσκεψη προτού τη θεωρήσουμε \"προηγούμενη\" επίσκεψη, σε ώρες"
     top_topics_formula_log_views_multiplier: "Ο πολλαπλασιαστής (n) της αξίας προβολών καταγραφής μπαίνει στην αρχή του νήματος της φόρμουλας: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
@@ -1451,42 +1500,40 @@ el:
     title: "Προσκάλεσε τον αποστολέα"
     subject_template: "%{invitee_name} σε προσκάλεσε σε '%{topic_title}' πάνω σε %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} σας προσκάλεσε σε μία συζήτηση
+      Ο/Η %{invitee_name} σας προσκάλεσε σε μία συζήτηση
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      στο
+      στην
 
       > %{site_title} -- %{site_description}
 
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
+      Αν σας ενδιαφέρει, κάντε κλικ στον παρακάτω σύνδεσμο:
 
       %{invite_link}
   custom_invite_mailer:
     title: "Προσαρμοσμένη Πρόσκληση Ταχυδρομείου"
     subject_template: "%{invitee_name} σε προσκάλεσε στο %{topic_title}' του %{site_domain_name}"
     text_body_template: |
-      %{invitee_name} σας προσκάλεσε σε μία συζήτηση
+      Ο/Η %{invitee_name} σας προσκάλεσε σε μία συζήτηση
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      στο
+      στην
 
       > %{site_title} -- %{site_description}
 
-      Με αυτή τη σημείωση
+      με αυτό το μήνυμα
 
       > %{user_custom_message}
 
-      Εάν σε ενδιαφέρει, κάνε κλικ στο σύνδεσμο παρακάτω:
+      Αν σας ενδιαφέρει, κάντε κλικ στον παρακάτω σύνδεσμο:
 
       %{invite_link}
-
-      Αυτή η πρόσκληση προέρχεται από έμπιστο χρήστη, επομένως ένας λογαριασμός θα δημιουργηθεί αυτόματα για εσένα χρησιμοποιώντας αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου.
   invite_forum_mailer:
     title: "Προσκαλέστε τον Μέιλερ του Φόρουμ"
     subject_template: "%{invitee_name} σε προσκάλεσε να συμμετέχεις στο %{site_domain_name}"
@@ -1502,6 +1549,7 @@ el:
       %{invite_link}
 
   custom_invite_forum_mailer:
+    title: "Προσαρμογή Πρόσκλησης Forum "
     subject_template: "%{invitee_name} σε προσκάλεσε να συμμετέχεις στο %{site_domailn_name}"
     text_body_template: |
       %{invitee_name} σας προσκάλεσε να γίνετε μέλος
@@ -1522,6 +1570,8 @@ el:
   invite_password_instructions:
     title: "Προσκάλεσε οδηγίες κωδικού"
     subject_template: "Όρισε κωδικό πρόσβασης για τον λογαρισμό σου %{site_name}"
+  admin_confirmation_mailer:
+    title: "Επικύρωση Διαχειριστή"
   test_mailer:
     title: "Δοκιμάστε τον αποστολέα"
     text_body_template: |
@@ -1580,6 +1630,7 @@ el:
       - Επισκέψου [meta.discourse.org](https://meta.discourse.org) για νέα, συζήτηση, και υποστήριξη για το Discourse
   new_version_mailer_with_notes:
     title: "Καινούργια έκδοση Αποστολέα με Σημειώσεις"
+    subject_template: "[%{email_prefix}] διαθέσιμη ενημέρωση"
     text_body_template: |
       Γιούπιιι, μια νέα έκδοση του [Discourse](http://www.discourse.org) είανι διαθέσιμη!
 
@@ -1605,7 +1656,7 @@ el:
     off_topic: "Η ανάρτησή σου επισημάθηκε ως **εκτός θέματος**: η κοινότητα πιστεύει ότι δεν ταιριάζει με το νήμα, όπως ορίζεται από τον τίτλο και την πρώτη ανάρτηση αυτή τη στιγμή. "
     inappropriate: "Η δημοσίευσή σου επισημάνθηκε ως \"ακατάλληλη\": η κοινότητα θεωρεί ότι είναι προσβλητική, υβριστική ή παραβίαση των [οδηγιών της κοινότητας](/οδηγίες)."
     spam: "Η δημοσίευσή σου επισημάνθηκε ως \"ανεπιθύμητη\": η κοινότητα θεωρεί ότι πρόκειται για διαφήμιση ή κάτι που αφορά προώθηση και δεν είναι χρήσιμη ή σχετική με το νήμα όπως αναμενόταν."
-    notify_moderators: "Η ανάρτησή σου επισημάνθηκε ως **προς την προσοχή του συντονιστή**: η κοινότητα πιστεύει ότι κάτι σχετικά με την ανάρτηση απαιτεί χειροκίνητη παρέμβαση από ένα συνεργάτη."
+    notify_moderators: "Η ανάρτησή σου επισημάνθηκε **προς έλεγχο από συντονιστή**. Η κοινότητα πιστεύει ότι κάτι σχετικά με την ανάρτησή σου, απαιτεί την παρέμβαση ενός συνεργάτη."
   flags_dispositions:
     agreed: "Ευχαριστούμε που μας ενημερώσατε. Συμφωνούμε ότι υπάρχει κάποιο θέμα και το εξετάζουμε."
     agreed_and_deleted: "Ευχαριστούμε που μας ενημερώσατε. Συμφωνούμε ότι υπάρχει κάποιο θέμα και έχουμε απομακρύνει τη δημοσίευση."
@@ -1613,6 +1664,8 @@ el:
     deferred: "Ευχαριστούμε που μας ειδοποιήσατε. Το εξετάζουμε."
     deferred_and_deleted: "Ευχαριστούμε που μας ειδοποίησες. Έχουμε αφαιρέσει τη δημοσίευση."
   system_messages:
+    private_topic_title: "Νήμα #%{id}"
+    contents_hidden: "Παρακαλώ επισκεφθείτε αυτή την ανάρτηση για να δείτε τα περιεχόμενά της."
     post_hidden:
       title: "Η δημοσίευση κρύφτηκε"
       subject_template: "Η δημοσίευση κρύφτηκε από τις επισημάνσεις της κοινότητας"
@@ -1918,6 +1971,15 @@ el:
         Μερικά προβλήματα αναφέρονται στον πίνακα του διαχειριστή σας.
 
         [Παρακαλώ επανεξετάστετα διορθώστετα](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
+      subject_template: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
+      text_body_template: |
+        Συγχαρητήρια, κέρδισες το βραβείο **Χρήστης του Μήνα για %{month_year}**. :trophy:
+
+        Αυτό το βραβείο επονέμεται σε δυο νέους χρήστες κάθε μήνα και θα είναι για πάντα ορατό στην [σελίδα χρήστη](%{base_url}/my/badges).
+
+        Γίνατε γρήγορα ένα πολύτιμο μέλος της κοινότητάς μας.  Σας ευχαριστούμε για την συμμετοχή σας και ελπίζουμε να συνεχίσετε έτσι και στο μέλλον!
   unsubscribe_link: |+
     Για να απεγγραφείς από αυτά τα ηλεκτρονικά μηνύματα, [click here](%{unsubscribe_url}).
 
@@ -1942,28 +2004,47 @@ el:
     visit_link_to_respond: "[Visit Topic](%{base_url}%{url}) για να αποκριθείς."
     visit_link_to_respond_pm: "[Visit Message](%{base_url}%{url}) για να αποκριθείς."
     posted_by: "Δημοσιεύθηκε από %{username} στις %{post_date}"
-    invited_to_private_message_body: |
-      %{username} σας προσκάλεσε σε ένα μήνυμα
+    invited_group_to_private_message_body: |
+      Ο/Η %{username} προσκλήθηκε @%{group_name} σε ένα μήνυμα
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      στο
+      στην
+
+      > %{site_title} -- %{site_description}
+    invited_to_private_message_body: |
+      Ο/Η %{username} σας προσκάλεσε σε ένα μήνυμα
+
+      > #### %{topic_title}
+      >
+      > %{topic_excerpt}
+
+      στην
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
-      %{username} σας προσκάλεσε σε μία συζήτηση
+      Ο/Η %{username} σας προσκάλεσε σε μια συζήτηση
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      στο
+      στην
 
       > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      subject_template: "[%{email_prefix}] %{username} προσκλήθηκε @%{group_name} σε ένα μήνυμα '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
     user_invited_to_private_message_pm:
       title: "Ο χρήστης προσκλήθηκε σε προσωπικό μήνυμα"
+      subject_template: "[%{email_prefix}] %{username} σας προσκάλεσε σε ένα μήνυμα '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1972,6 +2053,7 @@ el:
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       title: "Ο χρήστης προσκλήθηκε στο στάδιο προσωπικού μηνύματος"
+      subject_template: "[%{email_prefix}] %{username} σας προσκάλεσε σε ένα μήνυμα '%{topic_title}'"
       text_body_template: |+
         %{header_instructions}
 
@@ -1981,6 +2063,7 @@ el:
 
     user_invited_to_topic:
       title: "Ο χρήστης προσκλήθηκε στο νήμα"
+      subject_template: "[%{email_prefix}] %{username} σας προσκάλεσε στο '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
 
@@ -1989,6 +2072,7 @@ el:
         %{respond_instructions}
     user_replied:
       title: "Ο χρήστης απάντησε"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1999,6 +2083,7 @@ el:
         %{respond_instructions}
     user_replied_pm:
       title: "Ο χρήστης απάντησε σε προσωπικό μηνύμα"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2009,6 +2094,7 @@ el:
         %{respond_instructions}
     user_quoted:
       title: "Φράση χρήστη"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2019,6 +2105,7 @@ el:
         %{respond_instructions}
     user_linked:
       title: "Ο χρήστης συνδέθηκε"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2029,6 +2116,7 @@ el:
         %{respond_instructions}
     user_mentioned:
       title: "Ο χρήστης αναφέρθηκε"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2039,6 +2127,7 @@ el:
         %{respond_instructions}
     user_group_mentioned:
       title: "Αναφέρθηκε χρήστης ομάδας"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         &{header_instructions}
 
@@ -2049,6 +2138,7 @@ el:
         %{respond_instructions}
     user_posted:
       title: "Ο χρήστης δημοσίευσε"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -2059,6 +2149,7 @@ el:
         %{respond_instructions}
     user_watching_first_post:
       title: "Ο χρήστης παρακολουθεί την πρώτη δημοσίευση"
+      subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |+
         %{header_instructions}
 
@@ -2070,6 +2161,7 @@ el:
 
     user_posted_pm:
       title: "Ο χρήστης δημοσίευσε προσωπικό μήνυμα"
+      subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |+
         %{header_instructions}
 
@@ -2099,11 +2191,14 @@ el:
       join_the_discussion: "Διάβασε περισσότερα"
       popular_posts: "Δημοφιλείς Δημοσιεύσεις"
       more_new: "Νέο για εσένα"
+      subject_template: "[%{email_prefix}] Σύνοψη"
+      unsubscribe: "Λάβατε αυτή την σύνοψη από την %{site_link} επειδή δεν σας είδαμε εδώ και μερικές μέρες. Αν δεν θέλετε να λαμβάνετε αυτή την σύνοψη, αλλάξτε τις <a href='%{email_settings_url}'>ρυθμίσεις σας</a> ή επιλέξτε εδώ %{unsubscribe_link} για διαγραφή από την λίστα."
       click_here: "κάνε κλικ εδώ"
       from: "%{site_name} περίληψη"
       preheader: "Μία σύντομη περίληψη από την τελευταία σου επίσκεψη στο %{last_seen_at}"
     forgot_password:
       title: "Ξέχασα τον κωδικό πρόσβασης"
+      subject_template: "[%{email_prefix}] Επαναφορά κωδικού"
     set_password:
       title: "Όρισε κωδικό πρόσβασης"
     admin_login:
@@ -2675,6 +2770,11 @@ el:
       name: Πρώτη απάντηση μέσω ηλεκτρονικού ταχυδρομείου
       long_description: |
         Το παράσημο χορηγείται την πρώτη φορά που απαντάς σε μια δημοσίευση μέσω ηλεκτρονικού ταχυδρομείου :ηλεκτρονική διεύθυνση:.
+    new_user_of_the_month:
+      name: "Νέος Χρήστης του Μήνα"
+      description: Εξαιρετική συνεισφορά κατά τον πρώτο μήνα
+      long_description: |
+        Αυτό το βραβείο απονέμεται σε δύο νέους χρήστες κάθε μήνα για την εξαιρετική συνεισφορά τους στην κοινότητα, όπως αυτή μετρήθηκε από το πόσο σύχνα άρεσαν οι αναρτήσεις τους και σε ποιους.
   admin_login:
     success: "Το Email απεστάλη"
     error: "Σφάλμα!"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index ca5914b74e..4d2fec269f 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -208,6 +208,7 @@ en:
   too_many_links:
     one: "Sorry, new users can only put one link in a post."
     other: "Sorry, new users can only put %{count} links in a post."
+  contains_blocked_words: "Your post contains words that aren't allowed."
 
   spamming_host: "Sorry you cannot post a link to that host."
   user_is_suspended: "Suspended users are not allowed to post."
@@ -413,8 +414,11 @@ en:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'The following interpolation key(s) are invalid: "%{keys}"'
               missing_interpolation_keys: 'The following interpolation key(s) are missing: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Too many words for that action"
 
   user_profile:
     no_info_me: "<div class='missing-profile'>the About Me field of your profile is currently blank, <a href='/u/%{username_lower}/preferences/about-me'>would you like to fill it out?</a></div>"
@@ -486,6 +490,7 @@ en:
       invalid_email_in: "'%{email}' is not a valid email address."
       email_already_used_in_group: "'%{email}' is already used by the group '%{group_name}'."
       email_already_used_in_category: "'%{email}' is already used by the category '%{category_name}'."
+      description_incomplete: "The category description post must have at least one paragraph."
     cannot_delete:
       uncategorized: "Can't delete Uncategorized"
       has_subcategories: "Can't delete this category because it has sub-categories."
@@ -948,13 +953,15 @@ en:
     search_tokenize_chinese_japanese_korean: "Force search to tokenize Chinese/Japanese/Korean even on non CJK sites"
     search_prefer_recent_posts: "If searching your large forum is slow, this option tries an index of more recent posts first"
     search_recent_posts_size: "How many recent posts to keep in the index"
+    log_search_queries: "Log search queries performed by users"
+    search_query_log_max_size: "Maximum amount of search queries to keep"
     allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off."
     allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
     educate_until_posts: "When the user starts typing their first (n) new posts, show the pop-up new user education panel in the composer."
     title: "The name of this site, as used in the title tag."
     site_description: "Describe this site in one sentence, as used in the meta description tag."
-    contact_email: "Email address of key contact responsible for this site. Used for critical notifications such as unhandled flags, as well as on the /about contact form for urgent matters."
+    contact_email: "Email address of key contact responsible for this site. Used for critical notifications, as well as on the /about contact form for urgent matters."
     contact_url: "Contact URL for this site. Used on the /about contact form for urgent matters."
     queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
@@ -978,6 +985,7 @@ en:
     show_pinned_excerpt_desktop: "Show excerpt on pinned topics in desktop view."
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
     onebox_domains_blacklist: "A list of domains that will never be oneboxed."
+    inline_onebox_domains_whitelist: "A list of domains that will be oneboxed in miniature form if linked without a title"
     max_oneboxes_per_post: "Maximum number of oneboxes in a post."
 
     logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
@@ -1025,9 +1033,7 @@ en:
     flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
 
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
-    enable_experimental_markdown_it: "Enable the experimental markdown.it CommonMark engine, WARNING: some plugins may not work correctly"
     enable_markdown_typographer: "Use basic typography rules to improve text readability of paragraphs of text, replaces (c) (tm) etc, with symbols, reduces number of question marks and so on"
-    allow_html_tables: "Allow tables to be entered in Markdown using HTML tags. TABLE, THEAD, TD, TR, TH will be whitelisted (requires full rebake on all old posts containing tables)"
     post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)."
     must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!"
     pending_users_reminder_delay: "Notify moderators if new users have been waiting for approval for longer than this many hours. Set to -1 to disable notifications."
@@ -1036,6 +1042,7 @@ en:
     ga_domain_name: "OBSOLETE: Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics"
+    ga_universal_auto_link_domains: "Enable Google Universal Analytics (analytics.js) cross-domain tracking. Outgoing links to these domains will have the client id added to them. See Google's Cross-Domain Tracking guide."
     gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF"
     enable_escaped_fragments: "Fall back to Google's Ajax-Crawling API if no webcrawler is detected. See https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Allow moderators to create new categories"
@@ -1205,6 +1212,8 @@ en:
 
     allow_staff_to_upload_any_file_in_pm: "Allow staff members to upload any files in PM."
 
+    strip_image_metadata: "Strip image metadata."
+
     enable_flash_video_onebox: "Enable embedding of swf and flv (Adobe Flash) links in oneboxes. WARNING: may introduce security risks."
 
     default_invitee_trust_level: "Default trust level (0-4) for invited users."
@@ -1380,7 +1389,7 @@ en:
     email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set."
     email_site_title: "The title of the site used as the sender of emails from the site. Default to 'title' if not set. If your 'title' contains characters that are not allowed in email sender strings, use this setting."
 
-    find_related_post_with_key: "Only use the reply key to find the replied-to post. (Recommended if using Amazon SES)"
+    find_related_post_with_key: "Only use the 'reply key' to find the replied-to post. WARNING: disabling this allows user impersonation based on email address."
 
     minimum_topics_similar: "How many topics need to exist before similar topics are presented when composing new topics."
 
@@ -1765,7 +1774,7 @@ en:
     text_body_template: |
       %{invitee_name} invited you to a discussion
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -1783,7 +1792,7 @@ en:
     text_body_template: |
       %{invitee_name} invited you to a discussion
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2108,7 +2117,7 @@ en:
     csv_export_failed:
       title: "CSV Export Failed"
       subject_template: "Data export failed"
-      text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member."
+      text_body_template: "We're sorry, but your data export failed. Please check the logs or [contact a staff member](%{base_url}/about)."
 
     email_reject_insufficient_trust_level:
       title: "Email Reject insufficient Trust Level"
@@ -2116,7 +2125,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your account does not have the required trust level to post new topics to this email address. If you believe this is an error, contact a staff member.
+        Your account does not have the required trust level to post new topics to this email address. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_user_not_found:
       title: "Email Reject User Not Found"
@@ -2124,7 +2133,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your reply was sent from an unknown email address. Try sending from another email address, or contact a staff member.
+        Your reply was sent from an unknown email address. Try sending from another email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_screened_email:
       title: "Email Reject Screened Email"
@@ -2132,7 +2141,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your reply was sent from a blocked email address. Try sending from another email address, or contact a staff member.
+        Your reply was sent from a blocked email address. Try sending from another email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_inactive_user:
       title: "Email Reject Inactive User"
@@ -2156,7 +2165,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your reply was sent from a different email address than the one we expected, so we're not sure if this is the same person. Try sending from another email address, or contact a staff member.
+        Your reply was sent from a different email address than the one we expected, so we're not sure if this is the same person. Try sending from another email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_no_account:
       title: "Email Reject No Account"
@@ -2164,7 +2173,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        We can't find any accounts that match your email address. Try sending from a different email address, or contact a staff member.
+        We can't find any accounts that match your email address. Try sending from a different email address, or [contact a staff member](%{base_url}/about).
 
     email_reject_empty:
       title: "Email Reject Empty"
@@ -2190,7 +2199,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your account does not have the privileges to post new topics in that category. If you believe this is an error, contact a staff member.
+        Your account does not have the privileges to post new topics in that category. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_strangers_not_allowed:
       title: "Email Reject Strangers Not Allowed"
@@ -2198,7 +2207,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, contact a staff member.
+        The category you sent this email to only allows replies from users with valid accounts and known email addresses. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_invalid_post:
       title: "Email Reject Invalid Post"
@@ -2235,7 +2244,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The reply key in the email is invalid or unknown, so we can't figure out what this email is in reply to. Contact a staff member.
+        The reply key in the email is invalid or unknown, so we can't figure out what this email is in reply to. [Contact a staff member](%{base_url}/about).
 
     email_reject_bad_destination_address:
       title: "Email Reject Bad Destination Address"
@@ -2251,7 +2260,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The topic you are replying to no longer exists -- perhaps it was deleted? If you believe this is an error, contact a staff member.
+        The topic you are replying to no longer exists -- perhaps it was deleted? If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_topic_closed:
       title: "Email Reject Topic Closed"
@@ -2259,7 +2268,7 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        The topic you are replying to is currently closed and no longer accepting replies. If you believe this is an error, contact a staff member.
+        The topic you are replying to is currently closed and no longer accepting replies. If you believe this is an error, [contact a staff member](%{base_url}/about).
 
     email_reject_auto_generated:
       title: "Email Reject Auto Generated"
@@ -2267,7 +2276,15 @@ en:
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
 
-        Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, contact a staff member.
+        Your email was marked as "auto generated", which means it was automatically created by a computer instead of being typed by a human; we can't accept those kinds of emails. If you believe this is an error, [contact a staff member](%{base_url}/about).
+
+    email_reject_unrecognized_error:
+      title: "Email Reject Unrecognized Error"
+      subject_template: "[%{email_prefix}] Email issue -- Unrecognized Error"
+      text_body_template: |
+        We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
+
+        There was an unrecognized error while processing your email and it wasn't posted. You should try again, or [contact a staff member](%{base_url}/about).
 
     email_error_notification:
       title: "Email Error Notification"
@@ -2412,10 +2429,21 @@ en:
 
     posted_by: "Posted by %{username} on %{post_date}"
 
+    invited_group_to_private_message_body: |
+      %{username} invited @%{group_name} to a message
+
+      > #### %{topic_title}
+      >
+      > %{topic_excerpt}
+
+      at
+
+      > %{site_title} -- %{site_description}
+
     invited_to_private_message_body: |
       %{username} invited you to a message
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2426,7 +2454,7 @@ en:
     invited_to_topic_body: |
       %{username} invited you to a discussion
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2434,6 +2462,16 @@ en:
 
       > %{site_title} -- %{site_description}
 
+    user_invited_to_private_message_pm_group:
+      title: "User Invited Group to PM"
+      subject_template: "[%{email_prefix}] %{username} invited @%{group_name} to a message '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+
     user_invited_to_private_message_pm:
       title: "User Invited to PM"
       subject_template: "[%{email_prefix}] %{username} invited you to a message '%{topic_title}'"
@@ -2735,7 +2773,7 @@ en:
 
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
+      ## [Welcome to %{title}](#welcome)
       An account is required. Please create an account or log in to continue.
 
   terms_of_service:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 1dbe6baf1f..1c2b48bfed 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -357,7 +357,6 @@ es:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Las siguientes claves de interpolación no son válidas: "%{keys}"'
               missing_interpolation_keys: 'Las siguientes claves de interpolación se perdieron: "%{keys}"'
       <<: *errors
   user_profile:
@@ -932,9 +931,7 @@ es:
     notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores."
     flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia."
     traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea."
-    enable_experimental_markdown_it: "Habilitar el motor experimental CommonMark markdown.it, ADVERTENCIA: algunos plugins podrían no funcionar correctamente."
     enable_markdown_typographer: "Utilice reglas básicas de tipografía para mejorar la legibilidad de texto de los párrafos de texto, reemplaza (c) (tm) etc, con símbolos, reduce el número de signos de interrogación y así sucesivamente"
-    allow_html_tables: "Permitir la inserción de tablas en Markdown usando etiquetas HTML. Se permitirá usar TABLE, THEAD, TD, TR o TH (requiere un rebake completo para los posts antiguos que contengan tablas)"
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)."
     must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!"
     pending_users_reminder_delay: "Notificar a los moderadores si hay nuevos usuarios que hayan estado esperando aprbación durante más estas horas. Usa -1 para desactivar estas notificaciones."
@@ -1536,45 +1533,9 @@ es:
   invite_mailer:
     title: "Invitar Usuario"
     subject_template: "%{invitee_name} te invitó a '%{topic_title}' en %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} te invitó a un debate
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
-
-      Si estás interesado, haz clic en el siguiente enlace:
-
-      %{invite_link}
-
-      Esta invitación proviene de un usuario de confianza, por lo que puedes comentar en el tema inmediatamente.
   custom_invite_mailer:
     title: "Personalizar Invitar Usuario"
     subject_template: "%{invitee_name} te ha invitado a '%{topic_title}' en %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} te ha invitado a un debate
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
-
-      Mensaje de %{invitee_name}:
-
-      %{user_custom_message}
-
-      Si estás interesado en participar, haz clic en el enlace debajo:
-
-      %{invite_link}
-
-      Esta invitación viene de un usuario en el que confiamos, por lo que podrás responder inmediatamente.
   invite_forum_mailer:
     title: "Invitación suscripción del foro"
     subject_template: "%{invitee_name} te invitó a unirte a %{site_domain_name}"
@@ -2139,26 +2100,6 @@ es:
     visit_link_to_respond: "[Visita el tema](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visita el mensaje](%{base_url}%{url}) para responder."
     posted_by: "Publicado por %{username} el %{post_date}"
-    invited_to_private_message_body: |
-      %{username} te invitó a un mensaje directo
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} te invitó a un tema de debate
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      en
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Usuario invitado a MP"
       subject_template: "[%{email_prefix}] %{username} te ha invitado a un hilo de mensajes en '%{topic_title}'"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 209ab34571..b8bd1bcb32 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -884,7 +884,6 @@ fa_IR:
     notify_mods_when_user_blocked: "اگر کاربر به‌طور خودکار مسدود شد، به تمام مدیران پیام بفرست."
     flag_sockpuppets: "اگر کاربری به موضوع با ای پی برابر با کاربری که نوشته را شروع کرده ٬ آنها را به عنوان هرزنامه پرچم گزاری کن."
     traditional_markdown_linebreaks: "در مدل‌های نشانه گزاری از خط جدید سنتی استفاده کن،‌ که برای linebreak نیاز به دو فضای انتهایی دارد ."
-    allow_html_tables: "اجازه ارسال جدول به صورت markdown با تگ های HTML. TABLE, THEAD, TD, TR, TH قابل استفاده هستند. (نیازمند ایجا دوباره در نوشته‌های قدیمی که شامل جدول هستند)"
     post_undo_action_window_mins: "تعداد دقایقی که کاربران اجازه دارند اقدامی را که در نوشته انجام داده اند باز گردانند. (پسند، پرچم گذاری،‌ چیزهای دیگر)."
     must_approve_users: "همکاران باید تمامی حساب‌های کاربری را قبل از اجازه دسترسی به سایت تایید کنند. اخطار: فعال‌سازی این گزینه ممکن است باعث جلوگیری از دسترسی کاربرانی که قبلا عضو شده‌اند نیز بشود!"
     pending_users_reminder_delay: "اگر کاربر‌ها بیشتر از این مقدار ساعت منتظر تایید بودند به مدیران اعلام کن. مقدار -1 برای غیرفعال‌سازی."
@@ -1465,41 +1464,9 @@ fa_IR:
   invite_mailer:
     title: "دعوت نامه‌رسان"
     subject_template: "%{invitee_name} شما را به %{topic_title}' در  %{site_domain_name}  دعوت کرده"
-    text_body_template: |
-      %{invitee_name} شما را به گفتگو دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-
-      اگر علاقه‌مند هستید روی لینک زیر کلیک کنید:
-
-      %{invite_link}
   custom_invite_mailer:
     title: "دعوت سفارشی نامه‌رسان"
     subject_template: "%{invitee_name} شما را به '%{topic_title}' در %{site_domain_name} دعوت کرده"
-    text_body_template: |
-      %{invitee_name} شما را به گفتگو دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-
-      با این یادداشت
-
-      > %{user_custom_message}
-
-      اگر علاقه‌مند هستید روی لینک زیر کلیک کنید:
-
-      %{invite_link}
   invite_forum_mailer:
     title: "دعوت نامه‌رسان انجمن"
     subject_template: "%{invitee_name} به عضویت در %{site_domain_name} دعوت شدید"
@@ -2001,26 +1968,6 @@ fa_IR:
     visit_link_to_respond: "[موضوع را](%{base_url}%{url}) برای ارسال پاسخ ببینید."
     visit_link_to_respond_pm: "[پیام را](%{base_url}%{url}) برای ارسال پاسخ ببینید."
     posted_by: "نوشته شده توسط {username}% در تاریخ {post_date}%"
-    invited_to_private_message_body: |
-      %{username} شما را به یک پیام دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      در
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} شما را به یک بحث دعوت کرده
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      در
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "کاربر دعوت شده به پیام خصوصی"
       subject_template: "[%{email_prefix}] %{username} شما را به پیام '%{topic_title}' دعوت کرده"
@@ -2471,7 +2418,7 @@ fa_IR:
       long_description: |
         این نشان زمانی اعطا می‌شود که برای بار اول یک نوشته را  در پاسخ خود نقل‌قول کنید. نقل‌قول بخش‌های مربوطه کمک می‌کند که بحث‌های موضوع به هم متصل شوند. بهترین راه برای نقل قول انتخاب متن در نوشته و کلیک روی دکمه پاسخ است. سخاوتمندانه نقل‌قول کنید!
     read_guidelines:
-      name: دستور‌العمل را خوانده
+      name: خواندن دستورالعمل‌ها
       description: <a href="/guidelines">دستورالعمل های انجمن</a> را بخوانید
       long_description: |
         این نشان زمانی اعطا می‌شود  <a href="/guidelines">راهنمای انجمن را بخوانید</a>. دنبال کردن و به اشتراک گذاری این راهنمای ساده به ایجاد یک انجمن امن، لذت‌بخش و پایدار برای همه کمک می‌کند. همیشه به یاد داشته باشید که همیشه فردی وجود دارد که خیلی شبیه شماست، و برعکس این مسئله هم وجود دارد. خوب باشید!
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 9c699ac9ec..ca789d95a9 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -171,10 +171,12 @@ fi:
   too_many_links:
     one: "Pahoittelut, uudet käyttäjät voivat laittaa vain yhden linkin viestiin."
     other: "Pahoittelut, uusi käyttäjä voi laittaa vain %{count} linkkiä viestiin."
+  contains_blocked_words: "Viestissäsi on kielletty sanoja."
   spamming_host: "Pahoittelut, linkit tuolle sivulle eivät ole sallittuja."
   user_is_suspended: "Hyllytetyt käyttäjät eivät saa luoda viestejä."
   topic_not_found: "Jotain on mennyt pieleen. Ehkä tämä ketju on suljettu tai poistettu sillä välin, kun katselit sitä?"
   not_accepting_pms: "Pahoittelut, %{username} ei ota vastaan yksityisviestejä tällä hetkellä."
+  max_pm_recepients: "Pahoittelut, voit lähettää viestin enintään %{recipients_limit} vastaanottajalle."
   just_posted_that: "on liian samanlainen kuin aiempi viestisi"
   invalid_characters: "sisältää epäkelpoja merkkejä"
   is_invalid: "vaikuttaa epäselvältä, olihan se kokonainen virke?"
@@ -358,8 +360,11 @@ fi:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Nämä interpolaatioavaimet eivät kelpaa: "%{keys}"'
               missing_interpolation_keys: 'Nämä interpolaatioavaimet puuttuvat: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Toiminnolle on määritelty liian monta sanaa"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Tietoa minusta -kenttä käyttäjätiedoissasi on täyttämättä. <a href='/u/%{username_lower}/preferences/about-me'>Haluaisitko täyttää sen nyt?</a></div>"
@@ -422,6 +427,7 @@ fi:
       invalid_email_in: "'%{email}' ei ole käypä sähköpostiosoite"
       email_already_used_in_group: "'%{email}' on jo käytössä ryhmällä '%{group_name}'."
       email_already_used_in_category: "'%{email}' on jo käytössä alueella '%{category_name}'."
+      description_incomplete: "Alueen kuvauksessa on oltava ainakin yksi kappale."
     cannot_delete:
       uncategorized: "Alueettomat-aluetta ei voi poistaa"
       has_subcategories: "Aluetta ei voi poistaa, koska sillä on tytäralueita."
@@ -655,6 +661,7 @@ fi:
         remove: "Tämä ketju ei ole enää banneri. Sitä ei näytetä enää jokaisen sivun ylälaidassa."
   unsubscribed:
     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."
   unsubscribe:
     title: "Peru tilaus"
@@ -865,6 +872,8 @@ fi:
     search_tokenize_chinese_japanese_korean: "Pakota haku käsittelemään kiinaa/japania/koreaa myös muunkielisillä sivustoilla"
     search_prefer_recent_posts: "Jos hakeminen suurelta palstaltasi on hidasta, tämä asetus kokeilee hakemistorakennetta, jossa tuoreimmat viestit ovat ensin"
     search_recent_posts_size: "Kuinka monta tuoretta viestiä pidetään hakemistossa"
+    log_search_queries: "Pidä lokia käyttäjien tekemistä hauista"
+    search_query_log_max_size: "Kuinka monta hakukyselyä säilötään enintään"
     allow_uncategorized_topics: "Salli ketjujen luominen valitsematta aluetta. VAROITUS: Alueettomat ketjut täytyy siirtää jollekin alueelle ennen kuin poistat asetuksen käytöstä."
     allow_duplicate_topic_titles: "Salli ketjun luominen identtisellä otsikolla."
     unique_posts_mins: "Kuinka monen minuutin kuluttua käyttäjä voi lähettää uudestaan samansisältöisen viestin"
@@ -894,6 +903,7 @@ fi:
     show_pinned_excerpt_desktop: "Näytä katkelma kiinnitetyistä ketjuista työpöytänäkymässä."
     post_onebox_maxlength: "Discourse-viestin Onebox-esikatselun merkkien maksimimäärä."
     onebox_domains_blacklist: "Verkko-osoitteet, joista ei luoda Onebox-esikatselua"
+    inline_onebox_domains_whitelist: "Verkko-osoitteet, joista luodaan Onebox-esikatselu, jos niihin linkitetään määrittämättä otsikkoa."
     max_oneboxes_per_post: "Oneboxien enimmäismäärä yhdessä viestissä"
     logo_url: "Logo sivustosi vasemmassa yläkulmassa. Sen pitäisi olla leveä suorakulmio muodoltaan. Jos jätetään tyhjäksi, näytetään sivuston otsikkoteksti."
     digest_logo_url: "Vaihtoehtoinen logo, jota käytetään sähköpostikoosteessa. Muodoltaan sen tulisi olla leveä suorakulmio, eikä se saa olla SVG-muodossa. Jos ei aseteta, käytetään `logo_url`-kuvaa."
@@ -931,9 +941,7 @@ fi:
     notify_mods_when_user_blocked: "Jos käyttäjä estetään automaattisesti, lähetä viesti kaikille valvojille."
     flag_sockpuppets: "Jos uuden käyttäjän luomaan ketjuun vastaa toinen uusi käyttäjä samasta IP-osoitteesta, liputa molemmat viestit mahdolliseksi roskapostiksi."
     traditional_markdown_linebreaks: "Käytä perinteisiä rivinvaihtoja Markdownissa, joka vaatii kaksi perättäistä välilyöntiä rivin vaihtoon."
-    enable_experimental_markdown_it: "Ota käyttöön kokeellinen markdown.it Commonmark ohjelmistomoottori. VAROITUS: jotkut lisäosat voivat lakata toimimasta oikein"
     enable_markdown_typographer: "Käytetään tavanomaisia typografisia sääntöjä parantamaan tekstikappaleiden luettavuutta, (c), (tm) ym. korvataan symboleilla, kysymysmerkkien määrää vähennetään jne."
-    allow_html_tables: "Salli taulukoiden syöttäminen Markdowniin käyttäen HTML tageja. TABLE, THEAD, TD, TR, TH valkolistataan (edellyttää kaikkien taulukoita sisältävien vanhojen viestien uudelleen rakentamisen)"
     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ä."
@@ -1298,6 +1306,7 @@ fi:
     auto_close_messages_post_count: "Maksimimäärä viestejä yksityisketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     auto_close_topics_post_count: "Maksimimäärä viestejä ketjussa, kunnes se suljetaan automaattisesti (0 poistaaksesi käytöstä)"
     code_formatting_style: "Viestikentän koodipainike käyttää oletuksena tätä koodimuotoilutyyliä"
+    max_allowed_message_recipients: "Kuinka monta vastaanottajaa yksityisviestillä voi olla."
     default_email_digest_frequency: "Kuinka usein käyttäjille lähetetään sähköpostikooste oletuksena."
     default_include_tl0_in_digests: "Sisällytä uusien käyttäjien viestit sähköpostikoosteisiin oletuksena. Tätä voi muuttaa käyttäjäasetuksissa."
     default_email_private_messages: "Lähetä oletuksena sähköposti, kun joku lähettää käyttäjälle viestin."
@@ -1366,6 +1375,8 @@ fi:
       email_polling_disabled: "Sinun täytyy ottaa käyttöön joko manuaalinen tai POP3 pollaus ennen sähköpostivastauksia."
       user_locale_not_enabled: "'allow user locale' täytyy olla asetettuna ennen tämän asetuksen ottamista käyttöön."
       invalid_regex: "Säännöllinen lauseke ei kelpaa tai ei ole sallittu."
+      email_editable_enabled: "Asetus 'email editable' on otettava pois käytöstä ennen tämän asetuksen käyttöönottoa."
+      enable_sso_disabled: "Asetus 'enable sso' on otettava käyttöön ennen tämän asetuksen käyttöönottoa."
   search:
     within_post: "#%{post_number} käyttäjältä %{username}"
     types:
@@ -1530,36 +1541,35 @@ fi:
   invite_mailer:
     title: "Kutsu keskusteluun"
     subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
-    text_body_template: |+
+    text_body_template: |
       %{invitee_name} kutsui sinut keskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      keskustelupalstalla
+      sivustolla
 
       > %{site_title} -- %{site_description}
 
       Jos kiinnostuit, klikkaa alla olevaa linkkiä:
 
       %{invite_link}
-
   custom_invite_mailer:
     title: "Kutsu keskusteluun saatesanoilla"
     subject_template: "%{invitee_name} kutsui sinut ketjuun '%{topic_title}' sivustolla %{site_domain_name}"
     text_body_template: |
       %{invitee_name} kutsui sinut keskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
-      keskustelupalstalla
+      sivustolla
 
       > %{site_title} -- %{site_description}
 
-      tällaisin saatesanoin:
+      tällaisin saatesanoin
 
       > %{user_custom_message}
 
@@ -1851,28 +1861,28 @@ fi:
     csv_export_failed:
       title: "CSV:n vienti epäonnistui"
       subject_template: "Datan vienti epäonnistui"
-      text_body_template: "Pahoittelemme, mutta datan vientisi epäonnistui. Tarkasta lokit tai ota yhteyttä henkilökuntaan."
+      text_body_template: "Pahoittelemme, mutta datan vienti epäonnistui. Tarkasta lokit tai [ota yhteyttä henkilökuntaan](%{base_url}/about)."
     email_reject_insufficient_trust_level:
       title: "Sähköposti hylätty - riittämätön luottamustaso"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Riittämätön luottamustaso"
       text_body_template: |
-        Pahoittelut, sähköpostiviestiäsi tänne: %{destination} (otsikolla %{former_title}) ei voitu toimittaa.
+        Pahoittelut, sähköpostin lähettäminen kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Tilisi luottamustaso ei ole riittävä, jotta saisit lähettää uusia ketjuja tähän sähköpostiosoitteeseen. Jos uskot, että tämä johtuu virheestä, ota yhteyttä henkilökuntaan.
+        Et voi lähettää uusia ketjun avauksia tähän sähköpostiosoitteeseen, koska luottamustasosi ei riitä. Jos uskot, että tämä johtuu virheestä, [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_user_not_found:
       title: "Sähköposti hylätty - käyttäjää ei löytynyt"
       subject_template: "[%{email_prefix}] Sähköpostiongelma -- Käyttäjää ei löytynyt"
       text_body_template: |
-        Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
+        Pahoittelemme, mutta sähköpostin lähettäminen kohteeseen %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Vastauksesi lähetettiin tuntemattomasta sähköpostiosoitteesta. Yritä lähettää viesti toisesta osoitteesta, tai ota yhteyttä henkilökuntaan.
+        Vastauksesi lähetettiin tuntemattomasta sähköpostiosoitteesta. Yritä lähettää viesti toisesta osoitteesta tai [ota yhteyttä henkilökuntaan](%{base_url}/about).
     email_reject_screened_email:
       title: "Sähköposti hylätty - estetty sähköpostiosoite"
       subject_template: "[%{email_prefix}] Sähköpostiongelma-- Estetty sähköpostiosoite"
       text_body_template: |+
         Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
 
-        Viestisi lähetettiin estetystä sähköpostiosoitteesta. Yritä lähettää viesti toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan.
+        Vastauksesi lähetettiin estetystä sähköpostiosoitteesta. Yritä lähettää viesti toisesta sähköpostiosoitteesta tai  [ota yhteyttä henkilökuntaan](%{base_url}/about).
 
     email_reject_inactive_user:
       title: "Sähköposti hylätty - aktivoimaton käyttäjä"
@@ -2123,7 +2133,7 @@ fi:
     invited_to_private_message_body: |
       %{username} kutsui sinut yksityiskeskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
@@ -2131,9 +2141,9 @@ fi:
 
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
-      %{username} kutsui sinut keskusteluun
+      %{username} kustui sinut keskusteluun
 
-      > **%{topic_title}**
+      > #### %{topic_title}
       >
       > %{topic_excerpt}
 
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 2b85e00688..79dafa2f0a 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -357,7 +357,6 @@ fr:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Les clés d''interpolation suivantes sont invalides : « %{keys} »'
               missing_interpolation_keys: 'Les clés d''interpolation suivantes sont absentes : « %{keys} »'
       <<: *errors
   user_profile:
@@ -931,7 +930,6 @@ fr:
     notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs."
     flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse IP que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam."
     traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne."
-    allow_html_tables: "Autoriser la saisie des tableaux dans le Markdown en utilisant les tags HTML : TABLE, THEAD, TD, TR, TH sont autorisés (nécessite un rebake de tous les anciens messages contenant des tableaux)"
     post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (J'aime, signaler, etc.)"
     must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !"
     pending_users_reminder_delay: "Avertir les modérateurs si des nouveaux utilisateurs sont en attente d'approbation depuis x heures. Mettre -1 pour désactiver les notifications."
@@ -1528,41 +1526,9 @@ fr:
   invite_mailer:
     title: "Invitiation"
     subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      à
-
-      > %{site_title} -- %{site_description}
-
-      Si cela vous intéresse, cliquez sur le lien ci-dessous :
-
-      %{invite_link}
   custom_invite_mailer:
     title: "Invitation personnalisée"
     subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      à
-
-      > %{site_title} -- %{site_description}
-
-      Avec ce message :
-
-      > %{user_custom_message}
-
-      Si cela vous intéresse, cliquez sur le lien ci-dessous :
-
-      %{invite_link}
   invite_forum_mailer:
     title: "Invitation sur le forum"
     subject_template: "%{invitee_name} vous a invité(e) à rejoindre %{site_domain_name}"
@@ -2092,26 +2058,6 @@ fr:
     visit_link_to_respond: "[Voir le sujet](%{base_url}%{url}) pour répondre."
     visit_link_to_respond_pm: "[Voir le message](%{base_url}%{url}) pour répondre."
     posted_by: "Redigé par %{username} le %{post_date}"
-    invited_to_private_message_body: |
-      %{username} vous a invité(e) à un message
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} vous a invité(e) à une discussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      sur
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Utilisateur invité au MP"
       subject_template: "[%{email_prefix}] %{username} vous a invité dans la conversation « %{topic_title} »"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 5795be1d51..989cecda71 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -28,10 +28,10 @@ he:
   posts: "פוסטים"
   loading: "טוען"
   powered_by_html: 'מופעל על ידי <a href="https://www.discourse.org">דיסקורס</a>, לצפיה מיטבית יש להפעיל JavaScript'
-  log_in: "התחברות"
+  log_in: "כניסה"
   purge_reason: "נמחק אוטומטית כחשבון נטוש ולא פעיל"
   disable_remote_images_download_reason: "הורדת תמונות מרחוק נחסמה בשל היעדר מספיק שטח אחסון פנוי."
-  anonymous: "אנונימי"
+  anonymous: "אלמוני"
   remove_posts_deleted_by_author: "נמחק על ידי הכותב"
   themes:
     bad_color_scheme: "לא ניתן לעדכן את התמה, סכמת צבעים שגויה"
@@ -121,11 +121,11 @@ he:
     user_exists: "מצטערים, המשתמשים כבר הוזמנו. ניתן להזמין משתמשים לנושא רק פעם אחת."
   backup:
     operation_already_running: "פעולה רצה כרגע. לא יכול להתחיל עבודה חדשה עכשיו."
-    backup_file_should_be_tar_gz: "קובץ הגיבוי צריך להיות .tar.gz."
-    not_enough_space_on_disk: "אין מספיק מקום על הדיסק כדי להעלות את הגיבוי הזה."
+    backup_file_should_be_tar_gz: "קובץ הגיבוי צריך להיות ‎.tar.gz."
+    not_enough_space_on_disk: "אין מספיק מקום על הכונן כדי להעלות את הגיבוי הזה."
     invalid_filename: "שם קובץ הגיבוי מכיל תווים שגויים. תווים תקינים הם a-z 0-9 . - _."
   not_logged_in: "אתם צריכים להיות מחוברים כדי לעשות את זה."
-  not_found: "המשאב או כתובת ה-URL המבוקשת לא נמצאו."
+  not_found: "המשאב או הכתובת המבוקשת לא נמצאו."
   invalid_access: "אינכם מורשים לצפות במשאב שביקשתם."
   read_only_mode_enabled: "האתר הזה במצב קריאה בלבד. פעולות אין אפשריות."
   reading_time: "זמן קריאה"
@@ -171,10 +171,12 @@ he:
   too_many_links:
     one: "מצטערים, משתמשים חדשים יכולים להוסיף רק קישור אחד בפוסט."
     other: "מצטערים, משתמשים חדשים יכולים להוסיף רק %{count} קישורים בפוסט."
+  contains_blocked_words: "הפוסט שלך מכיל מילים אסורות."
   spamming_host: "סליחה אך אינכם יכולים להוסיף קישור לאתר זה."
   user_is_suspended: "משתמשים מושעים אינם מורשים לפרסם."
   topic_not_found: "משהו השתבש אולי נושא זה נסגר או נמחק בזמן שקראתם אותו?"
   not_accepting_pms: "מצטעים,  %{username} לא מקבל הודעות כרגע."
+  max_pm_recepients: "מצטערים, אתם יכולים לשלוח הודעה לכל היותר ל-%{recipients_limit} נמענים."
   just_posted_that: "דומה מידי למה שפרסמתם לאחרונה"
   invalid_characters: "מכיל תווים לא תקניים"
   is_invalid: "נראה לא ברור, האם זה משפט שלם?"
@@ -351,6 +353,10 @@ he:
           attributes:
             execute_at:
               in_the_past: "חייב להיות בעתיד"
+        watched_word:
+          attributes:
+            word:
+              too_many: "יש יותר מדי מילים בפעולה הזו"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>השדה ״אודותי״ בפרופיל שלכם הוא ריק כרגע, <a href='/u/%{username_lower}/preferences/about-me'>תרצו למלא אותו?</a></div>"
@@ -411,6 +417,7 @@ he:
       invalid_email_in: "'%{email}' אינה כתובת מייל תקפה."
       email_already_used_in_group: "'%{email}' כבר בשימוש על ידי הקבוצה '%{group_name}'."
       email_already_used_in_category: "'%{email}' כבר בשימוש על ידי הקטגוריה '%{category_name}'."
+      description_incomplete: "לתיאור קטגוריה זו צריכה להיות לפחות פסקה אחת."
     cannot_delete:
       uncategorized: "לא ניתן למחוק תוכן ללא קטגוריה"
       has_subcategories: "לא ניתן למחוק קטגוריה זו משום שיש בה תת-קטגוריות."
@@ -854,6 +861,8 @@ he:
     search_tokenize_chinese_japanese_korean: "אלצו את החיפוש לנתח סינית/יפנית/קוריאנית גם באתרים שאינם בשפות אלו"
     search_prefer_recent_posts: "אם חיפוש בפורום הגדול שלכם איטי, אופציה זו מנסה לאנדקס קודם כל את הפוסטים החדשים יותר"
     search_recent_posts_size: "כמה פוסטים חדשים לשמור באינדקס"
+    log_search_queries: "רישום שאילתות חיפוש שמתבצעות על ידי משתמשים"
+    search_query_log_max_size: "מספר מקסימלי של שאילתות חיפוש לשימור"
     allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה. אזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. "
     allow_duplicate_topic_titles: "אשרו נושאים עם כותרות זהות או משוכפלות."
     unique_posts_mins: "כמה דקות לפני שמשתמש יכול לפרסם את אותו תוכן שוב"
@@ -921,7 +930,6 @@ he:
     notify_mods_when_user_blocked: "אם משתמש נחסם אוטומטית, שילחו הודעה לכל המנחים."
     flag_sockpuppets: "אם משתמשים חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפוסטים של שניהם כספאם פוטנציאלי."
     traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה."
-    allow_html_tables: "אפשרו הכנסת טבלאות ב Markdown באמצעות תגיות HTML. התגיות TABLE, THEAD, TD, TR, TH יהיו ברשימה לבנה (מצריך אפייה מחדש של כל הפוסטים הישנים שכוללים טבלאות)"
     post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפוסט (לייק, סימון, וכו')."
     must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים."
     pending_users_reminder_delay: "הודיעו למנחים אם משתמשים חדשים ממתינים לאישור למעלה מכמות זו של שעות. קבעו ל -1 כדי לנטרל התראות."
@@ -1286,6 +1294,7 @@ he:
     auto_close_messages_post_count: "מספר פוסטים מקסימלי בהודעה לפני שהיא נסגרת אוטומטית (0 לניטרול)"
     auto_close_topics_post_count: "מספר מקסימלי של פוסטים בנושא לפני שהוא נסגר אוטומטית (0 לניטרול)"
     code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
+    max_allowed_message_recipients: "מספר מקסימלי של נמענים מותר בהודעה."
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פוסטים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל."
@@ -1521,41 +1530,9 @@ he:
   invite_mailer:
     title: "שולח-מיילים להזמנה"
     subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} הזמין/ה אתכם לדיון
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      ב
-
-      > %{site_title} -- %{site_description}
-
-      אם אתם מעוניינים, לחצו על הקישור למטה:
-
-      %{invite_link}
   custom_invite_mailer:
     title: "שולח-מיילים מותאם-אישית להזמנה"
     subject_template: "%{invitee_name} הזמין/הזמינה אותך לדיון  '%{topic_title}' באתר %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} הזמין/ה אתכם לדיון
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      ב
-
-      > %{site_title} -- %{site_description}
-
-      עם הערה זו
-
-      > %{user_custom_message}
-
-      אם אתם מעוניינים, לחצו על הקישור למטה:
-
-      %{invite_link}
   invite_forum_mailer:
     title: "שולח-מיילים להזמנה לפורום"
     subject_template: "%{invitee_name} הזמינ/ה אתכם להצטרף ל%{site_domain_name}"
@@ -1949,24 +1926,14 @@ he:
     email_reject_topic_not_found:
       title: "דחיית מייל נושא לא נמצא"
       subject_template: "[%{email_prefix}]  בעיית מייל -- לא נמצא נושא"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        הנושא שאתם מנסים להגיב אליו כבר לא קיים -- אולי הוא נמחק? אם אתם מאמינים שזו טעות, אנא פנו לחבר צוות.
     email_reject_topic_closed:
       title: "דחיית מייל נושא סגור"
       subject_template: "[%{email_prefix}]  בעיית מייל -- נושא נסגר"
-      text_body_template: |
-        אנחנו מצטערים, אך הודעת המייל ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
-
-        הנושא שאתם מגיבים אליו סגור כרגע ולא מקבל יותר תגובות. אם אתם מאמינים שזו טעות, אנא פנו לחבר צוות.
     email_reject_auto_generated:
       title: "דחיית מייל נוצר אוטומטית"
       subject_template: "[%{email_prefix}]  בעיית מייל -- תגובה נוצרה אוטומטית"
-      text_body_template: |
-        אנחנו מצטערים, אבל משהו לא עבד עם הודעת הדוא"ל שלך, שנשלחה אל %{destination} (titled %{former_title}).
-
-        המייל ששלחת סומן כ"נכתב אוטומטית", מה שאומר שהוא נכתב על ידי מחשב ולא הוקלד על ידי אדם; איננו יכולים לקבל מיילים שכאלה. אם אתם מאמינים שזוהי תקלה, אנא צרו קשר עם איש/אשת צוות.
+    email_reject_unrecognized_error:
+      subject_template: "[%{email_prefix}] בעיה עם הדוא״ל -- שגיאה לא מוכרת"
     email_error_notification:
       title: "התראת בעיית מייל"
       subject_template: "[%{email_prefix}]  בעיית מייל -- בעיית אימות POP"
@@ -2088,26 +2055,6 @@ he:
     visit_link_to_respond: "[בקרו בנושא](%{base_url}%{url}) כדי לענות."
     visit_link_to_respond_pm: "[בקרו בהודעה](%{base_url}%{url}) כדי לענות."
     posted_by: "פורסם על ידי %{username} ב %{post_date}"
-    invited_to_private_message_body: |
-      %{username} הזמין אותך להודעה
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      באתר
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} הזמין/הזמינה אותך לדיון
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      באתר
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "משתמש/ת הוזמן/ה להודעה פרטית"
       subject_template: "[%{email_prefix}] %{username} הזמין אותך להודעה '%{topic_title}'"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 722c723d09..b6321c1cae 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -171,10 +171,12 @@ it:
   too_many_links:
     one: "Spiacenti, i nuovi utenti possono inserire al massimo un collegamento in un messaggio."
     other: "Spiacenti, i nuovi utenti possono inserire al massimo %{count} collegamenti in un messaggio."
+  contains_blocked_words: "Il tuo messaggio contiene parole che non sono consentite."
   spamming_host: "Spiacenti, non puoi inserire un collegamento verso quel dominio."
   user_is_suspended: "Agli utenti sospesi non è permesso creare messaggi."
   topic_not_found: "Quancosa non ha funzionato. Forse questo argomento è stato chiuso o cancellato mentre lo leggevi."
   not_accepting_pms: "Spiacenti, %{username} non accetta messaggi al momento."
+  max_pm_recepients: "Spiacenti, puoi inviare un messaggio ad un massimo di %{recipients_limit} destinatari."
   just_posted_that: "è troppo simile a ciò che hai appena pubblicato"
   invalid_characters: "contiene caratteri non validi"
   is_invalid: "sembra poco chiaro, è una frase completa?"
@@ -360,8 +362,11 @@ it:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: 'Le seguenti chiavi(e) di interpolazione non sono valide: "%{keys}"'
               missing_interpolation_keys: 'Le seguenti chiavi(e) di interpolazione sono mancanti: "%{keys}"'
+        watched_word:
+          attributes:
+            word:
+              too_many: "Troppe parole per quest'azione"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>il campo \"Su di me\" del tuo profilo è vuoto, <a href='/u/%{username_lower}/preferences/about-me'>vuoi compilarlo? </a></div>"
@@ -424,6 +429,7 @@ it:
       invalid_email_in: "'%{email}' non è un indirizzo email valido."
       email_already_used_in_group: "L'indirizzo '%{email}' è stato già usato dal gruppo '%{group_name}'."
       email_already_used_in_category: "L'indirizzo '%{email}' è stato già usato dalla categoria '%{category_name}'."
+      description_incomplete: "Il messaggio di descrizione della categoria deve avere almeno un paragrafo."
     cannot_delete:
       uncategorized: "Non puoi eliminare la categoria \"Non classificato\""
       has_subcategories: "Non puoi cancellare questa categoria perché ha sotto-categorie."
@@ -868,6 +874,8 @@ it:
     search_tokenize_chinese_japanese_korean: "Attiva la tokenizzazione dei caratteri Cinesi/Giapponesi/Coreani nella ricerca anche sui siti non CJK"
     search_prefer_recent_posts: "Se il tuo forum è corposo e la ricerca è lenta, questa opzione tenta di indicizzare prima i messaggi più recenti"
     search_recent_posts_size: "Quanti messaggi recenti mantenere nell'indice"
+    log_search_queries: "Log delle query di ricerca eseguite dagli utenti"
+    search_query_log_max_size: "Quantità massima di query di ricerca da mantenere"
     allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria. ATTENZIONE: se ci sono argomenti senza categoria, devi ricategorizzarli prima di disabilitare questa opzione."
     allow_duplicate_topic_titles: "Permetti più argomenti con lo stesso identico titolo"
     unique_posts_mins: "Quanti minuti prima che un utente possa inviare un altro argomento con lo stesso contenuto"
@@ -897,6 +905,7 @@ it:
     show_pinned_excerpt_desktop: "Mostra estratti sugli argomenti appuntati nella vista desktop."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
     onebox_domains_blacklist: "Una lista di domini che non verranno mai oneboxed."
+    inline_onebox_domains_whitelist: "Una lista di domini che saranno oneboxed in forma di miniatura se collegati senza un titolo"
     max_oneboxes_per_post: "Numero massimo di oneboxe in un messaggio."
     logo_url: "L'immagine nel logo in alto a sinistra del sito, dovrebbe essere larga e di forma rettangolare. Se non impostata, verrà usato il testo del titolo del sito."
     digest_logo_url: "Il logo alternativo usato in cima alla email di riepilogo. Dovrebbe essere a forma di un ampio rettangolo. Non dovrebbe essere un'immagine SVG. Se lasciato vuoto, sarà utilizzato il campo `logo_url`. "
@@ -934,7 +943,6 @@ it:
     notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori."
     flag_sockpuppets: "Se un nuovo utente risponde ad un argomento dallo stesso indirizzo IP dell'utente che ha aperto l'argomento stesso, segnala entrambi i messaggi come potenziale spam."
     traditional_markdown_linebreaks: "Usa l'accapo tradizionale in Markdown, cioè due spazi a fine riga per andare a capo."
-    allow_html_tables: "Consenti di inserire tabelle in Markdown usando tag HTML. I tag TABLE, THEAD, TD, TR, TH saranno consentiti (richiede un full rebake di tutti i vecchi messaggi contenenti tabelle)"
     post_undo_action_window_mins: "Numero di minuti durante i quali gli utenti possono annullare le loro azioni recenti su un messaggio (segnalazioni, Mi piace, ecc.)."
     must_approve_users: "Lo staff deve approvare tutti i nuovi account utente prima che essi possano accedere al sito. ATTENZIONE: abilitare l'opzione per un sito live revocherà l'accesso per tutti gli utenti non-staff esistenti!"
     pending_users_reminder_delay: "Notifica i moderatori se nuovi utenti sono in attesa di approvazione per più di queste ore. Imposta a -1 per disabilitare le notifiche."
@@ -943,6 +951,7 @@ it:
     ga_domain_name: "OBSOLETO: nome del dominio Google analytics (ga.js), esempio: miosito.com; vedi http://google.com/analytics"
     ga_universal_tracking_code: "Codice di tracking Google Universal Analytics (analytics.js), es: UA-12345678-9; vedi http://google.com/analytics"
     ga_universal_domain_name: "Nome di dominio Google Universal Analytics (analytics.js), es: miosito.com; vedi http://google.com/analytics"
+    ga_universal_auto_link_domains: "Attiva Il monitoraggio interdominio di Google Universal Analytics (analytics.js). Ai collegamenti in uscita a questi domini verrà aggiunto l'id del client. Vedi la guida di Google Cross-domain Tracking."
     gtm_container_id: "Container id di Google Tag Manager. Es: GTM-ABCDEF"
     enable_escaped_fragments: "Usa le Ajax-Crawling API di Google se non viene rilevato un webcrawler. Vedi https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Permetti ai moderatori di creare nuove categorie"
@@ -1170,12 +1179,15 @@ it:
     disable_emails: "Evita che Discourse invii qualunque tipo di email"
     strip_images_from_short_emails: "Elimina le immagini dalle email aventi dimensione inferiore a 2800 Byte."
     short_email_length: "Lunghezza delle email brevi in Byte"
+    unsubscribe_via_email: "Consenti agli utenti di annullare la sottoscrizione alle email inviando una email con 'unsubscribe' nell'oggetto o nel corpo"
+    delete_email_logs_after_days: "Elimina i log delle email dopo (N) giorni. 0 per mantenerli indefinitamente"
     max_emails_per_day_per_user: "Numero massimo di email da inviare agli utenti per giorno. 0 per disabilitare il limite"
     enable_staged_users: "Crea automaticamente utenti temporanei quando si elaborano le email in arrivo."
     maximum_staged_users_per_email: "Numero massimo di utenti temporanei creati quando si elaborano le email in arrivo."
     auto_generated_whitelist: "Lista degli indirizzi email che non verranno verificati per i contenuti generati automaticamente. Esempio: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloccare le email in arrivo identificate come generate automaticamente."
     ignore_by_title: "Ignora le email in arrivo in base al loro titolo."
+    mailgun_api_key: "Chiave API Segreta di Mailgun usata per verificare i messaggi webhook. "
     attachment_content_type_blacklist: "Elenco delle parole chiave utilizzate per mettere in blacklist gli allegati in base al tipo di contenuto."
     attachment_filename_blacklist: "Elenco delle parole chiave utilizzate per mettere in blacklist gli allegati in base al nome del file."
     enable_forwarded_emails: "[BETA] Consenti agli utenti di creare un argomento inviando una email."
@@ -1205,22 +1217,85 @@ it:
     allow_animated_thumbnails: "Genera miniature animate delle gif animate."
     default_avatars: "URL degli avatar che verranno utilizzati come predefiniti per i nuovi utenti, fintanto che non li cambieranno esplicitamente."
     automatically_download_gravatars: "Scarica i Gravatars per gli utenti quando viene creato l'account o quando viene modificata l'email"
+    digest_topics: "Numero massimo di argomenti di successo da mostrare nell'email riepilogativa."
+    digest_posts: "Numero massimo dei messaggi di successo da mostrare nell'email riepilogativa."
+    digest_min_excerpt_length: "Lunghezza minima dell'estratto del messaggio nell'email riepilogativa, in caratteri."
+    suppress_digest_email_after_days: "Sopprimi le email di riepilogo per gli utenti che non visitano il sito per più di (n) giorni."
+    digest_suppress_categories: "Sopprimi queste categorie dalle email riepilogative."
+    disable_digest_emails: "Disabilita le email riepilogative per tutti gli utenti."
+    email_accent_bg_color: "Colore da usare come background per alcuni elementi delle email HTML. Inserire il nome di un colore ('red') o un valore esadecimale ('#FF000')."
+    email_link_color: "Colore dei collegamenti nelle email HTML. Inserire il nome di un colore ('blue') o un valore esadecimale ('#0000FF')."
+    max_daily_gravatar_crawls: "Numero massimo di volte al giorno in cui Discourse controllerà Gravatar per gli avatar personalizzati"
+    public_user_custom_fields: "Una whitelist di campi personalizzati di un utente che possono essere mostrati pubblicamente."
+    staff_user_custom_fields: "Una whitelist di campi personalizzati di un utente che possono essere mostrati allo staff."
+    enable_user_directory: "Fornire una directory degli utenti per la navigazione"
+    enable_group_directory: "Fornire una directory dei gruppi per la navigazione"
+    allow_anonymous_posting: "Permetti agli utenti di passare alla modalità anonima"
+    anonymous_posting_min_trust_level: "Livello di esperienza minimo richiesto per abilitare la pubblicazione in modalità anonima"
+    hide_user_profiles_from_public: "Disabilita schede utenti, profili utenti e directory utenti per gli utenti anonimi."
     allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo."
+    sequential_replies_threshold: "Numero di messaggi che un utente deve pubblicare di fila in un argomento prima che gli venga ricordato delle troppe risposte sequenziali."
+    get_a_room_threshold: "Numero di messaggi che un utente deve inviare alla stessa persona nello stesso argomento prima di essere avvertito."
     enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo."
+    dominating_topic_minimum_percent: "Quale percentuale di messaggi un utente deve pubblicare in un argomento prima di essere avvertito che sta eccessivamente dominando l'argomento."
+    disable_avatar_education_message: "Disabilita il messaggio educativo per cambiare avatar"
     suppress_uncategorized_badge: "Non mostrare il distintivo per gli argomenti senza categoria nell'elenco degli argomenti."
     global_notice: "Mostra a tutti i visitatori un avviso con striscione globale URGENTE, EMERGENZA, lascia vuoto per nasconderlo (HTML consentito)."
+    disable_edit_notifications: "Disabilita le notifiche di modifica dall'utente system quando 'download_remote_images_to_local' è attivo."
+    automatically_unpin_topics: " Spunta automaticamente gli argomenti quando l'utente arriva in fondo. "
+    read_time_word_count: "Conteggio di parole al minuto per calcolare il tempo stimato di lettura."
+    native_app_install_banner: "Domanda ai visitatori ricorrenti di installare l'app nativa di Discourse."
+    share_anonymized_statistics: "Condividi statistiche anonime di utilizzo."
     full_name_required: "Il nome completo è un campo obbligatorio del profilo utente."
+    enable_names: "Mostra il nome completo dell'utente su profilo, scheda utente e email. Disabilita per nascondere il nome completo ovunque."
+    display_name_on_posts: "Mostra il nome completo dell'utente sui messaggi oltre allo @username."
     short_progress_text_threshold: "Quando il numero di messaggi di un argomento supera questo valore, la barra di avanzamento mostrerà solo il numero di messaggi attuale. Se modifichi l'ampiezza della barra di avanzamento, potresti dover cambiare questo valore."
     default_code_lang: "Ai blocchi di codice GitHub viene applicata l'evidenziazione della sintassi del linguaggio di programmazione di default (lang-auto, ruby, python ecc.)"
+    warn_reviving_old_topic_age: "Quando qualcuno inizia a rispondere ad un argomento in cui l'ultima risposta è più vecchia di tale numero di giorni, verrà visualizzato un avviso. Disabilita impostando su 0."
+    autohighlight_all_code: "Forza l'evidenziazione della sintassi del codice nei blocchi di testo preformattato, anche se non è stato specificato il linguaggio di programmazione. "
+    highlighted_languages: "Regole di evidenziazione della sintassi incluse. (Avviso: includere troppe lingue può influire sulle prestazioni) vedi: https://highlightjs.org/static/demo/ per una dimostrazione"
     embed_by_username: "Nome utente Discourse dell'utente che crea gli argomenti incorporati."
     embed_truncate: "Tronca i messaggi incorporati."
+    allowed_href_schemes: "Schemi consentiti nei collegamenti in aggiunta a http e https."
     embed_post_limit: "Numero massimo di messaggi da incorporare."
+    embed_username_required: "E' richiesto il nome utente per la creazione di argomenti."
+    embed_whitelist_selector: "Selettore CSS per gli elementi da permettere negli embed."
+    embed_blacklist_selector: "Selettore CSS per gli elementi che sono rimossi dagli embed."
+    notify_about_flags_after: "Se ci sono segnalazioni che non sono state revisionate dopo un tale numero di ore, invia un messaggio privato allo staff. Imposta a 0 per disattivare. "
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
+    delete_drafts_older_than_n_days: Elimina bozze più vecchie di (n) giorni.
+    bootstrap_mode_min_users: "Numero minimo di utenti richiesto per disabilitare la modalità bootstrap (imposta a 0 per disattivare)"
+    prevent_anons_from_downloading_files: "Impedire agli utenti anonimi di scaricare gli allegati. ATTENZIONE: questo impedirà a qualsiasi risorsa del sito pubblicata come allegato di funzionare ad eccezione delle immagini."
     enable_emoji: "Attiva gli emoji"
+    enforce_square_emoji: "Forza tutte le emoji ad un aspetto di proporzioni quadrate."
+    approve_post_count: "La quantità di messaggi di un utente nuovo o di base che deve essere approvata"
+    approve_unless_trust_level: "I messaggi degli utenti al di sotto di questo livello di esperienza devono essere approvati"
+    approve_new_topics_unless_trust_level: "I nuovi argomenti degli utenti al di sotto di questo livello di esperienza devono essere approvati"
+    notify_about_queued_posts_after: "Se ci sono messaggi che devono essere revisionati dopo un tale numero di ore, una email verrà inviata a contact_email. Imposta a 0 per disattivare queste email."
+    auto_close_messages_post_count: "Numero massimo di messaggi consentiti in un messaggio privato prima di essere automaticamente chiuso (0 per disabilitare)"
+    auto_close_topics_post_count: "Numero massimo di messaggi consentiti in un argomento prima di essere automaticamente chiuso (0 per disabilitare)"
+    max_allowed_message_recipients: "Numero massimo di destinatari consentiti in un messaggio privato."
+    default_email_digest_frequency: "Con quale frequenza gli utenti ricevono email riepilogative di default."
+    default_email_private_messages: " Invia una email quando qualcuno scrive un messaggio ad un utente di default."
+    default_email_direct: "Invia una email quando qualcuno cita/risponde/menziona un utente di default."
+    default_email_mailing_list_mode: "Invia una email per ogni nuovo messaggio di default."
+    default_email_mailing_list_mode_frequency: "Con quale frequenza gli utenti che hanno attivato la modalità mailing list riceveranno email di default."
+    disable_mailing_list_mode: "Impedisci agli utenti di attivare la modalità mailing list."
+    default_email_always: "Invia una notifica via email anche quando l'utente è attivo di default."
+    default_email_previous_replies: "Includi risposte precedenti nelle email di default."
+    default_email_in_reply_to: "Includi un estratto della risposta ad un messaggio nelle email di default."
+    default_other_new_topic_duration_minutes: "Condizione globale predefinita per cui un argomento viene considerato nuovo."
+    default_other_auto_track_topics_after_msecs: "Tempo globale predefinito prima che un argomento venga automaticamente seguito."
+    default_other_notification_level_when_replying: "Livello di notifica globale predefinito quando un utente risponde ad un argomento."
+    default_other_external_links_in_new_tab: "Apri i collegamenti esterni in una nuova scheda di default. "
+    default_other_enable_quoting: "Attiva rispondi citando per il testo evidenziato di default."
     default_other_disable_jump_reply: "Per default non saltare al messaggio dell'utente dopo la sua risposta."
     default_categories_watching: "Elenco di categorie osservate per default."
     default_categories_tracking: "Elenco di categorie seguite per default."
     default_categories_muted: "Elenco di categorie silenziate per default."
+    max_user_api_reqs_per_day: "Numero massimo di richieste giornaliere per la chiave API utente "
+    max_user_api_reqs_per_minute: "Numero massimo di richieste al minuto per la chiave API utente"
+    max_api_keys_per_user: "Numero massimo di chiavi API utente per utente"
     tagging_enabled: "Abilitare le etichette per gli argomenti?"
     min_trust_to_create_tag: "Il livello di esperienza minimo per creare un'etichetta."
     max_tags_per_topic: "Il numero massimo di etichette che si possono applicare ad un argomento."
@@ -1379,10 +1454,31 @@ it:
     welcome_invite:
       subject_template: "Benvenuto su %{site_name}!"
     backup_succeeded:
+      title: "Backup Riuscito"
       subject_template: "Backup completato correttamente"
+      text_body_template: |
+        Il backup è avvenuto con successo.
+
+        Visita la  [sezione admin > backup](%{base_url}/admin/backups) per scaricare il nuovo backup.
+
+        Ecco il log:
+
+        ```text
+        %{logs}
+        ```
     backup_failed:
+      title: "Backup Fallito"
       subject_template: "Backup fallito"
+      text_body_template: |
+        Il backup è fallito.
+
+        Ecco il log:
+
+        ```text
+        %{logs}
+        ```
     restore_succeeded:
+      title: "Ripristino Riuscito"
       subject_template: "Il ripristino è avvenuto con successo."
       text_body_template: |
         Il ripristino è avvenuto con successo.
@@ -1393,6 +1489,7 @@ it:
         %{logs}
         ```
     restore_failed:
+      title: "Ripristino Fallito"
       subject_template: "Ripristino fallito"
       text_body_template: |
         Il ripristino è fallito.
@@ -1403,24 +1500,27 @@ it:
         %{logs}
         ```
     bulk_invite_succeeded:
+      title: "Invito di Massa Riuscito"
       subject_template: "Invito di massa processato con successo"
       text_body_template: "Il tuo file con l'invito di massa è stato processato, %{sent} inviti spediti."
     bulk_invite_failed:
+      title: "Invito di Massa Fallito"
       subject_template: "Invito di massa processato con errori"
     csv_export_succeeded:
+      title: "Esportazione CSV Riuscita"
       subject_template: "Esportazione dati completa"
+      text_body_template: |
+        L'esportazione dei tuoi dati è avvenuta con successo! :dvd:
+
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+
+        Il collegamento per il download qui sopra sarà valido per 48 ore.
+
+        I dati vengono compressi come archivio gzip. Se l'archivio non si auto-estrae quando lo si apre, utilizzare gli strumenti consigliati qui: http://www.gzip.org/#faq4
     csv_export_failed:
+      title: "Esportazione CSV Fallita"
       subject_template: "Esportazione dati fallita"
-    email_reject_screened_email:
-      text_body_template: |
-        Spiacenti, il tuo messaggio email a %{destination} (intitolato %{former_title}) non ha funzionato.
-
-        La tua risposta è stata inviata da un indirizzo email bloccato. Prova a spedire da un altro indirizzo email, oppure contatta un membro dello staff.
-    email_reject_no_account:
-      text_body_template: |
-        Ci dispiace, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato.
-
-        Non esiste un account con quell'indirizzo email. Prova ad inviarla a un altro indirizzo o contatta un membro dello staff.
+      text_body_template: "Siamo spiacenti, ma l'esportazione dei dati è fallita. Per favore controlla i log o [contatta un membro dello staff](%{base_url}/about)."
     email_reject_bad_destination_address:
       text_body_template: |+
         Spiacenti, ma il tuo messaggio email a %{destination} (intitolato %{former_title}) non è stato inviato.
@@ -1439,15 +1539,58 @@ it:
         Per ulteriori informazioni, ti rimandiamo alle [linee guida della comunità](%{base_url}/guidelines).
     too_many_tl3_flags:
       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 non può creare altre risposte o argomenti finché il tuo account 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).
     blocked_by_staff:
+      title: "Bloccato dallo Staff"
       subject_template: "Account temporaneamente sospeso"
+      text_body_template: |
+        Ciao,
+
+        questo è un messaggio automatico da %{site_name} per informarti che il tuo account è stato temporaneamente bloccato come misura precauzionale.
+
+        Per favore continua pure a navigare, anche se non potrai rispondere o creare argomenti fino a che un  [membro dello staff](%{base_url}/about) avrà revisionato i tuoi messaggi più recenti. Ci scusiamo per l'inconveniente.
+
+        Per maggiori dettagli, fai riferimento alle [linee guida della comunità](%{base_url}/guidelines).
     user_automatically_blocked:
+      title: "Utente Bloccato Automaticamente"
       subject_template: "Nuovo utente %{username} bloccato dalle segnalazioni della comunità"
+      text_body_template: |
+        Questo è un messaggio automatico.
+
+        Il nuovo utente [%{username}](%{user_url}) è stato automaticamente bloccato perché più utenti hanno contrassegnato i messaggi di %{username}.
+
+        Per favore [controlla le segnalazioni](%{base_url}/admin/flags). Se %{username} è stato bloccato 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 `block_new_user`.
     spam_post_blocked:
+      title: "Messaggio Spam Bloccato"
       subject_template: "Il messaggi del nuovo utente %{username} sono stati bloccati a causa dell'invio di ripetuti collegamenti."
+      text_body_template: |
+        Questo è un messaggio automatico.
+
+        Il nuovo utente [%{username}](%{user_url}) ha creato diversi messaggi con collegamenti a %{domains}, ma tali messaggi sono stati bloccati per evitare spam. L'utente è ancora abilitato alla creazione di messaggi ma senza collegamenti verso %{domains}.
+
+        Per favore [controlla questo utente](%{user_url}).
+
+        Questa impostazione può essere modificata tramite le impostazioni del sito   `newuser_spam_host_threshold` e `white_listed_spam_host_domains`.
     unblocked:
+      title: "Sbloccato"
       subject_template: "Account non più sospeso"
+      text_body_template: |
+        Ciao,
+
+        questo è un messaggio automatico da %{site_name} per informarti che il tuo account è stato sbloccato a seguito di revisione da parte dello staff.
+
+        Ora puoi nuovamente creare argomenti e risposte. Grazie della pazienza.
     pending_users_reminder:
+      title: "Promemoria Utenti in Sospeso"
       subject_template:
         one: "1 utente in attesa di approvazione"
         other: "%{count} utenti in attesa di approvazione"
@@ -1456,10 +1599,33 @@ it:
 
         [Per favore valutale nella sezione di amministrazione](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
+      title: "Scaricamento Immagini Remote Disabilitato"
       subject_template: "Lo scaricamento delle immagini remote è disabilitato"
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché è stato raggiunto il limite di spazio su disco definito in `download_remote_images_threshold`."
     dashboard_problems:
+      title: "Problemi Cruscotto"
       subject_template: "Si sono riscontrati problemi"
+      text_body_template: |
+        Alcuni problemi sono stati riportati sul tuo cruscotto di amministratore.
+
+        [Per favore esaminali e risolvili](%{base_url}/admin).
+    new_user_of_the_month:
+      title: "Sei il Nuovo Utente del Mese!"
+      subject_template: "Sei il Nuovo Utente del Mese!"
+      text_body_template: |
+        Congratulazioni, ti sei meritato il premio come **Nuovo Utente del Mese per %{month_year}**. :trophy:
+
+        Questo premio viene assegnato solo a due nuovi utenti al mese e sarà visibile permanentemente sulla [tua pagina utente](%{base_url}/my/badges).
+
+        Sei diventato velocemente un membro prezioso della nostra comunità. Grazie per l'adesione e continua a fare un buon lavoro!
+  unsubscribe_link: |
+    Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
+  unsubscribe_link_and_mail: |
+    Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Stai ricevendo questa email perchè hai abilitato la modalità mailing list.
+
+    Per annullare l'iscrizione a queste email, [clicca qui](%{unsubscribe_url}).
   subject_re: "R:"
   subject_pm: "[MP]"
   user_notifications:
@@ -1474,7 +1640,82 @@ it:
     visit_link_to_respond: "[Visita Argomento](%{base_url}%{url}) per replicare."
     visit_link_to_respond_pm: "[Visita Messaggio](%{base_url}%{url}) per replicare."
     posted_by: "Pubblicato da %{username} il %{post_date}"
+    invited_group_to_private_message_body: |
+      %{username} ha invitato @%{group_name} a partecipare al messaggio
+
+      > #### %{topic_title}
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+    invited_to_private_message_body: |
+      %{username} ti ha invitato a partecipare al messaggio
+
+      > #### %{topic_title}
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+    invited_to_topic_body: |
+      %{username} ti ha invitato alla discussione
+
+      > #### %{topic_title}
+      >
+      > %{topic_excerpt}
+
+      su
+
+      > %{site_title} -- %{site_description}
+    user_invited_to_private_message_pm_group:
+      subject_template: "[%{email_prefix}] %{username} ha invitato @%{group_name} a partecipare al messaggio '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm:
+      title: "Utente Invitato ad un MP"
+      subject_template: "[%{email_prefix}] %{username} ti ha invitato a partecipare al messaggio '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_private_message_pm_staged:
+      subject_template: "[%{email_prefix}] %{username} ti ha invitato a partecipare al messaggio '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_invited_to_topic:
+      title: "Utente Invitato ad un Argomento"
+      subject_template: "[%{email_prefix}] %{username} ti ha invitato a '%{topic_title}'"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{respond_instructions}
+    user_replied:
+      subject_template: "[%{email_prefix}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_replied_pm:
+      subject_template: "[%{email_prefix}][MP]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1484,6 +1725,8 @@ it:
 
         %{respond_instructions}
     user_quoted:
+      title: "Utente Citato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1493,6 +1736,7 @@ it:
 
         %{respond_instructions}
     user_linked:
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1502,6 +1746,8 @@ it:
 
         %{respond_instructions}
     user_mentioned:
+      title: "Utente Menzionato"
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1511,6 +1757,7 @@ it:
 
         %{respond_instructions}
     user_group_mentioned:
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1520,6 +1767,7 @@ it:
 
         %{respond_instructions}
     user_posted:
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1529,6 +1777,7 @@ it:
 
         %{respond_instructions}
     user_watching_first_post:
+      subject_template: "[%{email_prefix}]%{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1538,6 +1787,8 @@ it:
 
         %{respond_instructions}
     user_posted_pm:
+      title: "Pubblicazione MP da Utente"
+      subject_template: "[%{email_prefix}] [MP] %{topic_title}"
       text_body_template: |
         %{header_instructions}
 
@@ -1547,20 +1798,124 @@ it:
 
         %{respond_instructions}
     user_posted_pm_staged:
+      title: "Pubblicazione MP da Utente Temporaneo"
       subject_template: "%{optional_re}%{topic_title}"
       text_body_template: |2
 
         %{message}
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
+      since_last_visit: "Dalla tua ultima visita"
+      new_topics: "Nuovi Argomenti"
+      unread_messages: "Messaggi Non Letti"
+      unread_notifications: "Notifiche Non Lette"
       liked_received: "Like ricevuti"
+      new_posts: "Nuovi Messaggi"
       new_users: "Nuovi utenti"
+      popular_topics: "Argomenti Di Successo"
       follow_topic: "Segui questo topic"
+      join_the_discussion: "Leggi Altro"
+      popular_posts: "Messaggi di Successo"
+      more_new: "Nuovo per te"
+      subject_template: "[%{email_prefix}] Riepilogo"
+      unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Modifica <a href='%{email_settings_url}'>le tue impostazioni email</a>, o %{unsubscribe_link} annulla l'iscrizione."
       click_here: "clicca qui"
       from: "%{site_name} riepilogo"
       preheader: "Un breve riepilogo dall'ultima tua visita il %{last_seen_at}"
+    forgot_password:
+      title: "Password Dimenticata"
+      subject_template: "[%{email_prefix}] Reimposta password"
+      text_body_template: |
+        Qualcuno ha richiesto l'azzeramento della tua password su [%{site_name}](%{base_url}).
+
+        Se non sei stato tu, puoi tranquillamente ignorare questa email.
+
+        Clicca il seguente collegamento per scegliere una nuova password:
+        %{base_url}/u/password-reset/%{email_token}
+    set_password:
+      title: "Imposta Password"
+      subject_template: "[%{email_prefix}] Imposta Password"
+      text_body_template: |
+        Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook, ecc) associato con questo indirizzo email validato.
+
+        Se non hai fatto tu questa richiesta, ignora tranquillamente questa email.
+
+        Clicca sul seguente collegamento per scegliere una password:
+        %{base_url}/u/password-reset/%{email_token}
+    admin_login:
+      title: "Login Amministratore"
+      subject_template: "[%{email_prefix}] Login"
+      text_body_template: |
+        Qualcuno ha richiesto di connettersi con il tuo account su [%{site_name}](%{base_url}).
+
+        Se non sei stato tu a fare questa richiesta, puoi tranquillamente ignorare questa email.
+
+        Clicca sul seguente collegamento per connetterti:
+        %{base_url}/u/admin-login/%{email_token}
+    account_created:
+      title: "Account Creato"
+      subject_template: "[%{email_prefix}] Il Tuo Nuovo Account"
+      text_body_template: |
+        E' stato creato un nuovo account per te su %{site_name}
+
+        Clicca sul seguente collegamento per scegliere una password per il tuo nuovo account:
+        %{base_url}/u/password-reset/%{email_token}
+    confirm_new_email:
+      title: "Conferma Nuova Email"
+      subject_template: "[%{email_prefix}] Conferma il tuo nuovo indizzo email"
+      text_body_template: |
+        Conferma il tuo nuovo indirizzo email su %{site_name} cliccando il seguente collegamento:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    confirm_old_email:
+      title: "Conferma Vecchia Email"
+      subject_template: "[%{email_prefix}] Conferma il tuo attuale indirizzo email"
+      text_body_template: |
+        Prima di poter cambiare il tuo indirizzo email abbiamo bisogno che tu confermi di controllare
+        l'indirizzo email attuale. Dopo aver completato questo passaggio, dovrai confermare
+        il nuovo indirizzo email.
+
+        Conferma il tuo attuale indirizzo email su %{site_name} cliccando il seguente collegamento:
+
+        %{base_url}/u/authorize-email/%{email_token}
+    notify_old_email:
+      title: "Notifica Vecchia Email"
+      subject_template: "[%{email_prefix}] Il tuo indirizzo email è stato cambiato"
+      text_body_template: |
+        Questo è un messaggio automatico per farti sapere che il tuo indirizzo email per
+        %{site_name} è stato cambiato. Se è stato fatto per errore, per favore contatta un amministratore del sito.
+
+        Il tuo indirizzo email è stato cambiato in:
+
+        %{new_email}
     signup_after_approval:
+      title: "Iscrizione Dopo Approvazione"
       subject_template: "Sei stato ammesso su %{site_name}!"
+      text_body_template: |
+        Benvenuto su %{site_name}!
+
+        Un membro dello staff ha approvato il tuo account su  %{site_name}.
+
+        Clicca sul seguente collegamento per confermare e attivare il tuo nuovo account:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser.
+
+        %{new_user_tips}
+
+        Noi crediamo da sempre in un [comportamento comunitario civile](%{base_url}/guidelines).
+
+        Buona permanenza!
+    signup:
+      title: "Iscrizione"
+      subject_template: "[%{email_prefix}] Conferma il tuo nuovo account"
+      text_body_template: |
+        Benvenuto su %{site_name}!
+
+        Clicca sul collegamento seguente per confermare ed attivare il tuo nuovo account:
+        %{base_url}/u/activate-account/%{email_token}
+
+        Se il collegamento non è cliccabile, copialo ed incollalo nella barra degli indirizzi del tuo browser.
   page_not_found:
     title: "La pagina richiesta non esiste oppure è privata."
     popular_topics: "Di successo"
@@ -1570,24 +1925,33 @@ it:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Benvenuto su %{title}](#welcome)
+      ## [Benvenuto su %{title}](#welcome)
       E' richiesto un account. Per continuare, crea un nuovo account oppure connettiti.
   terms_of_service:
     title: "Termini di Servizio"
     signup_form_message: 'Ho letto e accetto i <a href="/tos" target="_blank">Termini del Servizio</a>.'
   deleted: 'cancellati'
+  image: "immagine"
   upload:
     edit_reason: "copie locali delle immagini scaricate"
     unauthorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: %{authorized_extensions})."
     pasted_image_filename: "Immagine incollata"
     store_failure: "Caricamento n°%{upload_id} fallito per l'utente n°%{user_id}."
     file_missing: "Spiacenti, devi fornire un file da caricare."
+    empty: "Spiacenti, ma il file che hai fornito è vuoto."
     attachments:
       too_large: "Spiacenti, ma il file che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB)."
     images:
       too_large: "Spiacenti, ma l'immagine che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB), per favore ridimensionala e riprova."
+      larger_than_x_megapixels: "Spiacenti, ma l'immagine che stai cercando di caricare è troppo grande (la dimensione massima è %{max_image_megapixels}-megapixel), per favore ridimensionala e riprova."
       size_not_found: "Spiacenti, ma non riusciamo a determinare la dimensione dell'immagine. E' forse danneggiata?"
+  avatar:
+    missing: "Spiacenti, non troviamo nessun avatar associato a questo indirizzo email. Puoi provare a caricarlo nuovamente?"
+  flag_reason:
+    sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto dallo stesso indirizzo IP (%{ip_address}). Vedi l'impostazione del sito <a href='/admin/site_settings/category/spam'>`flag_sockpuppets`</a>."
+    spam_hosts: "Questo nuovo utente ha provato a creare più messaggi con collegamenti allo stesso dominio (%{domain}). Vedi l'impostazione del sito <a href='/admin/site_settings/category/spam'>`newuser_spam_host_threshold`</a>."
   email_log:
+    post_user_deleted: "L'utente del messaggio è stato eliminato."
     no_user: "Non trovo l'utente con l'id %{user_id}"
     anonymous_user: "L'utente è anonimo"
     suspended_not_pm: "L'utente è sospeso, non è un messaggio"
@@ -1598,12 +1962,20 @@ it:
     post_deleted: "il messaggio è stato cancellato dal suo autore"
     user_suspended: "l'utente è stato sospeso"
     already_read: "l'utente ha già letto questo messaggio"
+    exceeded_emails_limit: "Ha superato max_emails_per_day_per_user"
+    exceeded_bounces_limit: "Ha superato bounce_score_threshold"
     message_blank: "il messaggio è vuoto"
     message_to_blank: "message.to è vuoto"
     text_part_body_blank: "text_part.body è vuoto"
     body_blank: "il corpo è vuoto"
+    no_echo_mailing_list_mode: "Notifiche della mailing list disattivate per i propri messaggi"
   color_schemes:
     base_theme_name: "Base"
+    default: "Combinazione Chiara"
+    dark: "Combinazione Scura"
+    default_theme_name: "Predefinito"
+    dark_theme_name: "Scuro"
+    light_theme_name: "Chiaro"
   about: "Informazioni su"
   guidelines: "Linee Guida"
   privacy: "Privacy"
@@ -1643,63 +2015,269 @@ it:
     leader:
       name: Veterano
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Assegnato</a> modifica globale, puntare, chiudere, archiviare, suddividere e riunire, maggiori "Mi piace"
+      long_description: |
+        Questo distintivo è assegnato quando si raggiunge il livello di esperienza 4. Sei un veterano in questa comunità selezionato dallo staff, e qui sei un esempio positivo per il resto della comunità con le tue azioni e parole. Hai la possibilità di modificare tutti i messaggi, agire come un moderatore con azioni comuni quali puntare, chiudere, rendere invisibile, archiviare, dividere e unire, e hai tonnellate di mi piace al giorno.
     welcome:
       name: Benvenuto
       description: Ha ricevuto un "Mi piace"
+      long_description: |
+        Questo distintivo è assegnato quando ricevi il tuo primo mi piace su un messaggio. Congratulazioni, hai pubblicato qualcosa che i membri della tua comunità hanno trovato interessante, eccezionale o utile!
     autobiographer:
       name: Autobiografo
+      description: Ha compilato le informazioni sul <a href="/my/preferences">profilo</a>
+      long_description: |
+        Questo distintivo è assegnato per aver compilato <a href="/my/preferences">il tuo profilo utente</a> e selezionato un'immagine del profilo. Lasciare che la comunità sappia di più su chi sei e a cosa sei interessato rende la comunità migliore e più connessa. Unisciti a noi!
     anniversary:
       name: Compleanno
       description: Membro attivo per un anno, ha scritto almeno una volta
       long_description: |
         Questo distintivo è assegnato a chi è membro da un anno con almeno un messaggio scritto durante quell'anno. Grazie per esserci e contribuire alla nostra comunità. Non potremmo farcela senza di te.
+    nice_post:
+      name: Risposta Piacevole
+      description: Ha ricevuto 10 mi piace su una risposta
+      long_description: |
+        Questo distintivo è assegnato quando una risposta riceve 10 mi piace. La tua risposta ha fatto davvero impressione sulla comunità e ha aiutato a portare la conversazione avanti!
+    good_post:
+      name: Buona Risposta
+      description: Ha ricevuto 25 mi piace su una risposta
+      long_description: |
+        Questo distintivo è assegnato quando una risposta riceve 25 mi piace. La tua risposta è stata eccezionale e ha reso la conversazione migliore per tutti!
+    great_post:
+      name: Grande Risposta
+      description: Ha ricevuto 50 mi piace su una risposta
+      long_description: |
+        Questo distintivo è assegnato quando una risposta riceve 50 mi piace. Wow! La tua risposta è stata ispiratrice, affascinante, divertente, o penetrante e la comunità l'ha amata.
+    nice_topic:
+      name: Argomento Piacevole
+      description: Ha ricevuto 10 mi piace su un argomento
+      long_description: |
+        Questo distintivo è assegnato quando un argomento riceve 10 mi piace. Hey, hai iniziato una conversazione interessante che la comunità ha apprezzato!
+    good_topic:
+      name: Buon Argomento
+      description: Ha ricevuto 25 mi piace su un argomento
+      long_description: |
+        Questo distintivo è assegnato quando il tuo argomento riceve 25 mi piace. Hai lanciato una conversazione vibrante che ha radunato la comunità!
     great_topic:
+      name: Grande Argomento
       description: Ha ricevuto 50 "Mi piace" in un argomento
+      long_description: |
+        Questo distintivo è assegnato quando un argomento riceve 50 mi piace. Hai avviato una conversazione affascinante e la comunità ha apprezzato la discussione dinamica che è seguita!
+    nice_share:
+      name: Piacevole Condivisione
+      description: Ha condiviso un messaggio con 25 visitatori unici
+      long_description: |
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 25 visitatori esterni. Grazie per diffondere la parola circa le nostre discussioni e questa comunità.
+    good_share:
+      name: Buona Condivisione
+      description: Ha condiviso un messaggio con 300 visitatori unici
+      long_description: |
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 300 visitatori esterni. Buon lavoro! Hai mostrato una grande discussione ad un gruppo di persone nuove e hai aiutato questa comunità a crescere.
+    great_share:
+      name: Grande Condivisione
+      description: Ha condiviso un messaggio con 1000 visitatori unici
+      long_description: |
+        Questo distintivo è assegnato per aver condiviso un collegamento che è stato cliccato da 1000 visitatori esterni. Wow! Hai promosso un'interessante discussione ad un pubblico enorme e ci hai aiutato a far crescere la nostra comunità in grande stile!
     first_like:
       name: Primo "Mi piace"
       description: Ha messo "Mi piace" a un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che metti mi piace ad un messaggio usando il pulsante :heart:. Mettere mi piace a dei messaggi è un ottimo modo per far sapere a tutti i membri della tua comunità che ciò che hanno pubblicato è stato interessante, utile, forte o divertente. Condividi l'amore!
     first_flag:
       name: Prima Segnalazione
       description: Segnalato un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che segnali un messaggio. La segnalazione serve per contribuire a mantenere questo luogo pulito e piacevole per tutti. Se noti dei messaggi che richiedono l'attenzione di un moderatore per qualsiasi motivo, non esitate a contrassegnarli. Puoi anche contrassegnare per inviare <b>messaggi personali</b> ad altri utenti se vedi un problema con i loro messaggi. Se vedi un problema, :flag_black: segnalalo!
+    promoter:
+      name: Promotore
+      description: Ha invitato un utente
+      long_description: |
+        Questo distintivo è assegnato quando si invita qualcuno ad unirsi alla comunità tramite il pulsante invita sulla tua pagina utente, o in fondo ad un argomento. Invitare amici che potrebbero essere interessati a discussioni specifiche è un ottimo modo per introdurre nuove persone alla nostra comunità, quindi grazie!
+    campaigner:
+      name: Attivista
+      description: Ha invitato 3 utenti
+      long_description: |
+        Questo distintivo è assegnato quando hai invitato 3 persone che hanno successivamente trascorso abbastanza tempo sul sito per diventare utenti base. Una comunità vivace ha bisogno di un'infusione regolare di nuovi arrivati che partecipano regolarmente e aggiungono nuove voci alle conversazioni.
+    champion:
+      name: Campione
+      description: Ha invitato 5 membri
+      long_description: |
+        Questo distintivo è assegnato quando hai invitato 5 persone che hanno successivamente trascorso abbastanza tempo sul sito per diventare membri a tutti gli effetti. Wow! Grazie per aver ampliato la diversità della nostra comunità con nuovi membri!
     first_share:
       name: Prima Condivisione
       description: Ha condiviso un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che condividi un collegamento ad una risposta o ad un argomento usando il pulsante condividi. Condividere collegamenti è un ottimo modo per mostrare interessanti discussioni al resto del mondo e far crescere la tua comunità.
     first_link:
       name: Primo Collegamento
+      description: Ha aggiunto un collegamento ad un altro argomento
+      long_description: |
+        Questo distintivo è assegnato la prima volta che aggiungi un collegamento ad un altro argomento. Collegare argomenti aiuta i tuoi colleghi lettori a trovare interessanti conversazioni correlate, mostrando le connessioni tra gli argomenti in entrambe le direzioni. Collega liberamente!
     first_quote:
+      name: Prima Citazione
       description: Ha citato un messaggio
+      long_description: |
+        Questo distintivo è assegnato la prima volta che citi un messaggio nella tua risposta. Citare le sezioni rilevanti di messaggi precedenti nella tua risposta aiuta a mantenere le discussioni connesse insieme e in argomento. Il modo più semplice per citare è evidenziare una sezione di un messaggio e quindi premere il pulsante rispondi. Cita generosamente!
+    read_guidelines:
+      name: Linee Guida
+      description: Ha letto le <a href="/guidelines">linee guida della comunità</a>
+      long_description: |
+        Questo distintivo è assegnato per <a href="/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 piacevole!
+    reader:
+      name: Lettore
+      description: Ha letto ogni risposta in un argomento con più di 100 risposte
+      long_description: |
+        Questo distintivo è assegnato la prima volta che leggi un argomento lungo con più di 100 risposte. Leggere una conversazione attentamente ti aiuta a seguire la discussione, a comprendere punti di vista diversi, e conduce a conversazioni ancora più interessanti. Quanto più si legge, tanto è migliore la conversazione. Come ci piace dire, la Lettura è Fondamentale! :slight_smile:
+    popular_link:
+      name: Collegamento Di Successo
+      description: Ha pubblicato un collegamento esterno con 50 click
+      long_description: |
+        Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 50 click. Grazie per aver pubblicato un collegamento utile che ha aggiunto un contesto interessante alla conversazione!
+    hot_link:
+      name: Collegamento Caldo
+      description: Ha pubblicato un collegamento esterno con 300 click
+      long_description: |
+        Questo distintivo è assegnato quando un collegamento che hai condiviso riceve 300 click. Grazie per aver pubblicato un collegamento affascinante che ha portato avanti la conversazione e ha illuminato la discussione!
+    famous_link:
+      name: Collegamento Famoso
+      description: Ha pubblicato un collegamento esterno con 1000 click
+      long_description: |
+        Questo distintivo è assegnato quando un collegamento condiviso riceve 1000 click. Wow! Hai inserito un link che ha migliorato significativamente la conversazione aggiungendo dettagli, contesto e informazioni essenziali. Ottimo lavoro!
     appreciated:
+      name: Apprezzato
       description: Ha ricevuto 1 "Mi piace" su 20 messaggi
+      long_description: |
+        Questo distintivo è assegnato quando ricevi almeno un mi piace su 20 messaggi differenti. La comunità si sta godendo i tuoi contributi alle conversazioni!
     respected:
+      name: Rispettato
       description: Ha ricevuto 2 "Mi piace" su 100 messaggi
+      long_description: |
+        Questo distintivo è assegnato quando ricevi almeno 2 mi piace su 100 messaggi differenti. La comunità sta imparando a rispettare i tuoi numerosi contributi alle conversazioni.
     admired:
+      name: Ammirato
       description: Ha ricevuto 5 "Mi piace" su 300 messaggi
+      long_description: |
+        Questo distintivo è assegnato quando ricevi almeno 5 mi piace su 300 messaggi differenti. Wow! La comunità ammira i tuoi contributi frequenti e di alta qualità nelle conversazioni.
+    out_of_love:
+      name: Amato
+      description: Ha messo 50 mi piace in un giorno
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace che hai a disposizione giornalmente. Ricordando di prenderti un momento per mettere mi piace ai messaggi che ti piacciono e apprezzi, incoraggi i membri della tua comunità a creare discussioni ancora più grandi in futuro.
+    higher_love:
+      name: Molto Amato
+      description: Ha messo 50 mi piace al giorno per 5 volte
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace giornalieri per 5 giorni. Grazie per aver dedicato del tempo ad incoraggiare le migliori conversazioni ogni giorno!
+    crazy_in_love:
+      name: Adorato
+      description: Ha messo 50 mi piace al giorno per 20 volte
+      long_description: |
+        Questo distintivo è assegnato quando usi tutti i 50 mi piace giornalieri per 20 giorni. Wow! Sei un modello di regolarità nel cercare di incoraggiare i membri della  tua comunità!
+    thank_you:
+      name: Ringraziato
+      description: Ha ricevuto 20 mi piace sui messaggi e dato 10 mi piace
+      long_description: |
+        Questo distintivo è assegnato quando ricevi 20 mi piace sui messaggi e dai 10 o più mi piace in cambio. Quando qualcuno mette mi piace ai tuoi messaggi, troverai il tempo per mettere mi piace a ciò che altri scrivono.
+    gives_back:
+      name: Ricambiato
+      description: Ha ricevuto 100 mi piace sui messaggi e dato 100 mi piace
+      long_description: |
+        Questo distintivo è assegnato quando hai ricevuto 100 mi piace sui messaggi e hai dato 100 o più mi piace in cambio. Grazie per aver ricambiato!
+    empathetic:
+      name: Empatico
+      description: Ha ricevuto 500 mi piace sui messaggi e dato 1000 mi piace
+      long_description: |
+        Questo distintivo è assegnato quando hai ricevuto 500 mi piace sui messaggi e hai dato 1000 o più mi piace in cambio. Sei un modello di generosità e di apprezzamento reciproco : due_hearts :.
     first_emoji:
+      name: Prima Emoji
+      description: Ha usato una Emoji in un messaggio
       long_description: |
         Questo distintivo viene assegnato la prima volta che inserisci un Emoji in un messaggio :thumbsup:. Gli Emoji ti permettono di trasmettere emozioni nei messaggi, dalla felicità :smiley: alla tristezza :anguished: alla rabbia :angry: e tutto ciò che sta nel mezzo :sunglasses:. Digita semplicemente : (carattere due punti) oppure premi il bottone Emoji nella barra degli strumenti dell'editor, per selezionare tra centinaia di possibilità :ok_hand:
+    first_mention:
+      name: Prima Menzione
+      description: Ha menzionato un utente in un messaggio
+      long_description: Questo distintivo è assegnato la prima volta che menzioni lo @username di qualcuno nel tuo messaggio. Ogni menzione genera una notifica a quella persona, così verrà a conoscenza del tuo messaggio. Inizia a digitare @ (il simbolo) per menzionare qualsiasi utente o, se è consentito, un gruppo - è un modo conveniente per portare qualcosa alla loro attenzione.
+    first_onebox:
+      name: Prima Onebox
+      description: ha inserito un collegamento che ha generato una onebox
+      long_description: Questo distintivo è assegnato la prima volta che inserisci un collegamento su una riga da solo, il quale viene automaticamente espanso in un'anteprima con un breve riassunto del collegamento, un titolo e (quando disponibile) un'immagine.
+    first_reply_by_email:
+      name: Prima Risposta Da Email
+      description: Ha risposto ad un messaggio tramite email
+      long_description: |
+        Questo distintivo è assegnato la prima volta che rispondi ad un messaggio tramite email :e-mail:.
+    new_user_of_the_month:
+      name: "Nuovo Utente del Mese"
+      description: Contributi eccezionali nel loro primo mese
+      long_description: |
+        Questo distintivo è assegnato per congratularsi con due nuovi utenti ogni mese per i loro ottimi contributi globali, misurati sulla frequenza dei like ricevuti per i loro messaggi e da chi li ha dati.
+    badge_title_metadata: "%{display_name}distintivo su %{site_title}"
   admin_login:
     success: "email Inviata"
     error: "Errore!"
     email_input: "Email Amministratore"
     submit_button: "Invia Email"
+  performance_report:
+    initial_post_raw: Questo argomento include rapporti di rendimento giornalieri per il tuo sito.
+    initial_topic_title: Rapporti sul rendimento del sito web
   tags:
     title: "Etichette"
+    staff_tag_disallowed: "L'etichetta \"%{tag}\" può essere applicata solo dallo staff."
     staff_tag_remove_disallowed: "L'etichetta \"%{tag}\" può essere cancellata soltanto dallo staff."
   rss_by_tag: "Argomenti etichettati %{tag}"
+  finish_installation:
+    congratulations: "Congratulazioni, hai installato Discourse!"
+    register:
+      button: "Registrare"
+      title: "Registrare Account Amministratore"
+      help: "registrare un nuovo account per cominciare"
+      no_emails: "Purtroppo non è stata definita alcuna email di amministratore durante l'installazione, per cui la configurazione <a href='https://meta.discourse.org/t/how-to-create-an-administrator-account-after-install/14046'>potrebbe risultare difficoltosa</a>."
+    confirm_email:
+      title: "Conferma la tua Email"
+      message: "<p>Abbiamo inviato una email di attivazione a <b>%{email}</b>. Segui le istruzioni nella email per attivare il tuo account.</p><p>Se non arriva assicurati di aver impostato correttamente l'email per Discourse e di aver controllato la cartella di spam.</p>"
+    resend_email:
+      title: "Rispedire Email di Attivazione"
+      message: "<p>Abbiamo rispedito una email di attivazione a <b>%{email}</b>"
+  safe_mode:
+    title: "Modalità sicura"
+    description: "La modalità sicura ti consente di testare il tuo sito senza caricare plugin o personalizzazioni del sito."
+    no_customizations: "Disabilita il tema corrente"
+    only_official: "Disabilita i plugin non ufficiali"
+    no_plugins: "Disabilita tutti i plugin"
+    enter: "Avvia Modalità Sicura"
   wizard:
+    title: "Configurazione Discourse"
     step:
+      locale:
+        title: "Benvenuto sul tuo Discourse!"
+        fields:
+          default_locale:
+            description: "Qual è il linguaggio predefinito della tua comunità?"
+      forum_title:
+        title: "Nome"
+        description: "Il tuo nome è un segno visibile in lontananza, la <i>prima</i> cosa che i visitatori potenziali noteranno sulla tua comunità. Cosa dice il tuo nome e il tuo titolo sulla tua comunità?"
+        fields:
+          title:
+            label: "Il nome della tua comunità"
+            placeholder: "Il Ritrovo di Jane"
+          site_description:
+            label: "Descrivi  la tua comunità in una breve frase"
+            placeholder: "Un posto per Jane e per i suoi amici dove discutere di cose forti"
       introduction:
         title: "Introduzione"
         fields:
           welcome:
             label: "Argomento di Benvenuto"
+            description: "<p>Come descriveresti la tua comunità ad un estraneo su un ascensore in circa 1 minuto?</p><ul><li>Per chi sono queste discussioni?</li><li>Cosa posso trovare qui?</li><li>Perché dovrei visitare il sito?</li></ul><p>Il tuo argomento di benvenuto è la prima cosa che i nuovi arrivati leggeranno. Pensalo come al <b>tuo paragrafo</b> 'discorso da ascensore' o 'dichiarazione di intenti'.</p>"
+            one_paragraph: "Restringi il tuo messaggio di benvenuto a un paragrafo."
       privacy:
         title: "Accesso"
+        description: "<p>La tua comunità è aperta a tutti o è limitata ai membri, agli inviti o all'approvazione? Se preferisci puoi impostare il sito come privato e poi passare a pubblico in seguito.</p><p>Puoi sempre inviare inviti da argomenti o dalla tua pagina di profilo utente.</p>"
         fields:
           privacy:
             choices:
               open:
                 label: "Pubblico"
+                description: "Chiunque può accedere a questa comunità e registrare un account"
               restricted:
                 label: "Privato"
                 description: "Solo le persone che ho invitato o approvato possono accedere a questa comunità"
@@ -1709,23 +2287,32 @@ it:
           contact_email:
             label: "Email"
             placeholder: "nome@esempio.com"
+            description: "Indirizzo email della persona o del gruppo responsabile di questa comunità. Utilizzato per notifiche critiche quali segnalazioni non gestite, aggiornamenti sulla protezione e sulla tua pagina <a href='/about' target='_blank'>informazioni</a> per un contatto urgente."
           contact_url:
             label: "Sito Web"
+            placeholder: "http://www.example.com/contact-us"
+            description: "Pagina web di contatto generale per te o per la tua organizzazione. Sarà visualizzato sulla tua pagina <a href='/about' target='_blank'>informazioni</a>."
           site_contact:
             label: "Messaggi Automatici"
+            description: "Tutti i messaggi personali automatici di Discourse saranno inviati da questo utente, ad esempio il messaggio di benvenuto inviato a ogni nuovo utente."
       corporate:
         title: "Società"
+        description: "Questi nomi verranno inseriti nelle <a href='/privacy' target='blank'>Norme sulla Privacy</a> e nei <a href='/tos' target='blank'>Termini di servizio</a>, che sono argomenti che è possibile modificare nella categoria Staff. Se non hai un'azienda, non esitare a saltare questo passaggio per ora."
         fields:
           company_short_name:
             label: "Nome Azienda (breve)"
+            placeholder: "Initech"
           company_full_name:
             label: "Nome Azienda (completo)"
+            placeholder: "Initech, Inc."
           company_domain:
             label: "Nome Dominio Azienda"
+            placeholder: "initech.com"
       colors:
         title: "Tema"
         fields:
           theme_id:
+            description: "Preferisci iniziare una combinazione di colori chiara o scura? È possibile personalizzare ulteriormente l'aspetto del tuo sito tramite Amministrazione, Personalizza."
             choices:
               default:
                 label: "Semplice Chiaro"
@@ -1736,24 +2323,40 @@ it:
         fields:
           logo_url:
             label: "Logo Primario"
+            description: "L'immagine del logo in alto a sinistra del tuo sito. Usare una forma rettangolare estesa."
           logo_small_url:
             label: "Logo Piccolo"
+            description: "Una versione compatta del tuo logo, mostrata in alto a sinistra del tuo sito, quando lo scorri verso il basso. Utilizzare una forma quadrata."
       icons:
         title: "Icone"
         fields:
           favicon_url:
             label: "Icona Piccola"
+            description: "Immagine dell'icona utilizzata per rappresentare il tuo sito nei browser web che sembra buona a piccole dimensioni, ad esempio 32px per 32px."
           apple_touch_icon_url:
             label: "Icona Grande"
+            description: "Immagine dell'icona utilizzata per rappresentare il tuo sito su dispositivi moderni che sembra buona a dimensioni più grandi. La dimensione consigliata è almeno 144px per 144px."
       homepage:
+        description: "Ti consigliamo di mostrare gli ultimi argomenti nella tua homepage, ma puoi anche visualizzare le categorie (gruppi di argomenti) sulla homepage, se preferisci."
         title: "Homepage"
         fields:
           homepage_style:
             choices:
+              latest:
+                label: "Ultimi Argomenti"
               categories:
                 label: "Categorie"
       emoji:
         title: "Emoji"
+        description: "Quale stile di emoji preferisci per la tua comunità? Puoi aggiungere più Emoji personalizzate in seguito tramite Amministrazione, Personalizza, Emoji."
+      invites:
+        title: "Invita lo Staff"
+        description: "Hai quasi finito! Invita alcuni membri dello staff a <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='blank'>contribuire alle discussioni</a> con argomenti e risposte interessanti per far partire la tua comunità."
+      finished:
+        title: "Il tuo Discourse è Pronto!"
+        description: |
+          <p>Se te la senti di cambiare queste impostazioni, visita <a href='/admin' target='_blank'>la tua sezione amministrazione</a>; la trovi accanto all'icona della chiave inglese nel menu hamburger del sito.</p>
+          <p>Divertiti e buona fortuna <a href='https://blog.discourse.org/2014/08/building-a-discourse-community/' target='_blank'>nel costruire la tua nuova comunità!</a></p>
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 6435fbb2b4..10fb5de0c6 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -14,6 +14,8 @@ ja:
     formats:
       short: "%Y-%d-%m"
       short_no_year: "%B %-d"
+      date_only: "%B%-d、%Y"
+      long: "%B%-d、%Y、%I:%M%P"
   date:
     month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
     <<: *datetime_formats
@@ -29,8 +31,13 @@ ja:
   purge_reason: "放棄されていたため自動的に削除、アカウントを停止しました。"
   disable_remote_images_download_reason: "ディスク容量が不足しているため、リモートでの画像ダウンロードは無効になっています。"
   anonymous: "匿名"
+  remove_posts_deleted_by_author: "削除者"
+  themes:
+    bad_color_scheme: "テーマを更新できないなら、カラースキームを無効にする"
+    other_error: "サーバーに不具合があるので、テーマを更新してください。"
   emails:
     incoming:
+      default_subject: "このトピックはタイトルが必要です。"
       show_trimmed_content: "続きを読む"
   errors: &errors
     format: '%{attribute} %{message}'
@@ -383,9 +390,9 @@ ja:
     description: "\"%{application_name}\" があなたのアカウントへのアクセスを要求しています: "
   reports:
     visits:
-      title: "訪問ユーザー"
+      title: "アクセスユーザー"
       xaxis: "日"
-      yaxis: "訪問者数"
+      yaxis: "アクセス数"
     signups:
       title: "新規ユーザー"
       xaxis: "日"
@@ -517,9 +524,9 @@ ja:
       xaxis: "日"
       yaxis: "合計"
     mobile_visits:
-      title: "訪問ユーザー"
+      title: "アクセスユーザー"
       xaxis: "日"
-      yaxis: "訪問者数"
+      yaxis: "アクセス数"
   dashboard:
     rails_env_warning: "サーバは %{env} モードで起動中です。"
     host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。"
@@ -551,7 +558,6 @@ ja:
     educate_until_posts: "最初(または複数)の投稿でタイピングを開始したら、ポップアップでガイダンスを表示させるか"
     title: "サイトの名前です。titleタグで使用されます"
     site_description: "このサイトについて簡単に説明してください。 descriptionタグで使用されます。"
-    contact_email: "このサイトへのお問い合わせを行うメールアドレス。お問い合わせフォームからの緊急事項、対応されていない通報など、緊急の通知に使用します"
     contact_url: "このサイトの問い合わせURL。緊急連絡用問い合わせフォームに使用されます"
     queue_jobs: "開発者ONLY! 警告! デフォルトでキューは sidekiq により処理されます。これを無効にするとサイトが動作不能になります。"
     crawl_images: "正しい幅と高さを取得するためにURLから画像を取得する"
@@ -945,6 +951,7 @@ ja:
     deferred: "伝えてくれてありがとうございます。調査しています"
     deferred_and_deleted: "伝えてくれてありがとうございます。投稿を削除しました"
   system_messages:
+    contents_hidden: "内容を確認するためにその投稿にアクセスして下さい。"
     welcome_user:
       subject_template: "%{site_name} へようこそ!"
     welcome_invite:
@@ -983,6 +990,9 @@ ja:
     download_remote_images_disabled:
       subject_template: "リモート画像のダウンロードを無効化"
       text_body_template: "'download_remote_images_threshold'の制限に達したため、`download_remote_images_to_local`の設定は無効になりました"
+  unsubscribe_mailing_list: |
+    本メッセージは、メーリングリストモードの設定が有効になっているため配信されました。
+    配信停止をご希望の場合は、[こちらをクリック](%{unsubscribe_url})
   subject_re: "Re:"
   subject_pm: "[プライベートメッセージ]"
   user_notifications:
@@ -990,6 +1000,8 @@ ja:
     unsubscribe:
       title: "解除"
       description: "メールに興味がありませんか? 下のリンクをクリックすると、即座にメール解除ができます:"
+    reply_by_email: "回答するにはこのメールに返信するか、 (%{base_url}%{url}) に[ブラウザでアクセスしてください]。"
+    visit_link_to_respond: "回答するには(%{base_url}%{url})に[ブラウザでアクセスしてください]。"
     posted_by: "%{post_date} に %{username} が投稿"
     digest:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
@@ -1138,19 +1150,53 @@ ja:
     editor:
       name: 編集者
       description: はじめて投稿を編集する
+      long_description: |
+        このバッジは投稿内容の初回編集時におくられます。今後編集のつもりがなくても編集することは良いアイデアです。-投稿を改善したり、細部の間違いを修正したり、何か初期投稿で失敗した時にも内容を追加できます。編集はあなたの投稿をこれまでより良いものにします!
+    basic_user:
+      long_description: |
+        このバッジは信用レベルが1に達した時に授与されます。サイトに出入りして下さったり、我々のコミュニティがどういうものなのかを学ぶためにトピックに目を通して下さり有難うございます。あなたのユーザー条件は次の通りです;全ての必要なコミュニティ要素が許可されました。個人メッセージ、フラグ付け、wiki編集、および複数の画像とリンクの投稿
+    regular:
+      long_description: |
+        このバッジは信用レベルが3に達した時に授与されます。
+        あなたは今最もアクティブな読者の一人であり、我々のコミュニティを素晴らしいものに変えてくれる信用できる貢献者です。カテゴライズしなおしたり、トピック名を付け替えたり、スパムフラグを利用したり、プライベートラウンジエリアにアクセスしたりすることができ、日ごとにいいねが増えるでしょう。
+    welcome:
+      long_description: |
+        このバッジは投稿に対して初めていいね!された時に授与されます。おめでとうございます、投稿した内容についてあなたのコミュニティメンバーは興味深く、クールで有能です!
     autobiographer:
       name: あなたはだれ？
       description: <a href="/my/preferences">プロフィール</a>をすべて書く
+      long_description: |
+        このバッジは<a href="/my/preferences">ご自身のユーザープロフィール</a>を記入またはプロフィール写真を選択すると授与されます。コミュニティに対してあなたがどういう人物であるか、また改善について興味がある物をもう少し詳しくお知らせ頂き、更に結びつきのあるコミュニティへ。連携しましょう!
+    anniversary:
+      long_description: |
+        このバッジは一年間メンバーで有り続け、少なくともその年に一回は投稿したときに授与されます。サイトに出入りして下さったり、我々のコミュニティに貢献して下さり有難うございます。我々はあなたを必要としています。
     nice_post:
       name: ナイスな返事
+      long_description: |
+        このバッジはあなたの返信が10回いいね!されたときに授与されます。あなたの返信はコミュニティにとってとても印象深く、会話を促進することに役立っています!
     good_post:
       name: イカす返事
+      long_description: |
+        このバッジはあなたが25回いいね!されたときに授与されます。あなたの返答は特別で参加者のために会話をよりよいものに変えてくれました!
     great_post:
       name: 素晴らしい返事
+      long_description: |
+        このバッジは50回いいね!されたときに授与されます。素晴らしい!あなたの返答は心をつかみ、魅力的で、とても陽気で、洞察力がありそしてコミュニティをとても大切にされていました。
     nice_topic:
       name: ナイスなトピック
+      long_description: |
+        このバッジはあなたのトピックが10回いいね!されたときに授与されます。あなたはコミュニティが楽しめるような興味深い会話を開始しました!
     good_topic:
       name: イカすトピック
+    nice_share:
+      long_description: |
+        このバッジは共有リンクが25人のサイト訪問者からクリックされた時に授与されます。我々のディスカッションとこのコミュニティについて展開して下さり有難うございます!
+    good_share:
+      long_description: |
+        このバッジは共有リンクが300人のサイト訪問者からクリックされた時に授与されます。素晴らしい出来です!素晴らしいディスカッションで注目を集め、コミュニティの成長を助けてくれました。
+    great_share:
+      long_description: |
+        このバッジは共有リンクが1000人のサイト訪問者からクリックされた時に授与されます。恐るべし数です!莫大な人数への興味深い討論であなたは昇格しました、そして大胆な手法で我々のコミュニティの成長を助けてくれました!
     first_flag:
       name: はじめの通報
       description: 通報した投稿
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 30f6b772cd..2805b2b9ac 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -344,7 +344,6 @@ ko:
         translation_overrides:
           attributes:
             value:
-              invalid_interpolation_keys: '다음 interpolation key가 유효하지 않습니다: "%{keys}"'
               missing_interpolation_keys: '다음 interpolation key가 없습니다: "%{keys}"'
       <<: *errors
   user_profile:
@@ -876,9 +875,7 @@ ko:
     notify_mods_when_user_blocked: "만약 사용자가 자동 블락되면 중간 운영자에게 메시지 보내기"
     flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고"
     traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것."
-    enable_experimental_markdown_it: "(실험) CommonMark를 지원하는 markdown.it 엔진을 사용합니다. 경고: 올바르게 작동하지 않는 플러그인이 있을 수 있습니다."
     enable_markdown_typographer: "문단의 가독성을 높이기 위해서 기본 타이포그라피 룰을 사용합니다. (c) (tm), 기타 기호를 교체하고 연달아 나오는 물음표의 갯수를 줄입니다."
-    allow_html_tables: "마크다운 문서에 HTML 테이블을 허용합니다. TABLE, THEAD, TD, TR, TH 태그를 사용할 수 있습니다.(테이블이 포함된 이전 게시물에 적용하려면 rebake 해야 합니다.)"
     post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)"
     must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다."
     pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요."
@@ -1046,7 +1043,8 @@ ko:
     tl3_requires_posts_read_all_time: "VIP 사용자-3 이 되기 위해 꼭 보아야 하는 글타래의 전체 개수"
     tl3_requires_max_flagged: "회원 레벨3의 자격을 얻으려면, 지난 (tl3 time period)일 동안 x명의 사용자로부터 x개 이상의 포스트를 신고당한 일이 없어야 합니다. x 값을 설정.(0이상)"
     tl3_promotion_min_duration: "회원등급이 2로 떨어진 후 다시 VIP 사용자-3 이 될 수 있는 최소 일 수"
-    tl3_requires_likes_given: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)동안 받아야 하는 최소 좋아요 수."
+    tl3_requires_likes_given: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)동안 줘야 하는 최소 좋아요 수."
+    tl3_requires_likes_received: "회원 레벨3 자격을 얻기 위하여 지난 (tl3 time period)일 동안 받아야 하는  최소 좋아요 수."
     tl3_links_no_follow: "VIP 사용자-3 의 글에 있는 링크에서 rel=nofollow 를 제거하지 마시오."
     min_trust_to_create_topic: "새로운 주제를 생성하기 위한 최소 회원등급"
     min_trust_to_edit_wiki_post: "위키로 설정된 글 수정할 수 있는 최소 회원등급"
@@ -1055,12 +1053,14 @@ ko:
     min_trust_to_send_messages: "새로운 개인 메시지를 보내기 위한 최소 신뢰도"
     newuser_max_links: "새로운 사용자가 글에 붙일 수 있는 최대 링크 개수"
     newuser_max_images: "새로운 사용자가 글에 붙일 수 있는 최대 이미지 개수"
-    newuser_max_attachments: "새로운 사용자가 포트에 붙일 수 있는 최대 첨부파일 개수"
-    newuser_max_mentions_per_post: "새료운 사용자가 글에 사용할 수 있는 최대 @name 알림 개수"
-    newuser_max_replies_per_topic: "다른 사용자가 답글을 달기 전, 새로운 사용자가 개별 글타래에 달 수 있는 최대 답글 개수"
+    newuser_max_attachments: "새로운 사용자가 포스트에 첨부할 수 있는 최대 파일 개수"
+    newuser_max_mentions_per_post: "새로운 사용자가 글에서 쓸 수 있는 최대 @아이디 멘션 개수"
+    newuser_max_replies_per_topic: "다른 사용자가 댓글을 달기 전, 새로운 사용자가 개별 토픽에 달 수 있는 최대 답글 개수"
     max_mentions_per_post: "글 당 사용할 수 있는 최대 @name 알림의 수"
+    max_users_notified_per_group_mention: "그룹이 멘션을 받으면 알림을 받는 최대사용자의 수(최대치에 도달하면 알림이 전송되지 않음)"
     create_thumbnails: "글의 너무 큰 크기의 이미지는 thumnails와 lightbox를 만든다."
     email_time_window_mins: "알림 메일을 보내기 전 대기 기간(분), 사용자에게 글의 변경하고 완료할 수 있는 기회를 준다."
+    private_email_time_window_seconds: "사용자가 메시지를 재편집할 기회를 주기 위하여 개인 알림 메일을 보내기 이전에 설정한 시간만큼 대기합니다."
     email_posts_context: "알림메일의 내용에 추가할 기존 답글 수"
     flush_timings_secs: "사용자의 이용 시간 데이터를 서버로 보내는 기간(초)"
     title_max_word_length: "글타래 제목안에 단어들의 최대 길이"
@@ -1070,12 +1070,15 @@ ko:
     title_fancy_entities: "글타래 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수"
     min_body_similar_length: "유사 글타래에 대한 체크가 있기 전, 글의 최소 본문 글자 수"
+    desktop_category_page_style: "/categories 페이지의 비주얼 스타일"
     category_colors: "허용된 카테고리에 사용될 hexadecimal 색상 값의 리스트"
     category_style: "카테고리 뱃지 시각 스타일"
     max_image_size_kb: "최대 이미지 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     max_attachment_size_kb: "최대 첨부파일 업로드 사이즈(kB). 이 설정은 꼭 nginx / apache와 proxy에도 적용해야 합니다."
     authorized_extensions: "파일 업로드에 허용되는 확장자 리스트 ('*'을 사용하면 모든 타입의 파일이 가능합니다.)"
+    theme_authorized_extensions: "테마 업로드에 허용되는 확장자 목록('*'를 입력하면 모든 확장자 허용)"
     max_similar_results: "새로운 글타래를 작성할 때, 에디터 위에 보여줄 비슷한 글타래들의 개수. 제목과 본문을 바탕으로 비교합니다."
+    max_image_megapixels: "이미지의 최대 메가픽셀수"
     title_prettify: "일반적인 제목의 오타 및 오류를 수정해준다. 모두 대문자로 쓰거나, 첫자가 소문자이거나(영문), 복수의 !, ? 혹은 마침표(.)가 중복으로 들어간 것 등"
     topic_views_heat_low: "글타래가 연하게 하이라이트 되기 위한 조회수"
     topic_views_heat_medium: "글타래가 적당하게 하이라이트 되기 위한 조회수"
@@ -1092,8 +1095,11 @@ ko:
     faq_url: "FAQ주소가 있으면 전체 URL을 적어주세요."
     tos_url: "이용약관이 있으면 전체 URL을 적어주세요."
     privacy_policy_url: "개인정보 보호가 있으면 전체 URL을 적어주세요."
+    newuser_spam_host_threshold: "새로운 사용자가 동일한 호스트의 링크를 포스팅하더라도 스팸으로 간주되지 않는 최대 포스팅 수 `newuser_spam_host_threshold`"
     white_listed_spam_host_domains: "스팸 호스트 테스트로부터 제외할 도메인 리스트. 새로운 사용자는 새로운 사용자는 헤당 도메인에 대한 링크를 포함하는 글를 생성하는데 제한되지 않는다."
     staff_like_weight: "스태프가 좋아요를 눌렀을 때 부여할 가산점"
+    topic_view_duration_hours: "N 시간마다 IP/User 별로 새 토픽 조회수를 셉니다."
+    user_profile_view_duration_hours: "N 시간마다 IP/User 별로 새 프로필 조회수를 셉니다."
     levenshtein_distance_spammer_emails: "스패머 메일을 체크할 때, 허용할 다른 글자 개수(fuzzy match)"
     max_new_accounts_per_registration_ip: "(n) 회원등급의 0개의 계정(스태프도 tl2 이상도 아닌 계정만)이 이 IP에 있으면, 새로운 회원가입 방지."
     min_ban_entries_for_roll_up: "Roll up 버튼을 눌렀을 때, 적어도 (N)개의 엔트리가 있다면 새 subnet ban 엔트리를 만듭니다."
@@ -1101,16 +1107,40 @@ ko:
     max_age_unmatched_ips: "(N)일 뒤에 안 맞는 막힌 IP 접근을 지웁니다."
     num_flaggers_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고자 수"
     num_flags_to_close_topic: "추후 중재를 위해 자동으로 글타래를 일시정지시킬 최소 신고 횟수"
+    num_hours_to_close_topic: "운영진 중재를 위하여 토픽을 중지시킬 시간"
     auto_respond_to_flag_actions: "신고 기각 시 자동 답변 활성화"
+    min_first_post_typing_time: "사용자가 첫번째 포스트를 작성할 때 타이핑에 소요해야 하는 밀리초. 설정값에 도달하지 않았을 때는 자동으로 승인 큐에 포함됩니다. 승인 0으로 설정하면 해제됩니다.(해제는 권장하지 않습니다)"
+    auto_block_fast_typers_on_first_post: " min_first_post_typing_time에 도달하지 않은 사용자를 자동으로 차단"
     auto_block_fast_typers_max_trust_level: "빠른 타이핑이 감지되면 자동 차단을 적용할 최대 신뢰도"
+    auto_block_first_post_regex: "첫번째 포스트를 검사하여 통과하면 사용자를 차단하고 승인 대기열에 포함시키는 대소문자 구분이 없는 정규표현식. 예: raging|a[bc]a, 는 raging, aba, aca를 포함한 첫번째 포스트를 차단합니다. 첫번째 포스트에만 적용됩니다."
     reply_by_email_enabled: "이메일을 통해 주제에 답글을 달 수 있음."
     reply_by_email_address: "이메일 주소로 답글을 다는 템플릿. 예: %{reply_key}@reply.myforum.com"
+    alternative_reply_by_email_addresses: "수신된 이메일에 대한 답장메일의 대체 템플릿 목록. 예: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
     incoming_email_prefer_html: "수신 이메일에 text 대신 HTML을 사용"
     disable_emails: "Discourse가 어떤 메일로 보내지 못하도록 합니다."
     strip_images_from_short_emails: "2800바이트, 즉 2.73 KB 이내 사이즈를 가지도록 이미지를 빼주세요."
     short_email_length: "짦은 이메일 바이트 길이"
     display_name_on_email_from: "이메일 보낸사람 필드에 전체 이름을 표시"
+    unsubscribe_via_email: "사용자가 이메일 제목이나 내용에 'unsubscribe' 를 포함시켜서 답장하면 이메일 구독을 해지가 되도록 허용"
+    unsubscribe_via_email_footer: "이메일의 하단에 이메일 mailto: 링크 방식의 구독해지 링크를 첨부하기"
+    delete_email_logs_after_days: "(N) 일이 지나면 이메일 로그 삭제하기. 0으로 설정하면 삭제하지 않음"
+    max_emails_per_day_per_user: "사용자에게 보낼 이메일의 하루 최대치. 0으로 설정하면 제한없음."
+    enable_staged_users: "수신 이메일 처리 중일 때 자동으로 격리된 회원 생성."
+    maximum_staged_users_per_email: "수신된 이메일을 처리하는 동안 생성할 최대 격리회원 수"
+    auto_generated_whitelist: "자동 생성 메일로 체크되지 않는 이메일 주소의 목록. 예: foo@bar.com|discourse@bar.com"
+    block_auto_generated_emails: "자동 생성된 이메일로 확인된 수신 이메일 차단."
+    ignore_by_title: "제목을 기준으로 수신 메일 무시."
+    mailgun_api_key: "webhook 메시지를 확인할 Mailgun Secret API 키"
+    soft_bounce_score: "임시 반송이 일어났을 때 사용자에게 반송 스코어 추가."
+    hard_bounce_score: "영구 반송이 일어났을 때 사용자에게 반송 스코어 추가."
+    bounce_score_threshold: "사용자에게 메일을 보낼 최대 반송 스코어."
+    bounce_score_threshold_deactivate: "사용자를 비활성화 할 최대 반송 스코어."
+    reset_bounce_score_after_days: "X 일 이후 반송 스코어 자동 초기화."
+    attachment_content_type_blacklist: "콘텐츠 타입을 기준으로 첨부를 차단할 키워드 블랙리스트."
+    attachment_filename_blacklist: "파일 이름을 기준으로 첨부를 차단할 키워드 블랙리스트."
     enable_forwarded_emails: "[베타] 사용자가 이메일 포워딩으로 토픽을 생성할 수 있도록 허용"
+    always_show_trimmed_content: "항상 수신 메일의 다듬어진 부분을 표시. 경고: 메일 주소가 드러날 수 있습니다."
+    private_email: "개인 정보 보호를 위하여 이메일에 포스트나 토픽의 내용 미포함."
     manual_polling_enabled: "이메일 답장을 위한 API를 사용하여 이메일 푸시"
     pop3_polling_enabled: "POP3를 이용한 이메일 설문조사"
     pop3_polling_ssl: "SSL로 POP3 서버를 연결합니다. (추천)"
@@ -1125,29 +1155,52 @@ ko:
     email_in_min_trust: "이메일을 통해 새 글타래를 포스팅 할 수 있는 최소 사용자 회원등급"
     email_prefix: "이메일 제목에 쓰일 [라벨]. 설정하지 않으면 기본적으로 'title(필수 설정의)' 이 된다."
     email_site_title: "사이트에서 전송되는 이메일의 보내는 이를 사이트 이름으로 설정. 설정하지 않으면 'title(필수 설정의)'이 된다. 만약 'title'에 보내는 이에 허용되지 않는 글자가 포함되어 있으면 이 설정이 사용된다."
+    find_related_post_with_key: "응답 포스트를 찾을 때는 reply 키만 사용.(Amazon SES 사용 시 권장)"
     minimum_topics_similar: "새로운 글타래를 작성할 때, 유사한 글타래들을 보여주기 위해 존재해야 할 최소 글타래 개수"
     relative_date_duration: "절대적 날짜(9월 3일) 대신 상대적 날짜(7일 전)가 사용될 일 수 (글타래가 작성된 이후부터)"
     delete_user_max_post_age: "(x)일 이전의 첫 글가 있는 유저는 삭제할 수 없음."
     delete_all_posts_max: "전체 글 지우기 버튼을 통해 한번에 삭제할 수 있는 최대 글 수. 만약 사용자가 이것보다 많은 글을 가지고 있으면 한번에 삭제 할 수 없다."
     username_change_period: "등록 후 사용자 이름 최소 유지 일 수(0은 사용자 이름 변경을 막음)"
     email_editable: "가입 후 이메일 주소 변경 허용"
+    logout_redirect: "로그아웃 후에 리디렉션할 위치 (예: http://somesite.com/logout)"
+    allow_uploaded_avatars: "사용자가 커스텀 프로필 사진을 올릴 수 있도록 허용."
+    allow_animated_avatars: "사용자가 프로필 사진으로 애니메이션 GIF 파일을 올릴 수 있도록 허용. 경고: 이 설정을 바꾼 후  avatars:refresh rake task 를 실행."
     allow_animated_thumbnails: "움직이는 gif로 썸네일을 만듭니다."
     default_avatars: "신규가입자가 받게될 기본 아바타 URL"
     automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드합니다."
+    digest_topics: "요약 이메일에 표시할 인기 토픽의 최대 개수."
+    digest_posts: "요약 이메일에 표시할 인기 포스트의 최대 개수."
+    digest_other_topics: "요약 이메일의 '신규 토픽과 팔로우하는 카테고리'에 표시되는 토픽의 최대 개수."
+    digest_min_excerpt_length: "요약 이메일에서 발췌된 포스트의 최소 표시 글자 수."
+    suppress_digest_email_after_days: "(n) 일 이상 사이트를 방문하지 않은 사용자에게는 요약 이메일 보내지 않기."
+    digest_suppress_categories: "요약 이메일에서 이 카테고리 숨기기."
     disable_digest_emails: "모든 사용자에게 요약 이메일 전송 해제하기"
+    email_accent_bg_color: "강조 색상은 HTML 이메일의 몇몇 요소의 배경색상으로 사용됩니다. 색상명('red')이나 hex 값('#FF0000')을 입력하세요."
+    email_accent_fg_color: "텍스트 컬러는 HTML 이메일의 배경색상으로 렌더링됩니다. 색상명('white')나 hex값('#FFFFFF')을 입력하세요."
+    email_link_color: "HTML 이메일의 링크 색상. 색상명('blue')나 hex값('#0000FF')를 입력하세요."
+    detect_custom_avatars: "사용자가 커스텀 프로필 사진을 올렸는지의 체크 여부."
     max_daily_gravatar_crawls: "하루에 Discourse가 커스텀 아파타를 위해 Gravatar를 체크하는 최대 횟수"
     public_user_custom_fields: "유저가 쓸 수 있는 공개 커스텀 필드 목록"
     staff_user_custom_fields: "스태프가 쓸 수 있는 공개 커스텀 필드 목록"
-    enable_user_directory: "전체 유저 둘러보기 목록 제공"
+    enable_user_directory: "브라우징을 위한 유저의 디렉토리 제공"
+    enable_group_directory: "브라우징을 위한 그룹의 디렉토리 제공"
     allow_anonymous_posting: "익명 모드 허용"
     anonymous_posting_min_trust_level: "익명 게시 할 수 있는 최소 회원등급"
     anonymous_account_duration_minutes: "한 익명이 익명계정을 만들 때 빨리 만드는 걸 막을 분 단위 시간 예: 600으로 정해놓으면 마지막 게시하고 익명 전환 후로 600분이 지나는 즉시 새 계정이 만들어 집니다."
+    hide_user_profiles_from_public: "익명사용자의 사용자 카드, 사용자 프로필, 사용자 디렉토리 해제."
+    user_website_domains_whitelist: "이 목록에 속한 도메인으로는 개인 웹사이트 등록 불가함. ` | `를 구분자로 한 목록."
     allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용합니다."
+    sequential_replies_threshold: "너무 많은 연속 댓글을 달고 있다고 경고를 받지 않고 사용자가 연달아 쓸 수 있는 포스트 수."
+    get_a_room_threshold: "경고를 받지 않고, 같은 토픽에서 같은 사람에게 보낼 수 있는 허용 포스트 수."
     enable_mobile_theme: "모바일 디바이스는 모바일 환경에 친화적인 테마를 사용합니다, 그리고 PC용 화면으로 전환할 수 있습니다. 만약 커스텀 스타일 시트를 사용한다면 이것을 비활성화 시키세요."
     dominating_topic_minimum_percent: "한 글타래에서 한 사용자의 영향력을 결정하는 글 수의 퍼센트"
+    disable_avatar_education_message: "아바타 변경 교육 메시지 해제."
     suppress_uncategorized_badge: "글타래 리스트에서 카테고리가 없는 글타래에 대한 훈장을 보여주지 않는다."
+    permalink_normalizations: "퍼마링크를 매칭하기 전에 다음 정규표현식을 적용. 예: /(topic.*)\\?.*/\\1 를 적용하면 토픽 루트에서 퀴리 스트링을 뽑아냅니다. 캡쳐된 값에 접근하려면 정규표현식+스트링 형식에 \\1 등을 사용하면 됩니다."
     global_notice: "긴급, 비상 전체 배너를 모든 방문자에게 표시합니다. 숨기려면 빈칸으로 바꾸면 됩니다(HTML 허용)."
     disable_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다."
+    automatically_unpin_topics: "사용자가 하단에 도달하면 토픽 고정을 자동 해제."
+    read_time_word_count: "읽은 시간 추정치 계산을 위한 1분 당 워드 카운트."
     share_anonymized_statistics: "익명화된 사용 통계 공유하기"
     full_name_required: "사용자 프로필에서 실명을 필수 입력 항목으로 설정"
     enable_names: "사용자의 실명을 프로필, 사용자카드, 이메일에서 표시함. 실명을 표시하지 않으려면 체크를 해제하세요."
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index c28ee211c7..828a8c074b 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -895,7 +895,6 @@ nl:
     notify_mods_when_user_blocked: "Als een gebruiker automatisch geblokkeerd is, stuur dan een bericht naar alle moderatoren."
     flag_sockpuppets: "Als een nieuwe gebruiker antwoord op een topic vanaf hetzelfde ip-adres als de nieuwe gebruiker die het topic opende, markeer dan beide berichten als potentiële spam."
     traditional_markdown_linebreaks: "Gebruik traditionele regeleinden in Markdown, welke 2 spaties aan het einde van een regel nodig heeft voor een regeleinde."
-    allow_html_tables: "Sta toe dat tabellen in Markdown mogen worden ingevoerd met behulp van HTML-tags. TABLE, TD, TR, TH zullen aan de whitelist worden toegevoegd (vereist volledig herbouwen van alle oude berichten met tabellen)"
     post_undo_action_window_mins: "Het aantal minuten waarin gebruikers hun recente acties op een bericht nog terug kunnen draaien (liken, markeren, etc)."
     must_approve_users: "Stafleden moeten alle nieuwe gebruikersaccounts goedkeuren voordat ze de site mogen bezoeken. OPGELET: als dit wordt aangezet voor een actieve site wordt alle toegang voor bestaande niet stafleden ingetrokken."
     pending_users_reminder_delay: "Moderators informeren als nieuwe gebruikers al langer dan dit aantal uren op goedkeuring wachten. Stel dit in op -1 om meldingen uit te schakelen."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 67ddc8bdf6..84074ab6c9 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -956,7 +956,6 @@ pl_PL:
     notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     flag_sockpuppets: "Jeśli nowy użytkownik odpowiada na dany temat z tego samego adresu IP co nowy użytkownik, który założył temat, oznacz ich posty jako potencjalny spam."
     traditional_markdown_linebreaks: "Używaj tradycyjnych znaków końca linii w Markdown, to znaczy dwóch spacji na końcu linii."
-    allow_html_tables: "Pozwalaj tabelom być zamieszczanym w Markdown przy użyciu tagów HTML. TABLE, THEAD, TD, TR, TH będą dozwolone (wymaga pełnego rebake na wszystkich starych postach zawierających tabele)."
     post_undo_action_window_mins: "Przez tyle minut użytkownicy mogą cofnąć swoje ostatnie działania przy danym poście (lajki, flagowanie, itd.)."
     must_approve_users: "Zespół musi zaakceptować wszystkie nowe konta zanim uzyskają dostęp do serwisu. UWAGA: włączenie tego dla już udostępnionej strony sprawi, że zostanie odebrany dostęp wszystkim istniejącym użytkownikom spoza zespołu."
     pending_users_reminder_delay: "Powiadomić moderatorów jeżeli nowi użytkownicy czekali na zatwierdzenie dłużej niż his mamy godzin. Ustaw -1 aby wyłączyć powiadomienia. "
@@ -1349,40 +1348,8 @@ pl_PL:
     subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień mailowych ze strony %{site_title}"
   invite_mailer:
     subject_template: "%{invitee_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} zaprosił cię do dyskusji
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w serwisie
-
-      > %{site_title} -- %{site_description}
-
-      Jeśli jesteś zainteresowany, kliknij w link:
-
-      %{invite_link}
   custom_invite_mailer:
     subject_template: "%{invitee_name} zaprosił cię do dyskusji '%{topic_title}' w serwisie %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} zaprosił cię do dyskusji
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w serwisie
-
-      > %{site_title} -- %{site_description}
-
-      Informacja od zapraszającego:
-
-      > %{user_custom_message}
-
-      Jeśli jesteś zainteresowany, kliknij w link:
-
-      %{invite_link}
   invite_forum_mailer:
     subject_template: "%{invitee_name} zaprosił cię do dołączenia do %{site_domain_name}"
     text_body_template: |
@@ -1657,25 +1624,6 @@ pl_PL:
     visit_link_to_respond: "[Zobacz Temat](%{base_url}%{url}) aby odpowiedzieć."
     visit_link_to_respond_pm: "[Zobacz wiadomość](%{base_url}%{url}) aby odpowiedzieć."
     posted_by: "Dodany przez %{username} w dniu %{post_date}"
-    invited_to_private_message_body: |
-      %{username} zaprosił cię do wiadomści
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} zaprosił cię do dyskusji
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      w
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Użytkownik zaprosił do PW"
       text_body_template: |
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index a89dda5a2d..7968d800ba 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -27,29 +27,35 @@ pt:
   topics: "Tópicos"
   posts: "mensagens"
   loading: "A carregar"
+  powered_by_html: 'Desenvolvido por <a href="https://www.discourse.org">Discourse</a>, e melhor visualização com o JavaScript ativado'
   log_in: "Iniciar Sessão"
-  purge_reason: "Conta removida automaticamente como conta abandonada, desactivada."
-  disable_remote_images_download_reason: "O download remoto de imagens foi desativado por não haver espaço disponível no disco."
+  purge_reason: "Eliminada automaticamente como abandonada, conta desativada"
+  disable_remote_images_download_reason: "A transferência remota de imagens foi desativada por não haver espaço disponível no disco."
   anonymous: "Anónimo"
+  remove_posts_deleted_by_author: "Eliminado pelo autor"
+  themes:
+    bad_color_scheme: "Não é possível atualizar o tema, esquema de cor inválido"
+    other_error: "Ocorreu algo de errado ao atualizar o tema"
   emails:
     incoming:
+      default_subject: "Este tópico precisa de um título"
       show_trimmed_content: "Mostrar conteúdo aparado"
-      maximum_staged_user_per_email_reached: "Foi atingido o número máximo de utilizadores temporários por email."
+      maximum_staged_user_per_email_reached: "Foi atingido o número máximo de utilizadores temporários criados por e-mail."
       errors:
         empty_email_error: "Acontece quando a informação não processada do email recebido veio em branco."
-        no_message_id_error: "Acontece quando o email recebido não tem 'Message-Id' no cabeçalho da mensagem."
+        no_message_id_error: "Acontece quando o e-mail não tem 'Id. de Mensagem' no cabeçalho."
         auto_generated_email_error: "Acontece quando o cabeçalho 'precedence' é definida como: 'list', 'junk' ou 'auto_reply', ou quando algum cabeçalho contém: 'auto-submitted', 'auto-replied' ou 'auto-generated'."
-        no_body_detected_error: "Acontece quando conseguimos obter um corpo de mensagem e não existem anexos."
-        inactive_user_error: "Acontece quando o remetente não está activo."
-        blocked_user_error: "Acontece quando o remetente está bloqueado."
+        no_body_detected_error: "Acontece quando nós não conseguimos extrair um corpo e não existiam anexos."
+        inactive_user_error: "Acontece quando o remetente não está ativo."
+        blocked_user_error: "Acontece quando o remetente foi bloqueado."
         bad_destination_address: "Acontece quando nenhum dos endereços de email nos campos para/cc/bcc coincide com um endereço de email configurado."
-        strangers_not_allowed_error: "Acontece quando um utilizador tenta criar um tópico numa categoria da qual não é membro."
-        insufficient_trust_level_error: "Acontece quando um utilizador tentar criar um tópico numa categoria para a qual não tem o nível de confiança necessário."
-        reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de email diferente do destinatário da notificação."
-        topic_not_found_error: "Acontece quando a resposta veio de um tópico relacionado mas o tópico relacionado foi apagado."
-        topic_closed_error: "Acontece quando uma resposta chegou mas o tópico relacionado foi fechado."
-        bounced_email_error: "O email é um relatório de email redirecionado."
-        screened_email_error: "Acontece quando a morada de email da pessoa que o enviou já foi confirmada."
+        strangers_not_allowed_error: "Acontece quando um utilizador tentou criar um novo tópico numa categoria em que não é membro."
+        insufficient_trust_level_error: "Acontece quando um utilizador tentou criar um novo tópico numa categoria em que não tem o nível de confiança necessário."
+        reply_user_not_matching_error: "Acontece quando uma resposta veio de um endereço de e-mail diferente de onde a notificação foi enviada."
+        topic_not_found_error: "Acontece quando é recebida uma resposta, mas que o tópico relacionado foi eliminado."
+        topic_closed_error: "Acontece quando é recebida uma resposta, mas que o tópico relacionado foi encerrado."
+        bounced_email_error: "A mensagem é um relatório de mensagem redirecionado."
+        screened_email_error: "Acontece quando o endereço de e-mail do remetente já foi confirmado."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -103,6 +109,8 @@ pt:
       max_username_length_range: "Não pode definir o máximo abaixo do mínimo."
       default_categories_already_selected: "Não pode selecionar uma categoria usada noutra lista."
       s3_upload_bucket_is_required: "Não pode ativar carregamentos para o S3 excepto se tiver fornecido o 's3_upload_bucket'."
+  invite:
+    not_found: "O seu código de convite é inválido. Por favor, contacte o administrador do site."
   bulk_invite:
     file_should_be_csv: "O ficheiro carregado deve ser do formato CSV."
     error: "Ocorreu um erro ao carregar esse ficheiro. Por favor tente mais tarde."
@@ -125,6 +133,8 @@ pt:
   embed:
     start_discussion: "Iniciar Discussão"
     continue: "Continuar Discussão"
+    no_hosts: "Não foram configurados anfitriões para incorporar."
+    configure: "Configurar Incorporação"
     more_replies:
       one: "mais 1 resposta"
       other: "mais %{count} respostas"
@@ -158,6 +168,7 @@ pt:
   spamming_host: "Pedimos desculpa, não pode colocar uma hiperligação para esse servidor."
   user_is_suspended: "Utilizadores suspensos não têm permissão para publicar."
   topic_not_found: "Algo de errado ocorreu. Talvez este tópico tenha sido fechado ou eliminado enquanto olhava para ele?"
+  not_accepting_pms: "Desculpe, de momento, %{username} não está a aceitar mensagens."
   just_posted_that: "é demasiado semelhante ao que publicaste recentemente"
   invalid_characters: "contem caracteres inválidos"
   is_invalid: "parece pouco claro, é uma frase completa?"
@@ -177,6 +188,12 @@ pt:
     latest: "Tópicos recentes"
     hot: "Tópicos quentes"
     top: "Melhores tópicos"
+    top_all: "Melhores tópicos de todos os tempos"
+    top_yearly: "Melhores tópicos do ano"
+    top_quarterly: "Melhores tópicos do trimestre"
+    top_monthly: "Melhores tópicos do mês"
+    top_weekly: "Melhores tópicos da semana"
+    top_daily: "Melhores tópicos do dia"
     posts: "Últimas mensagens"
     private_posts: "Mensagens privadas recentes"
     group_posts: "Mensagens recentes em %{group_name}"
@@ -190,6 +207,8 @@ pt:
   queue:
     delete_reason: "Eliminado através da fila de moderação de mensagens"
   groups:
+    success:
+      bulk_add: "%{users_added}utilizadores foram adicionados ao grupo."
     errors:
       can_not_modify_automatic: "Não pode modificar um grupo automático"
       member_already_exist: "'%{username}' já é membro deste grupo."
@@ -197,6 +216,7 @@ pt:
       invalid_incoming_email: "'%{email}' não é um endereço de email válido."
       email_already_used_in_group: "'%{email}' já é utilizado pelo grupo '%{group_name}'."
       email_already_used_in_category: "'%{email}' já é utilizado pela categoria '%{category_name}'."
+      cant_allow_membership_requests: "Não pode permitir pedidos de adesão para um grupo sem quaisquer donos."
     default_names:
       everyone: "todos"
       admins: "administradores"
@@ -207,6 +227,9 @@ pt:
       trust_level_2: "nivel_de_confianca_2"
       trust_level_3: "nivel_de_confianca_3"
       trust_level_4: "nivel_de_confianca_4"
+    request_membership_pm:
+      title: "Pedido de Adesão para @%{group_name}"
+      body: "Eu gostaria de de solicitar a adesão em @%{group_name}."
   education:
     until_posts:
       one: "1 mensagem"
@@ -261,16 +284,28 @@ pt:
               same_as_username: "é a mesma que o seu nome de utilizador. Por favor utilize uma palavra-passe mais segura."
               same_as_email: "é a mesma que o seu email. Por favor utilize uma palavra-passe mais segura."
               same_as_current: "é a mesma que a sua palavra-passe atual."
+              unique_characters: "tem demasiados carateres repetidos. Por favor, utilize uma palavra-passe mais segura."
             ip_address:
               signup_not_allowed: "A inscrição não é permitida através desta conta."
         color_scheme_color:
           attributes:
             hex:
               invalid: "não é uma cor válida"
+        post_reply:
+          base:
+            different_topic: "A publicação e a resposta devem pertencer ao mesmo tópico."
         web_hook:
           attributes:
             payload_url:
               invalid: "URL inválido. O URL deve incluir http:// ou https://. E espaços não são permitidos."
+        custom_emoji:
+          attributes:
+            name:
+              taken: já está a ser utilizado por outro emoji
+        topic_timer:
+          attributes:
+            execute_at:
+              in_the_past: "deve estar no futuro."
       <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
@@ -280,6 +315,9 @@ pt:
   meta_category_description: "Discussão sobre este sítio, a sua organização, como funciona, e como podemos melhorá-lo."
   staff_category_name: "Pessoal"
   staff_category_description: "Categoria privada para discussões do pessoal. Os tópicos estão apenas visíveis para administradores e moderadores."
+  assets_topic_title: "Ativos para o desenho do site"
+  discourse_welcome_topic:
+    title: "Bem-vindo ao Discourse"
   lounge_welcome:
     title: "Bem-vindo ao Salão"
     body: |2+
@@ -433,6 +471,8 @@ pt:
         other: "há quase %{count} anos atrás"
   password_reset:
     no_token: "Desculpe, essa hiperligação para alterar a palavra-passe é muito antiga. Selecione o botão Iniciar Sessão e utilize 'Esqueci a minha palavra-passe' para obter uma nova hiperligação."
+    choose_new: "Escolha uma nova palavra-passe"
+    choose: "Escolha uma palavra-passe"
     update: 'Atualizar Palavra-passe'
     save: 'Definir Palavra-passe'
     title: 'Redefinir Palavra-passe'
@@ -455,43 +495,58 @@ pt:
     welcome_to: "Bem-vindo a %{site_name}!"
     approval_required: "Um moderador tem que aprovar a sua conta antes de poder aceder a este fórum. Irá receber um email quando a sua conta for aprovada!"
     missing_session: "Não conseguimos detectar se a sua conta foi criada, pelo que pedimos que confirme que tem os cookies permitidos."
+    activated: "Desculpe, esta conta já foi ativada."
+    admin_confirm:
+      title: "Confirmar Conta de Administrador"
+      description: "Tem a certeza que o <b>%{target_username}</b> seja um administrador?"
+      grant: "Conceder Acesso de Administrador"
+      complete: "<b>%{target_username}</b> é agora um administrador."
+      back_to: "Voltar a %{title}"
   post_action_types:
     off_topic:
       title: 'Fora de Contexto'
       description: 'Esta mensagem não é relevante para a discussão corrente, conforme definido pelo título e pela primeira mensagem, e provavelmente deverá ser transferida para outro tópico.'
+      short_description: 'Não é relevante para a discussão'
       long_form: 'sinalizou isto como fora de contexto'
     spam:
       title: 'Spam'
+      short_description: 'É um anúncio ou vandalismo'
       long_form: 'sinalizou isto como spam'
       email_title: '"%{title}" foi sinalizado como spam'
       email_body: "%{link}\n\n%{message}"
     inappropriate:
       title: 'Inapropriado'
       description: 'Esta mensagem contém conteúdo que uma pessoa sensata iria considerar ofensivo, abusivo, ou como uma violação das <a href="/guidelines"> orientações da nossa comunidade</a>.'
+      short_description: 'Uma violação das <a href="/guidelines">nossas orientações da comunidade</a>'
       long_form: 'sinalizou isto como inapropriado'
     notify_user:
       title: 'Enviar uma mensagem a @{{username}}'
       description: 'Quero falar com esta pessoa diretamente e em privado acerca da sua mensagem.'
+      short_description: 'Eu quero falar com esta pessoa diretamente e em privado sobre a sua publicação.'
       long_form: 'utilizador com mensagens'
       email_title: 'A sua mensagem em "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Algo Mais"
       description: 'Esta mensagem requer a atenção do pessoal por outra razão não listada acima.'
+      short_description: 'Requer a atenção da equipa por outra razão'
       long_form: 'marcou isto para ser alvo da atenção do pessoal'
       email_title: 'Uma mensagem em "%{title}" requer a atenção do pessoal'
       email_body: "%{link}\n\n%{message}"
     bookmark:
       title: 'Adicionar Marcador'
       description: 'Adicionar um marcador a esta mensagem'
+      short_description: 'Adicionar esta publicação aos marcadores'
       long_form: 'adicionou um marcador a esta mensagem'
     like:
       title: 'Gostar'
       description: 'Gostar desta mensagem'
+      short_description: 'Gostar desta publicação'
       long_form: 'gostou disto'
     vote:
       title: 'Votar'
       description: 'Votar nesta mensagem'
+      short_description: 'Votar para esta publicação'
       long_form: 'votou nesta mensagem'
   user_activity:
     no_bookmarks:
@@ -802,7 +857,6 @@ pt:
     notify_mods_when_user_blocked: "Se um utilizador for bloqueado de forma automática, enviar uma mensagem a todos os moderadores."
     flag_sockpuppets: "Se um novo utilizador responde a um tópico a partir do mesmo endereço IP do novo utilizador que iniciou o tópico, sinalizar ambas as mensagens como potencial spam."
     traditional_markdown_linebreaks: "Utilize tradicionais quebras de linha no Markdown, que requer dois espaços no final para uma quebra de linha."
-    allow_html_tables: "Permitir inserção de tabelas em Markdown utilizando tags HTML. TABLE,THEAD, TD, TR,TH fazem parte da lista branca (requer que todas as mensagens antigas que contém tabelas sejam refeitas)"
     post_undo_action_window_mins: "Número de minutos durante o qual os utilizadores têm permissão para desfazer ações numa mensagem (gostos, sinalizações, etc)."
     must_approve_users: "O pessoal deve aprovar todas as novas contas de utilizador antes destas terem permissão para aceder ao sítio. AVISO: ativar isto para um sítio ativo irá revogar o acesso aos utilizadores existentes que não fazem parte do pessoal!"
     pending_users_reminder_delay: "Notificar moderadores se novos utilizadores estiverem à espera de aprovação por mais que esta quantidade de horas. Configurar com -1 para desativar notificações."
@@ -1709,29 +1763,6 @@ pt:
     visit_link_to_respond: "[Visitar Tópico](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visitar Mensagem](%{base_url}%{url}) para responder."
     posted_by: "Publicado por %{username} em %{post_date}"
-    invited_to_private_message_body: |+
-      %{username} convidou-o para uma mensagem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      at
-
-      > %{site_title} -- %{site_description}
-
-    invited_to_topic_body: |+
-      %{username} convidou-o para uma discussão
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
-
-
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 1450f873a7..873cf7e69a 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -1339,16 +1339,6 @@ pt_BR:
     visit_link_to_respond: "[Visite o Tópico](%{base_url}%{url}) para responder."
     visit_link_to_respond_pm: "[Visite o Mensagem](%{base_url}%{url}) para responder."
     posted_by: "Postado por %{username} em %{post_date}"
-    invited_to_topic_body: |
-      %{username} convidou você para uma discussão
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      em
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 8082e409bf..7bb1d31006 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -878,7 +878,6 @@ ro:
     notify_mods_when_user_blocked: "Dacă un utilizator este blocat automat, trimite un mesaj tuturor moderatorilor."
     flag_sockpuppets: "Dacă un utilizator nou răspunde unui subiect de la același IP ca utilizatorul ce a pornit subiectul, marchează ambele postări ca potențial spam."
     traditional_markdown_linebreaks: "Folosește întreruperi de rând tradiționale în Markdown, ceea ce necesită două spații pentru un capăt de rând. "
-    allow_html_tables: "Permite introducerea de tabele în Markdown prin folosirea de etichete HTML. HEAD, TD, TR, TH vor fi autorizate (necesită un rebake pe toate postările vechi ce conțin tabele)"
     post_undo_action_window_mins: "Numărul de minute în care utilizatorii pot anula acțiunile recente asupra unei postări (aprecieri, marcări cu marcaje de avertizare, etc)."
     must_approve_users: "Membrii echipei trebuie să aprobe toate conturile noilor utilizatori înainte ca aceștia să poată accesa site-ul. ATENȚIE: activarea acestei opțiuni pentru un site în producție va revoca accesul tuturor utilizatorilor care nu sunt membri ai echipei!"
     pending_users_reminder_delay: "Notifică moderatorii dacă noii utilizatori sunt în așteptarea aprobării de mai mult de atâtea ore. Setează la -1 pentru a dezactiva notificările."
@@ -1800,26 +1799,6 @@ ro:
     visit_link_to_respond: "[Vizitează subiect](%{base_url}%{url}) pentru a răspunde."
     visit_link_to_respond_pm: "[Vizitează subiect](%{base_url}%{url}) pentru a răspunde."
     posted_by: "Postat de %{username} pe data %{post_date}"
-    invited_to_private_message_body: |
-      %{username} te-a invitat la un mesaj
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      pe
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} te-a invitat la o discuție
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      pe
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index c624ff9a90..c826a3b6c4 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -28,30 +28,33 @@ ru:
   posts: "сообщения"
   loading: "Загрузка..."
   log_in: "Войти"
-  purge_reason: "Деактивированная учетная запись будет автоматически удалена как заброшенная"
-  disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске."
+  purge_reason: "Аккаунт удалён автоматически как заброшенный и неактивированный."
+  disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостатка места на диске."
   anonymous: "Гость"
   remove_posts_deleted_by_author: "Удалено автором"
+  themes:
+    bad_color_scheme: "При обновлении темы оформления обнаружена неверная цветовая схема."
+    other_error: "При обновлении темы оформления что-то пошло не так."
   emails:
     incoming:
-      default_subject: "Для темы необходим заголовок"
-      show_trimmed_content: "Показывать урезанное содержимое"
+      default_subject: "Тема входящего письма по умолчанию."
+      show_trimmed_content: "Показывать сокращённый текст"
       maximum_staged_user_per_email_reached: "Достигнуто максимальное количество постановочных пользователей, созданных по электронной почте."
       errors:
         empty_email_error: "Происходит, когда мы получаем пустое письмо."
         no_message_id_error: "Происходит, когда письмо не имеет заголовка 'Message-Id'."
-        auto_generated_email_error: "Случается, когда заголовок 'Приоритет' установлен в: список, мусор, навалочных или автоматический ответ, или когда какой-либо другой заголовок содержит: автоматический представленный, автоматический ответ или автоматически генерируется."
-        no_body_detected_error: "Случается, когда мы не могли извлечь тело и не было никаких вложений."
+        auto_generated_email_error: "Происходит когда заголовок \"приоритет\" установлен в: 'bulk', 'list', 'auto_reply', 'junk' или когда другой заголовок содержит флаги 'auto-submitted', 'auto-replied' или 'auto-generated'."
+        no_body_detected_error: "Случается, когда мы не смогли извлечь текст письма и не было никаких вложений."
         inactive_user_error: "Происходит, когда отправитель неактивен."
         blocked_user_error: "Происходит, когда отправитель заблокирован."
-        bad_destination_address: "Случается, когда ни один из адресов электронной почты в To / Cc / Bcc поля не совпадающего с настройки входящей адрес электронной почты."
-        strangers_not_allowed_error: "Возникает,когда пользователь пытается создать новую тему в разделе,членом которой он не является"
-        insufficient_trust_level_error: "Случается, когда пользователь пытается создать новую тему в категории они не имеют необходимого уровня доверия для."
-        reply_user_not_matching_error: "Случается, когда ответ пришел с другой адрес электронной почты уведомление было направлено."
-        topic_not_found_error: "Случается, когда ответ пришел, но связанная тема уже удалена."
-        topic_closed_error: "Случается, когда ответ пришел, но связанная тема уже закрыта."
-        bounced_email_error: "Электронная почта является подпрыгнул отчет по электронной почте."
-        screened_email_error: "Случается, когда адрес электронной почты отправителя был уже экранированы."
+        bad_destination_address: "Происходит, когда ни один из адресатов, указанных в полях To/Cc/Bcc не совпадает со входящим адресом электронной почты."
+        strangers_not_allowed_error: "Происходит когда пользователь пытается создать новую тему в разделе, участником которого он не является."
+        insufficient_trust_level_error: "Происходит когда пользователь пытается создать новую тему в категории, недоступной ему по уровню доступа."
+        reply_user_not_matching_error: "Происходит, когда ответ приходит с адреса, отличного от того, на который было направлено уведомление."
+        topic_not_found_error: "Происходит, когда ответ пришел, но связанная тема уже удалена."
+        topic_closed_error: "Происходит когда ответ пришел, но связанная тема уже закрыта."
+        bounced_email_error: "Возврат недоставленного сообщения электронной почты."
+        screened_email_error: "Происходит, когда адрес отправителя электронной почты уже верифицирован (проверен)."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -72,8 +75,8 @@ ru:
       inclusion: не включен в список
       invalid: неверный
       is_invalid: "Не совсем ясно, это предложение закончено?"
-      contains_censored_words: "содержит следующие нецензурные слова  %{censored_words}"
-      matches_censored_pattern: "содержит нецензурные слова, которые соответствуют шаблону  %{censored_words}"
+      contains_censored_words: "содержит следующие запрещенные слова  %{censored_words}"
+      matches_censored_pattern: "содержит запрещенные на сайте выражения, которые соответствуют шаблону  %{censored_words}"
       less_than: должен быть меньше %{count}
       less_than_or_equal_to: должен быть меньше или равен %{count}
       not_a_number: не число
@@ -113,6 +116,7 @@ ru:
       s3_upload_bucket_is_required: "Нельзя включить загрузки на S3, пока не задана настройка 's3_upload_bucket'."
   invite:
     not_found: "Неверный код приглашения. Пожалуйста, свяжитесь с администратором сайта."
+    user_exists: "Нет необходимости приглашать <b>%{email}</b>, у него уже есть <a href='/u/%{username}/summary'>аккаунт</a>!"
   bulk_invite:
     file_should_be_csv: "Загружаемый файл должен быть в csv-формате."
     error: "Произошла ошибка при загрузке файла. Пожалуйста, повторите попытку позже."
@@ -123,23 +127,23 @@ ru:
     backup_file_should_be_tar_gz: "Файл резервной копии должен быть архивом в формате .TAR.GZ."
     not_enough_space_on_disk: "Не хватает места на диске сервера для загрузки этой резервной копии."
     invalid_filename: "Резервная копия файла содержит недопустимые символы. Допустимые символы A-Z 0-9. - _."
-  not_logged_in: "Для этого действия, пожалуйста авторизуйтесь."
+  not_logged_in: "Для этого действия необходимо зарегистрироваться."
   not_found: "Запрашиваемая страница или ресурс не найден."
   invalid_access: "У вас нет прав для просмотра запрашиваемого ресурса."
-  read_only_mode_enabled: "Сайт в режиме только для чтения. Взаимодействия отключены."
+  read_only_mode_enabled: "Сайт в режиме только для чтения. Какие-либо иные действия запрещены. "
   reading_time: "Время на прочтение"
   likes: "Лайков"
   too_many_replies:
     one: "Извините, новые пользователи могут оставлять только один ответ к теме."
     few: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
     many: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
-    other: "Извините, новые пользователи могут оставлять только %{count} ответов к одной теме."
+    other: "Извините, новые пользователи могут оставлять только %{count} ответ(ов) к одной теме."
   embed:
     start_discussion: "Начать обсуждение"
     continue: "Продолжить обсуждение"
-    error: "Встраивание Ошибки"
-    referer: "Отсылающий:"
-    mismatch: "Ссылающийся не совпал с каким-либо из следующих хостов:"
+    error: "Внутренняя ошибка"
+    referer: "Источник:"
+    mismatch: "Источник не совпал с каким-либо из следующих хостов:"
     no_hosts: "Никаких хостов не настроено для встраивания."
     configure: "Настроить Встраивание"
     more_replies:
@@ -189,8 +193,9 @@ ru:
   spamming_host: "Извините, вы не можете разместить ссылку в этом сообщении."
   user_is_suspended: "Заблокированным пользователям запрещено писать."
   topic_not_found: "Что-то пошло не так. Возможно, эта тема была закрыта или заархивирована, пока вы ее читали?"
-  not_accepting_pms: "К сожалению, %{username} не принимает сообщения в данный момент."
-  just_posted_that: "слишком схоже с уже опубликованным Вами сообщением"
+  not_accepting_pms: "К сожалению, %{username} в данный момент не принимает сообщения."
+  max_pm_recepients: "Извините, вы можете послать сообщение максимум %{recipients_limit}получателю."
+  just_posted_that: "слишком схоже с уже опубликованным вами сообщением"
   invalid_characters: "содержит недопустимые символы"
   is_invalid: "Не совсем ясно, это предложение закончено?"
   next_page: "следующая страница →"
@@ -228,6 +233,8 @@ ru:
   queue:
     delete_reason: "Удалено по запросу модератора."
   groups:
+    success:
+      bulk_add: "%{users_added}пользователей было добавлено в группу."
     errors:
       can_not_modify_automatic: "Вы не можете изменить автоматическую группу."
       member_already_exist: "'%{username}' уже является членом этой группы."
@@ -246,6 +253,9 @@ ru:
       trust_level_2: "уровень доверия 2"
       trust_level_3: "уровень доверия 3"
       trust_level_4: "уровень доверия 4"
+    request_membership_pm:
+      title: "Запрос на участие в группе %{group_name}"
+      body: "Я хотел бы подать заявку на участие в группе %{group_name}"
   education:
     until_posts:
       one: "1 сообщение"
@@ -259,17 +269,15 @@ ru:
 
       - Интересен ли придуманный заголовок? Достаточно ли точно он описывает то, что вы хотите обсудить в вашей теме?
 
-      - О чём ваша тема? Кому она будет интересна? Почему она важна для обсуждения? Какой, по-вашему мнению, будет реакция общества на тему?
+      - О чём ваша тема? Кому она будет интересна? Почему она важна для обсуждения? Какой, по-вашему мнению, будет реакция сообщества на тему?
 
-      - Постарайтесь включить в текст сообщения подходящие поисковые слова, по которым другие смогут *найти* тему. Выберите раздел, к которому ваша тема подходит по смыслу.
+      - Постарайтесь включить в текст сообщения подходящие теги, по которым другие смогут *найти* тему. Выберите раздел, к которому ваша тема подходит по смыслу.
 
       Больше информации вы найдете в нашем [руководстве пользователя](/guidelines). Данное окно будет показываться, пока вы создаете свои первые %{education_posts_text}.
     new-reply: |
       Добро пожаловать на сайт %{site_name} &mdash; **Спасибо за участие в обсуждении!**
 
-      Составляя свой ответ в теме, учитывайте следующее:
-
-      - Улучшит ли ваш ответ обсуждение в целом, хотя бы немного?
+      - Как вы думаете, улучшит ли ваш ответ обсуждение в целом, хотя бы немного?
 
       - Будьте дружелюбны к участникам разговора.
 
@@ -278,11 +286,11 @@ ru:
       Больше информации вы найдете в нашем [руководстве пользователя](/guidelines). Данное окно будет показываться пока вы создаете свои первые %{education_posts_text}.
     avatar: |
       ### Как насчет изображения для вашей учетной записи?
-      Вы опубликовали несколько тем и ответы, но ваше изображение профиля не уникален как вы - это просто письмо.
+      Вы опубликовали несколько тем и ответы, но ваше изображение профиля не уникально - это просто первая буква вашего имени.
 
-      Рассматривали ли вы **[посетить свой профиль пользователя] (%{profile_path})**  и загрузить изображение, которое представляет вас?
+      Может быть вам стоит **[посетить свой профиль пользователя] (%{profile_path})**  и загрузить аватарку?
 
-      Это легче следить за ходом обсуждений и найти интересных людей в разговорах, когда каждый человек имеет уникальный профиль картину!
+      Когда каждый пользователь имеет уникальную аватарку, следить за обсуждениями становится значительно легче!
     sequential_replies: |
       ### Лучше совмещать несколько ответов в один
 
@@ -320,6 +328,7 @@ ru:
               same_as_username: "совпадает с вашим псевдонимом. Пожалуйста, придумайте более надежный пароль."
               same_as_email: "совпадает с вашим e-mail. Пожалуйста, придумайте более надежный пароль."
               same_as_current: "такая же, как текущий пароль."
+              unique_characters: "слишком много повторяющихся символов. Используйте пожалуйста более сложный пароль."
             ip_address:
               signup_not_allowed: "Регистрация с данной учетной записью запрещена."
         color_scheme_color:
@@ -978,7 +987,7 @@ ru:
     allow_all_attachments_for_group_messages: "Разрешить все почтовые вложения для групповых сообщений."
     enable_flash_video_onebox: "Разрешить умную вставку ссылок sqf и flv (Adobe Flash). ВНИМАНИЕ: повышает риски безопасности сайта."
     default_invitee_trust_level: "Уровень доверия приглашенных пользователей по-умолчанию (от 0 до 4)."
-    default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, Вы можете столкнуться с большим колличеством спама."
+    default_trust_level: "Уровень доверия по умолчанию для всех новых пользователей (0-4). ВНИМАНИЕ! Повышая уровень доверия для новых пользователей, вы можете столкнуться с большим количеством спама."
     tl1_requires_topics_entered: "В скольких темах новый пользователь должен побывать для продвижения до уровня доверия 1."
     tl1_requires_read_posts: "Сколько сообщений новый пользователь должен прочитать для продвижения до уровня доверия 1."
     tl1_requires_time_spent_mins: "Сколько минут новый пользователь должен читать сообщения на форуме для продвижения до уровня доверия 1."
@@ -1261,6 +1270,7 @@ ru:
     incorrect_username_email_or_password: "Неверное имя пользователя, адрес электронной почты или пароль"
     wait_approval: "Спасибо за регистрацию. Мы оповестим вас, когда ваша учетная запись будет одобрена."
     active: "Ваша учетная запись активирована и готова к использованию."
+    activate_email: "<p>Почти готово! Мы выслали письмо на <b>%{email}</b>. Пожалуйста, следуйте инструкциям в этом письме для активации вашей учетной записи.</p><p>Если письмо не пришло, пожалуйста, проверьте папку \"спам\", или попробуйте войти еще раз, чтобы выслать активационное письмо повторно.</p>"
     not_activated: "Вы пока что не можете войти на сайт. Пожалуйста, следуйте инструкциям по активации учетной записи, которые мы отправили вам  по электронной почтой."
     not_allowed_from_ip_address: "Вход с этого IP в качестве пользователя %{username} запрещен."
     admin_not_allowed_from_ip_address: "Вход с этого IP в качестве администратора запрещен."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 71cd2e89a3..912d3d5da0 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -761,7 +761,6 @@ sk:
     notify_mods_when_user_blocked: "Ak je používateľ automaticky zablokovaný, pošli správu všetkým moderátorom."
     flag_sockpuppets: "Ak nový používateľ odpovedá na tému z rovnakej IP adresy, ako nový používateľ, ktorý danú tému vytvoril, označ oba ich príspevky ako potencionálny spam."
     traditional_markdown_linebreaks: "V Markdown použiť tradičné oddeľovače riadkov, čo vyžaduje dve koncové medzery ako oddeľovač riadku."
-    allow_html_tables: "V Markdown umožniť použitie tabuliek pomocou HTML značiek. TABLE, THEAD, TD, TR, TH budú umožnené (vyžaduje \"full rebake\" na všetkých starých príspevkoch ktoré obsahujú tabuľky)"
     post_undo_action_window_mins: "Počet minút počas ktorých môžu používatelia zrušiť poslednú akciu na príspevku (\"Páči sa\", označenie, atď..)."
     must_approve_users: "Obsluha musí povoliť účty všetkým novým používateľom skôr než im bude povolený prístup na stránku. UPOZORNENIE: zapnutie na živej stránke spôsobí zrušenie prístupu pre existujúcich používateľov, okrem obsluhy!"
     pending_users_reminder_delay: "Upozorni moderátora ak nový používateľ čaká na schválenie dlhšie ako tento počet hodín. Nastavte -1 pre vypnutie upozornenia."
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 2e2d4eb90a..93510e25f4 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -63,6 +63,8 @@ sq:
       load_from_remote: "Postimi nuk mundi të ngarkohet. Riprovoheni!"
     site_settings:
       default_categories_already_selected: "Nuk mund të zgjidhni një kategori të përdorur në një tjetër listë."
+  invite:
+    user_exists: "Nuk keni nevojë të ftoni <b>%{email}</b>, ata <a href='/u/%{username}/summary'>kanë krijuar një llogari në faqe!</a>"
   not_logged_in: "Ju duhet të identifikoheni për këtë veprim."
   invalid_access: "Ju nuk jeni të drejta për të parë burimin e kërkuar."
   reading_time: "Koha e leximit"
@@ -387,6 +389,7 @@ sq:
     title: "Çregjistrohuni"
     stop_watching_topic: "Ndaloni së ndjekuri këtë temë, %{link}"
     unwatch_category: "Ndaloni së ndjekuri të gjitha temat në %{category}"
+    disable_digest_emails: "Mos më dërgo më mesazhe email me përmbledhjet"
     all: "Mos më dërgoni më email nga %{sitename}"
   user_api_key:
     title: "Lejo këtë aplikimi të ketë akses në faqe"
@@ -571,7 +574,7 @@ sq:
     fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)."
     add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\""
     exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
-    post_excerpt_maxlength: "Maximum length of a post excerpt / summary."
+    post_excerpt_maxlength: "Gjatësia maksimale e një përmbledhjeje të një postimi. "
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
     logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
     logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown."
@@ -1040,26 +1043,6 @@ sq:
     visit_link_to_respond: "[Shiko Temën](%{base_url}%{url}) për tu përgjigjur."
     visit_link_to_respond_pm: "[Shiko Mesazhin](%{base_url}%/{url}) për tu përgjigjur."
     posted_by: "Postuar nga %{username} më %{post_date}"
-    invited_to_private_message_body: |
-      %{username} ju ftoi tek mesazhi
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      në
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} ju ftoi në një bisedë
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tek
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
@@ -1169,8 +1152,11 @@ sq:
         %{message}
     digest:
       why: "Një përmbledhje e shkurtër e temave tek %{site_link} që prej vizitës tuaj të fundit më %{last_seen_at}"
+      subject_template: "[%{email_prefix}] Përmbledhja"
+      unsubscribe: "Kjo përmbledhje dërgohet nga %{site_link} ku nuk ju kemi parë në faqe për ca kohë. Ndryshoni <a href='%{email_settings_url}'>preferencat tuaja</a>, ose %{unsubscribe_link} për të mos i marrë më këto mesazhe."
       click_here: "klikoni këtu"
-      from: "%{site_name} - Një përmbledhje e shkurtër"
+      from: "%{site_name} - përmbledhja"
+      preheader: "Një përmbledhe e shkurtër e faqes që nga vizita juaj e fundit më %{last_seen_at}"
     notify_old_email:
       text_body_template: |
         Ky është një mesazh automatik që ju njofton se adresa juaj email për
@@ -1189,7 +1175,7 @@ sq:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
+      ## [Welcome to %{title}](#welcome)
       An account is required. Please create an account or log in to continue.
   terms_of_service:
     title: "Kushtet e shërbimit"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 6ac8c593d3..9387c78ea4 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -818,7 +818,6 @@ sv:
     notify_mods_when_user_blocked: "Om en användare blockeras automatiskt, skicka ett meddelande till alla moderatorer."
     flag_sockpuppets: "Flagga båda användarnas inlägg som potentiell skräppost om en ny användare svarar på ett ämne från samma IP-adress som den andra nya användaren som skapade ämnet."
     traditional_markdown_linebreaks: "Använd vanliga radmatningar i Markdown, vilka kräver 2 avslutande mellanslag för en radmatning."
-    allow_html_tables: "Tillåt tabeller att läggas in i Markdown genom användning av HTML-taggar. TABLE, THEAD, TD, TR, TH kommer att vitlistas (kräver full uppdatering/rebake av alla gamla inlägg som innehåller tabeller)"
     post_undo_action_window_mins: "Antal minuter som en användare tillåts att upphäva handlingar på ett inlägg som gjorts nyligen (gillning, flaggning osv)."
     must_approve_users: "Personal måste godkänna alla nya användarkonton innan de tillåts använda webbplatsen. VARNING: om det tillåts när webbplatsen är live så kommer det att upphäva tillgång för alla existerande användare som inte är personal!"
     pending_users_reminder_delay: "Notifiera moderatorer om nya användare har väntat på godkännande längre än så här många timmar. Ange -1 för att inaktivera notifikationer. "
@@ -1650,26 +1649,6 @@ sv:
     visit_link_to_respond: "[Besök ämnet](%{base_url}%{url}) för att ge din respons. "
     visit_link_to_respond_pm: "[Besök meddelanden](%{base_url}%{url}) för att ge din respons."
     posted_by: "Postat av %{username} den %{post_date}"
-    invited_to_private_message_body: |
-      %{username} bjöd in dit till ett meddelande
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      vid
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} bjöd in dig till en diskussion
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      vid
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "Användare invitera personligt"
       text_body_template: |
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 0430d47a47..30d63f631a 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -705,7 +705,6 @@ tr_TR:
     notify_mods_when_user_blocked: "Eğer bir kullanıcı otomatik olarak engellendiyse, tüm moderatörlere ileti yolla."
     flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel istenmeyen olarak bildir. "
     traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan."
-    allow_html_tables: "Tabloların HTML etiketleri kullanılarak Markdown ile oluşturulmasına izin verin. TABLE, THEAD, TD, TR, TH kabul edilir (tablo içeren tüm eski gönderilerin yenilenmesini gerektirir) "
     post_undo_action_window_mins: "Bir gönderide yapılan yeni eylemlerin (beğenme, bildirme vb) geri alınabileceği zaman, dakika olarak"
     must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir. UYARI: yayındaki bir site için bunu etkinleştirmek görevli olmayan hesapların erişimini iptal edecek."
     pending_users_reminder_delay: "Belirtilen saatten daha uzun bir süredir onay bekleyen yeni kullanıcılar mevcutsa moderatörleri bilgilendir. Bilgilendirmeyi devre dışı bırakmak için -1 girin."
@@ -1325,26 +1324,6 @@ tr_TR:
     visit_link_to_respond: "Cevaplamak için [konuyu ziyaret edin](%{base_url}%{url})."
     visit_link_to_respond_pm: "Cevaplamak için [iletiyi ziyaret edin](%{base_url}%{url})."
     posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi"
-    invited_to_private_message_body: |
-      %{username} sizi bir iletiye davet etti
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      şurada
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} sizi bir tartışmaya davet etti
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      şurada
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       text_body_template: |
         %{header_instructions}
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 62f13094af..8445258d57 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -681,7 +681,6 @@ vi:
     notify_mods_when_user_blocked: "Nếu một thành viên được khóa tự động, gửi tin nhắn đến tất cả các điều hành viên."
     flag_sockpuppets: "Nếu thành viên mới trả lời chủ đề có cùng địa chỉ IP với thành viên mới tạo chủ đề, đánh dấu các bài viết của họ là spam tiềm năng."
     traditional_markdown_linebreaks: "Sử dụng ngắt dòng truyền thống trong Markdown, đòi hỏi hai khoảng trống kế tiếp cho một ngắt dòng."
-    allow_html_tables: "Cho phép nhập bảng trong Markdown sử dụng các thẻ HTML. TABLE, THEAD, TD, TR, TH sẽ được sử dụng (đòi hỏi thực hiện lại cho các bài viết cũ có chứa bảng)"
     post_undo_action_window_mins: "Số phút thành viên được phép làm lại các hành động gần đây với bài viết (like, đánh dấu...)."
     must_approve_users: "Quản trị viên phải duyệt tất cả các tài khoản thành viên mới trước khi họ có quyền truy cập website. LƯU Ý: bật tính năng này trên site đang hoạt động sẽ hủy bỏ quyền truy cập đối với các tài khoản thành viên hiện tại!"
     pending_users_reminder_delay: "Thông báo cho quản trị viên nếu thành viên mới đã chờ duyệt lâu hơn số giờ được thiết lập ở đây, đặt là -1 để tắt thông báo."
@@ -1286,26 +1285,6 @@ vi:
       description: "Bạn không thích nhận mail giống mail này? Nhấn vào bỏ theo dõi để bỏ đăng ký ngay lập tức:"
     only_reply_by_email: "Trả lời email này để phản hồi."
     posted_by: "Đăng bởi %{{username} ngày %{post_date}"
-    invited_to_private_message_body: |
-      %{username} mời bạn xem
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tại
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} mời bạn thảo luận
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      tại
-
-      > %{site_title} -- %{site_description}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 297f1c3e33..27008d68fa 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -347,7 +347,7 @@ zh_CN:
   meta_category_description: "讨论该站点的站务、组织、如何运作和如何改善它。"
   staff_category_name: "管理人员"
   staff_category_description: "管理人员可见的分类。只有管理员和版主才能阅览主题。"
-  assets_topic_title: "站点设计资料"
+  assets_topic_title: "站点设计资源"
   discourse_welcome_topic:
     title: "欢迎来到 Discourse"
     body: |2
@@ -881,7 +881,6 @@ zh_CN:
     notify_mods_when_user_blocked: "如果一个用户被自动封禁了，发送一个私信给所有管理员。"
     flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行"
-    allow_html_tables: "允许在输入 Markdown 文本时使用表格 HTML 标签。标签 TABLE、THEAD、TD、TR、TH 将被允许使用，即白名单这些标签（需要重置所有包含表格的老帖子的 HTML）"
     post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数"
     must_approve_users: "新用户在被允许访问站点前需要由管理人员批准。警告：在运行的站点中启用将解除所有非管理人员用户的访问权限！"
     pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
@@ -1462,37 +1461,9 @@ zh_CN:
   invite_mailer:
     title: "要求发件人"
     subject_template: "%{invitee_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' "
-    text_body_template: |
-      %{invitee_name}邀请你参与讨论：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      社区：
-
-      > %{site_title} -- %{site_description}
-
-      如果你有兴趣，点击下方的链接：
-
-      %{invite_link}
   custom_invite_mailer:
     title: "自定义邀请发件人"
     subject_template: "%{invitee_name}邀请你'%{topic_title}'在%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name}邀请你参与讨论：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      社区：
-
-      > %{site_title} -- %{site_description}
-
-      如果你有兴趣，点击下方的链接：
-
-      %{invite_link}
   invite_forum_mailer:
     title: "邀请论坛发件人"
     subject_template: "%{invitee_name} 邀请你加入 %{site_domain_name}"
@@ -2033,26 +2004,6 @@ zh_CN:
     visit_link_to_respond: "[访问主题](%{base_url}%{url})以回复."
     visit_link_to_respond_pm: "[访问私信](%{base_url}%{url})以回复."
     posted_by: "%{username}发表于%{post_date}"
-    invited_to_private_message_body: |
-      %{username} 邀请你至私信交流：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      论坛：
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} 邀请你参与讨论：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      论坛：
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "邀请用户至私信"
       subject_template: "[%{email_prefix}] %{username}邀请你至私信“%{topic_title}”"
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index ebd13f4af5..bd0659b579 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -832,7 +832,6 @@ zh_TW:
     notify_mods_when_user_blocked: "若有用戶被自動封鎖，將發送訊息給所有板主。"
     flag_sockpuppets: "如果一個新用戶開始了一個主題，並且同時另一個新用戶以同一個 IP 在該主題回復，他們所有的帖子都將被自動標記為垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用傳統的換行符號，即用兩個行末空格來換行"
-    allow_html_tables: "允許在輸入 Markdown 文本時使用表格 HTML 標籤。標籤 TABLE、THEAD、TD、TR、TH 將被允許使用，即白名單這些標籤（需要重置所有包含表格的老帖子的 HTML）"
     post_undo_action_window_mins: "允許用戶在帖子上進行撤銷操作（讚、標記等）所需等待的時間分隔（分鐘）"
     must_approve_users: "新用戶在被允許訪問站點前需要由管理人員批准。警告：在運行的站點中啟用將解除所有非管理人員用戶的訪問權限！"
     pending_users_reminder_delay: "如果新用戶等待批准時間超過此小時設置則通知版主。設置 -1 關閉通知。"
@@ -1375,41 +1374,9 @@ zh_TW:
   invite_mailer:
     title: "邀請 Mailer"
     subject_template: "%{invitee_name} 邀請你參與在 %{site_domain_name} 討論的話題 '%{topic_title}'"
-    text_body_template: |
-      %{invitee_name} 邀請你參與位於
-
-      > %{site_title} -- %{site_description}
-
-      的以下討論
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      如果你有興趣，請點擊下面的連結：
-
-      %{invite_link}
   custom_invite_mailer:
     title: "客製邀請 Mailer"
     subject_template: "%{invitee_name}邀請你'%{topic_title}'在%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} 留下以下留言
-
-      > %{user_custom_message}
-
-      邀請你參與位於
-
-      > %{site_title} -- %{site_description}
-
-      的討論
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      如果你有興趣，請點擊下面的連結：
-
-      %{invite_link}
   invite_forum_mailer:
     title: "邀請論壇 Mailer"
     subject_template: "%{invitee_name} 邀請你加入 %{site_domain_name}"
@@ -1858,26 +1825,6 @@ zh_TW:
     visit_link_to_respond: "[訪問主題](%{base_url}%{url})以回覆。"
     visit_link_to_respond_pm: "[訪問\"私訊\"](%{base_url}%{url})以回覆。"
     posted_by: "由 %{username} 張貼於 %{post_date}"
-    invited_to_private_message_body: |
-      %{username} 邀請你至消息交流：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      論壇：
-
-      > %{site_title} -- %{site_description}
-    invited_to_topic_body: |
-      %{username} 邀請你參與討論：
-
-      > **%{topic_title}**
-      >
-      > %{topic_excerpt}
-
-      論壇：
-
-      > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       title: "用戶被邀請至私人訊息"
       text_body_template: |
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index e7741c1eb3..65b631aec3 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -121,7 +121,7 @@ server {
     }
 
     # cache emojis
-    location ~ /_?emoji.*\.(png|gif|jpg|jpeg)$/ {
+    location ~ /images/emoji/ {
       expires 1y;
       add_header Cache-Control public,immutable;
     }
diff --git a/config/puma.rb b/config/puma.rb
index d472c7278f..85f38250ec 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,4 +1,4 @@
-if ENV['RAILS_ENV']=='production'
+if ENV['RAILS_ENV'] == 'production'
 
   # First, you need to change these below to your situation.
   APP_ROOT = '/home/discourse/discourse'
@@ -6,11 +6,11 @@ if ENV['RAILS_ENV']=='production'
 
   # Second, you can choose how many threads that you are going to run at same time.
   workers "#{num_workers}"
-  threads 8,32
+  threads 8, 32
 
   # Unless you know what you are changing, do not change them.
-  bind  "unix://#{APP_ROOT}/tmp/sockets/puma.sock"
-  stdout_redirect "#{APP_ROOT}/log/puma.log","#{APP_ROOT}/log/puma.err.log"
+  bind "unix://#{APP_ROOT}/tmp/sockets/puma.sock"
+  stdout_redirect "#{APP_ROOT}/log/puma.log", "#{APP_ROOT}/log/puma.err.log"
   pidfile "#{APP_ROOT}/tmp/pids/puma.pid"
   state_path "#{APP_ROOT}/tmp/pids/puma.state"
   daemonize true
diff --git a/config/routes.rb b/config/routes.rb
index ebc92dc8df..553bbc9e5b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -130,12 +130,11 @@ Discourse::Application.routes.draw do
       put "anonymize"
       post "reset_bounce_score"
     end
-    get "users/:id.json" => 'users#show', defaults: {format: 'json'}
-    get 'users/:id/:username' => 'users#show', constraints: {username: USERNAME_ROUTE_FORMAT}
+    get "users/:id.json" => 'users#show', defaults: { format: 'json' }
+    get 'users/:id/:username' => 'users#show', constraints: { username: USERNAME_ROUTE_FORMAT }
     get 'users/:id/:username/badges' => 'users#show'
     get 'users/:id/:username/tl3_requirements' => 'users#show'
 
-
     post "users/sync_sso" => "users#sync_sso", constraints: AdminConstraint.new
     post "users/invite_admin" => "users#invite_admin", constraints: AdminConstraint.new
 
@@ -169,6 +168,12 @@ Discourse::Application.routes.draw do
         end
       end
       resources :screened_urls,         only: [:index]
+      resources :watched_words, only: [:index, :create, :update, :destroy] do
+        collection do
+          get "action/:id" => "watched_words#index"
+        end
+      end
+      post "watched_words/upload" => "watched_words#upload"
     end
 
     get "/logs" => "staff_action_logs#index"
@@ -266,10 +271,9 @@ Discourse::Application.routes.draw do
       end
     end
 
-    get "memory_stats"=> "diagnostics#memory_stats", constraints: AdminConstraint.new
-    get "dump_heap"=> "diagnostics#dump_heap", constraints: AdminConstraint.new
-    get "dump_statement_cache"=> "diagnostics#dump_statement_cache", constraints: AdminConstraint.new
-
+    get "memory_stats" => "diagnostics#memory_stats", constraints: AdminConstraint.new
+    get "dump_heap" => "diagnostics#dump_heap", constraints: AdminConstraint.new
+    get "dump_statement_cache" => "diagnostics#dump_statement_cache", constraints: AdminConstraint.new
   end # admin namespace
 
   get "email_preferences" => "email#preferences_redirect", :as => "email_preferences_redirect"
@@ -327,7 +331,7 @@ Discourse::Application.routes.draw do
     post "#{root_path}/read-faq" => "users#read_faq"
     get "#{root_path}/search/users" => "users#search_users"
 
-    get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : {as: :old_account_created}))
+    get({ "#{root_path}/account-created/" => "users#account_created" }.merge(index == 1 ? { as: :users_account_created } : { as: :old_account_created }))
 
     get "#{root_path}/account-created/resent" => "users#account_created"
     get "#{root_path}/account-created/edit-email" => "users#account_created"
@@ -342,63 +346,63 @@ Discourse::Application.routes.draw do
       constraints: { token: /[0-9a-f]+/ }
     }.merge(index == 1 ? { as: 'confirm_admin' } : {}))
     post "#{root_path}/confirm-admin/:token" => "users#confirm_admin", constraints: { token: /[0-9a-f]+/ }
-    get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username.json" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json}
+    get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/messages/:filter" => "user_actions#private_messages", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: { username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: { username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username.json" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }, defaults: { format: :json }
     get({ "#{root_path}/:username" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT, format: /(json|html)/ } }.merge(index == 1 ? { as: 'user' } : {}))
-    put "#{root_path}/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: { format: :json }
-    get "#{root_path}/:username/emails" => "users#check_emails", constraints: {username: USERNAME_ROUTE_FORMAT}
+    put "#{root_path}/:username" => "users#update", constraints: { username: USERNAME_ROUTE_FORMAT }, defaults: { format: :json }
+    get "#{root_path}/:username/emails" => "users#check_emails", constraints: { username: USERNAME_ROUTE_FORMAT }
     get({ "#{root_path}/:username/preferences" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT } }.merge(index == 1 ? { as: :email_preferences } : {}))
-    get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/about-me" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/username" => "users#username", constraints: {username: USERNAME_ROUTE_FORMAT}
-    delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/preferences/card-badge" => "users#card_badge", constraints: {username: USERNAME_ROUTE_FORMAT}
-    put "#{root_path}/:username/preferences/card-badge" => "users#update_card_badge", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/summary" => "users#summary", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/invited" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT}
+    get "#{root_path}/:username/preferences/email" => "users_email#index", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/account" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/profile" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/emails" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/notifications" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/categories" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/tags" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/interface" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/apps" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    put "#{root_path}/:username/preferences/email" => "users_email#update", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/about-me" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/badge_title" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    put "#{root_path}/:username/preferences/badge_title" => "users#badge_title", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/username" => "users#preferences", constraints: { username: USERNAME_ROUTE_FORMAT }
+    put "#{root_path}/:username/preferences/username" => "users#username", constraints: { username: USERNAME_ROUTE_FORMAT }
+    delete "#{root_path}/:username/preferences/user_image" => "users#destroy_user_image", constraints: { username: USERNAME_ROUTE_FORMAT }
+    put "#{root_path}/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/preferences/card-badge" => "users#card_badge", constraints: { username: USERNAME_ROUTE_FORMAT }
+    put "#{root_path}/:username/preferences/card-badge" => "users#update_card_badge", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/staff-info" => "users#staff_info", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/summary" => "users#summary", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/invited" => "users#invited", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/invited_count" => "users#invited_count", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/invited/:filter" => "users#invited", constraints: { username: USERNAME_ROUTE_FORMAT }
     post "#{root_path}/action/send_activation_email" => "users#send_activation_email"
-    get "#{root_path}/:username/summary" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/badges" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/notifications" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/activity/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    delete "#{root_path}/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/by-external/:external_id" => "users#show", constraints: {external_id: /[^\/]+/}
-    get "#{root_path}/:username/flagged-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/deleted-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
-    get "#{root_path}/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: {username: USERNAME_ROUTE_FORMAT}
+    get "#{root_path}/:username/summary" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/activity" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/activity/:filter" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/badges" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/notifications" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/notifications/:filter" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/activity/pending" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    delete "#{root_path}/:username" => "users#destroy", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/by-external/:external_id" => "users#show", constraints: { external_id: /[^\/]+/ }
+    get "#{root_path}/:username/flagged-posts" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/deleted-posts" => "users#show", constraints: { username: USERNAME_ROUTE_FORMAT }
+    get "#{root_path}/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: { username: USERNAME_ROUTE_FORMAT }
   end
 
-  get "user-badges/:username.json" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json}
-  get "user-badges/:username" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "user-badges/:username.json" => "user_badges#username", constraints: { username: USERNAME_ROUTE_FORMAT }, defaults: { format: :json }
+  get "user-badges/:username" => "user_badges#username", constraints: { username: USERNAME_ROUTE_FORMAT }
 
-  post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT}
+  post "user_avatar/:username/refresh_gravatar" => "user_avatars#refresh_gravatar", constraints: { username: USERNAME_ROUTE_FORMAT }
+  get "letter_avatar/:username/:size/:version.png" => "user_avatars#show_letter", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT }
   get "user_avatar/:hostname/:username/:size/:version.png" => "user_avatars#show", format: false, constraints: { hostname: /[\w\.-]+/, size: /\d+/, username: USERNAME_ROUTE_FORMAT }
 
   # in most production settings this is bypassed
@@ -422,8 +426,8 @@ Discourse::Application.routes.draw do
   get "private-posts" => "posts#latest", id: "private_posts"
   get "posts/by_number/:topic_id/:post_number" => "posts#by_number"
   get "posts/:id/reply-history" => "posts#reply_history"
-  get "posts/:username/deleted" => "posts#deleted_posts", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "posts/:username/flagged" => "posts#flagged_posts", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "posts/:username/deleted" => "posts#deleted_posts", constraints: { username: USERNAME_ROUTE_FORMAT }
+  get "posts/:username/flagged" => "posts#flagged_posts", constraints: { username: USERNAME_ROUTE_FORMAT }
 
   resources :groups, id: USERNAME_ROUTE_FORMAT do
     get "posts.rss" => "groups#posts_feed", format: :rss
@@ -440,6 +444,10 @@ Discourse::Application.routes.draw do
     get 'mentionable'
     get 'logs' => 'groups#histories'
 
+    collection do
+      get "search" => "groups#search"
+    end
+
     member do
       put "members" => "groups#add_members"
       delete "members" => "groups#remove_member"
@@ -501,10 +509,9 @@ Discourse::Application.routes.draw do
   get "/badges/:id(/:slug)" => "badges#show"
   resources :user_badges, only: [:index, :create, :destroy]
 
-
   get '/c', to: redirect('/categories')
 
-  resources :categories, :except => :show
+  resources :categories, except: :show
   post "category/:category_id/move" => "categories#move"
   post "categories/reorder" => "categories#reorder"
   post "category/:category_id/notifications" => "categories#set_notifications"
@@ -550,6 +557,7 @@ Discourse::Application.routes.draw do
   get "top" => "list#top"
   get "search/query" => "search#query"
   get "search" => "search#show"
+  post "search/click" => "search#click"
 
   # Topics resource
   get "t/:id" => "topics#show"
@@ -566,11 +574,11 @@ Discourse::Application.routes.draw do
   resources :similar_topics
 
   get "topics/feature_stats"
-  get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "topics/private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", constraints: {username: USERNAME_ROUTE_FORMAT}
+  get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: { username: USERNAME_ROUTE_FORMAT }
+  get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: { username: USERNAME_ROUTE_FORMAT }
+  get "topics/private-messages-sent/:username" => "list#private_messages_sent", as: "topics_private_messages_sent", constraints: { username: USERNAME_ROUTE_FORMAT }
+  get "topics/private-messages-archive/:username" => "list#private_messages_archive", as: "topics_private_messages_archive", constraints: { username: USERNAME_ROUTE_FORMAT }
+  get "topics/private-messages-unread/:username" => "list#private_messages_unread", as: "topics_private_messages_unread", constraints: { username: USERNAME_ROUTE_FORMAT }
   get "topics/private-messages-group/:username/:group_name.json" => "list#private_messages_group", as: "topics_private_messages_group", constraints: {
     username: USERNAME_ROUTE_FORMAT,
     group_name: USERNAME_ROUTE_FORMAT
@@ -590,49 +598,49 @@ Discourse::Application.routes.draw do
 
   # Topic routes
   get "t/id_for/:slug" => "topics#id_for_slug"
-  get "t/:slug/:topic_id/print" => "topics#show", format: :html, print: true, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/wordpress" => "topics#wordpress", constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/summary" => "topics#show", defaults: {summary: true}, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/summary" => "topics#show", constraints: {topic_id: /\d+/}
-  put "t/:slug/:topic_id" => "topics#update", constraints: {topic_id: /\d+/}
-  put "t/:slug/:topic_id/star" => "topics#star", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/star" => "topics#star", constraints: {topic_id: /\d+/}
-  put "t/:slug/:topic_id/status" => "topics#status", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/status" => "topics#status", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/clear-pin" => "topics#clear_pin", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/re-pin" => "topics#re_pin", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/mute" => "topics#mute", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/unmute" => "topics#unmute", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/timer" => "topics#timer", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/make-banner" => "topics#make_banner", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove-banner" => "topics#remove_banner", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove-allowed-user" => "topics#remove_allowed_user", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove-allowed-group" => "topics#remove_allowed_group", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/recover" => "topics#recover", constraints: {topic_id: /\d+/}
-  get "t/:topic_id/:post_number" => "topics#show", constraints: {topic_id: /\d+/, post_number: /\d+/}
-  get "t/:topic_id/last" => "topics#show", post_number: 99999999, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id.rss" => "topics#feed", format: :rss, constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id" => "topics#show", constraints: {topic_id: /\d+/}
-  get "t/:slug/:topic_id/:post_number" => "topics#show", constraints: {topic_id: /\d+/, post_number: /\d+/}
-  get "t/:slug/:topic_id/last" => "topics#show", post_number: 99999999, constraints: {topic_id: /\d+/}
-  get "t/:topic_id/posts" => "topics#posts", constraints: {topic_id: /\d+/}, format: :json
-  get "t/:topic_id/excerpts" => "topics#excerpts", constraints: {topic_id: /\d+/}, format: :json
-  post "t/:topic_id/timings" => "topics#timings", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/invite" => "topics#invite", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/invite-group" => "topics#invite_group", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/move-posts" => "topics#move_posts", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: {topic_id: /\d+/}
-  post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: {topic_id: /\d+/}
-  delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/bookmark" => "topics#bookmark", constraints: {topic_id: /\d+/}
-  put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: {topic_id: /\d+/}
+  get "t/:slug/:topic_id/print" => "topics#show", format: :html, print: true, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/wordpress" => "topics#wordpress", constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/moderator-liked" => "topics#moderator_liked", constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/summary" => "topics#show", defaults: { summary: true }, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/unsubscribe" => "topics#unsubscribe", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/summary" => "topics#show", constraints: { topic_id: /\d+/ }
+  put "t/:slug/:topic_id" => "topics#update", constraints: { topic_id: /\d+/ }
+  put "t/:slug/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/star" => "topics#star", constraints: { topic_id: /\d+/ }
+  put "t/:slug/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/status" => "topics#status", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/clear-pin" => "topics#clear_pin", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/re-pin" => "topics#re_pin", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/mute" => "topics#mute", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/unmute" => "topics#unmute", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/timer" => "topics#timer", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/make-banner" => "topics#make_banner", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove-banner" => "topics#remove_banner", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove-allowed-user" => "topics#remove_allowed_user", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove-allowed-group" => "topics#remove_allowed_group", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/recover" => "topics#recover", constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
+  get "t/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id.rss" => "topics#feed", format: :rss, constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id" => "topics#show", constraints: { topic_id: /\d+/ }
+  get "t/:slug/:topic_id/:post_number" => "topics#show", constraints: { topic_id: /\d+/, post_number: /\d+/ }
+  get "t/:slug/:topic_id/last" => "topics#show", post_number: 99999999, constraints: { topic_id: /\d+/ }
+  get "t/:topic_id/posts" => "topics#posts", constraints: { topic_id: /\d+/ }, format: :json
+  get "t/:topic_id/excerpts" => "topics#excerpts", constraints: { topic_id: /\d+/ }, format: :json
+  post "t/:topic_id/timings" => "topics#timings", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/invite" => "topics#invite", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/invite-group" => "topics#invite_group", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/move-posts" => "topics#move_posts", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/merge-topic" => "topics#merge_topic", constraints: { topic_id: /\d+/ }
+  post "t/:topic_id/change-owner" => "topics#change_post_owners", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/change-timestamp" => "topics#change_timestamps", constraints: { topic_id: /\d+/ }
+  delete "t/:topic_id/timings" => "topics#destroy_timings", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/bookmark" => "topics#bookmark", constraints: { topic_id: /\d+/ }
+  put "t/:topic_id/remove_bookmarks" => "topics#remove_bookmarks", constraints: { topic_id: /\d+/ }
 
-  post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: {topic_id: /\d+/}
+  post "t/:topic_id/notifications" => "topics#set_notifications" , constraints: { topic_id: /\d+/ }
 
   get "p/:post_id(/:user_id)" => "posts#short_link"
   get "/posts/:id/cooked" => "posts#cooked"
@@ -663,6 +671,7 @@ Discourse::Application.routes.draw do
   end
 
   get "onebox" => "onebox#show"
+  get "inline-onebox" => "inline_onebox#show"
 
   get "exception" => "list#latest"
 
@@ -712,12 +721,12 @@ Discourse::Application.routes.draw do
   end
 
   Discourse.filters.each do |filter|
-    root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), :as => "list_#{filter}"
+    root to: "list##{filter}", constraints: HomePageConstraint.new("#{filter}"), as: "list_#{filter}"
   end
   # special case for categories
-  root to: "categories#index", constraints: HomePageConstraint.new("categories"), :as => "categories_index"
+  root to: "categories#index", constraints: HomePageConstraint.new("categories"), as: "categories_index"
   # special case for top
-  root to: "list#top", constraints: HomePageConstraint.new("top"), :as => "top_lists"
+  root to: "list#top", constraints: HomePageConstraint.new("top"), as: "top_lists"
 
   root to: 'finish_installation#index', constraints: HomePageConstraint.new("finish_installation"), as: 'installation_redirect'
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index fd487d97a6..ed2147124e 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -103,6 +103,9 @@ basic:
   ga_universal_domain_name:
     client: true
     default: 'auto'
+  ga_universal_auto_link_domains:
+    default: ''
+    type: list
   ga_tracking_code:
     client: true
     default: ''
@@ -492,18 +495,12 @@ posting:
   delete_removed_posts_after:
     client: true
     default: 24
-  enable_experimental_markdown_it:
-    client: true
-    default: false
   traditional_markdown_linebreaks:
     client: true
     default: false
   enable_markdown_typographer:
     client: true
-    default: false
-  allow_html_tables:
-    client: true
-    default: false
+    default: true
   suppress_reply_directly_below:
     client: true
     default: true
@@ -558,11 +555,6 @@ posting:
     type: list
     client: true
   delete_old_hidden_posts: true
-  censored_words:
-    client: true
-    default: ''
-    refresh: true
-    type: list
   censored_pattern:
     client: true
     default: ''
@@ -641,7 +633,7 @@ email:
     default: ''
     validator: "AlternativeReplyByEmailAddressesValidator"
   find_related_post_with_key:
-    default: false
+    default: true
   manual_polling_enabled:
     default: false
   pop3_polling_enabled:
@@ -814,6 +806,7 @@ files:
   allow_staff_to_upload_any_file_in_pm:
     default: true
     client: true
+  strip_image_metadata: true
 
 trust:
   default_trust_level:
@@ -923,6 +916,9 @@ onebox:
   max_oneboxes_per_post:
     default: 50
     client: true
+  inline_onebox_domains_whitelist:
+    default: ''
+    type: list
 
 spam:
   add_rel_nofollow_to_user_content: true
@@ -1113,7 +1109,7 @@ legal:
 
 backups:
   readonly_mode_during_backup:
-    default: true
+    default: false
   allow_restore:
     default: false
   maximum_backups:
@@ -1150,6 +1146,8 @@ search:
   search_tokenize_chinese_japanese_korean: false
   search_prefer_recent_posts: false
   search_recent_posts_size: 100000
+  log_search_queries: true
+  search_query_log_max_size: 1000000
 
 uncategorized:
   version_checks:
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index 716c96cc98..e0d0894cec 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -126,9 +126,9 @@ before_fork do |server, worker|
 
         def max_rss
           rss = `ps -eo rss,args | grep sidekiq | grep -v grep | awk '{print $1}'`
-                .split("\n")
-                .map(&:to_i)
-                .max
+            .split("\n")
+            .map(&:to_i)
+            .max
 
           rss ||= 0
 
@@ -146,9 +146,9 @@ before_fork do |server, worker|
         def force_kill_rogue_sidekiq
           info = `ps -eo pid,rss,args | grep sidekiq | grep -v grep | awk '{print $1,$2}'`
           info.split("\n").each do |row|
-            pid,mem = row.split(" ").map(&:to_i)
-            if pid > 0 && (mem*1024) > max_allowed_size
-              Rails.logger.warn "Detected rogue Sidekiq pid #{pid} mem #{mem*1024}, killing"
+            pid, mem = row.split(" ").map(&:to_i)
+            if pid > 0 && (mem * 1024) > max_allowed_size
+              Rails.logger.warn "Detected rogue Sidekiq pid #{pid} mem #{mem * 1024}, killing"
               Process.kill("KILL", pid) rescue nil
             end
           end
@@ -199,7 +199,6 @@ before_fork do |server, worker|
   ActiveRecord::Base.connection.disconnect!
   $redis.client.disconnect
 
-
   # Throttle the master from forking too quickly by sleeping.  Due
   # to the implementation of standard Unix signal handlers, this
   # helps (but does not completely) prevent identical, repeated signals
diff --git a/db/fixtures/001_categories.rb b/db/fixtures/001_categories.rb
index 1a0282b84e..4dc13268ac 100644
--- a/db/fixtures/001_categories.rb
+++ b/db/fixtures/001_categories.rb
@@ -30,7 +30,7 @@ ColumnDropper.drop(
   table: 'categories',
   after_migration: 'AddUploadsToCategories',
   columns: ['logo_url', 'background_url'],
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts 'Removing superflous categories columns!'
   }
 )
diff --git a/db/fixtures/002_groups.rb b/db/fixtures/002_groups.rb
index 68912df848..d7ae62c944 100644
--- a/db/fixtures/002_groups.rb
+++ b/db/fixtures/002_groups.rb
@@ -7,9 +7,9 @@ Group.where(name: 'everyone').update_all(visibility_level: Group.visibility_leve
 
 ColumnDropper.drop(
   table: 'groups',
-  after_migration: 'AddVisibleBackToGroups',
-  columns:  %w[visible],
-  on_drop: ->(){
+  after_migration: 'RemovePublicFromGroups',
+  columns:  %w[visible public],
+  on_drop: ->() {
     STDERR.puts 'Removing superflous visible group column!'
   }
 )
diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb
index a8f55dd6f8..22cf2c7714 100644
--- a/db/fixtures/006_badges.rb
+++ b/db/fixtures/006_badges.rb
@@ -142,9 +142,9 @@ Badge.seed do |b|
 end
 
 [
-  [Badge::Promoter,"Promoter",BadgeType::Bronze,1,0],
-  [Badge::Campaigner,"Campaigner",BadgeType::Silver,3,1],
-  [Badge::Champion,"Champion",BadgeType::Gold,5,2],
+  [Badge::Promoter, "Promoter", BadgeType::Bronze, 1, 0],
+  [Badge::Campaigner, "Campaigner", BadgeType::Silver, 3, 1],
+  [Badge::Champion, "Champion", BadgeType::Gold, 5, 2],
 ].each do |id, name, type, count, trust_level|
   Badge.seed do |b|
     b.id = id
@@ -154,7 +154,7 @@ end
     b.multiple_grant = false
     b.target_posts = false
     b.show_posts = false
-    b.query = BadgeQueries.invite_badge(count,trust_level)
+    b.query = BadgeQueries.invite_badge(count, trust_level)
     b.default_badge_grouping_id = BadgeGrouping::Community
     # daily is good enough
     b.trigger = Badge::Trigger::None
@@ -307,7 +307,6 @@ end
   end
 end
 
-
 [
   [Badge::ThankYou,   "Thank You",  BadgeType::Bronze, 20, 10],
   [Badge::GivesBack,  "Gives Back", BadgeType::Silver, 100, 100],
diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb
index d725d78a41..937faa20cf 100644
--- a/db/fixtures/009_users.rb
+++ b/db/fixtures/009_users.rb
@@ -6,12 +6,18 @@ if user
   user.save
 end
 
+UserEmail.seed do |ue|
+  ue.id = -1
+  ue.email = "no_email"
+  ue.primary = true
+  ue.user_id = -1
+end
+
 User.seed do |u|
   u.id = -1
   u.name = "system"
   u.username = "system"
   u.username_lower = "system"
-  u.email = "no_email"
   u.password = SecureRandom.hex
   u.active = true
   u.admin = true
@@ -27,7 +33,6 @@ UserOption.where(user_id: -1).update_all(
 
 Group.user_trust_level_change!(-1, TrustLevel[4])
 
-
 ColumnDropper.drop(
   table: 'users',
   after_migration: 'AddUserAuthTokens',
@@ -49,19 +54,25 @@ ColumnDropper.drop(
       last_redirected_to_top_at
       auth_token
       auth_token_updated_at ],
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts 'Removing superflous users columns!'
   }
 )
 
 # User for the smoke tests
 if ENV["SMOKE"] == "1"
+  UserEmail.seed do |ue|
+    ue.id = 0
+    ue.email = "smoke_user@discourse.org"
+    ue.primary = true
+    ue.user_id = 0
+  end
+
   smoke_user = User.seed do |u|
     u.id = 0
     u.name = "smoke_user"
     u.username = "smoke_user"
     u.username_lower = "smoke_user"
-    u.email = "smoke_user@discourse.org"
     u.password = "P4ssw0rd"
     u.active = true
     u.approved = true
@@ -77,4 +88,3 @@ if ENV["SMOKE"] == "1"
 
   EmailToken.where(user_id: smoke_user.id).update_all(confirmed: true)
 end
-
diff --git a/db/fixtures/501_meta_category.rb b/db/fixtures/501_meta_category.rb
index 9996b2abc8..38ed96aaea 100644
--- a/db/fixtures/501_meta_category.rb
+++ b/db/fixtures/501_meta_category.rb
@@ -17,7 +17,7 @@ unless Rails.env.test?
         raise "Failed meta topic"
       end
 
-      meta.set_permissions(:everyone => :full)
+      meta.set_permissions(everyone: :full)
       meta.topic_id = post.topic.id
       unless meta.save
         puts meta.errors.full_messages
diff --git a/db/fixtures/502_staff_category.rb b/db/fixtures/502_staff_category.rb
index f1b62c1bf2..54faa6385b 100644
--- a/db/fixtures/502_staff_category.rb
+++ b/db/fixtures/502_staff_category.rb
@@ -1,6 +1,6 @@
 unless Rails.env.test?
   staff = Category.find_by(id: SiteSetting.staff_category_id)
-  if staff and !staff.group_ids.include?(Group[:staff].id)
+  if staff && !staff.group_ids.include?(Group[:staff].id)
 
     # Add permissions and a description to the Staff category.
 
diff --git a/db/fixtures/600_themes.rb b/db/fixtures/600_themes.rb
index 0ec6e274d2..5b141c57ad 100644
--- a/db/fixtures/600_themes.rb
+++ b/db/fixtures/600_themes.rb
@@ -7,13 +7,13 @@ if !Theme.exists?
   dark_scheme ||= ColorScheme.create_from_base(name: name, via_wizard: true, base_scheme_id: "dark")
 
   name = I18n.t('color_schemes.dark_theme_name')
-  _dark_theme =  Theme.create(name: name, user_id: -1,
-                                         color_scheme_id: dark_scheme.id,
-                                         user_selectable: true)
+  _dark_theme = Theme.create(name: name, user_id: -1,
+                             color_scheme_id: dark_scheme.id,
+                             user_selectable: true)
 
   name = I18n.t('color_schemes.default_theme_name')
-  default_theme =  Theme.create(name: name, user_id: -1,
-                                         user_selectable: true)
+  default_theme = Theme.create(name: name, user_id: -1,
+                               user_selectable: true)
 
   default_theme.set_default!
 end
@@ -22,7 +22,7 @@ ColumnDropper.drop(
   table: 'theme_fields',
   after_migration: 'AddUploadIdToThemeFields',
   columns: ['target'],
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts 'Removing superflous theme_fields target column!'
   }
 )
diff --git a/db/fixtures/999_delayed.rb b/db/fixtures/999_delayed.rb
index 1141e13e64..4d69a58267 100644
--- a/db/fixtures/999_delayed.rb
+++ b/db/fixtures/999_delayed.rb
@@ -6,7 +6,7 @@ TableMigrationHelper.delayed_drop(
   old_name: 'topic_status_updates',
   new_name: 'topic_timers',
   after_migration: 'RenameTopicStatusUpdatesToTopicTimers',
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts "Dropping topic_status_updates. It was moved to topic_timers."
   }
 )
diff --git a/db/fixtures/999_topics.rb b/db/fixtures/999_topics.rb
index 541cacad12..25958a8c69 100644
--- a/db/fixtures/999_topics.rb
+++ b/db/fixtures/999_topics.rb
@@ -6,9 +6,9 @@ staff = Category.find_by(id: SiteSetting.staff_category_id)
 seed_welcome_topics = (Topic.where('id NOT IN (SELECT topic_id from categories where topic_id is not null)').count == 0 && !Rails.env.test?)
 
 unless Rails.env.test?
-  def create_static_page_topic(site_setting_key, title_key, body_key, body_override, category, description, params={})
+  def create_static_page_topic(site_setting_key, title_key, body_key, body_override, category, description, params = {})
     unless SiteSetting.send(site_setting_key) > 0
-      creator = PostCreator.new( Discourse.system_user,
+      creator = PostCreator.new(Discourse.system_user,
                                  title: I18n.t(title_key, default: I18n.t(title_key, locale: :en)),
                                  raw: body_override.present? ? body_override : I18n.t(body_key, params.merge(default: I18n.t(body_key, params.merge(locale: :en)))),
                                  skip_validations: true,
@@ -19,18 +19,16 @@ unless Rails.env.test?
 
       SiteSetting.send("#{site_setting_key}=", post.topic_id)
 
-      _reply = PostCreator.create( Discourse.system_user,
+      _reply = PostCreator.create(Discourse.system_user,
                                   raw: I18n.t('static_topic_first_reply', page_name: I18n.t(title_key, default: I18n.t(title_key, locale: :en))),
                                   skip_validations: true,
-                                  topic_id: post.topic_id )
+                                  topic_id: post.topic_id)
     end
   end
 
-  create_static_page_topic('tos_topic_id', 'tos_topic.title', "tos_topic.body", nil, staff, "terms of service", {
-    company_domain: "company_domain",
-    company_full_name: "company_full_name",
-    company_name: "company_short_name"
-  })
+  create_static_page_topic('tos_topic_id', 'tos_topic.title', "tos_topic.body", nil, staff, "terms of service",     company_domain: "company_domain",
+                                                                                                                    company_full_name: "company_full_name",
+                                                                                                                    company_name: "company_short_name")
 
   create_static_page_topic('guidelines_topic_id', 'guidelines_topic.title', "guidelines_topic.body", nil, staff, "guidelines")
 
@@ -57,15 +55,13 @@ if seed_welcome_topics
   end
 
   welcome = File.read(filename)
-  PostCreator.create( Discourse.system_user,
+  PostCreator.create(Discourse.system_user,
                       raw: welcome,
                       title: DiscoursePluginRegistry.seed_data["admin_quick_start_title"] || "READ ME FIRST: Admin Quick Start Guide",
                       skip_validations: true,
                       category: staff ? staff.name : nil)
 end
 
-
-
 # run this later, cause we need to make sure new application controller resilience is in place first
 
 ColumnDropper.drop(
@@ -74,7 +70,7 @@ ColumnDropper.drop(
   columns: %w{
     first_topic_unread_at
   },
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts "Removing superflous user stats columns!"
     ActiveRecord::Base.exec_sql "DROP FUNCTION IF EXISTS first_unread_topic_for(int)"
   }
@@ -91,7 +87,7 @@ ColumnDropper.drop(
     notify_user_count
     last_unread_at
   },
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts "Removing superflous topic columns!"
   }
 )
@@ -106,7 +102,7 @@ ColumnDropper.drop(
     auto_close_based_on_last_post
     auto_close_hours
   },
-  on_drop: ->(){
+  on_drop: ->() {
     STDERR.puts "Removing superflous topic columns!"
   },
   delay: 3600
diff --git a/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb b/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb
index 9f7daa2742..28e3371745 100644
--- a/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb
+++ b/db/migrate/20120502192121_add_last_post_user_id_to_forum_threads.rb
@@ -3,7 +3,6 @@ class AddLastPostUserIdToForumThreads < ActiveRecord::Migration
   def up
     add_column :forum_threads, :last_post_user_id, :integer
 
-
     execute "update forum_threads t
     set last_post_user_id = (select user_id from posts where forum_thread_id = t.Id order by post_number desc limit 1)"
 
diff --git a/db/migrate/20120629150253_denormalize_expressions.rb b/db/migrate/20120629150253_denormalize_expressions.rb
index 1b8a659db4..8a38664885 100644
--- a/db/migrate/20120629150253_denormalize_expressions.rb
+++ b/db/migrate/20120629150253_denormalize_expressions.rb
@@ -15,7 +15,6 @@ class DenormalizeExpressions < ActiveRecord::Migration
     add_column :forum_threads, :expression4_count, :integer, null: false, default: 0
     add_column :forum_threads, :expression5_count, :integer, null: false, default: 0
 
-
     (1..5).each do |i|
       execute "update posts set expression#{i}_count = (select count(*) from expressions where parent_id = posts.id and expression_type_id = #{i})"
       execute "update forum_threads set expression#{i}_count = (select sum(expression#{i}_count) from posts where forum_thread_id = forum_threads.id)"
diff --git a/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb b/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb
index bd1e05bea2..4bd5e9b733 100644
--- a/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb
+++ b/db/migrate/20120719004636_add_email_hashed_password_name_salt_to_users.rb
@@ -4,7 +4,7 @@ class AddEmailHashedPasswordNameSaltToUsers < ActiveRecord::Migration
 
     execute "update users set email= md5(random()::text) || 'domain.com'"
 
-    change_column :users, :email, :string, limit:256, null: false
+    change_column :users, :email, :string, limit: 256, null: false
     add_index :users, [:email], unique: true
 
     rename_column :users, :display_username, :name
@@ -12,7 +12,7 @@ class AddEmailHashedPasswordNameSaltToUsers < ActiveRecord::Migration
     add_column :users, :password_hash, :string, limit: 64
     add_column :users, :salt, :string, limit: 32
     add_column :users, :active, :boolean
-    add_column :users, :activation_key,:string, limit: 32
+    add_column :users, :activation_key, :string, limit: 32
 
     add_column :user_open_ids, :active, :boolean, null: false
 
diff --git a/db/migrate/20120720013733_add_username_lower_to_users.rb b/db/migrate/20120720013733_add_username_lower_to_users.rb
index 764fae375d..38602aa2aa 100644
--- a/db/migrate/20120720013733_add_username_lower_to_users.rb
+++ b/db/migrate/20120720013733_add_username_lower_to_users.rb
@@ -3,7 +3,7 @@ class AddUsernameLowerToUsers < ActiveRecord::Migration
     add_column :users, :username_lower, :string, limit: 20
     execute "update users set username_lower = lower(username)"
     add_index :users, [:username_lower], unique: true
-    change_column :users, :username_lower, :string, limit: 20, null:false
+    change_column :users, :username_lower, :string, limit: 20, null: false
   end
   def down
     remove_column :users, :username_lower
diff --git a/db/migrate/20120807223020_create_actions.rb b/db/migrate/20120807223020_create_actions.rb
index 623bda5929..ace5939785 100644
--- a/db/migrate/20120807223020_create_actions.rb
+++ b/db/migrate/20120807223020_create_actions.rb
@@ -8,7 +8,6 @@ class CreateActions < ActiveRecord::Migration
       # There is a notificiation table as well that covers much of this,
       # but this table is wider and is intended for non-notifying actions as well
 
-
       t.integer :action_type, null: false
       t.integer :user_id, null: false
       t.integer :target_forum_thread_id
diff --git a/db/migrate/20120809020415_remove_site_id.rb b/db/migrate/20120809020415_remove_site_id.rb
index 86727e86fd..c9904d4a70 100644
--- a/db/migrate/20120809020415_remove_site_id.rb
+++ b/db/migrate/20120809020415_remove_site_id.rb
@@ -9,7 +9,7 @@ class RemoveSiteId < ActiveRecord::Migration
 
     remove_index 'expression_types', name: 'index_expression_types_on_site_id_and_expression_index'
     remove_index 'expression_types', name: 'index_expression_types_on_site_id_and_name'
-    remove_column 'expression_types','site_id'
+    remove_column 'expression_types', 'site_id'
     add_index "expression_types", ["expression_index"], unique: true
     add_index "expression_types", ["name"], unique: true
 
diff --git a/db/migrate/20120809053414_correct_indexing_on_posts.rb b/db/migrate/20120809053414_correct_indexing_on_posts.rb
index b3777e093a..13ff4507d6 100644
--- a/db/migrate/20120809053414_correct_indexing_on_posts.rb
+++ b/db/migrate/20120809053414_correct_indexing_on_posts.rb
@@ -1,20 +1,20 @@
 class CorrectIndexingOnPosts < ActiveRecord::Migration
   def up
-      execute "update posts pp
+    execute "update posts pp
 set post_number = c.real_number
 from
 (
 	select p1.id, count(*) real_number from posts p1
 	join posts p2 on p1.forum_thread_id = p2.forum_thread_id
 	where p2.id <= p1.id and p1.forum_thread_id = p2.forum_thread_id
-        group by p1.id
+      group by p1.id
 ) as c
 where pp.id = c.id and pp.post_number <> c.real_number"
 
-    remove_index "posts", ["forum_thread_id","post_number"]
+    remove_index "posts", ["forum_thread_id", "post_number"]
 
     # this needs to be unique if it is not we can not use post_number to identify a post
-    add_index "posts", ["forum_thread_id","post_number"], unique: true
+    add_index "posts", ["forum_thread_id", "post_number"], unique: true
 
   end
 
diff --git a/db/migrate/20120809154750_remove_index_for_now.rb b/db/migrate/20120809154750_remove_index_for_now.rb
index 148cbe70a0..ea20ceb152 100644
--- a/db/migrate/20120809154750_remove_index_for_now.rb
+++ b/db/migrate/20120809154750_remove_index_for_now.rb
@@ -1,11 +1,11 @@
 class RemoveIndexForNow < ActiveRecord::Migration
   def up
-    remove_index "posts", ["forum_thread_id","post_number"]
-    add_index "posts", ["forum_thread_id","post_number"], unique: false
+    remove_index "posts", ["forum_thread_id", "post_number"]
+    add_index "posts", ["forum_thread_id", "post_number"], unique: false
   end
 
   def down
-    remove_index "posts", ["forum_thread_id","post_number"]
-    add_index "posts", ["forum_thread_id","post_number"], unique: true
+    remove_index "posts", ["forum_thread_id", "post_number"]
+    add_index "posts", ["forum_thread_id", "post_number"], unique: true
   end
 end
diff --git a/db/migrate/20120809174649_create_post_actions.rb b/db/migrate/20120809174649_create_post_actions.rb
index ddcf4d4632..7a8e5d9f44 100644
--- a/db/migrate/20120809174649_create_post_actions.rb
+++ b/db/migrate/20120809174649_create_post_actions.rb
@@ -3,7 +3,7 @@ class CreatePostActions < ActiveRecord::Migration
     create_table :post_actions do |t|
       t.integer :post_id, null: false
       t.integer :user_id, null: false
-      t.integer :post_action_type_id, null:false
+      t.integer :post_action_type_id, null: false
       t.datetime :deleted_at
       t.timestamps
     end
diff --git a/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb b/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb
index 5a8ea4af87..6d79402d34 100644
--- a/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb
+++ b/db/migrate/20120816050526_add_unique_constraint_to_user_actions.rb
@@ -1,5 +1,5 @@
 class AddUniqueConstraintToUserActions < ActiveRecord::Migration
   def change
-    add_index :user_actions, ['action_type','user_id', 'target_forum_thread_id', 'target_post_id', 'acting_user_id'], name: "idx_unique_rows", unique: true
+    add_index :user_actions, ['action_type', 'user_id', 'target_forum_thread_id', 'target_post_id', 'acting_user_id'], name: "idx_unique_rows", unique: true
   end
 end
diff --git a/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb b/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb
index 584c62c9fb..9420f79a8d 100644
--- a/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb
+++ b/db/migrate/20120821191616_add_bumped_at_to_forum_threads.rb
@@ -5,6 +5,6 @@ class AddBumpedAtToForumThreads < ActiveRecord::Migration
     change_column :forum_threads, :bumped_at, :datetime, null: false
 
     remove_index :forum_threads, :last_posted_at
-    add_index :forum_threads, :bumped_at, order: {bumped_at: :desc}
+    add_index :forum_threads, :bumped_at, order: { bumped_at: :desc }
   end
 end
diff --git a/db/migrate/20121011155904_create_email_logs.rb b/db/migrate/20121011155904_create_email_logs.rb
index 2d92e00db6..abfea55e76 100644
--- a/db/migrate/20121011155904_create_email_logs.rb
+++ b/db/migrate/20121011155904_create_email_logs.rb
@@ -7,7 +7,7 @@ class CreateEmailLogs < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :email_logs, :created_at, order: {created_at: :desc}
-    add_index :email_logs, [:user_id, :created_at], order: {created_at: :desc}
+    add_index :email_logs, :created_at, order: { created_at: :desc }
+    add_index :email_logs, [:user_id, :created_at], order: { created_at: :desc }
   end
 end
diff --git a/db/migrate/20121018103721_rename_forum_thread_tables.rb b/db/migrate/20121018103721_rename_forum_thread_tables.rb
index d513d1b0e2..84980494da 100644
--- a/db/migrate/20121018103721_rename_forum_thread_tables.rb
+++ b/db/migrate/20121018103721_rename_forum_thread_tables.rb
@@ -14,7 +14,6 @@ class RenameForumThreadTables < ActiveRecord::Migration
     rename_column 'categories', 'threads_month', 'topics_month'
     rename_column 'categories', 'threads_week', 'topics_week'
 
-
     rename_column 'category_featured_topics', 'forum_thread_id', 'topic_id'
 
     rename_column 'topic_link_clicks', 'forum_thread_link_id', 'topic_link_id'
@@ -22,7 +21,6 @@ class RenameForumThreadTables < ActiveRecord::Migration
     rename_column 'topic_links', 'forum_thread_id', 'topic_id'
     rename_column 'topic_links', 'link_forum_thread_id', 'link_topic_id'
 
-
     rename_column 'topic_users', 'forum_thread_id', 'topic_id'
 
     rename_column 'incoming_links', 'forum_thread_id', 'topic_id'
diff --git a/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb b/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb
index 1432d8ba70..34ee5edbce 100644
--- a/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb
+++ b/db/migrate/20130122232825_add_auto_track_after_seconds_and_banning_and_dob_to_user.rb
@@ -6,7 +6,7 @@ class AddAutoTrackAfterSecondsAndBanningAndDobToUser < ActiveRecord::Migration
     add_column :users, :auto_track_topics_after_msecs, :integer
     add_column :users, :views, :integer, null: false, default: 0
 
-    remove_column  :users, :auto_track_topics
+    remove_column :users, :auto_track_topics
 
     add_column :topic_users, :total_msecs_viewed, :integer, null: false, default: 0
 
diff --git a/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb b/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb
index 3f537dfdc9..1eb09763de 100644
--- a/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb
+++ b/db/migrate/20130319122248_add_reply_to_user_id_to_post.rb
@@ -3,8 +3,8 @@ class AddReplyToUserIdToPost < ActiveRecord::Migration
     # caching this column makes the topic page WAY faster
     add_column :posts, :reply_to_user_id, :integer
     execute 'UPDATE posts p SET reply_to_user_id = (
-                SELECT u.id from users u 
-                JOIN posts p2 ON  p2.user_id = u.id AND 
+                SELECT u.id from users u
+                JOIN posts p2 ON  p2.user_id = u.id AND
                                   p2.post_number = p.reply_to_post_number AND
                                   p2.topic_id = p.topic_id
             )'
diff --git a/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb b/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb
index 3fffe74303..89bdb3aee4 100644
--- a/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb
+++ b/db/migrate/20130320012100_add_user_indexes_to_posts_and_topics.rb
@@ -1,9 +1,9 @@
 class AddUserIndexesToPostsAndTopics < ActiveRecord::Migration
   def up
-    execute "CREATE INDEX idx_posts_user_id_deleted_at 
+    execute "CREATE INDEX idx_posts_user_id_deleted_at
               ON posts(user_id) WHERE deleted_at IS NULL"
-    
-    execute "CREATE INDEX idx_topics_user_id_deleted_at 
+
+    execute "CREATE INDEX idx_topics_user_id_deleted_at
               ON topics(user_id) WHERE deleted_at IS NULL"
   end
 
diff --git a/db/migrate/20130404232558_add_user_extras.rb b/db/migrate/20130404232558_add_user_extras.rb
index 73d1add55d..70c75482e5 100644
--- a/db/migrate/20130404232558_add_user_extras.rb
+++ b/db/migrate/20130404232558_add_user_extras.rb
@@ -7,7 +7,6 @@ class AddUserExtras < ActiveRecord::Migration
     add_column :users, :likes_received, :integer, null: false, default: 0
     add_column :users, :topic_reply_count, :integer, null: false, default: 0
 
-
     # NOTE: to keep migrations working through refactorings we avoid externalizing this stuff.
     #   even though a helper method may make sense
     execute <<SQL
diff --git a/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb b/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb
index 5463394c84..d4b92156a0 100644
--- a/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb
+++ b/db/migrate/20130426044914_allow_nulls_in_incoming_links.rb
@@ -1,6 +1,6 @@
 class AllowNullsInIncomingLinks < ActiveRecord::Migration
   def change
-    change_column :incoming_links, :referer, :string, limit:1000, null: true
-    change_column :incoming_links, :domain, :string, limit:100, null: true
+    change_column :incoming_links, :referer, :string, limit: 1000, null: true
+    change_column :incoming_links, :domain, :string, limit: 100, null: true
   end
 end
diff --git a/db/migrate/20130527152648_add_like_score_to_posts.rb b/db/migrate/20130527152648_add_like_score_to_posts.rb
index 98c61ea9fb..55b2ebad3d 100644
--- a/db/migrate/20130527152648_add_like_score_to_posts.rb
+++ b/db/migrate/20130527152648_add_like_score_to_posts.rb
@@ -15,5 +15,3 @@ class AddLikeScoreToPosts < ActiveRecord::Migration
               WHERE x.post_id = p.id"
   end
 end
-
-
diff --git a/db/migrate/20130612200846_create_post_upload_join_table.rb b/db/migrate/20130612200846_create_post_upload_join_table.rb
index 94698c89f0..c7b16f8499 100644
--- a/db/migrate/20130612200846_create_post_upload_join_table.rb
+++ b/db/migrate/20130612200846_create_post_upload_join_table.rb
@@ -1,12 +1,12 @@
 class CreatePostUploadJoinTable < ActiveRecord::Migration
   def change
-  	create_table :posts_uploads, force: true, id: false do |t|
-  		t.integer :post_id
-  		t.integer :upload_id
-  	end
+    create_table :posts_uploads, force: true, id: false do |t|
+      t.integer :post_id
+      t.integer :upload_id
+    end
 
-  	add_index :posts_uploads, :post_id
-  	add_index :posts_uploads, :upload_id
-  	add_index :posts_uploads, [:post_id, :upload_id], unique: true
+    add_index :posts_uploads, :post_id
+    add_index :posts_uploads, :upload_id
+    add_index :posts_uploads, [:post_id, :upload_id], unique: true
   end
 end
diff --git a/db/migrate/20130613211700_drop_posts_uploads.rb b/db/migrate/20130613211700_drop_posts_uploads.rb
index d383d22710..67d8b3d3b3 100644
--- a/db/migrate/20130613211700_drop_posts_uploads.rb
+++ b/db/migrate/20130613211700_drop_posts_uploads.rb
@@ -7,7 +7,7 @@ class DropPostsUploads < ActiveRecord::Migration
     create_table :posts_uploads, id: false do |t|
       t.integer :post_id
       t.integer :upload_id
-  end
+    end
 
     add_index :posts_uploads, :post_id
     add_index :posts_uploads, :upload_id
diff --git a/db/migrate/20130621042855_change_supress_to_suppress.rb b/db/migrate/20130621042855_change_supress_to_suppress.rb
index 1e8f497b09..41d74c8172 100644
--- a/db/migrate/20130621042855_change_supress_to_suppress.rb
+++ b/db/migrate/20130621042855_change_supress_to_suppress.rb
@@ -1,9 +1,9 @@
 class ChangeSupressToSuppress < ActiveRecord::Migration
   def up
-    SiteSetting.where(name: "suppress_reply_directly_below").update_all({name: "supress_reply_directly_below"})
+    SiteSetting.where(name: "suppress_reply_directly_below").update_all(name: "supress_reply_directly_below")
   end
 
   def down
-    SiteSetting.where(name: "supress_reply_directly_below").update_all({name: "suppress_reply_directly_below"})
+    SiteSetting.where(name: "supress_reply_directly_below").update_all(name: "suppress_reply_directly_below")
   end
 end
diff --git a/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb b/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb
index a0c3924bfd..fafa829443 100644
--- a/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb
+++ b/db/migrate/20130624203206_change_ip_to_inet_in_topic_link_clicks.rb
@@ -11,7 +11,7 @@ class ChangeIpToInetInTopicLinkClicks < ActiveRecord::Migration
       (ip >>  0 & 255)
     );"
 
-    change_column :topic_link_clicks, :ip_address, :inet, { :null => false }
+    change_column :topic_link_clicks, :ip_address, :inet, null: false
     remove_column :topic_link_clicks, :ip
   end
 
diff --git a/db/migrate/20130625022454_change_ip_to_inet_in_views.rb b/db/migrate/20130625022454_change_ip_to_inet_in_views.rb
index 30a0e8390b..e4e01f5629 100644
--- a/db/migrate/20130625022454_change_ip_to_inet_in_views.rb
+++ b/db/migrate/20130625022454_change_ip_to_inet_in_views.rb
@@ -12,7 +12,7 @@ class ChangeIpToInetInViews < ActiveRecord::Migration
       (ip >>  0 & 255)
     );"
 
-    change_column table, :ip_address, :inet, { :null => false }
+    change_column table, :ip_address, :inet, null: false
     remove_column table, :ip
   end
 
diff --git a/db/migrate/20130625170842_remove_access_password.rb b/db/migrate/20130625170842_remove_access_password.rb
index 31c5a83d4a..d2b87bc71b 100644
--- a/db/migrate/20130625170842_remove_access_password.rb
+++ b/db/migrate/20130625170842_remove_access_password.rb
@@ -1,7 +1,7 @@
 class RemoveAccessPassword < ActiveRecord::Migration
   def up
     result = execute("SELECT count(*) FROM site_settings where name='access_password' and char_length(value) > 0")
-    if result[0] and result[0]["count"].to_i > 0
+    if result[0] && result[0]["count"].to_i > (0)
       execute "DELETE FROM site_settings where name='access_password'"
       SiteSetting.login_required = true
       SiteSetting.must_approve_users = true
diff --git a/db/migrate/20130911182437_create_user_stats.rb b/db/migrate/20130911182437_create_user_stats.rb
index 66f5370743..ff3f78ab18 100644
--- a/db/migrate/20130911182437_create_user_stats.rb
+++ b/db/migrate/20130911182437_create_user_stats.rb
@@ -1,6 +1,6 @@
 class CreateUserStats < ActiveRecord::Migration
   def up
-    create_table :user_stats, :id => false do |t|
+    create_table :user_stats, id: false do |t|
       t.references :user, null: false
       t.boolean :has_custom_avatar, default: false, null: false
     end
diff --git a/db/migrate/20130912185218_acting_user_null.rb b/db/migrate/20130912185218_acting_user_null.rb
index fe99e3783c..d03eabe527 100644
--- a/db/migrate/20130912185218_acting_user_null.rb
+++ b/db/migrate/20130912185218_acting_user_null.rb
@@ -1,10 +1,10 @@
 class ActingUserNull < ActiveRecord::Migration
   def up
-    change_column :user_histories, :acting_user_id, :integer, :null => true
+    change_column :user_histories, :acting_user_id, :integer, null: true
   end
 
   def down
     execute "DELETE FROM user_histories WHERE acting_user_id IS NULL"
-    change_column :user_histories, :acting_user_id, :integer, :null => false
+    change_column :user_histories, :acting_user_id, :integer, null: false
   end
 end
diff --git a/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb b/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb
index b1a20098d6..3055c712a8 100644
--- a/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb
+++ b/db/migrate/20131002070347_add_user_id_parent_type_index_on_views.rb
@@ -1,5 +1,5 @@
 class AddUserIdParentTypeIndexOnViews < ActiveRecord::Migration
   def change
-    add_index :views, [:user_id,:parent_type,:parent_id]
+    add_index :views, [:user_id, :parent_type, :parent_id]
   end
 end
diff --git a/db/migrate/20131022045114_add_uncategorized_category.rb b/db/migrate/20131022045114_add_uncategorized_category.rb
index 953960fd66..347bc2320c 100644
--- a/db/migrate/20131022045114_add_uncategorized_category.rb
+++ b/db/migrate/20131022045114_add_uncategorized_category.rb
@@ -17,7 +17,6 @@ class AddUncategorizedCategory < ActiveRecord::Migration
     execute "INSERT INTO site_settings(name, data_type, value, created_at, updated_at)
              VALUES ('uncategorized_category_id', 3, #{category_id}, now(), now())"
 
-
     execute "DELETE from site_settings where name in ('uncategorized_name', 'uncategorized_text_color', 'uncategorized_color')"
 
     execute "UPDATE topics SET category_id = #{category_id} WHERE archetype = 'regular' AND category_id IS NULL"
diff --git a/db/migrate/20131023163509_add_parent_category_id_to_categories.rb b/db/migrate/20131023163509_add_parent_category_id_to_categories.rb
index f4b86f5041..759895f5fe 100644
--- a/db/migrate/20131023163509_add_parent_category_id_to_categories.rb
+++ b/db/migrate/20131023163509_add_parent_category_id_to_categories.rb
@@ -3,4 +3,3 @@ class AddParentCategoryIdToCategories < ActiveRecord::Migration
     add_column :categories, :parent_category_id, :integer
   end
 end
-
diff --git a/db/migrate/20131210181901_migrate_word_counts.rb b/db/migrate/20131210181901_migrate_word_counts.rb
index 64e05aae99..e783725bb8 100644
--- a/db/migrate/20131210181901_migrate_word_counts.rb
+++ b/db/migrate/20131210181901_migrate_word_counts.rb
@@ -2,7 +2,7 @@ class MigrateWordCounts < ActiveRecord::Migration
   disable_ddl_transaction!
 
   def up
-    post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+    post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     while post_ids.length > 0
       3.times do
         begin
@@ -12,10 +12,10 @@ class MigrateWordCounts < ActiveRecord::Migration
           # Deadlock. Try again, up to 3 times.
         end
       end
-      post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+      post_ids = execute("SELECT id FROM posts WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     end
 
-    topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+    topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     while topic_ids.length > 0
       3.times do
         begin
@@ -25,7 +25,7 @@ class MigrateWordCounts < ActiveRecord::Migration
           # Deadlock. Try again, up to 3 times.
         end
       end
-      topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map {|r| r['id'].to_i }
+      topic_ids = execute("SELECT id FROM topics WHERE word_count IS NULL LIMIT 500").map { |r| r['id'].to_i }
     end
 
   end
diff --git a/db/migrate/20140211230222_move_cas_settings.rb b/db/migrate/20140211230222_move_cas_settings.rb
index 0de988fbfa..b832385a3b 100644
--- a/db/migrate/20140211230222_move_cas_settings.rb
+++ b/db/migrate/20140211230222_move_cas_settings.rb
@@ -4,23 +4,23 @@ class MoveCasSettings < ActiveRecord::Migration
     #convert the data over to be used by the plugin.
     cas_hostname = SiteSetting.find_by(name: "cas_hostname")
     cas_sso_hostname = SiteSetting.find_by(name: "cas_sso_hostname")
-    if cas_hostname  && ! cas_sso_hostname
+    if cas_hostname && ! cas_sso_hostname
       #convert the setting over for use by the plugin
       cas_hostname.update_attribute(:name, 'cas_sso_hostname')
-    elsif cas_hostname  && cas_sso_hostname
+    elsif cas_hostname && cas_sso_hostname
       #copy the setting over for use by the plugin and delete the original setting
-      cas_sso_hostname.update_attribute(:value,cas_hostname.value)
+      cas_sso_hostname.update_attribute(:value, cas_hostname.value)
       cas_hostname.destroy
     end
 
     cas_domainname = SiteSetting.find_by(name: "cas_domainname")
     cas_sso_email_domain = SiteSetting.find_by(name: "cas_sso_email_domain")
-    if cas_domainname  && ! cas_sso_email_domain
+    if cas_domainname && ! cas_sso_email_domain
       #convert the setting over for use by the plugin
       cas_domainname.update_attribute(:name, 'cas_sso_email_domain')
-    elsif cas_domainname  && cas_sso_email_domain
+    elsif cas_domainname && cas_sso_email_domain
       #copy the setting over for use by the plugin and delete the original setting
-      cas_sso_email_domain.update_attribute(:value,cas_domainname.value)
+      cas_sso_email_domain.update_attribute(:value, cas_domainname.value)
       cas_domainname.destroy
     end
 
@@ -29,7 +29,7 @@ class MoveCasSettings < ActiveRecord::Migration
       cas_logins.destroy
     end
 
-    #remove the unused table
+   #remove the unused table
    drop_table :cas_user_infos
 
   end
diff --git a/db/migrate/20140227104930_add_custom_email_in_to_categories.rb b/db/migrate/20140227104930_add_custom_email_in_to_categories.rb
index 7d3cac2c5f..fa31829caf 100644
--- a/db/migrate/20140227104930_add_custom_email_in_to_categories.rb
+++ b/db/migrate/20140227104930_add_custom_email_in_to_categories.rb
@@ -1,12 +1,12 @@
 class AddCustomEmailInToCategories < ActiveRecord::Migration
   def up
-  	add_column :categories, :email_in, :string, null: true
-  	add_column :categories, :email_in_allow_strangers, :boolean, default: false
-  	add_index :categories, :email_in, unique: true
+    add_column :categories, :email_in, :string, null: true
+    add_column :categories, :email_in_allow_strangers, :boolean, default: false
+    add_index :categories, :email_in, unique: true
   end
   def down
-  	remove_column :categories, :email_in
-  	remove_column :categories, :email_in_allow_strangers
-  	remove_index :categories, :email_in
+    remove_column :categories, :email_in
+    remove_column :categories, :email_in_allow_strangers
+    remove_index :categories, :email_in
   end
 end
diff --git a/db/migrate/20140318150412_add_excerpt_to_topics.rb b/db/migrate/20140318150412_add_excerpt_to_topics.rb
index 35283cb47b..513906d900 100644
--- a/db/migrate/20140318150412_add_excerpt_to_topics.rb
+++ b/db/migrate/20140318150412_add_excerpt_to_topics.rb
@@ -2,7 +2,7 @@ class AddExcerptToTopics < ActiveRecord::Migration
   def up
     add_column :topics, :excerpt, :string, limit: 1000
 
-    topic_ids = execute("SELECT id FROM topics WHERE pinned_at IS NOT NULL").map {|r| r['id'].to_i }
+    topic_ids = execute("SELECT id FROM topics WHERE pinned_at IS NOT NULL").map { |r| r['id'].to_i }
     topic_ids.each do |topic_id|
       cooked = execute("SELECT cooked FROM posts WHERE topic_id = #{topic_id} ORDER BY post_number ASC LIMIT 1")[0]['cooked']
       if cooked
diff --git a/db/migrate/20140402201432_make_content_sha1_nullable.rb b/db/migrate/20140402201432_make_content_sha1_nullable.rb
index 29b7572edc..fd2a60ebd9 100644
--- a/db/migrate/20140402201432_make_content_sha1_nullable.rb
+++ b/db/migrate/20140402201432_make_content_sha1_nullable.rb
@@ -1,5 +1,5 @@
 class MakeContentSha1Nullable < ActiveRecord::Migration
   def change
-    change_column :topic_embeds, :content_sha1, :string, :limit => 40, :null => true
+    change_column :topic_embeds, :content_sha1, :string, limit: 40, null: true
   end
 end
diff --git a/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb b/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb
index ae4a8f364a..82e90e7153 100644
--- a/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb
+++ b/db/migrate/20140530002535_remove_system_avatars_from_user_avatars.rb
@@ -9,7 +9,7 @@ class RemoveSystemAvatarsFromUserAvatars < ActiveRecord::Migration
     # normally we dont reach into the object model, but we have to here.
     # otherwise we will wait a real long time for uploads to go away
     skip = -1
-    while skip=destroy_system_avatar_batch(skip) do
+    while skip = destroy_system_avatar_batch(skip) do
       puts "Destroyed up to id: #{skip}"
     end
 
@@ -21,9 +21,9 @@ class RemoveSystemAvatarsFromUserAvatars < ActiveRecord::Migration
     initial = skip
 
     Upload.where('id IN (SELECT system_upload_id FROM user_avatars) AND id > ?', skip)
-        .order(:id)
-        .limit(500)
-        .each do |upload|
+      .order(:id)
+      .limit(500)
+      .each do |upload|
       skip = upload.id
       begin
         upload.destroy
diff --git a/db/migrate/20140715055242_add_quoted_posts.rb b/db/migrate/20140715055242_add_quoted_posts.rb
index 587d894799..5f6c79cd3e 100644
--- a/db/migrate/20140715055242_add_quoted_posts.rb
+++ b/db/migrate/20140715055242_add_quoted_posts.rb
@@ -9,7 +9,6 @@ class AddQuotedPosts < ActiveRecord::Migration
     add_index :quoted_posts, [:post_id, :quoted_post_id], unique: true
     add_index :quoted_posts, [:quoted_post_id, :post_id], unique: true
 
-
     # NOTE this can be done in pg but too much of a headache
     id = 0
     while id = backfill_batch(id, 1000); end
@@ -37,9 +36,8 @@ SQL
         topic_id = a['data-topic'].to_i
         post_number = a['data-post'].to_i
 
-        next if uniq[[topic_id,post_number]]
-        uniq[[topic_id,post_number]] = true
-
+        next if uniq[[topic_id, post_number]]
+        uniq[[topic_id, post_number]] = true
 
         execute "INSERT INTO quoted_posts(post_id, quoted_post_id, created_at, updated_at)
                  SELECT #{post_id}, id, created_at, updated_at
diff --git a/db/migrate/20140804010803_incoming_link_normalization.rb b/db/migrate/20140804010803_incoming_link_normalization.rb
index 2c3743541a..171451dff5 100644
--- a/db/migrate/20140804010803_incoming_link_normalization.rb
+++ b/db/migrate/20140804010803_incoming_link_normalization.rb
@@ -36,7 +36,6 @@ class IncomingLinkNormalization < ActiveRecord::Migration
             ) X
           WHERE a[2] IS NOT NULL"
 
-
     execute "UPDATE incoming_links l
     SET incoming_referer_id = r.id
     FROM incoming_referers r
@@ -59,7 +58,6 @@ class IncomingLinkNormalization < ActiveRecord::Migration
     FROM incoming_domains d
     WHERE d.name = l.domain AND d.https = l.https AND d.port = l.port"
 
-
     remove_column :incoming_referers, :domain
     remove_column :incoming_referers, :port
     remove_column :incoming_referers, :https
diff --git a/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb b/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb
index 4f6e6f1b2e..67b9d784b5 100644
--- a/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb
+++ b/db/migrate/20140804075613_normalize_topic_view_data_and_index.rb
@@ -29,7 +29,6 @@ class NormalizeTopicViewDataAndIndex < ActiveRecord::Migration
     SELECT NULL, topic_id, ip_address, viewed_at FROM tmp_views_ip
     '
 
-
     execute 'CREATE UNIQUE INDEX user_id_topic_id_topic_views ON topic_views(user_id, topic_id) WHERE user_id IS NOT NULL'
     execute 'CREATE UNIQUE INDEX ip_address_topic_id_topic_views ON topic_views(ip_address, topic_id) WHERE user_id IS NULL'
 
diff --git a/db/migrate/20140815215618_add_name_lower_to_categories.rb b/db/migrate/20140815215618_add_name_lower_to_categories.rb
index 97c1685337..20f6ef8c37 100644
--- a/db/migrate/20140815215618_add_name_lower_to_categories.rb
+++ b/db/migrate/20140815215618_add_name_lower_to_categories.rb
@@ -3,7 +3,7 @@ class AddNameLowerToCategories < ActiveRecord::Migration
   def up
     add_column :categories, :name_lower, :string, limit: 50
     execute "update categories set name_lower = lower(name)"
-    change_column :categories, :name_lower, :string, limit: 50, null:false
+    change_column :categories, :name_lower, :string, limit: 50, null: false
   end
 
   def down
diff --git a/db/migrate/20140913192733_add_trust_level_locked_column.rb b/db/migrate/20140913192733_add_trust_level_locked_column.rb
index 8ac5b0b989..c086f4a2fd 100644
--- a/db/migrate/20140913192733_add_trust_level_locked_column.rb
+++ b/db/migrate/20140913192733_add_trust_level_locked_column.rb
@@ -1,6 +1,6 @@
 class AddTrustLevelLockedColumn < ActiveRecord::Migration
   def change
-    add_column :users, :trust_level_locked, :boolean, { default: false, null: false}
+    add_column :users, :trust_level_locked, :boolean, default: false, null: false
 
     reversible do |dir|
       dir.up do
diff --git a/db/migrate/20140929204155_migrate_tos_setting.rb b/db/migrate/20140929204155_migrate_tos_setting.rb
index 4e313c0373..6ecac45bb8 100644
--- a/db/migrate/20140929204155_migrate_tos_setting.rb
+++ b/db/migrate/20140929204155_migrate_tos_setting.rb
@@ -13,7 +13,6 @@ class MigrateTosSetting < ActiveRecord::Migration
         label = res[0]['value']
       end
 
-
       label = PG::Connection.escape_string(label)
       execute("INSERT INTO user_fields (name, field_type, editable) VALUES ('#{label}', 'confirm', false)")
     end
diff --git a/db/migrate/20141216112341_resolve_duplicate_group_names.rb b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
index 63a49e4b60..dc8fa1fdb0 100644
--- a/db/migrate/20141216112341_resolve_duplicate_group_names.rb
+++ b/db/migrate/20141216112341_resolve_duplicate_group_names.rb
@@ -11,7 +11,7 @@ class ResolveDuplicateGroupNames < ActiveRecord::Migration
     groups  = Group.where id: results.map { |r| r['id'] }
     groups.group_by { |g| g.name.downcase }.each do |key, value|
       value.each_with_index do |dup, index|
-        dup.update! name: "#{dup.name[0..18]}_#{index+1}" if index > 0
+        dup.update! name: "#{dup.name[0..18]}_#{index + 1}" if index > 0
       end
     end
   end
diff --git a/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb b/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb
index 2dcdd47314..58b5f37831 100644
--- a/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb
+++ b/db/migrate/20150108002354_add_liked_and_bookmarked_to_topic_user.rb
@@ -4,7 +4,7 @@ class AddLikedAndBookmarkedToTopicUser < ActiveRecord::Migration
     add_column :topic_users, :bookmarked, :boolean, default: false
 
     # likes and bookmarks PostActionType.types[:like] and :bookmark which should not be used in a migration
-    {liked: 2, bookmarked: 1}.each do |name, type|
+    { liked: 2, bookmarked: 1 }.each do |name, type|
       execute "UPDATE topic_users
                SET #{name} = true
                WHERE EXISTS (SELECT 1 FROM post_actions pa
diff --git a/db/migrate/20150713203955_enlarge_users_email_field.rb b/db/migrate/20150713203955_enlarge_users_email_field.rb
index 15856c0f04..9b4238f4b5 100644
--- a/db/migrate/20150713203955_enlarge_users_email_field.rb
+++ b/db/migrate/20150713203955_enlarge_users_email_field.rb
@@ -1,8 +1,8 @@
 class EnlargeUsersEmailField < ActiveRecord::Migration
   def up
-    change_column :users, :email, :string, :limit => 513
+    change_column :users, :email, :string, limit: 513
   end
   def down
-    change_column :users, :email, :string, :limit => 128
+    change_column :users, :email, :string, limit: 128
   end
 end
diff --git a/db/migrate/20150729150523_migrate_auto_close_posts.rb b/db/migrate/20150729150523_migrate_auto_close_posts.rb
index d00ec9623a..1a4d6bc0e7 100644
--- a/db/migrate/20150729150523_migrate_auto_close_posts.rb
+++ b/db/migrate/20150729150523_migrate_auto_close_posts.rb
@@ -9,7 +9,7 @@ class MigrateAutoClosePosts < ActiveRecord::Migration
 
       sql = "UPDATE posts SET action_code = 'autoclosed.enabled', post_type = 3 "
       sql << "WHERE post_type = 2 AND ("
-      sql << strings.map {|s| "raw ~* #{ActiveRecord::Base.connection.quote(s)}" }.join(' OR ')
+      sql << strings.map { |s| "raw ~* #{ActiveRecord::Base.connection.quote(s)}" }.join(' OR ')
       sql << ")"
 
       execute sql
diff --git a/db/migrate/20160108051129_fix_incorrect_user_history.rb b/db/migrate/20160108051129_fix_incorrect_user_history.rb
index 2a9cbdf0fb..e7b44a9e76 100644
--- a/db/migrate/20160108051129_fix_incorrect_user_history.rb
+++ b/db/migrate/20160108051129_fix_incorrect_user_history.rb
@@ -7,7 +7,6 @@ class FixIncorrectUserHistory < ActiveRecord::Migration
     #
     # This migration hunts for date stuff started going wrong and date it started being good and corrects the data
 
-
     # this is a :auto_trust_level_change mislabled as :check_email
     # impersonate that was actually delete topic
     condition = <<CLAUSE
diff --git a/db/migrate/20161205001727_add_topic_columns_back.rb b/db/migrate/20161205001727_add_topic_columns_back.rb
index d464c54a9e..b34ecd7243 100644
--- a/db/migrate/20161205001727_add_topic_columns_back.rb
+++ b/db/migrate/20161205001727_add_topic_columns_back.rb
@@ -4,7 +4,7 @@ class AddTopicColumnsBack < ActiveRecord::Migration
   # if we remove them then sites will be down during migration
 
   def up
-     add_column :topics, :bookmark_count, :int
+    add_column :topics, :bookmark_count, :int
      add_column :topics, :off_topic_count, :int
      add_column :topics, :illegal_count, :int
      add_column :topics, :inappropriate_count, :int
@@ -12,7 +12,7 @@ class AddTopicColumnsBack < ActiveRecord::Migration
   end
 
   def down
-     remove_column :topics, :bookmark_count
+    remove_column :topics, :bookmark_count
      remove_column :topics, :off_topic_count
      remove_column :topics, :illegal_count
      remove_column :topics, :inappropriate_count
diff --git a/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb b/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb
index 7d5fc43000..5b514699b1 100644
--- a/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb
+++ b/db/migrate/20161216101352_add_all_topics_wiki_to_categories.rb
@@ -2,4 +2,4 @@ class AddAllTopicsWikiToCategories < ActiveRecord::Migration
   def change
     add_column :categories, :all_topics_wiki, :boolean, default: false, null: false
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb b/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb
index 454a5d6098..2d2feb3be9 100644
--- a/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb
+++ b/db/migrate/20170221204204_add_show_subcategory_list_to_categories.rb
@@ -3,7 +3,7 @@ class AddShowSubcategoryListToCategories < ActiveRecord::Migration
     add_column :categories, :show_subcategory_list, :boolean, default: false
 
     result = execute("select count(1) from site_settings where name = 'show_subcategory_list' and value = 't'")
-    if result[0] and result[0]["count"].to_i > 0
+    if result[0] && result[0]["count"].to_i > (0)
       execute "UPDATE categories SET show_subcategory_list = true WHERE parent_category_id IS NULL"
     end
   end
diff --git a/db/migrate/20170313192741_add_themes.rb b/db/migrate/20170313192741_add_themes.rb
index ab2e3abc3b..52905c86b7 100644
--- a/db/migrate/20170313192741_add_themes.rb
+++ b/db/migrate/20170313192741_add_themes.rb
@@ -20,16 +20,15 @@ class AddThemes < ActiveRecord::Migration
     remove_column :color_schemes, :versioned_id
 
     enabled_theme_count = execute("SELECT count(*) FROM themes WHERE enabled")
-        .to_a[0]["count"].to_i
-
+      .to_a[0]["count"].to_i
 
     enabled_scheme_id = execute("SELECT id FROM color_schemes WHERE enabled")
-        .to_a[0]&.fetch("id")
+      .to_a[0]&.fetch("id")
 
     theme_key, theme_id =
       execute("SELECT key, id FROM themes WHERE enabled").to_a[0]&.values
 
-    if (enabled_theme_count == 0  && enabled_scheme_id) || enabled_theme_count > 1
+    if (enabled_theme_count == 0 && enabled_scheme_id) || enabled_theme_count > 1
 
       puts "Creating a new default theme!"
 
@@ -67,8 +66,6 @@ SQL
       execute(sql)
     end
 
-
-
     remove_column :themes, :enabled
     remove_column :color_schemes, :enabled
   end
diff --git a/db/migrate/20170609115401_add_extension_to_topic_links.rb b/db/migrate/20170609115401_add_extension_to_topic_links.rb
new file mode 100644
index 0000000000..7c05a12d1a
--- /dev/null
+++ b/db/migrate/20170609115401_add_extension_to_topic_links.rb
@@ -0,0 +1,6 @@
+class AddExtensionToTopicLinks < ActiveRecord::Migration
+  def change
+    add_column :topic_links, :extension, :string, limit: 10
+    add_index :topic_links, :extension
+  end
+end
diff --git a/db/migrate/20170628152322_create_watched_words.rb b/db/migrate/20170628152322_create_watched_words.rb
new file mode 100644
index 0000000000..212a3d2b9f
--- /dev/null
+++ b/db/migrate/20170628152322_create_watched_words.rb
@@ -0,0 +1,11 @@
+class CreateWatchedWords < ActiveRecord::Migration
+  def change
+    create_table :watched_words do |t|
+      t.string  :word,   null: false
+      t.integer :action, null: false
+      t.timestamps
+    end
+
+    add_index :watched_words, [:action, :word], unique: true
+  end
+end
diff --git a/db/migrate/20170703115216_add_extension_to_uploads.rb b/db/migrate/20170703115216_add_extension_to_uploads.rb
new file mode 100644
index 0000000000..76aa08fa11
--- /dev/null
+++ b/db/migrate/20170703115216_add_extension_to_uploads.rb
@@ -0,0 +1,11 @@
+class AddExtensionToUploads < ActiveRecord::Migration
+  def up
+    add_column :uploads, :extension, :string, limit: 10
+    execute "CREATE INDEX index_uploads_on_extension ON uploads(lower(extension))"
+  end
+
+  def down
+    remove_column :uploads, :extension
+    execute "DROP INDEX index_uploads_on_extension"
+  end
+end
diff --git a/db/migrate/20170713164357_create_search_logs.rb b/db/migrate/20170713164357_create_search_logs.rb
new file mode 100644
index 0000000000..26d6f1a425
--- /dev/null
+++ b/db/migrate/20170713164357_create_search_logs.rb
@@ -0,0 +1,12 @@
+class CreateSearchLogs < ActiveRecord::Migration
+  def change
+    create_table :search_logs do |t|
+      t.string :term, null: false
+      t.integer :user_id, null: true
+      t.inet    :ip_address, null: false
+      t.integer :clicked_topic_id, null: true
+      t.integer :search_type, null: false
+      t.datetime :created_at, null: false
+    end
+  end
+end
diff --git a/db/migrate/20170717084947_create_user_emails.rb b/db/migrate/20170717084947_create_user_emails.rb
new file mode 100644
index 0000000000..eb6dc4980d
--- /dev/null
+++ b/db/migrate/20170717084947_create_user_emails.rb
@@ -0,0 +1,42 @@
+require_dependency 'column_dropper'
+
+class CreateUserEmails < ActiveRecord::Migration
+  def up
+    create_table :user_emails do |t|
+      t.integer :user_id, null: false
+      t.string :email, limit: 513, null: false
+      t.boolean :primary, default: false, null: false
+      t.timestamps
+    end
+
+    add_index :user_emails, :user_id
+    add_index :user_emails, [:user_id, :primary], unique: true
+
+    execute "CREATE UNIQUE INDEX index_user_emails_on_email ON user_emails (lower(email));"
+
+    execute <<~SQL
+    INSERT INTO user_emails (
+      id,
+      user_id,
+      email,
+      "primary",
+      created_at,
+      updated_at
+    ) SELECT
+      id,
+      id,
+      email,
+      'TRUE',
+      created_at,
+      updated_at
+    FROM users
+    SQL
+
+    change_column_null :users, :email, true
+    ColumnDropper.mark_readonly(:users, :email)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20170728012754_split_public_in_groups.rb b/db/migrate/20170728012754_split_public_in_groups.rb
new file mode 100644
index 0000000000..31303986c5
--- /dev/null
+++ b/db/migrate/20170728012754_split_public_in_groups.rb
@@ -0,0 +1,17 @@
+class SplitPublicInGroups < ActiveRecord::Migration
+  def up
+    add_column :groups, :public_exit, :boolean, default: false, null: false
+    add_column :groups, :public_admission, :boolean, default: false, null: false
+
+    ActiveRecord::Base.exec_sql <<~SQL
+    UPDATE groups
+    SET public_exit = true, public_admission = true
+    WHERE public = true
+    SQL
+  end
+
+  def down
+    remove_column :groups, :public_exit
+    remove_column :groups, :public_admission
+  end
+end
diff --git a/db/migrate/20170728054115_remove_public_from_groups.rb b/db/migrate/20170728054115_remove_public_from_groups.rb
new file mode 100644
index 0000000000..216bed0a6b
--- /dev/null
+++ b/db/migrate/20170728054115_remove_public_from_groups.rb
@@ -0,0 +1,9 @@
+class RemovePublicFromGroups < ActiveRecord::Migration
+  def up
+    # Defer dropping of the columns until the new application code has been deployed.
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/migrate/20170731030330_fix_primary_emails_for_staged_users.rb b/db/migrate/20170731030330_fix_primary_emails_for_staged_users.rb
new file mode 100644
index 0000000000..d31e7578ef
--- /dev/null
+++ b/db/migrate/20170731030330_fix_primary_emails_for_staged_users.rb
@@ -0,0 +1,28 @@
+class FixPrimaryEmailsForStagedUsers < ActiveRecord::Migration
+  def up
+    execute <<~SQL
+    INSERT INTO user_emails (
+      user_id,
+      email,
+      "primary",
+      created_at,
+      updated_at
+    ) SELECT
+      users.id,
+      email_tokens.email,
+      'TRUE',
+      users.created_at,
+      users.updated_at
+    FROM users
+    LEFT JOIN user_emails ON user_emails.user_id = users.id
+    LEFT JOIN email_tokens ON email_tokens.user_id = users.id
+    WHERE staged
+    AND NOT active
+    AND user_emails.id IS NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md
index fce07d005c..a8bf7a1b84 100644
--- a/docs/DEVELOPER-ADVANCED.md
+++ b/docs/DEVELOPER-ADVANCED.md
@@ -19,13 +19,12 @@ To get your Ubuntu 16.04 LTS install up and running to develop Discourse and Dis
     curl -sSL https://get.rvm.io | bash -s stable
     echo 'gem: --no-document' >> ~/.gemrc
 
-    # Logout and back in to activate RVM installation
+    # exit the terminal and open it again to activate RVM
 
-    rvm install 2.3.1
-    rvm --default use 2.3.1 # If this error out check https://rvm.io/integration/gnome-terminal
+    rvm install 2.3.4
+    rvm --default use 2.3.4 # If this error out check https://rvm.io/integration/gnome-terminal
     gem install bundler mailcatcher
 
-
     # Postgresql
     sudo su postgres
     createuser --createdb --superuser -Upostgres $(cat /tmp/username)
@@ -37,10 +36,12 @@ To get your Ubuntu 16.04 LTS install up and running to develop Discourse and Dis
     exit
 
     # Node
-    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
-    # exit the terminal and open it again
-    nvm install 6.2.0
-    nvm alias default 6.2.0
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
+
+    # exit the terminal and open it again to activate NVM
+
+    nvm install node
+    nvm alias default node
     npm install -g svgo phantomjs-prebuilt
 
 
@@ -49,14 +50,19 @@ If everything goes alright, let's clone Discourse and start hacking:
     git clone https://github.com/discourse/discourse.git ~/discourse
     cd ~/discourse
     bundle install
-    bundle exec rake db:create db:migrate db:test:prepare
-    bundle exec rake autospec # CTRL + C to stop; Optional
-    bundle exec rails s -b 0.0.0.0 # Open browser on http://localhost:3000 and you should see Discourse
+    bundle exec rake db:migrate
+    RAILS_ENV=test bundle exec rake db:migrate
+    
+    # run the specs (optional)
+    bundle exec rake autospec # CTRL + C to stop
+    
+    # launch discourse
+    bundle exec rails s -b 0.0.0.0 # open browser on http://localhost:3000 and you should see Discourse
 
 Create a test account, and enable it with:
 
     bundle exec rails c
-    u = User.find_by_id 1
+    u = User.find(1)
     u.activate
     u.grant_admin!
     exit
@@ -64,7 +70,7 @@ Create a test account, and enable it with:
 Discourse does a lot of stuff async, so it's better to run sidekiq even on development mode:
 
     ruby $(mailcatcher) # open http://localhost:1080 to see the emails, stop with pkill -f mailcatcher
-    bundle exec sidekiq -q critical,low,default -d -l log/sidekiq.log # open http://localhost:3000/sidekiq to see the queue, stop with pkill -f sidekiq
+    bundle exec sidekiq # open http://localhost:3000/sidekiq to see queues
     bundle exec rails server
 
 And happy hacking!
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index 84500b50f7..ce2dfbb3e2 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -98,9 +98,7 @@ module ActiveRecord
       if fallback_handler.master_down?
         fallback_handler.verify_master
 
-        connection = postgresql_connection(config.dup.merge({
-          host: config[:replica_host], port: config[:replica_port]
-        }))
+        connection = postgresql_connection(config.dup.merge(host: config[:replica_host], port: config[:replica_port]))
 
         verify_replica(connection)
         Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
diff --git a/lib/admin_constraint.rb b/lib/admin_constraint.rb
index 0ee711c2bc..db5c0e73b6 100644
--- a/lib/admin_constraint.rb
+++ b/lib/admin_constraint.rb
@@ -2,7 +2,7 @@ require_dependency 'current_user'
 
 class AdminConstraint
 
-  def initialize(options={})
+  def initialize(options = {})
     @require_master = options[:require_master]
   end
 
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index ffd1dd404d..0f216c606b 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -4,7 +4,7 @@ class AdminUserIndexQuery
 
   def initialize(params = {}, klass = User, trust_levels = TrustLevel.levels)
     @params = params
-    @query = initialize_query_with_order(klass)
+    @query = initialize_query_with_order(klass).joins(:user_emails)
     @trust_levels = trust_levels
   end
 
@@ -24,10 +24,10 @@ class AdminUserIndexQuery
     'read_time' => 'user_stats.time_read'
   }
 
-  def find_users(limit=100)
+  def find_users(limit = 100)
     page = params[:page].to_i - 1
     if page < 0
-        page = 0
+      page = 0
     end
     find_users_query.limit(limit).offset(page * limit)
   end
@@ -52,7 +52,7 @@ class AdminUserIndexQuery
 
     if !custom_order.present?
       if params[:query] == "active"
-        order << "COALESCE(last_seen_at, to_date('1970-01-01', 'YYYY-MM-DD')) DESC"
+        order << "COALESCE(users.last_seen_at, to_date('1970-01-01', 'YYYY-MM-DD')) DESC"
       else
         order << "users.created_at DESC"
       end
@@ -81,22 +81,22 @@ class AdminUserIndexQuery
     where_conds << "user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1"
 
     @query.activated
-          .references(:user_stats)
-          .includes(:user_profile)
-          .where("COALESCE(user_profiles.bio_raw, '') != ''")
-          .where('users.created_at <= ?', 1.day.ago)
-          .where(where_conds.map {|c| "(#{c})"}.join(" OR "))
+      .references(:user_stats)
+      .includes(:user_profile)
+      .where("COALESCE(user_profiles.bio_raw, '') != ''")
+      .where('users.created_at <= ?', 1.day.ago)
+      .where(where_conds.map { |c| "(#{c})" }.join(" OR "))
   end
 
   def filter_by_query_classification
     case params[:query]
-      when 'staff'      then @query.where("admin or moderator")
-      when 'admins'     then @query.where(admin: true)
-      when 'moderators' then @query.where(moderator: true)
-      when 'blocked'    then @query.blocked
-      when 'suspended'  then @query.suspended
-      when 'pending'    then @query.not_suspended.where(approved: false)
-      when 'suspect'    then suspect_users
+    when 'staff'      then @query.where("admin or moderator")
+    when 'admins'     then @query.where(admin: true)
+    when 'moderators' then @query.where(moderator: true)
+    when 'blocked'    then @query.blocked
+    when 'suspended'  then @query.suspended
+    when 'pending'    then @query.not_suspended.where(approved: false)
+    when 'suspect'    then suspect_users
     end
   end
 
@@ -106,7 +106,7 @@ class AdminUserIndexQuery
       if ip = IPAddr.new(params[:filter]) rescue nil
         @query.where('ip_address <<= :ip OR registration_ip_address <<= :ip', ip: ip.to_cidr_s)
       else
-        @query.where('username_lower ILIKE :filter OR email ILIKE :filter', filter: "%#{params[:filter]}%")
+        @query.where('username_lower ILIKE :filter OR user_emails.email ILIKE :filter', filter: "%#{params[:filter]}%")
       end
     end
   end
@@ -119,7 +119,7 @@ class AdminUserIndexQuery
 
   def filter_exclude
     if params[:exclude].present?
-      @query.where('id != ?', params[:exclude])
+      @query.where('users.id != ?', params[:exclude])
     end
   end
 
diff --git a/lib/archetype.rb b/lib/archetype.rb
index 7213c8b26f..8c8f3591ae 100644
--- a/lib/archetype.rb
+++ b/lib/archetype.rb
@@ -32,7 +32,7 @@ class Archetype
     @archetypes.values
   end
 
-  def self.register(name, options={})
+  def self.register(name, options = {})
     @archetypes ||= {}
     @archetypes[name] = Archetype.new(name, options)
   end
diff --git a/lib/auth/current_user_provider.rb b/lib/auth/current_user_provider.rb
index cdd4d495fc..1affbc8d87 100644
--- a/lib/auth/current_user_provider.rb
+++ b/lib/auth/current_user_provider.rb
@@ -12,12 +12,12 @@ class Auth::CurrentUserProvider
   end
 
   # log on a user and set cookies and session etc.
-  def log_on_user(user,session,cookies)
+  def log_on_user(user, session, cookies)
     raise NotImplementedError
   end
 
   # optional interface to be called to refresh cookies etc if needed
-  def refresh_session(user,session,cookies)
+  def refresh_session(user, session, cookies)
   end
 
   # api has special rights return true if api was detected
@@ -35,7 +35,6 @@ class Auth::CurrentUserProvider
     raise NotImplementedError
   end
 
-
   def log_off_user(session, cookies)
     raise NotImplementedError
   end
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index 4be651472b..e94340c0de 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -44,7 +44,7 @@ class Auth::DefaultCurrentUserProvider
     current_user = nil
 
     if auth_token && auth_token.length == 32
-      limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN ,60)
+      limiter = RateLimiter.new(nil, "cookie_auth_#{request.ip}", COOKIE_ATTEMPTS_PER_MIN , 60)
 
       if limiter.can_perform?
         @user_token = UserAuthToken.lookup(auth_token,
@@ -127,8 +127,8 @@ class Auth::DefaultCurrentUserProvider
 
       if !@user_token.legacy && needs_rotation
         if @user_token.rotate!(user_agent: @env['HTTP_USER_AGENT'],
-                              client_ip: @request.ip,
-                              path: @env['REQUEST_PATH'])
+                               client_ip: @request.ip,
+                               path: @env['REQUEST_PATH'])
           cookies[TOKEN_COOKIE] = cookie_hash(@user_token.unhashed_auth_token)
         end
       elsif @user_token.legacy
@@ -200,7 +200,6 @@ class Auth::DefaultCurrentUserProvider
     cookies.delete(TOKEN_COOKIE)
   end
 
-
   # api has special rights return true if api was detected
   def is_api?
     current_user
diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index f7f90cb26b..f969c8dabf 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -52,8 +52,8 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
 
   def register_middleware(omniauth)
     omniauth.provider :facebook,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.facebook_app_id
               strategy.options[:client_secret] = SiteSetting.facebook_app_secret
               strategy.options[:info_fields] = 'gender,email,name,about,first_name,link,last_name,website,location'
@@ -61,7 +61,7 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
                 strategy.options[:scope] = 'email,user_about_me,user_location,user_website'
               end
            },
-           :scope => "email"
+           scope: "email"
   end
 
   protected
diff --git a/lib/auth/github_authenticator.rb b/lib/auth/github_authenticator.rb
index e79414973a..41874a04c1 100644
--- a/lib/auth/github_authenticator.rb
+++ b/lib/auth/github_authenticator.rb
@@ -47,10 +47,8 @@ class Auth::GithubAuthenticator < Auth::Authenticator
       # Potentially use *any* of the emails from GitHub to find a match or
       # register a new user, with preference given to the primary email.
       all_emails = Array.new(auth_token[:extra][:all_emails])
-      all_emails.unshift({
-          :email => data[:email],
-          :verified => !!data[:email_verified]
-      })
+      all_emails.unshift(email: data[:email],
+                         verified: !!data[:email_verified])
 
       # Only consider verified emails to match an existing user.  We don't want
       # someone to be able to create a GitHub account with an unverified email
@@ -106,14 +104,13 @@ class Auth::GithubAuthenticator < Auth::Authenticator
     )
   end
 
-
   def register_middleware(omniauth)
     omniauth.provider :github,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.github_client_id
               strategy.options[:client_secret] = SiteSetting.github_client_secret
            },
-           :scope => "user:email"
+           scope: "user:email"
   end
 end
diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb
index 31e44ea25d..385aa92148 100644
--- a/lib/auth/google_oauth2_authenticator.rb
+++ b/lib/auth/google_oauth2_authenticator.rb
@@ -21,7 +21,7 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
     if !result.user && !result.email.blank? && result.email_valid
       result.user = User.find_by_email(result.email)
       if result.user
-        ::GoogleUserInfo.create({user_id: result.user.id}.merge(google_hash))
+        ::GoogleUserInfo.create({ user_id: result.user.id }.merge(google_hash))
       end
     end
 
@@ -30,7 +30,7 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
 
   def after_create_account(user, auth)
     data = auth[:extra_data]
-    GoogleUserInfo.create({user_id: user.id}.merge(data))
+    GoogleUserInfo.create({ user_id: user.id }.merge(data))
     if auth[:email_valid].to_s == 'true'
       EmailToken.confirm(user.email_tokens.first.token)
       user.set_automatic_groups
@@ -41,8 +41,8 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator
     # jwt encoding is causing auth to fail in quite a few conditions
     # skipping
     omniauth.provider :google_oauth2,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.google_oauth2_client_id
               strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret
            },
diff --git a/lib/auth/instagram_authenticator.rb b/lib/auth/instagram_authenticator.rb
index ba2dd7f1bb..507981ef2a 100644
--- a/lib/auth/instagram_authenticator.rb
+++ b/lib/auth/instagram_authenticator.rb
@@ -39,8 +39,8 @@ class Auth::InstagramAuthenticator < Auth::Authenticator
 
   def register_middleware(omniauth)
     omniauth.provider :instagram,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:client_id] = SiteSetting.instagram_consumer_key
               strategy.options[:client_secret] = SiteSetting.instagram_consumer_secret
            }
diff --git a/lib/auth/oauth2_authenticator.rb b/lib/auth/oauth2_authenticator.rb
index 5484a19f5f..cadd1022a7 100644
--- a/lib/auth/oauth2_authenticator.rb
+++ b/lib/auth/oauth2_authenticator.rb
@@ -5,7 +5,7 @@ class Auth::OAuth2Authenticator < Auth::Authenticator
   end
 
   # only option at the moment is :trusted
-  def initialize(name, opts={})
+  def initialize(name, opts = {})
     @name = name
     @opts = opts
   end
diff --git a/lib/auth/open_id_authenticator.rb b/lib/auth/open_id_authenticator.rb
index 04f2764a9c..1bb17447c7 100644
--- a/lib/auth/open_id_authenticator.rb
+++ b/lib/auth/open_id_authenticator.rb
@@ -49,15 +49,14 @@ class Auth::OpenIdAuthenticator < Auth::Authenticator
     )
   end
 
-
   def register_middleware(omniauth)
     omniauth.provider :open_id,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:store] = OpenID::Store::Redis.new($redis)
            },
-           :name => name,
-           :identifier => identifier,
-           :require => "omniauth-openid"
+           name: name,
+           identifier: identifier,
+           require: "omniauth-openid"
   end
 end
diff --git a/lib/auth/result.rb b/lib/auth/result.rb
index eabc699999..0c18d3e1e5 100644
--- a/lib/auth/result.rb
+++ b/lib/auth/result.rb
@@ -35,8 +35,8 @@ class Auth::Result
       if user.suspended?
         {
           suspended: true,
-          suspended_message: I18n.t( user.suspend_reason ? "login.suspended_with_reason" : "login.suspended",
-                                     {date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason} )
+          suspended_message: I18n.t(user.suspend_reason ? "login.suspended_with_reason" : "login.suspended",
+                                     date: I18n.l(user.suspended_till, format: :date_only), reason: user.suspend_reason)
         }
       else
         {
diff --git a/lib/auth/twitter_authenticator.rb b/lib/auth/twitter_authenticator.rb
index c5f91c0477..a88d2124c6 100644
--- a/lib/auth/twitter_authenticator.rb
+++ b/lib/auth/twitter_authenticator.rb
@@ -57,8 +57,8 @@ class Auth::TwitterAuthenticator < Auth::Authenticator
 
   def register_middleware(omniauth)
     omniauth.provider :twitter,
-           :setup => lambda { |env|
-              strategy = env["omniauth.strategy"]
+           setup: lambda { |env|
+             strategy = env["omniauth.strategy"]
               strategy.options[:consumer_key] = SiteSetting.twitter_consumer_key
               strategy.options[:consumer_secret] = SiteSetting.twitter_consumer_secret
            }
diff --git a/lib/autospec/formatter.rb b/lib/autospec/formatter.rb
index 98d872de8e..a5fe09acbe 100644
--- a/lib/autospec/formatter.rb
+++ b/lib/autospec/formatter.rb
@@ -16,7 +16,7 @@ class Autospec::Formatter < RSpec::Core::Formatters::BaseTextFormatter
   def start(example_count)
     super
     File.delete(RSPEC_RESULT) if File.exists?(RSPEC_RESULT)
-    @fail_file = File.open(RSPEC_RESULT,"w")
+    @fail_file = File.open(RSPEC_RESULT, "w")
   end
 
   def example_passed(_notification)
diff --git a/lib/autospec/manager.rb b/lib/autospec/manager.rb
index 3cc52008e1..857967031c 100644
--- a/lib/autospec/manager.rb
+++ b/lib/autospec/manager.rb
@@ -9,7 +9,7 @@ module Autospec; end
 
 class Autospec::Manager
 
-  def self.run(opts={})
+  def self.run(opts = {})
     self.new(opts).run
   end
 
@@ -66,10 +66,10 @@ class Autospec::Manager
     Autospec::QunitRunner.new
   end
 
-  def ensure_all_specs_will_run(current_runner=nil)
+  def ensure_all_specs_will_run(current_runner = nil)
     puts "@@@@@@@@@@@@ ensure_all_specs_will_run" if @debug
 
-    @queue.reject!{|_,s,_| s == "spec"}
+    @queue.reject! { |_, s, _| s == "spec" }
 
     if current_runner
       @queue.concat [['spec', 'spec', current_runner]]
@@ -151,14 +151,14 @@ class Autospec::Manager
 
     # try focus tag
     if failed_specs.length > 0
-      filename,_ = failed_specs[0].split(":")
+      filename, _ = failed_specs[0].split(":")
       if filename && File.exist?(filename) && !File.directory?(filename)
         spec = File.read(filename)
-        start,_ =  spec.split(/\S*#focus\S*$/)
+        start, _ = spec.split(/\S*#focus\S*$/)
         if start.length < spec.length
           line = start.scan(/\n/).length + 1
           puts "Found #focus tag on line #{line}!"
-          failed_specs = ["#{filename}:#{line+1}"]
+          failed_specs = ["#{filename}:#{line + 1}"]
         end
       end
     end
@@ -188,7 +188,7 @@ class Autospec::Manager
       FileUtils.rm_f(socket_path)
       server = SocketServer.new(socket_path)
       server.start do |line|
-        file,line = line.split(' ')
+        file, line = line.split(' ')
         file = file.sub(Rails.root.to_s << "/", "")
         # process_change can aquire a mutex and block
         # the acceptor
@@ -196,7 +196,7 @@ class Autospec::Manager
           if file =~ /(es6|js)$/
             process_change([[file]])
           else
-            process_change([[file,line]])
+            process_change([[file, line]])
           end
         end
         "OK"
@@ -213,7 +213,7 @@ class Autospec::Manager
           listener = Listen.to("#{path}/#{watch}", options) do |modified, added, _|
             paths = [modified, added].flatten
             paths.compact!
-            paths.map!{|long| long[(path.length+1)..-1]}
+            paths.map! { |long| long[(path.length + 1)..-1] }
             process_change(paths)
           end
           listener.start
@@ -246,7 +246,7 @@ class Autospec::Manager
           end
         end
         # watchers
-        runner.watchers.each do |k,v|
+        runner.watchers.each do |k, v|
           if m = k.match(file)
             puts "@@@@@@@@@@@@ #{file} matched a watcher for #{runner}" if @debug
             hit = true
diff --git a/lib/autospec/qunit_runner.rb b/lib/autospec/qunit_runner.rb
index 577a7c824c..5c57064370 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -144,7 +144,7 @@ module Autospec
     end
 
     def try_to_find_module_name(file)
-      file,_ = file.split(/:\d+$/)
+      file, _ = file.split(/:\d+$/)
       return unless File.exists?(file)
       File.open(file, "r").each_line do |line|
         if m = /module\(['"]([^'"]+)/i.match(line)
diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb
index b6f5b90dd1..3fb9c09377 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -19,8 +19,8 @@ module Autospec
 
     watch(%r{^spec/fabricators/.+_fabricator\.rb$})     { "spec" }
 
-    watch(%r{^app/assets/javascripts/pretty-text/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb"}
-    watch(%r{^plugins/.*/discourse-markdown/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb"}
+    watch(%r{^app/assets/javascripts/pretty-text/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb" }
+    watch(%r{^plugins/.*/discourse-markdown/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb" }
 
     watch(%r{^plugins/.*/spec/.*\.rb})
 
diff --git a/lib/autospec/simple_runner.rb b/lib/autospec/simple_runner.rb
index 01c0aada5a..2c1fe8e656 100644
--- a/lib/autospec/simple_runner.rb
+++ b/lib/autospec/simple_runner.rb
@@ -13,8 +13,8 @@ module Autospec
               "-f", "Autospec::Formatter", specs.split].flatten.join(" ")
       # launch rspec
       Dir.chdir(Rails.root) do
-        env = {"RAILS_ENV" => "test"}
-        if specs.split(' ').any?{|s| s =~ /^(.\/)?plugins/}
+        env = { "RAILS_ENV" => "test" }
+        if specs.split(' ').any? { |s| s =~ /^(.\/)?plugins/ }
           env["LOAD_PLUGINS"] = "1"
           puts "Loading plugins while running specs"
         end
diff --git a/lib/autospec/spork_runner.rb b/lib/autospec/spork_runner.rb
index fbd05d93ef..b8ae2c8627 100644
--- a/lib/autospec/spork_runner.rb
+++ b/lib/autospec/spork_runner.rb
@@ -30,7 +30,7 @@ module Autospec
     def run(specs)
       args = ["-r", "#{File.dirname(__FILE__)}/formatter.rb",
               "-f", "Autospec::Formatter", specs.split].flatten
-      spork_service.run(args,$stderr,$stdout)
+      spork_service.run(args, $stderr, $stdout)
     end
 
     def reload
@@ -66,7 +66,7 @@ module Autospec
 
     def write_pid_file(file, pid)
       FileUtils.mkdir_p(Rails.root + "tmp/pids")
-      File.open(file,'w') do |f|
+      File.open(file, 'w') do |f|
         f.write(pid)
       end
     end
@@ -95,7 +95,7 @@ module Autospec
         sleep 1
       end
 
-      @spork_pid = Process.spawn({'RAILS_ENV' => 'test'}, "bundle exec spork")
+      @spork_pid = Process.spawn({ 'RAILS_ENV' => 'test' }, "bundle exec spork")
       write_pid_file(spork_pid_file, @spork_pid)
 
       running = false
diff --git a/lib/avatar_lookup.rb b/lib/avatar_lookup.rb
index 4af184052a..d86871fee0 100644
--- a/lib/avatar_lookup.rb
+++ b/lib/avatar_lookup.rb
@@ -1,6 +1,6 @@
 class AvatarLookup
 
-  def initialize(user_ids=[])
+  def initialize(user_ids = [])
     @user_ids = user_ids.tap(&:compact!).tap(&:uniq!).tap(&:flatten!)
   end
 
@@ -12,7 +12,7 @@ class AvatarLookup
   private
 
   def self.lookup_columns
-    @lookup_columns ||= %i{id email username uploaded_avatar_id}
+    @lookup_columns ||= %i{id user_emails.email username uploaded_avatar_id}
   end
 
   def users
@@ -22,9 +22,10 @@ class AvatarLookup
   def user_lookup_hash
     # adding tap here is a personal taste thing
     hash = {}
-    User.where(:id => @user_ids)
-        .select(AvatarLookup.lookup_columns)
-        .each{ |user| hash[user.id] = user }
+    User.joins(:user_emails)
+      .where(id: @user_ids)
+      .select(AvatarLookup.lookup_columns)
+      .each { |user| hash[user.id] = user }
     hash
   end
 end
diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb
index 12a9ecd21d..c16314f98c 100644
--- a/lib/backup_restore/backup_restore.rb
+++ b/lib/backup_restore/backup_restore.rb
@@ -11,11 +11,11 @@ module BackupRestore
   METADATA_FILE = "meta.json"
   LOGS_CHANNEL = "/admin/backups/logs"
 
-  def self.backup!(user_id, opts={})
+  def self.backup!(user_id, opts = {})
     start! BackupRestore::Backuper.new(user_id, opts)
   end
 
-  def self.restore!(user_id, opts={})
+  def self.restore!(user_id, opts = {})
     start! BackupRestore::Restorer.new(user_id, opts)
   end
 
diff --git a/lib/backup_restore/backuper.rb b/lib/backup_restore/backuper.rb
index c70a7a5850..9465457092 100644
--- a/lib/backup_restore/backuper.rb
+++ b/lib/backup_restore/backuper.rb
@@ -3,7 +3,7 @@ module BackupRestore
   class Backuper
     attr_reader :success
 
-    def initialize(user_id, opts={})
+    def initialize(user_id, opts = {})
       @user_id = user_id
       @client_id = opts[:client_id]
       @publish_to_message_bus = opts[:publish_to_message_bus] || false
diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index de6e133df1..c0c2b41377 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -8,7 +8,7 @@ module BackupRestore
   class Restorer
     attr_reader :success
 
-    def initialize(user_id, opts={})
+    def initialize(user_id, opts = {})
       @user_id = user_id
       @client_id = opts[:client_id]
       @filename = opts[:filename]
@@ -400,7 +400,7 @@ module BackupRestore
     end
 
     def notify_user
-      if user = User.find_by(email: @user_info[:email])
+      if user = User.find_by_email(@user_info[:email])
         log "Notifying '#{user.username}' of the end of the restore..."
         status = @success ? :restore_succeeded : :restore_failed
 
diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index 20a08d7daf..cdb5ac8d6a 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -133,44 +133,44 @@ SQL
   GROUP BY acting_user_id
 SQL
 
-  def self.invite_badge(count,trust_level)
-"
-  SELECT u.id user_id, current_timestamp granted_at
-  FROM users u
-  WHERE u.id IN (
-    SELECT invited_by_id
-    FROM invites i
-    JOIN users u2 ON u2.id = i.user_id
-    WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND not u2.blocked
-    GROUP BY invited_by_id
-    HAVING COUNT(*) >= #{count.to_i}
-  ) AND u.active AND NOT u.blocked AND u.id > 0 AND
-    (:backfill OR u.id IN (:user_ids) )
-"
+  def self.invite_badge(count, trust_level)
+    "
+      SELECT u.id user_id, current_timestamp granted_at
+      FROM users u
+      WHERE u.id IN (
+        SELECT invited_by_id
+        FROM invites i
+        JOIN users u2 ON u2.id = i.user_id
+        WHERE i.deleted_at IS NULL AND u2.active AND u2.trust_level >= #{trust_level.to_i} AND not u2.blocked
+        GROUP BY invited_by_id
+        HAVING COUNT(*) >= #{count.to_i}
+      ) AND u.active AND NOT u.blocked AND u.id > 0 AND
+        (:backfill OR u.id IN (:user_ids) )
+    "
   end
 
   def self.like_badge(count, is_topic)
     # we can do better with dates, but its hard work
-"
-  SELECT p.user_id, p.id post_id, p.updated_at granted_at
-  FROM badge_posts p
-  WHERE #{is_topic ? "p.post_number = 1" : "p.post_number > 1" } AND p.like_count >= #{count.to_i} AND
-    (:backfill OR p.id IN (:post_ids) )
-"
+    "
+      SELECT p.user_id, p.id post_id, p.updated_at granted_at
+      FROM badge_posts p
+      WHERE #{is_topic ? "p.post_number = 1" : "p.post_number > 1" } AND p.like_count >= #{count.to_i} AND
+        (:backfill OR p.id IN (:post_ids) )
+    "
   end
 
   def self.trust_level(level)
     # we can do better with dates, but its hard work figuring this out historically
-"
-  SELECT u.id user_id, current_timestamp granted_at FROM users u
-  WHERE trust_level >= #{level.to_i} AND (
-    :backfill OR u.id IN (:user_ids)
-  )
-"
+    "
+      SELECT u.id user_id, current_timestamp granted_at FROM users u
+      WHERE trust_level >= #{level.to_i} AND (
+        :backfill OR u.id IN (:user_ids)
+      )
+    "
   end
 
   def self.sharing_badge(count)
-<<SQL
+    <<SQL
   SELECT views.user_id, i2.post_id, current_timestamp granted_at
   FROM
   (
diff --git a/lib/cache.rb b/lib/cache.rb
index 00ca6365a5..ab30d6c885 100644
--- a/lib/cache.rb
+++ b/lib/cache.rb
@@ -27,7 +27,7 @@ class Cache < ActiveSupport::Cache::Store
     end
   end
 
-  def namespaced_key(key, opts=nil)
+  def namespaced_key(key, opts = nil)
     "#{@namespace}:" << key
   end
 
diff --git a/lib/category_badge.rb b/lib/category_badge.rb
index e6a7abebf0..068e312a54 100644
--- a/lib/category_badge.rb
+++ b/lib/category_badge.rb
@@ -10,11 +10,13 @@ module CategoryBadge
   end
 
   def self.inline_badge_wrapper_style
-    style = case (SiteSetting.category_style || :box).to_sym
-            when :bar then 'line-height: 1.25; margin-right: 5px;'
-            when :box then 'line-height: 1.5; margin-top: 5px; margin-right: 5px;'
-            when :bullet then 'line-height: 1; margin-right: 10px;'
-            end
+    style =
+      case (SiteSetting.category_style || :box).to_sym
+      when :bar then 'line-height: 1.25; margin-right: 5px;'
+      when :box then 'line-height: 1.5; margin-top: 5px; margin-right: 5px;'
+      when :bullet then 'line-height: 1; margin-right: 10px;'
+      end
+
     " style='font-size: 0.857em; white-space: nowrap; display: inline-block; position: relative; #{style}'"
   end
 
@@ -34,34 +36,41 @@ module CategoryBadge
     # parent span
     unless category.parent_category_id.nil? || opts[:hide_parent]
       parent_category = Category.find_by(id: category.parent_category_id)
-      result << if opts[:inline_style]
-        case (SiteSetting.category_style || :box).to_sym
-        when :bar then inline_category_stripe(parent_category.color, 'display: inline-block; padding: 1px;', true)
-        when :box then inline_category_stripe(parent_category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
-        when :bullet then inline_category_stripe(parent_category.color, 'display: inline-block; width: 5px; height: 10px; line-height: 1;')
+      result <<
+        if opts[:inline_style]
+          case (SiteSetting.category_style || :box).to_sym
+          when :bar
+            inline_category_stripe(parent_category.color, 'display: inline-block; padding: 1px;', true)
+          when :box
+            inline_category_stripe(parent_category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
+          when :bullet
+            inline_category_stripe(parent_category.color, 'display: inline-block; width: 5px; height: 10px; line-height: 1;')
+          end
+        else
+          category_stripe(parent_category.color, 'badge-category-parent-bg')
         end
-      else
-        category_stripe(parent_category.color, 'badge-category-parent-bg')
-      end
     end
 
     show_parent = category.parent_category_id && !opts[:hide_parent]
 
     # sub parent or main category span
-    result << if opts[:inline_style]
-      case (SiteSetting.category_style || :box).to_sym
-      when :bar then inline_category_stripe(category.color, 'display: inline-block; padding: 1px;', true)
-      when :box
-        unless show_parent
-          inline_category_stripe(category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
-        else
-          inline_category_stripe(category.color, 'left: 5px; display: block; position: absolute; width: calc(100% - 5px); height: 100%;')
+    result <<
+      if opts[:inline_style]
+        case (SiteSetting.category_style || :box).to_sym
+        when :bar
+          inline_category_stripe(category.color, 'display: inline-block; padding: 1px;', true)
+        when :box
+          unless show_parent
+            inline_category_stripe(category.color, 'display: block; position: absolute; width: 100%; height: 100%;')
+          else
+            inline_category_stripe(category.color, 'left: 5px; display: block; position: absolute; width: calc(100% - 5px); height: 100%;')
+          end
+        when :bullet
+          inline_category_stripe(category.color, "display: inline-block; width: #{category.parent_category_id.nil? ? 10 : 5}px; height: 10px;")
         end
-      when :bullet then inline_category_stripe(category.color, "display: inline-block; width: #{category.parent_category_id.nil? ? 10 : 5}px; height: 10px;")
+      else
+        category_stripe(category.color, 'badge-category-bg')
       end
-    else
-      category_stripe(category.color, 'badge-category-bg')
-    end
 
     # category name
     class_names = 'badge-category clear-badge'
@@ -69,11 +78,15 @@ module CategoryBadge
     description = category.description_text ? "title='#{category.description_text.html_safe}'" : ''
     category_url = opts[:absolute_url] ? "#{Discourse.base_url_no_prefix}#{category.url}" : category.url
 
-    extra_span_classes = if opts[:inline_style]
+    extra_span_classes =
+      if opts[:inline_style]
         case (SiteSetting.category_style || :box).to_sym
-        when :bar then 'padding: 3px; color: #222222 !important; vertical-align: text-top; margin-top: -3px; display: inline-block;'
-        when :box then "#{show_parent ? 'margin-left: 5px; ' : ''} position: relative; padding: 0 5px; margin-top: 2px;"
-        when :bullet then 'color: #222222 !important; vertical-align: text-top; line-height: 1; margin-left: 4px; padding-left: 2px; display: inline;'
+        when :bar
+          'padding: 3px; color: #222222 !important; vertical-align: text-top; margin-top: -3px; display: inline-block;'
+        when :box
+          "#{show_parent ? 'margin-left: 5px; ' : ''} position: relative; padding: 0 5px; margin-top: 2px;"
+        when :bullet
+          'color: #222222 !important; vertical-align: text-top; line-height: 1; margin-left: 4px; padding-left: 2px; display: inline;'
         end + 'max-width: 150px; overflow: hidden; text-overflow: ellipsis;'
       else
         ''
diff --git a/lib/column_dropper.rb b/lib/column_dropper.rb
index 766ddddddf..7c77a25331 100644
--- a/lib/column_dropper.rb
+++ b/lib/column_dropper.rb
@@ -8,31 +8,67 @@ class ColumnDropper
 
     delay ||= Rails.env.production? ? 60 : 0
 
-    sql = <<SQL
+    sql = <<~SQL
     SELECT 1
     FROM INFORMATION_SCHEMA.COLUMNS
     WHERE table_schema = 'public' AND
-          table_name = :table AND
-          column_name IN (:columns) AND
-          EXISTS (
-            SELECT 1
-            FROM schema_migration_details
-            WHERE name = :after_migration AND
-                  created_at <= (current_timestamp at time zone 'UTC' - interval :delay)
-          )
+      table_name = :table AND
+      column_name IN (:columns) AND
+      EXISTS (
+        SELECT 1
+        FROM schema_migration_details
+        WHERE name = :after_migration AND
+              created_at <= (current_timestamp at time zone 'UTC' - interval :delay)
+      )
     LIMIT 1
-SQL
+    SQL
 
     if ActiveRecord::Base.exec_sql(sql, table: table,
                                         columns: columns,
                                         delay: "#{delay.to_i || 0} seconds",
                                         after_migration: after_migration).to_a.length > 0
-        on_drop&.call
+      on_drop&.call
 
-        columns.each do |column|
-          # safe cause it is protected on method entry, can not be passed in params
-          ActiveRecord::Base.exec_sql("ALTER TABLE #{table} DROP COLUMN IF EXISTS #{column}")
-        end
+      columns.each do |column|
+        # safe cause it is protected on method entry, can not be passed in params
+        ActiveRecord::Base.exec_sql("ALTER TABLE #{table} DROP COLUMN IF EXISTS #{column}")
+
+        ActiveRecord::Base.exec_sql <<~SQL
+        DROP FUNCTION IF EXISTS #{readonly_function_name(table, column)};
+        DROP TRIGGER IF EXISTS #{readonly_trigger_name(table, column)} ON #{table};
+        SQL
+      end
+
+      Discourse.reset_active_record_cache
     end
   end
+
+  def self.mark_readonly(table_name, column_name)
+    ActiveRecord::Base.exec_sql <<-SQL
+    CREATE OR REPLACE FUNCTION #{readonly_function_name(table_name, column_name)} RETURNS trigger AS $rcr$
+      BEGIN
+        RAISE EXCEPTION 'Discourse: #{column_name} in #{table_name} is readonly';
+      END
+    $rcr$ LANGUAGE plpgsql;
+    SQL
+
+    ActiveRecord::Base.exec_sql <<-SQL
+    CREATE TRIGGER #{readonly_trigger_name(table_name, column_name)}
+    BEFORE INSERT OR UPDATE OF #{column_name}
+    ON #{table_name}
+    FOR EACH ROW
+    WHEN (NEW.#{column_name} IS NOT NULL)
+    EXECUTE PROCEDURE #{readonly_function_name(table_name, column_name)};
+    SQL
+  end
+
+  private
+
+  def self.readonly_function_name(table_name, column_name)
+    "raise_#{table_name}_#{column_name}_readonly()"
+  end
+
+  def self.readonly_trigger_name(table_name, column_name)
+    "#{table_name}_#{column_name}_readonly"
+  end
 end
diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index fa3c952abd..94d5a23efa 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -7,7 +7,7 @@ class ComposerMessagesFinder
   end
 
   def self.check_methods
-    @check_methods ||= instance_methods.find_all {|m| m =~ /^check\_/}
+    @check_methods ||= instance_methods.find_all { |m| m =~ /^check\_/ }
   end
 
   def find
@@ -70,7 +70,7 @@ class ComposerMessagesFinder
     return if SiteSetting.disable_avatar_education_message || SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars
 
     # If we got this far, log that we've nagged them about the avatar
-    UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: @user.id )
+    UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: @user.id)
 
     # Return the message
     {
@@ -86,19 +86,19 @@ class ComposerMessagesFinder
 
     # Count the topics made by this user in the last day
     recent_posts_user_ids = Post.where(topic_id: @details[:topic_id])
-                                .where("created_at > ?", 1.day.ago)
-                                .order('created_at desc')
-                                .limit(SiteSetting.sequential_replies_threshold)
-                                .pluck(:user_id)
+      .where("created_at > ?", 1.day.ago)
+      .order('created_at desc')
+      .limit(SiteSetting.sequential_replies_threshold)
+      .pluck(:user_id)
 
     # Did we get back as many posts as we asked for, and are they all by the current user?
     return if recent_posts_user_ids.size != SiteSetting.sequential_replies_threshold ||
-              recent_posts_user_ids.detect {|u| u != @user.id }
+              recent_posts_user_ids.detect { |u| u != @user.id }
 
     # If we got this far, log that we've nagged them about the sequential replies
     UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies],
                         target_user_id: @user.id,
-                        topic_id: @details[:topic_id] )
+                        topic_id: @details[:topic_id])
 
     {
       id: 'sequential_replies',
@@ -149,7 +149,7 @@ class ComposerMessagesFinder
       order('created_at desc').
       limit(SiteSetting.get_a_room_threshold).
       pluck(:reply_to_user_id).
-      find_all {|uid| uid != @user.id && uid == reply_to_user_id}
+      find_all { |uid| uid != @user.id && uid == reply_to_user_id }
 
     return unless last_x_replies.size == SiteSetting.get_a_room_threshold
     return unless @topic.posts.count('distinct user_id') >= min_users_posted
diff --git a/lib/content_buffer.rb b/lib/content_buffer.rb
index 99d176d4cb..8db6146f0b 100644
--- a/lib/content_buffer.rb
+++ b/lib/content_buffer.rb
@@ -35,7 +35,7 @@ class ContentBuffer
       end
 
       # fix last line
-      @lines[start_row] << @lines[finish_row][finish_col-1..-1]
+      @lines[start_row] << @lines[finish_row][finish_col - 1..-1]
     end
 
     if transform[:operation] == :insert
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 9d950f4cf0..585a9e995a 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -9,7 +9,7 @@ class CookedPostProcessor
 
   attr_reader :cooking_options
 
-  def initialize(post, opts={})
+  def initialize(post, opts = {})
     @dirty = false
     @opts = opts
     @post = post
@@ -63,7 +63,7 @@ class CookedPostProcessor
 
     upload_ids |= oneboxed_image_uploads.pluck(:id)
 
-    values = upload_ids.map{ |u| "(#{@post.id},#{u})" }.join(",")
+    values = upload_ids.map { |u| "(#{@post.id},#{u})" }.join(",")
     PostUpload.transaction do
       PostUpload.delete_all(post_id: @post.id)
       if upload_ids.length > 0
@@ -80,8 +80,6 @@ class CookedPostProcessor
       limit_size!(img)
       convert_to_link!(img)
     end
-
-    update_post_image
   end
 
   def extract_images
@@ -102,8 +100,6 @@ class CookedPostProcessor
     @doc.css("img[src]") -
     # minus, emojis
     @doc.css("img.emoji") -
-    # minus, image inside oneboxes
-    oneboxed_images -
     # minus, images inside quotes
     @doc.css(".quote img")
   end
@@ -142,11 +138,11 @@ class CookedPostProcessor
       original_width, original_height = original_image_size.map(&:to_f)
 
       if w > 0
-        ratio = w/original_width
-        [w.floor, (original_height*ratio).floor]
+        ratio = w / original_width
+        [w.floor, (original_height * ratio).floor]
       else
-        ratio = h/original_height
-        [(original_width*ratio).floor, h.floor]
+        ratio = h / original_height
+        [(original_width * ratio).floor, h.floor]
       end
     end
   end
@@ -238,7 +234,7 @@ class CookedPostProcessor
     false
   end
 
-  def add_lightbox!(img, original_width, original_height, upload=nil)
+  def add_lightbox!(img, original_width, original_height, upload = nil)
     # first, create a div to hold our lightbox
     lightbox = Nokogiri::XML::Node.new("div", @doc)
     lightbox["class"] = "lightbox-wrapper"
@@ -283,7 +279,7 @@ class CookedPostProcessor
     return I18n.t("upload.pasted_image_filename")
   end
 
-  def create_span_node(klass, content=nil)
+  def create_span_node(klass, content = nil)
     span = Nokogiri::XML::Node.new("span", @doc)
     span.content = content if content
     span["class"] = klass
@@ -292,6 +288,8 @@ class CookedPostProcessor
 
   def update_post_image
     img = extract_images_for_post.first
+    return if img.blank?
+
     if img["src"].present?
       @post.update_column(:image_url, img["src"][0...255]) # post
       @post.topic.update_column(:image_url, img["src"][0...255]) if @post.is_first_post? # topic
@@ -310,6 +308,11 @@ class CookedPostProcessor
       Oneboxer.onebox(url, args)
     end
 
+    update_post_image
+
+    # make sure we grab dimensions for oneboxed images
+    oneboxed_images.each { |img| limit_size!(img) }
+
     uploads = oneboxed_image_uploads.select(:url, :origin)
     oneboxed_images.each do |img|
       upload = uploads.detect { |u| u.origin == img["src"] }
@@ -374,7 +377,7 @@ class CookedPostProcessor
     # log the site setting change
     reason = I18n.t("disable_remote_images_download_reason")
     staff_action_logger = StaffActionLogger.new(Discourse.system_user)
-    staff_action_logger.log_site_setting_change("download_remote_images_to_local", true, false, { details: reason })
+    staff_action_logger.log_site_setting_change("download_remote_images_to_local", true, false, details: reason)
 
     # also send a private message to the site contact user
     notify_about_low_disk_space
diff --git a/lib/current_user.rb b/lib/current_user.rb
index 01c5570028..a5035b9764 100644
--- a/lib/current_user.rb
+++ b/lib/current_user.rb
@@ -8,19 +8,18 @@ module CurrentUser
     Discourse.current_user_provider.new(env).current_user
   end
 
-
   # can be used to pretend current user does no exist, for CSRF attacks
   def clear_current_user
     @current_user_provider = Discourse.current_user_provider.new({})
   end
 
   def log_on_user(user)
-    current_user_provider.log_on_user(user,session,cookies)
+    current_user_provider.log_on_user(user, session, cookies)
     user.logged_in
   end
 
   def log_off_user
-    current_user_provider.log_off_user(session,cookies)
+    current_user_provider.log_off_user(session, cookies)
   end
 
   def is_api?
@@ -36,7 +35,7 @@ module CurrentUser
   end
 
   def refresh_session(user)
-    current_user_provider.refresh_session(user,session,cookies)
+    current_user_provider.refresh_session(user, session, cookies)
   end
 
   private
diff --git a/lib/demon/base.rb b/lib/demon/base.rb
index 6fb162faad..188a27e9fe 100644
--- a/lib/demon/base.rb
+++ b/lib/demon/base.rb
@@ -7,7 +7,7 @@ class Demon::Base
     @demons
   end
 
-  def self.start(count=1)
+  def self.start(count = 1)
     @demons ||= {}
     count.times do |i|
       (@demons["#{prefix}_#{i}"] ||= new(i)).start
@@ -50,7 +50,7 @@ class Demon::Base
     "#{Rails.root}/tmp/pids/#{self.class.prefix}_#{@index}.pid"
   end
 
-  def alive?(pid=nil)
+  def alive?(pid = nil)
     pid ||= @pid
     if pid
       Demon::Base.alive?(pid)
@@ -63,14 +63,14 @@ class Demon::Base
     @started = false
     if @pid
       # TODO configurable stop signal
-      Process.kill("HUP",@pid)
+      Process.kill("HUP", @pid)
 
       wait_for_stop = lambda {
         timeout = @stop_timeout
 
         while alive? && timeout > 0
-          timeout -= (@stop_timeout/10.0)
-          sleep(@stop_timeout/10.0)
+          timeout -= (@stop_timeout / 10.0)
+          sleep(@stop_timeout / 10.0)
           Process.waitpid(@pid, Process::WNOHANG) rescue -1
         end
 
@@ -86,7 +86,6 @@ class Demon::Base
 
       wait_for_stop.call
 
-
       @pid = nil
       @started = false
     end
@@ -116,7 +115,7 @@ class Demon::Base
     if existing = already_running?
       # should not happen ... so kill violently
       STDERR.puts "Attempting to kill pid #{existing}"
-      Process.kill("TERM",existing)
+      Process.kill("TERM", existing)
     end
 
     @started = true
@@ -156,7 +155,7 @@ class Demon::Base
 
   def write_pid_file
     FileUtils.mkdir_p(Rails.root + "tmp/pids")
-    File.open(pid_file,'w') do |f|
+    File.open(pid_file, 'w') do |f|
       f.write(@pid)
     end
   end
@@ -182,7 +181,6 @@ class Demon::Base
     end
   end
 
-
   def suppress_stdout
     true
   end
diff --git a/lib/demon/rails_autospec.rb b/lib/demon/rails_autospec.rb
index 92d15a8fb2..702876c87e 100644
--- a/lib/demon/rails_autospec.rb
+++ b/lib/demon/rails_autospec.rb
@@ -12,9 +12,9 @@ class Demon::RailsAutospec < Demon::Base
     require "rack"
     ENV["RAILS_ENV"] = "test"
     Rack::Server.start(
-      :config => "config.ru",
-      :AccessLog => [],
-      :Port => ENV["TEST_SERVER_PORT"] || 60099,
+      config: "config.ru",
+      AccessLog: [],
+      Port: ENV["TEST_SERVER_PORT"] || 60099,
     )
   rescue => e
     STDERR.puts e.message
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index a6f0194415..85e343c987 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -7,7 +7,7 @@ class Demon::Sidekiq < Demon::Base
   end
 
   def self.after_fork(&blk)
-    blk ? (@blk=blk) : @blk
+    blk ? (@blk = blk) : @blk
   end
 
   private
diff --git a/lib/directory_helper.rb b/lib/directory_helper.rb
index ec8eaccc5a..7f8e6b86e3 100644
--- a/lib/directory_helper.rb
+++ b/lib/directory_helper.rb
@@ -2,7 +2,7 @@ module DirectoryHelper
 
   def tmp_directory(prefix)
     directory_cache[prefix] ||= begin
-      f = File.join( Rails.root, 'tmp', Time.now.strftime("#{prefix}%Y%m%d%H%M%S") )
+      f = File.join(Rails.root, 'tmp', Time.now.strftime("#{prefix}%Y%m%d%H%M%S"))
       FileUtils.mkdir_p(f) unless Dir[f].present?
       f
     end
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 086ed28b72..dd9d9d3fef 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -63,7 +63,7 @@ module Discourse
   # When they don't have permission to do something
   class InvalidAccess < StandardError
     attr_reader :obj
-    def initialize(msg=nil, obj=nil)
+    def initialize(msg = nil, obj = nil)
       super(msg)
       @obj = obj
     end
@@ -115,7 +115,6 @@ module Discourse
     set
   end
 
-
   def self.activate_plugins!
     all_plugins = Plugin::Instance.find_all("#{Rails.root}/plugins")
 
@@ -144,11 +143,11 @@ module Discourse
   end
 
   def self.official_plugins
-    plugins.find_all{|p| p.metadata.official?}
+    plugins.find_all { |p| p.metadata.official? }
   end
 
   def self.unofficial_plugins
-    plugins.find_all{|p| !p.metadata.official?}
+    plugins.find_all { |p| !p.metadata.official? }
   end
 
   def self.assets_digest
@@ -214,6 +213,25 @@ module Discourse
     base_url_no_prefix + base_uri
   end
 
+  def self.route_for(uri)
+
+    uri = URI(uri) rescue nil unless (uri.is_a?(URI))
+    return unless uri
+
+    path = uri.path || ""
+    if (uri.host == Discourse.current_hostname &&
+      path.start_with?(Discourse.base_uri)) ||
+      !uri.host
+
+      path.slice!(Discourse.base_uri)
+      return Rails.application.routes.recognize_path(path)
+    end
+
+    nil
+  rescue ActionController::RoutingError
+    nil
+  end
+
   READONLY_MODE_KEY_TTL  ||= 60
   READONLY_MODE_KEY      ||= 'readonly_mode'.freeze
   PG_READONLY_MODE_KEY   ||= 'readonly_mode:postgres'.freeze
@@ -359,7 +377,7 @@ module Discourse
     Rails.cache.reconnect
     Logster.store.redis.reconnect
     # shuts down all connections in the pool
-    Sidekiq.redis_pool.shutdown{|c| nil}
+    Sidekiq.redis_pool.shutdown { |c| nil }
     # re-establish
     Sidekiq.redis = sidekiq_redis_config
     start_connection_reaper
@@ -383,7 +401,7 @@ module Discourse
           sleep GlobalSetting.connection_reaper_interval
           reap_connections(GlobalSetting.connection_reaper_age, GlobalSetting.connection_reaper_max_age)
         rescue => e
-          Discourse.handle_exception(e, {message: "Error reaping connections"})
+          Discourse.handle_exception(e, message: "Error reaping connections")
         end
       end
     end
@@ -391,7 +409,7 @@ module Discourse
 
   def self.reap_connections(idle, max_age)
     pools = []
-    ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool){|pool| pools << pool}
+    ObjectSpace.each_object(ActiveRecord::ConnectionAdapters::ConnectionPool) { |pool| pools << pool }
 
     pools.each do |pool|
       pool.drain(idle.seconds, max_age.seconds)
@@ -414,7 +432,7 @@ module Discourse
 
   def self.reset_active_record_cache_if_needed(e)
     last_cache_reset = Discourse.last_ar_cache_reset
-    if e && e.message =~ /UndefinedColumn/ && (last_cache_reset.nil?  || last_cache_reset < 30.seconds.ago)
+    if e && e.message =~ /UndefinedColumn/ && (last_cache_reset.nil? || last_cache_reset < 30.seconds.ago)
       Rails.logger.warn "Clear Active Record cache cause schema appears to have changed!"
       Discourse.last_ar_cache_reset = Time.zone.now
       Discourse.reset_active_record_cache
@@ -429,5 +447,4 @@ module Discourse
     nil
   end
 
-
 end
diff --git a/lib/discourse_cookie_store.rb b/lib/discourse_cookie_store.rb
index f962ba3a0c..2dbd56792f 100644
--- a/lib/discourse_cookie_store.rb
+++ b/lib/discourse_cookie_store.rb
@@ -1,6 +1,6 @@
 class ActionDispatch::Session::DiscourseCookieStore < ActionDispatch::Session::CookieStore
-  def initialize(app, options={})
-    super(app,options)
+  def initialize(app, options = {})
+    super(app, options)
   end
 
   private
diff --git a/lib/discourse_hub.rb b/lib/discourse_hub.rb
index 174ca23fb8..940800be17 100644
--- a/lib/discourse_hub.rb
+++ b/lib/discourse_hub.rb
@@ -5,7 +5,7 @@ module DiscourseHub
   STATS_FETCHED_AT_KEY = "stats_fetched_at"
 
   def self.version_check_payload
-    default_payload = { installed_version: Discourse::VERSION::STRING }.merge!(Discourse.git_branch == "unknown" ? {} : {branch: Discourse.git_branch})
+    default_payload = { installed_version: Discourse::VERSION::STRING }.merge!(Discourse.git_branch == "unknown" ? {} : { branch: Discourse.git_branch })
     default_payload.merge!(get_payload)
   end
 
@@ -23,23 +23,23 @@ module DiscourseHub
     SiteSetting.share_anonymized_statistics && stats_fetched_at < 7.days.ago ? About.fetch_cached_stats.symbolize_keys : {}
   end
 
-  def self.get(rel_url, params={})
+  def self.get(rel_url, params = {})
     singular_action :get, rel_url, params
   end
 
-  def self.post(rel_url, params={})
+  def self.post(rel_url, params = {})
     collection_action :post, rel_url, params
   end
 
-  def self.put(rel_url, params={})
+  def self.put(rel_url, params = {})
     collection_action :put, rel_url, params
   end
 
-  def self.delete(rel_url, params={})
+  def self.delete(rel_url, params = {})
     singular_action :delete, rel_url, params
   end
 
-  def self.singular_action(action, rel_url, params={})
+  def self.singular_action(action, rel_url, params = {})
     JSON.parse(Excon.send(action,
       "#{hub_base_url}#{rel_url}",
       headers: { 'Referer' => referer, 'Accept' => accepts.join(', ') },
@@ -48,7 +48,7 @@ module DiscourseHub
     ).body)
   end
 
-  def self.collection_action(action, rel_url, params={})
+  def self.collection_action(action, rel_url, params = {})
     JSON.parse(Excon.send(action,
       "#{hub_base_url}#{rel_url}",
       body: JSON[params],
diff --git a/lib/discourse_plugin.rb b/lib/discourse_plugin.rb
index b39b676c02..a2f86705ae 100644
--- a/lib/discourse_plugin.rb
+++ b/lib/discourse_plugin.rb
@@ -27,10 +27,10 @@ class DiscoursePlugin
   # Find the modules defined in the plugin with "Mixin" in their name.
   def self.mixins
     constants.map { |const_name| const_get(const_name) }
-             .select { |const| const.class == Module && const.name["Mixin"] }
+      .select { |const| const.class == Module && const.name["Mixin"] }
   end
 
-  def register_js(file, opts={})
+  def register_js(file, opts = {})
     @registry.register_js(file, opts)
   end
 
@@ -38,7 +38,7 @@ class DiscoursePlugin
     @registry.register_css(file)
   end
 
-  def register_archetype(name, options={})
+  def register_archetype(name, options = {})
     @registry.register_archetype(name, options)
   end
 
@@ -48,4 +48,3 @@ class DiscoursePlugin
   end
 
 end
-
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index 568c48932d..9e404c16c5 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -70,7 +70,7 @@ class DiscoursePluginRegistry
 
   end
 
-  def register_js(filename, options={})
+  def register_js(filename, options = {})
     # If we have a server side option, add that too.
     self.class.javascripts << filename
   end
@@ -79,15 +79,15 @@ class DiscoursePluginRegistry
     self.class.stylesheets << filename
   end
 
-  def register_archetype(name, options={})
+  def register_archetype(name, options = {})
     Archetype.register(name, options)
   end
 
-  def self.register_glob(root, extension, options=nil)
+  def self.register_glob(root, extension, options = nil)
     self.asset_globs << [root, extension, options || {}]
   end
 
-  def self.each_globbed_asset(each_options=nil)
+  def self.each_globbed_asset(each_options = nil)
     each_options ||= {}
 
     self.asset_globs.each do |g|
@@ -108,7 +108,7 @@ class DiscoursePluginRegistry
   JS_REGEX = /\.js$|\.js\.erb$|\.js\.es6$/
   HANDLEBARS_REGEX = /\.hbs$|\.js\.handlebars$/
 
-  def self.register_asset(asset, opts=nil)
+  def self.register_asset(asset, opts = nil)
     if asset =~ JS_REGEX
       if opts == :admin
         self.admin_javascripts << asset
@@ -140,7 +140,7 @@ class DiscoursePluginRegistry
     html_builders[name] = block
   end
 
-  def self.build_html(name, ctx=nil)
+  def self.build_html(name, ctx = nil)
     html_builders[name]&.call(ctx)
   end
 
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index aaa5f74ef7..f646cba58e 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -15,6 +15,7 @@ class DiscourseRedis
       @mutex = Mutex.new
       @slave_config = DiscourseRedis.slave_config
       @timer_task = init_timer_task
+      @message_bus_keepalive_interval = MessageBus.keepalive_interval
     end
 
     def verify_master
@@ -41,6 +42,7 @@ class DiscourseRedis
             slave_client.call([:client, [:kill, 'type', connection_type]])
           end
 
+          MessageBus.keepalive_interval = @message_bus_keepalive_interval
           Discourse.clear_readonly!
           Discourse.request_refresh!
           success = true
@@ -57,7 +59,12 @@ class DiscourseRedis
     end
 
     def master=(args)
-      synchronize { @master = args }
+      synchronize do
+        @master = args
+
+        # Disables MessageBus keepalive when Redis is in readonly mode
+        MessageBus.keepalive_interval = 0 if !@master
+      end
     end
 
     def running?
@@ -125,10 +132,10 @@ class DiscourseRedis
   end
 
   def self.slave_config(options = config)
-    options.dup.merge!({ host: options[:slave_host], port: options[:slave_port] })
+    options.dup.merge!(host: options[:slave_host], port: options[:slave_port])
   end
 
-  def initialize(config=nil)
+  def initialize(config = nil)
     @config = config || DiscourseRedis.config
     @redis = DiscourseRedis.raw_connection(@config)
   end
@@ -146,7 +153,7 @@ class DiscourseRedis
     yield
   rescue Redis::CommandError => ex
     if ex.message =~ /READONLY/
-      unless Discourse.recently_readonly?
+      unless Discourse.recently_readonly? || Rails.env.test?
         STDERR.puts "WARN: Redis is in a readonly state. Performed a noop"
       end
 
@@ -182,7 +189,7 @@ class DiscourseRedis
   end
 
   def mget(*args)
-    args.map!{|a| "#{namespace}:#{a}"}
+    args.map! { |a| "#{namespace}:#{a}" }
     DiscourseRedis.ignore_readonly { @redis.mget(*args) }
   end
 
@@ -193,10 +200,10 @@ class DiscourseRedis
     end
   end
 
-  def keys(pattern=nil)
+  def keys(pattern = nil)
     DiscourseRedis.ignore_readonly do
       len = namespace.length + 1
-      @redis.keys("#{namespace}:#{pattern || '*'}").map{
+      @redis.keys("#{namespace}:#{pattern || '*'}").map {
         |k| k[len..-1]
       }
     end
@@ -210,7 +217,7 @@ class DiscourseRedis
 
   def flushdb
     DiscourseRedis.ignore_readonly do
-      keys.each{|k| del(k)}
+      keys.each { |k| del(k) }
     end
   end
 
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 67e4d71171..0fcf8bda9b 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -3,7 +3,6 @@ module DiscourseTagging
   TAGS_FIELD_NAME = "tags"
   TAGS_FILTER_REGEXP = /[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/ # /?#[]@!$&'()*+,;=.%\`^|{}"<>
 
-
   def self.tag_topic_by_names(topic, guardian, tag_names_arg, append: false)
     if SiteSetting.tagging_enabled
       tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, guardian) || []
@@ -33,11 +32,9 @@ module DiscourseTagging
 
         # guardian is explicitly nil cause we don't want to strip all
         # staff tags that already passed validation
-        tags = filter_allowed_tags(Tag.where(name: tag_names), nil, {
-          for_input: true,
-          category: category,
-          selected_tags: tag_names
-        }).to_a
+        tags = filter_allowed_tags(Tag.where(name: tag_names), nil,           for_input: true,
+                                                                              category: category,
+                                                                              selected_tags: tag_names).to_a
 
         if tags.size < tag_names.size && (category.nil? || category.tags.count == 0)
           tag_names.each do |name|
@@ -51,7 +48,7 @@ module DiscourseTagging
       else
         topic.tags = []
       end
-      topic.tags_changed=true
+      topic.tags_changed = true
     end
     true
   end
@@ -61,7 +58,7 @@ module DiscourseTagging
   #   category: a Category to which the object being tagged belongs
   #   for_input: result is for an input field, so only show permitted tags
   #   selected_tags: an array of tag names that are in the current selection
-  def self.filter_allowed_tags(query, guardian, opts={})
+  def self.filter_allowed_tags(query, guardian, opts = {})
     term = opts[:term]
     if term.present?
       term.gsub!("_", "\\_")
@@ -124,9 +121,9 @@ module DiscourseTagging
       else
         # One tag per group restriction
         exclude_group_ids = TagGroup.where(one_per_topic: true)
-                                    .joins(:tag_group_memberships)
-                                    .where('tag_group_memberships.tag_id in (?)', selected_tag_ids)
-                                    .pluck(:id)
+          .joins(:tag_group_memberships)
+          .where('tag_group_memberships.tag_id in (?)', selected_tag_ids)
+          .pluck(:id)
 
         if exclude_group_ids.empty?
           sql = "tags.id NOT IN (#{select_sql} WHERE tg.parent_tag_id NOT IN (?))"
@@ -135,9 +132,9 @@ module DiscourseTagging
           # It's possible that the selected tags violate some one-tag-per-group restrictions,
           # so filter them out by picking one from each group.
           limit_tag_ids = TagGroupMembership.select('distinct on (tag_group_id) tag_id')
-                                            .where(tag_id: selected_tag_ids)
-                                            .where(tag_group_id: exclude_group_ids)
-                                            .map(&:tag_id)
+            .where(tag_id: selected_tag_ids)
+            .where(tag_group_id: exclude_group_ids)
+            .map(&:tag_id)
           sql = "(tags.id NOT IN (#{select_sql} WHERE (tg.parent_tag_id NOT IN (?) OR tg.id in (?))) OR tags.id IN (?))"
           query = query.where(sql, selected_tag_ids, exclude_group_ids, limit_tag_ids)
         end
@@ -149,8 +146,8 @@ module DiscourseTagging
 
   def self.clean_tag(tag)
     tag.downcase.strip
-       .gsub(/\s+/, '-').squeeze('-')
-       .gsub(TAGS_FILTER_REGEXP, '')[0...SiteSetting.max_tag_length]
+      .gsub(/\s+/, '-').squeeze('-')
+      .gsub(TAGS_FILTER_REGEXP, '')[0...SiteSetting.max_tag_length]
   end
 
   def self.staff_only_tags(tags)
@@ -164,7 +161,7 @@ module DiscourseTagging
     tag_diff.present? ? tag_diff : nil
   end
 
-  def self.tags_for_saving(tags_arg, guardian, opts={})
+  def self.tags_for_saving(tags_arg, guardian, opts = {})
 
     return [] unless guardian.can_tag_topics? && tags_arg.present?
 
@@ -179,7 +176,7 @@ module DiscourseTagging
     return opts[:unlimited] ? tag_names : tag_names[0...SiteSetting.max_tags_per_topic]
   end
 
-  def self.add_or_create_tags_by_name(taggable, tag_names_arg, opts={})
+  def self.add_or_create_tags_by_name(taggable, tag_names_arg, opts = {})
     tag_names = DiscourseTagging.tags_for_saving(tag_names_arg, Guardian.new(Discourse.system_user), opts) || []
     if taggable.tags.pluck(:name).sort != tag_names.sort
       taggable.tags = Tag.where(name: tag_names).all
diff --git a/lib/discourse_updates.rb b/lib/discourse_updates.rb
index 3e2f14c682..dd56806360 100644
--- a/lib/discourse_updates.rb
+++ b/lib/discourse_updates.rb
@@ -33,10 +33,10 @@ module DiscourseUpdates
 
         # Handle cases when version check data is old so we report something that makes sense
 
-        if (version_info.updated_at.nil? or  # never performed a version check
-            last_installed_version != Discourse::VERSION::STRING or  # upgraded since the last version check
-            (version_info.missing_versions_count == 0 and version_info.latest_version != version_info.installed_version) or  # old data
-            (version_info.missing_versions_count != 0 and version_info.latest_version == version_info.installed_version))    # old data
+        if (version_info.updated_at.nil? ||  # never performed a version check
+            last_installed_version != (Discourse::VERSION::STRING) ||  # upgraded since the last version check
+            (version_info.missing_versions_count == (0) && version_info.latest_version != (version_info.installed_version)) ||  # old data
+            (version_info.missing_versions_count != (0) && version_info.latest_version == (version_info.installed_version)))    # old data
           Jobs.enqueue(:version_check, all_sites: true)
           version_info.version_check_pending = true
           unless version_info.updated_at.nil?
@@ -92,7 +92,7 @@ module DiscourseUpdates
       if versions.present?
         # store the list in redis
         version_keys = []
-        versions[0,5].each do |v|
+        versions[0, 5].each do |v|
           key = "#{missing_versions_key_prefix}:#{v['version']}"
           $redis.mapped_hmset key, v
           version_keys << key
@@ -108,7 +108,6 @@ module DiscourseUpdates
       keys.present? ? keys.map { |k| $redis.hgetall(k) } : []
     end
 
-
     private
 
       def last_installed_version_key
diff --git a/lib/distributed_cache.rb b/lib/distributed_cache.rb
index 3175332036..2b08e64216 100644
--- a/lib/distributed_cache.rb
+++ b/lib/distributed_cache.rb
@@ -17,7 +17,7 @@ class DistributedCache
   end
 
   def self.process_message(message)
-    i = @subscribers.length-1
+    i = @subscribers.length - 1
 
     payload = message.data
 
@@ -32,9 +32,9 @@ class DistributedCache
         hash = current.hash(message.site_id)
 
         case payload["op"]
-          when "set" then hash[payload["key"]] = payload["marshalled"] ?  Marshal.load(Base64.decode64(payload["value"])) : payload["value"]
-          when "delete" then hash.delete(payload["key"])
-          when "clear"  then hash.clear
+        when "set" then hash[payload["key"]] = payload["marshalled"] ? Marshal.load(Base64.decode64(payload["value"])) : payload["value"]
+        when "delete" then hash.delete(payload["key"])
+        when "clear"  then hash.clear
         end
 
       rescue WeakRef::RefError
@@ -66,22 +66,22 @@ class DistributedCache
     message[:origin] = hash.identity
     message[:hash_key] = hash.key
     message[:discourse_version] = Discourse.git_version
-    MessageBus.publish(channel_name, message, { user_ids: [-1] })
+    MessageBus.publish(channel_name, message, user_ids: [-1])
   end
 
   def self.set(hash, key, value)
     # special support for set
     marshal = (Set === value || Hash === value)
     value = Base64.encode64(Marshal.dump(value)) if marshal
-    publish(hash, { op: :set, key: key, value: value, marshalled: marshal })
+    publish(hash, op: :set, key: key, value: value, marshalled: marshal)
   end
 
   def self.delete(hash, key)
-    publish(hash, { op: :delete, key: key })
+    publish(hash, op: :delete, key: key)
   end
 
   def self.clear(hash)
-    publish(hash, { op: :clear })
+    publish(hash, op: :clear)
   end
 
   def self.register(hash)
@@ -103,7 +103,7 @@ class DistributedCache
     (@seed_id ||= SecureRandom.hex) + "#{Process.pid}"
   end
 
-  def []=(k,v)
+  def []=(k, v)
     k = k.to_s if Symbol === k
     DistributedCache.set(self, k, v)
     hash[k] = v
diff --git a/lib/distributed_memoizer.rb b/lib/distributed_memoizer.rb
index c5e7031d37..e80b687923 100644
--- a/lib/distributed_memoizer.rb
+++ b/lib/distributed_memoizer.rb
@@ -19,7 +19,7 @@ class DistributedMemoizer
       begin
         while Time.new < start + MAX_WAIT && !got_lock
           LOCK.synchronize do
-            got_lock = get_lock(redis,redis_lock_key)
+            got_lock = get_lock(redis, redis_lock_key)
           end
           sleep 0.001
         end
@@ -38,7 +38,6 @@ class DistributedMemoizer
     result
   end
 
-
   def self.redis_lock_key(key)
     "memoize_lock_" << key
   end
diff --git a/lib/distributed_mutex.rb b/lib/distributed_mutex.rb
index 6a0e0af8cd..b014a554a3 100644
--- a/lib/distributed_mutex.rb
+++ b/lib/distributed_mutex.rb
@@ -1,11 +1,11 @@
 # Cross-process locking using Redis.
 class DistributedMutex
 
-  def self.synchronize(key, redis=nil, &blk)
+  def self.synchronize(key, redis = nil, &blk)
     self.new(key, redis).synchronize(&blk)
   end
 
-  def initialize(key, redis=nil)
+  def initialize(key, redis = nil)
     @key = key
     @redis = redis || $redis
     @mutex = Mutex.new
diff --git a/lib/email/message_builder.rb b/lib/email/message_builder.rb
index 7632a24484..c72d7bca9e 100644
--- a/lib/email/message_builder.rb
+++ b/lib/email/message_builder.rb
@@ -17,7 +17,7 @@ module Email
   class MessageBuilder
     attr_reader :template_args
 
-    def initialize(to, opts=nil)
+    def initialize(to, opts = nil)
       @to = to
       @opts = opts || {}
 
@@ -166,7 +166,6 @@ module Email
       result
     end
 
-
     protected
 
     def reply_key
@@ -195,11 +194,13 @@ module Email
 
       @reply_by_email_address = SiteSetting.reply_by_email_address.dup
       @reply_by_email_address.gsub!("%{reply_key}", reply_key)
-      @reply_by_email_address = if private_reply?
-                                  alias_email(@reply_by_email_address)
-                                else
-                                  site_alias_email(@reply_by_email_address)
-                                end
+
+      @reply_by_email_address =
+        if private_reply?
+          alias_email(@reply_by_email_address)
+        else
+          site_alias_email(@reply_by_email_address)
+        end
     end
 
     def alias_email(source)
diff --git a/lib/email/processor.rb b/lib/email/processor.rb
index 71c9b846f7..a13d3814df 100644
--- a/lib/email/processor.rb
+++ b/lib/email/processor.rb
@@ -2,12 +2,12 @@ module Email
 
   class Processor
 
-    def initialize(mail, retry_on_rate_limit=true)
+    def initialize(mail, retry_on_rate_limit = true)
       @mail = mail
       @retry_on_rate_limit = retry_on_rate_limit
     end
 
-    def self.process!(mail, retry_on_rate_limit=true)
+    def self.process!(mail, retry_on_rate_limit = true)
       Email::Processor.new(mail, retry_on_rate_limit).process!
     end
 
@@ -35,23 +35,24 @@ module Email
 
     def handle_failure(mail_string, e, incoming_email)
       message_template = case e
-        when Email::Receiver::EmptyEmailError             then :email_reject_empty
-        when Email::Receiver::NoBodyDetectedError         then :email_reject_empty
-        when Email::Receiver::UserNotFoundError           then :email_reject_user_not_found
-        when Email::Receiver::ScreenedEmailError          then :email_reject_screened_email
-        when Email::Receiver::AutoGeneratedEmailError     then :email_reject_auto_generated
-        when Email::Receiver::InactiveUserError           then :email_reject_inactive_user
-        when Email::Receiver::BlockedUserError            then :email_reject_blocked_user
-        when Email::Receiver::BadDestinationAddress       then :email_reject_bad_destination_address
-        when Email::Receiver::StrangersNotAllowedError    then :email_reject_strangers_not_allowed
-        when Email::Receiver::InsufficientTrustLevelError then :email_reject_insufficient_trust_level
-        when Email::Receiver::ReplyUserNotMatchingError   then :email_reject_reply_user_not_matching
-        when Email::Receiver::TopicNotFoundError          then :email_reject_topic_not_found
-        when Email::Receiver::TopicClosedError            then :email_reject_topic_closed
-        when Email::Receiver::InvalidPost                 then :email_reject_invalid_post
-        when ActiveRecord::Rollback                       then :email_reject_invalid_post
-        when Email::Receiver::InvalidPostAction           then :email_reject_invalid_post_action
-        when Discourse::InvalidAccess                     then :email_reject_invalid_access
+                         when Email::Receiver::EmptyEmailError             then :email_reject_empty
+                         when Email::Receiver::NoBodyDetectedError         then :email_reject_empty
+                         when Email::Receiver::UserNotFoundError           then :email_reject_user_not_found
+                         when Email::Receiver::ScreenedEmailError          then :email_reject_screened_email
+                         when Email::Receiver::AutoGeneratedEmailError     then :email_reject_auto_generated
+                         when Email::Receiver::InactiveUserError           then :email_reject_inactive_user
+                         when Email::Receiver::BlockedUserError            then :email_reject_blocked_user
+                         when Email::Receiver::BadDestinationAddress       then :email_reject_bad_destination_address
+                         when Email::Receiver::StrangersNotAllowedError    then :email_reject_strangers_not_allowed
+                         when Email::Receiver::InsufficientTrustLevelError then :email_reject_insufficient_trust_level
+                         when Email::Receiver::ReplyUserNotMatchingError   then :email_reject_reply_user_not_matching
+                         when Email::Receiver::TopicNotFoundError          then :email_reject_topic_not_found
+                         when Email::Receiver::TopicClosedError            then :email_reject_topic_closed
+                         when Email::Receiver::InvalidPost                 then :email_reject_invalid_post
+                         when ActiveRecord::Rollback                       then :email_reject_invalid_post
+                         when Email::Receiver::InvalidPostAction           then :email_reject_invalid_post_action
+                         when Discourse::InvalidAccess                     then :email_reject_invalid_access
+        else                                                   :email_reject_unrecognized_error
       end
 
       template_args = {}
@@ -63,6 +64,14 @@ module Email
         template_args[:post_error] = e.message
       end
 
+      if message_template == :email_reject_unrecognized_error
+        msg  = "Unrecognized error type (#{e.class}: #{e.message}) when processing incoming email"
+        msg += "\n\nBacktrace:\n#{e.backtrace.map { |l| "  #{l}" }.join("\n")}"
+        msg += "\n\nMail:\n#{mail_string}"
+
+        Rails.logger.error(msg)
+      end
+
       if message_template
         # inform the user about the rejection
         message = Mail::Message.new(mail_string)
@@ -76,18 +85,14 @@ module Email
         if can_send_rejection_email?(message.from, message_template)
           Email::Sender.new(client_message, message_template).send
         end
-      else
-        msg  = "Unrecognized error type (#{e.class}: #{e.message}) when processing incoming email"
-        msg += "\n\nBacktrace:\n#{e.backtrace.map { |l| "  #{l}" }.join("\n")}"
-        msg += "\n\nMail:\n#{mail_string}"
-
-        Rails.logger.error(msg)
       end
 
       client_message
     end
 
     def can_send_rejection_email?(email, type)
+      return true if type == :email_reject_unrecognized_error
+
       key = "rejection_email:#{email}:#{type}:#{Date.today}"
 
       if $redis.setnx(key, "1")
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index d4cdee0f7f..94a8dd77b3 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -153,7 +153,7 @@ module Email
       if $redis.setnx(key, "1")
         $redis.expire(key, 25.hours)
 
-        if user = User.find_by(email: email)
+        if user = User.find_by_email(email)
           user.user_stat.bounce_score += score
           user.user_stat.reset_bounce_score_after = SiteSetting.reset_bounce_score_after_days.days.from_now
           user.user_stat.save
@@ -166,7 +166,7 @@ module Email
           elsif bounce_score >= SiteSetting.bounce_score_threshold
             # NOTE: we check bounce_score before sending emails, nothing to do
             # here other than log it happened.
-            reason = I18n.t("user.email.revoked", { email: user.email, date: user.user_stat.reset_bounce_score_after })
+            reason = I18n.t("user.email.revoked", email: user.email, date: user.user_stat.reset_bounce_score_after)
             StaffActionLogger.new(Discourse.system_user).log_revoke_email(user, reason)
           end
         end
@@ -466,7 +466,7 @@ module Email
       true
     end
 
-    def self.reply_by_email_address_regex(extract_reply_key=true)
+    def self.reply_by_email_address_regex(extract_reply_key = true)
       reply_addresses = [SiteSetting.reply_by_email_address]
       reply_addresses << (SiteSetting.alternative_reply_by_email_addresses.presence || "").split("|")
 
@@ -538,11 +538,11 @@ module Email
       PostActionType.types[:like] if likes.include?(body.strip.downcase)
     end
 
-    def create_topic(options={})
+    def create_topic(options = {})
       create_post_with_attachments(options)
     end
 
-    def create_reply(options={})
+    def create_reply(options = {})
       raise TopicNotFoundError if options[:topic].nil? || options[:topic].trashed?
 
       if post_action_type = post_action_for(options[:raw])
@@ -572,7 +572,7 @@ module Email
       end
     end
 
-    def create_post_with_attachments(options={})
+    def create_post_with_attachments(options = {})
       # deal with attachments
       attachments.each do |attachment|
         tmp = Tempfile.new(["discourse-email-attachment", File.extname(attachment.filename)])
@@ -612,7 +612,7 @@ module Email
       end
     end
 
-    def create_post(options={})
+    def create_post(options = {})
       options[:via_email] = true
       options[:raw_email] = @raw_email
 
@@ -622,7 +622,7 @@ module Email
         raise InvalidPost, "No post creation date found. Is the e-mail missing a Date: header?"
       end
 
-      options[:created_at]   = DateTime.now if options[:created_at] > DateTime.now
+      options[:created_at] = DateTime.now if options[:created_at] > DateTime.now
 
       is_private_message = options[:archetype] == Archetype.private_message ||
                            options[:topic].try(:private_message?)
diff --git a/lib/email/renderer.rb b/lib/email/renderer.rb
index 9b209781ff..be802b7a99 100644
--- a/lib/email/renderer.rb
+++ b/lib/email/renderer.rb
@@ -3,7 +3,7 @@ require_dependency 'email/styles'
 module Email
   class Renderer
 
-    def initialize(message, opts=nil)
+    def initialize(message, opts = nil)
       @message = message
       @opts = opts || {}
     end
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index 61c5fc1685..08e141a923 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -15,7 +15,7 @@ SMTP_CLIENT_ERRORS = [Net::SMTPFatalError, Net::SMTPSyntaxError]
 module Email
   class Sender
 
-    def initialize(message, email_type, user=nil)
+    def initialize(message, email_type, user = nil)
       @message =  message
       @email_type = email_type
       @user = user
@@ -55,8 +55,8 @@ module Email
       # These are the links we add when a user uploads a file or image.
       # Ideally we would parse general markdown into plain text, but that is almost an intractable problem.
       url_prefix = Discourse.base_url
-      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<a class="attachment" href="(\/uploads\/default\/[^"]+)">([^<]*)<\/a>/, '[\2]('+url_prefix+'\1)')
-      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<img src="(\/uploads\/default\/[^"]+)"([^>]*)>/, '![]('+url_prefix+'\1)')
+      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<a class="attachment" href="(\/uploads\/default\/[^"]+)">([^<]*)<\/a>/, '[\2](' + url_prefix + '\1)')
+      @message.parts[0].body = @message.parts[0].body.to_s.gsub(/<img src="(\/uploads\/default\/[^"]+)"([^>]*)>/, '![](' + url_prefix + '\1)')
 
       @message.text_part.content_type = 'text/plain; charset=UTF-8'
 
@@ -88,8 +88,8 @@ module Email
           "<topic/#{topic_id}/#{post_id}@#{host}>"
 
         referenced_posts = Post.includes(:incoming_email)
-                               .where(id: PostReply.where(reply_id: post_id).select(:post_id))
-                               .order(id: :desc)
+          .where(id: PostReply.where(reply_id: post_id).select(:post_id))
+          .order(id: :desc)
 
         referenced_post_message_ids = referenced_posts.map do |post|
           if post.incoming_email&.message_id.present?
@@ -165,9 +165,9 @@ module Email
       when /\.mailjet\.com/
         @message.header['X-MJ-CustomID'] = @message.message_id
       when "smtp.mandrillapp.com"
-        merge_json_x_header('X-MC-Metadata', { message_id: @message.message_id })
+        merge_json_x_header('X-MC-Metadata', message_id: @message.message_id)
       when "smtp.sparkpostmail.com"
-        merge_json_x_header('X-MSYS-API', { metadata: { message_id: @message.message_id } })
+        merge_json_x_header('X-MSYS-API', metadata: { message_id: @message.message_id })
       end
 
       # Suppress images from short emails
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 4b51a02331..09a7273136 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -10,7 +10,7 @@ module Email
 
     delegate :css, to: :fragment
 
-    def initialize(html, opts=nil)
+    def initialize(html, opts = nil)
       @html = html
       @opts = opts || {}
       @fragment = Nokogiri::HTML.fragment(@html)
@@ -41,7 +41,7 @@ module Email
           img['width'] = img['height'] = 20
         else
           # use dimensions of original iPhone screen for 'too big, let device rescale'
-          if img['width'].to_i > 320 or img['height'].to_i > 480
+          if img['width'].to_i > (320) || img['height'].to_i > (480)
             img['width'] = img['height'] = 'auto'
           end
         end
@@ -246,7 +246,7 @@ module Email
         linknum = 0
         element.css('a').each do |inner|
           # we want the first footer link to be specially highlighted as IMPORTANT
-          if footernum == 0 and linknum == 0
+          if footernum == (0) && linknum == (0)
             inner['style'] = "background-color: #006699; color:#ffffff; border-top: 4px solid #006699; border-right: 6px solid #006699; border-bottom: 4px solid #006699; border-left: 6px solid #006699; display: inline-block;"
           else
             inner['style'] = "color:#666;"
@@ -271,7 +271,7 @@ module Email
     def style(selector, style, attribs = {})
       @fragment.css(selector).each do |element|
         add_styles(element, style) if style
-        attribs.each do |k,v|
+        attribs.each do |k, v|
           element[k] = v
         end
       end
diff --git a/lib/email_updater.rb b/lib/email_updater.rb
index ab4c8246a2..12a2878194 100644
--- a/lib/email_updater.rb
+++ b/lib/email_updater.rb
@@ -7,12 +7,12 @@ class EmailUpdater
 
   attr_reader :user
 
-  def initialize(guardian=nil, user=nil)
+  def initialize(guardian = nil, user = nil)
     @guardian = guardian
     @user = user
   end
 
-  def self.human_attribute_name(name, options={})
+  def self.human_attribute_name(name, options = {})
     User.human_attribute_name(name, options)
   end
 
@@ -68,8 +68,8 @@ class EmailUpdater
         @user = token.user
 
         change_req = user.email_change_requests
-                          .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', { token_id: token.id})
-                          .first
+          .where('old_email_token_id = :token_id OR new_email_token_id = :token_id', token_id: token.id)
+          .first
 
         # Simple state machine
         case change_req.try(:change_state)
@@ -81,7 +81,7 @@ class EmailUpdater
           confirm_result = :authorizing_new
         when EmailChangeRequest.states[:authorizing_new]
           change_req.update_column(:change_state, EmailChangeRequest.states[:complete])
-          user.update_column(:email, token.email)
+          user.primary_email.update_column(:email, token.email)
           confirm_result = :complete
         end
       else
diff --git a/lib/emoji/db.json b/lib/emoji/db.json
index 4036e94a08..b5835bf3af 100644
--- a/lib/emoji/db.json
+++ b/lib/emoji/db.json
@@ -829,7 +829,7 @@
       "name": "bowing_man"
     },
     {
-      "code": "1f926",
+      "code": "1f926-200d-2642-fe0f",
       "name": "man_facepalming"
     },
     {
@@ -6142,7 +6142,23 @@
     "business_suit_levitating",
     "woman_juggling",
     "man_juggling",
-    "sleeping_bed"
+    "sleeping_bed",
+    "child",
+    "adult",
+    "older_adult",
+    "woman_with_headscarf",
+    "bearded_person",
+    "breast_feeding",
+    "mage",
+    "fairy",
+    "vampire",
+    "merperson",
+    "elf",
+    "person_in_steamy_room",
+    "person_climbing",
+    "person_in_lotus_position",
+    "love_you_gesture",
+    "palms_up_together"
   ],
   "aliases": {
     "right_anger_bubble": [
diff --git a/lib/emoji/groups.json b/lib/emoji/groups.json
new file mode 100644
index 0000000000..5b313dfc11
--- /dev/null
+++ b/lib/emoji/groups.json
@@ -0,0 +1,6047 @@
+[
+  {
+    "name": "people",
+    "fullname": "People",
+    "tabicon": "grinning",
+    "icons": [
+      {
+        "name": "grinning",
+        "diversity": false
+      },
+      {
+        "name": "grin",
+        "diversity": false
+      },
+      {
+        "name": "joy",
+        "diversity": false
+      },
+      {
+        "name": "rofl",
+        "diversity": false
+      },
+      {
+        "name": "smiley",
+        "diversity": false
+      },
+      {
+        "name": "smile",
+        "diversity": false
+      },
+      {
+        "name": "sweat_smile",
+        "diversity": false
+      },
+      {
+        "name": "laughing",
+        "diversity": false
+      },
+      {
+        "name": "wink",
+        "diversity": false
+      },
+      {
+        "name": "blush",
+        "diversity": false
+      },
+      {
+        "name": "yum",
+        "diversity": false
+      },
+      {
+        "name": "sunglasses",
+        "diversity": false
+      },
+      {
+        "name": "heart_eyes",
+        "diversity": false
+      },
+      {
+        "name": "kissing_heart",
+        "diversity": false
+      },
+      {
+        "name": "kissing",
+        "diversity": false
+      },
+      {
+        "name": "kissing_smiling_eyes",
+        "diversity": false
+      },
+      {
+        "name": "kissing_closed_eyes",
+        "diversity": false
+      },
+      {
+        "name": "relaxed",
+        "diversity": false
+      },
+      {
+        "name": "slightly_smiling_face",
+        "diversity": false
+      },
+      {
+        "name": "hugs",
+        "diversity": false
+      },
+      {
+        "name": "star_struck",
+        "diversity": false
+      },
+      {
+        "name": "thinking",
+        "diversity": false
+      },
+      {
+        "name": "face_with_raised_eyebrow",
+        "diversity": false
+      },
+      {
+        "name": "neutral_face",
+        "diversity": false
+      },
+      {
+        "name": "expressionless",
+        "diversity": false
+      },
+      {
+        "name": "no_mouth",
+        "diversity": false
+      },
+      {
+        "name": "roll_eyes",
+        "diversity": false
+      },
+      {
+        "name": "smirk",
+        "diversity": false
+      },
+      {
+        "name": "persevere",
+        "diversity": false
+      },
+      {
+        "name": "disappointed_relieved",
+        "diversity": false
+      },
+      {
+        "name": "open_mouth",
+        "diversity": false
+      },
+      {
+        "name": "zipper_mouth_face",
+        "diversity": false
+      },
+      {
+        "name": "hushed",
+        "diversity": false
+      },
+      {
+        "name": "sleepy",
+        "diversity": false
+      },
+      {
+        "name": "tired_face",
+        "diversity": false
+      },
+      {
+        "name": "sleeping",
+        "diversity": false
+      },
+      {
+        "name": "relieved",
+        "diversity": false
+      },
+      {
+        "name": "stuck_out_tongue",
+        "diversity": false
+      },
+      {
+        "name": "stuck_out_tongue_winking_eye",
+        "diversity": false
+      },
+      {
+        "name": "stuck_out_tongue_closed_eyes",
+        "diversity": false
+      },
+      {
+        "name": "drooling_face",
+        "diversity": false
+      },
+      {
+        "name": "unamused",
+        "diversity": false
+      },
+      {
+        "name": "sweat",
+        "diversity": false
+      },
+      {
+        "name": "pensive",
+        "diversity": false
+      },
+      {
+        "name": "confused",
+        "diversity": false
+      },
+      {
+        "name": "upside_down_face",
+        "diversity": false
+      },
+      {
+        "name": "money_mouth_face",
+        "diversity": false
+      },
+      {
+        "name": "astonished",
+        "diversity": false
+      },
+      {
+        "name": "frowning_face",
+        "diversity": false
+      },
+      {
+        "name": "slightly_frowning_face",
+        "diversity": false
+      },
+      {
+        "name": "confounded",
+        "diversity": false
+      },
+      {
+        "name": "disappointed",
+        "diversity": false
+      },
+      {
+        "name": "worried",
+        "diversity": false
+      },
+      {
+        "name": "triumph",
+        "diversity": false
+      },
+      {
+        "name": "cry",
+        "diversity": false
+      },
+      {
+        "name": "sob",
+        "diversity": false
+      },
+      {
+        "name": "frowning",
+        "diversity": false
+      },
+      {
+        "name": "anguished",
+        "diversity": false
+      },
+      {
+        "name": "fearful",
+        "diversity": false
+      },
+      {
+        "name": "weary",
+        "diversity": false
+      },
+      {
+        "name": "exploding_head",
+        "diversity": false
+      },
+      {
+        "name": "grimacing",
+        "diversity": false
+      },
+      {
+        "name": "cold_sweat",
+        "diversity": false
+      },
+      {
+        "name": "scream",
+        "diversity": false
+      },
+      {
+        "name": "flushed",
+        "diversity": false
+      },
+      {
+        "name": "crazy_face",
+        "diversity": false
+      },
+      {
+        "name": "dizzy_face",
+        "diversity": false
+      },
+      {
+        "name": "rage",
+        "diversity": false
+      },
+      {
+        "name": "angry",
+        "diversity": false
+      },
+      {
+        "name": "face_with_symbols_over_mouth",
+        "diversity": false
+      },
+      {
+        "name": "mask",
+        "diversity": false
+      },
+      {
+        "name": "face_with_thermometer",
+        "diversity": false
+      },
+      {
+        "name": "face_with_head_bandage",
+        "diversity": false
+      },
+      {
+        "name": "nauseated_face",
+        "diversity": false
+      },
+      {
+        "name": "face_vomiting",
+        "diversity": false
+      },
+      {
+        "name": "sneezing_face",
+        "diversity": false
+      },
+      {
+        "name": "innocent",
+        "diversity": false
+      },
+      {
+        "name": "cowboy_hat_face",
+        "diversity": false
+      },
+      {
+        "name": "clown_face",
+        "diversity": false
+      },
+      {
+        "name": "lying_face",
+        "diversity": false
+      },
+      {
+        "name": "sushing_face",
+        "diversity": false
+      },
+      {
+        "name": "face_with_hand_over_mouth",
+        "diversity": false
+      },
+      {
+        "name": "face_with_monocle",
+        "diversity": false
+      },
+      {
+        "name": "nerd_face",
+        "diversity": false
+      },
+      {
+        "name": "smiling_imp",
+        "diversity": false
+      },
+      {
+        "name": "imp",
+        "diversity": false
+      },
+      {
+        "name": "japanese_ogre",
+        "diversity": false
+      },
+      {
+        "name": "japanese_goblin",
+        "diversity": false
+      },
+      {
+        "name": "skull",
+        "diversity": false
+      },
+      {
+        "name": "skull_and_crossbones",
+        "diversity": false
+      },
+      {
+        "name": "ghost",
+        "diversity": false
+      },
+      {
+        "name": "alien",
+        "diversity": false
+      },
+      {
+        "name": "space_invader",
+        "diversity": false
+      },
+      {
+        "name": "robot",
+        "diversity": false
+      },
+      {
+        "name": "poop",
+        "diversity": false
+      },
+      {
+        "name": "smiley_cat",
+        "diversity": false
+      },
+      {
+        "name": "smile_cat",
+        "diversity": false
+      },
+      {
+        "name": "joy_cat",
+        "diversity": false
+      },
+      {
+        "name": "heart_eyes_cat",
+        "diversity": false
+      },
+      {
+        "name": "smirk_cat",
+        "diversity": false
+      },
+      {
+        "name": "kissing_cat",
+        "diversity": false
+      },
+      {
+        "name": "scream_cat",
+        "diversity": false
+      },
+      {
+        "name": "crying_cat_face",
+        "diversity": false
+      },
+      {
+        "name": "pouting_cat",
+        "diversity": false
+      },
+      {
+        "name": "see_no_evil",
+        "diversity": false
+      },
+      {
+        "name": "hear_no_evil",
+        "diversity": false
+      },
+      {
+        "name": "speak_no_evil",
+        "diversity": false
+      },
+      {
+        "name": "baby",
+        "diversity": true
+      },
+      {
+        "name": "child",
+        "diversity": true
+      },
+      {
+        "name": "boy",
+        "diversity": true
+      },
+      {
+        "name": "girl",
+        "diversity": true
+      },
+      {
+        "name": "adult",
+        "diversity": true
+      },
+      {
+        "name": "man",
+        "diversity": true
+      },
+      {
+        "name": "woman",
+        "diversity": true
+      },
+      {
+        "name": "older_adult",
+        "diversity": true
+      },
+      {
+        "name": "older_man",
+        "diversity": true
+      },
+      {
+        "name": "older_woman",
+        "diversity": true
+      },
+      {
+        "name": "man_health_worker",
+        "diversity": true
+      },
+      {
+        "name": "woman_health_worker",
+        "diversity": true
+      },
+      {
+        "name": "man_student",
+        "diversity": true
+      },
+      {
+        "name": "woman_student",
+        "diversity": true
+      },
+      {
+        "name": "man_teacher",
+        "diversity": true
+      },
+      {
+        "name": "woman_teacher",
+        "diversity": true
+      },
+      {
+        "name": "man_judge",
+        "diversity": true
+      },
+      {
+        "name": "woman_judge",
+        "diversity": true
+      },
+      {
+        "name": "man_farmer",
+        "diversity": true
+      },
+      {
+        "name": "woman_farmer",
+        "diversity": true
+      },
+      {
+        "name": "man_cook",
+        "diversity": true
+      },
+      {
+        "name": "woman_cook",
+        "diversity": true
+      },
+      {
+        "name": "man_mechanic",
+        "diversity": true
+      },
+      {
+        "name": "woman_mechanic",
+        "diversity": true
+      },
+      {
+        "name": "man_factory_worker",
+        "diversity": true
+      },
+      {
+        "name": "woman_factory_worker",
+        "diversity": true
+      },
+      {
+        "name": "man_office_worker",
+        "diversity": true
+      },
+      {
+        "name": "woman_office_worker",
+        "diversity": true
+      },
+      {
+        "name": "man_scientist",
+        "diversity": true
+      },
+      {
+        "name": "woman_scientist",
+        "diversity": true
+      },
+      {
+        "name": "man_technologist",
+        "diversity": true
+      },
+      {
+        "name": "woman_technologist",
+        "diversity": true
+      },
+      {
+        "name": "man_singer",
+        "diversity": true
+      },
+      {
+        "name": "woman_singer",
+        "diversity": true
+      },
+      {
+        "name": "man_artist",
+        "diversity": true
+      },
+      {
+        "name": "woman_artist",
+        "diversity": true
+      },
+      {
+        "name": "man_pilot",
+        "diversity": true
+      },
+      {
+        "name": "woman_pilot",
+        "diversity": true
+      },
+      {
+        "name": "man_astronaut",
+        "diversity": true
+      },
+      {
+        "name": "woman_astronaut",
+        "diversity": true
+      },
+      {
+        "name": "man_firefighter",
+        "diversity": true
+      },
+      {
+        "name": "woman_firefighter",
+        "diversity": true
+      },
+      {
+        "name": "policeman",
+        "diversity": true
+      },
+      {
+        "name": "policewoman",
+        "diversity": true
+      },
+      {
+        "name": "male_detective",
+        "diversity": true
+      },
+      {
+        "name": "female_detective",
+        "diversity": false
+      },
+      {
+        "name": "guardsman",
+        "diversity": true
+      },
+      {
+        "name": "guardswoman",
+        "diversity": true
+      },
+      {
+        "name": "construction_worker_man",
+        "diversity": true
+      },
+      {
+        "name": "construction_worker_woman",
+        "diversity": true
+      },
+      {
+        "name": "prince",
+        "diversity": true
+      },
+      {
+        "name": "princess",
+        "diversity": true
+      },
+      {
+        "name": "man_with_turban",
+        "diversity": true
+      },
+      {
+        "name": "woman_with_turban",
+        "diversity": true
+      },
+      {
+        "name": "man_with_gua_pi_mao",
+        "diversity": true
+      },
+      {
+        "name": "woman_with_headscarf",
+        "diversity": true
+      },
+      {
+        "name": "bearded_person",
+        "diversity": true
+      },
+      {
+        "name": "blonde_man",
+        "diversity": true
+      },
+      {
+        "name": "blonde_woman",
+        "diversity": true
+      },
+      {
+        "name": "man_in_tuxedo",
+        "diversity": true
+      },
+      {
+        "name": "bride_with_veil",
+        "diversity": true
+      },
+      {
+        "name": "pregnant_woman",
+        "diversity": true
+      },
+      {
+        "name": "breast_feeding",
+        "diversity": true
+      },
+      {
+        "name": "angel",
+        "diversity": true
+      },
+      {
+        "name": "santa",
+        "diversity": true
+      },
+      {
+        "name": "mrs_claus",
+        "diversity": true
+      },
+      {
+        "name": "mage",
+        "diversity": true
+      },
+      {
+        "name": "fairy",
+        "diversity": true
+      },
+      {
+        "name": "vampire",
+        "diversity": true
+      },
+      {
+        "name": "merperson",
+        "diversity": true
+      },
+      {
+        "name": "elf",
+        "diversity": true
+      },
+      {
+        "name": "genie",
+        "diversity": false
+      },
+      {
+        "name": "zombie",
+        "diversity": false
+      },
+      {
+        "name": "frowning_woman",
+        "diversity": true
+      },
+      {
+        "name": "frowning_man",
+        "diversity": true
+      },
+      {
+        "name": "pouting_woman",
+        "diversity": true
+      },
+      {
+        "name": "pouting_man",
+        "diversity": true
+      },
+      {
+        "name": "no_good_woman",
+        "diversity": true
+      },
+      {
+        "name": "no_good_man",
+        "diversity": true
+      },
+      {
+        "name": "ok_woman",
+        "diversity": true
+      },
+      {
+        "name": "ok_man",
+        "diversity": true
+      },
+      {
+        "name": "tipping_hand_woman",
+        "diversity": true
+      },
+      {
+        "name": "tipping_hand_man",
+        "diversity": true
+      },
+      {
+        "name": "raising_hand_woman",
+        "diversity": true
+      },
+      {
+        "name": "raising_hand_man",
+        "diversity": true
+      },
+      {
+        "name": "bowing_man",
+        "diversity": true
+      },
+      {
+        "name": "bowing_woman",
+        "diversity": true
+      },
+      {
+        "name": "man_facepalming",
+        "diversity": true
+      },
+      {
+        "name": "woman_facepalming",
+        "diversity": true
+      },
+      {
+        "name": "man_shrugging",
+        "diversity": true
+      },
+      {
+        "name": "woman_shrugging",
+        "diversity": true
+      },
+      {
+        "name": "couple",
+        "diversity": false
+      },
+      {
+        "name": "two_men_holding_hands",
+        "diversity": false
+      },
+      {
+        "name": "two_women_holding_hands",
+        "diversity": false
+      },
+      {
+        "name": "couplekiss_man_woman",
+        "diversity": false
+      },
+      {
+        "name": "couplekiss_man_man",
+        "diversity": false
+      },
+      {
+        "name": "couplekiss_woman_woman",
+        "diversity": false
+      },
+      {
+        "name": "couple_with_heart_woman_man",
+        "diversity": false
+      },
+      {
+        "name": "couple_with_heart_man_man",
+        "diversity": false
+      },
+      {
+        "name": "couple_with_heart_woman_woman",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_woman_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_man_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_woman_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_man_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_man_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_boy_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_girl",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_girl_boy",
+        "diversity": false
+      },
+      {
+        "name": "family_woman_girl_girl",
+        "diversity": false
+      },
+      {
+        "name": "selfie",
+        "diversity": true
+      },
+      {
+        "name": "muscle",
+        "diversity": true
+      },
+      {
+        "name": "point_left",
+        "diversity": true
+      },
+      {
+        "name": "point_right",
+        "diversity": true
+      },
+      {
+        "name": "point_up",
+        "diversity": true
+      },
+      {
+        "name": "point_up_2",
+        "diversity": true
+      },
+      {
+        "name": "fu",
+        "diversity": true
+      },
+      {
+        "name": "point_down",
+        "diversity": true
+      },
+      {
+        "name": "v",
+        "diversity": true
+      },
+      {
+        "name": "crossed_fingers",
+        "diversity": true
+      },
+      {
+        "name": "vulcan_salute",
+        "diversity": true
+      },
+      {
+        "name": "metal",
+        "diversity": true
+      },
+      {
+        "name": "call_me_hand",
+        "diversity": true
+      },
+      {
+        "name": "raised_hand_with_fingers_splayed",
+        "diversity": true
+      },
+      {
+        "name": "raised_hand",
+        "diversity": true
+      },
+      {
+        "name": "ok_hand",
+        "diversity": true
+      },
+      {
+        "name": "+1",
+        "diversity": true
+      },
+      {
+        "name": "-1",
+        "diversity": true
+      },
+      {
+        "name": "fist",
+        "diversity": true
+      },
+      {
+        "name": "facepunch",
+        "diversity": true
+      },
+      {
+        "name": "fist_left",
+        "diversity": true
+      },
+      {
+        "name": "fist_right",
+        "diversity": true
+      },
+      {
+        "name": "raised_back_of_hand",
+        "diversity": true
+      },
+      {
+        "name": "wave",
+        "diversity": true
+      },
+      {
+        "name": "love_you_gesture",
+        "diversity": true
+      },
+      {
+        "name": "writing_hand",
+        "diversity": true
+      },
+      {
+        "name": "clap",
+        "diversity": true
+      },
+      {
+        "name": "open_hands",
+        "diversity": true
+      },
+      {
+        "name": "raised_hands",
+        "diversity": true
+      },
+      {
+        "name": "palms_up_together",
+        "diversity": true
+      },
+      {
+        "name": "pray",
+        "diversity": true
+      },
+      {
+        "name": "handshake",
+        "diversity": false
+      },
+      {
+        "name": "nail_care",
+        "diversity": true
+      },
+      {
+        "name": "ear",
+        "diversity": true
+      },
+      {
+        "name": "nose",
+        "diversity": true
+      },
+      {
+        "name": "footprints",
+        "diversity": false
+      },
+      {
+        "name": "eyes",
+        "diversity": false
+      },
+      {
+        "name": "eye",
+        "diversity": false
+      },
+      {
+        "name": "brain",
+        "diversity": false
+      },
+      {
+        "name": "tongue",
+        "diversity": false
+      },
+      {
+        "name": "lips",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "nature",
+    "fullname": "Nature",
+    "tabicon": "evergreen_tree",
+    "icons": [
+      {
+        "name": "monkey_face",
+        "diversity": false
+      },
+      {
+        "name": "monkey",
+        "diversity": false
+      },
+      {
+        "name": "gorilla",
+        "diversity": false
+      },
+      {
+        "name": "dog",
+        "diversity": false
+      },
+      {
+        "name": "dog2",
+        "diversity": false
+      },
+      {
+        "name": "poodle",
+        "diversity": false
+      },
+      {
+        "name": "wolf",
+        "diversity": false
+      },
+      {
+        "name": "fox_face",
+        "diversity": false
+      },
+      {
+        "name": "cat",
+        "diversity": false
+      },
+      {
+        "name": "cat2",
+        "diversity": false
+      },
+      {
+        "name": "lion",
+        "diversity": false
+      },
+      {
+        "name": "tiger",
+        "diversity": false
+      },
+      {
+        "name": "tiger2",
+        "diversity": false
+      },
+      {
+        "name": "leopard",
+        "diversity": false
+      },
+      {
+        "name": "horse",
+        "diversity": false
+      },
+      {
+        "name": "racehorse",
+        "diversity": false
+      },
+      {
+        "name": "unicorn",
+        "diversity": false
+      },
+      {
+        "name": "zebra",
+        "diversity": false
+      },
+      {
+        "name": "deer",
+        "diversity": false
+      },
+      {
+        "name": "cow",
+        "diversity": false
+      },
+      {
+        "name": "ox",
+        "diversity": false
+      },
+      {
+        "name": "water_buffalo",
+        "diversity": false
+      },
+      {
+        "name": "cow2",
+        "diversity": false
+      },
+      {
+        "name": "pig",
+        "diversity": false
+      },
+      {
+        "name": "pig2",
+        "diversity": false
+      },
+      {
+        "name": "boar",
+        "diversity": false
+      },
+      {
+        "name": "pig_nose",
+        "diversity": false
+      },
+      {
+        "name": "ram",
+        "diversity": false
+      },
+      {
+        "name": "sheep",
+        "diversity": false
+      },
+      {
+        "name": "goat",
+        "diversity": false
+      },
+      {
+        "name": "dromedary_camel",
+        "diversity": false
+      },
+      {
+        "name": "camel",
+        "diversity": false
+      },
+      {
+        "name": "giraffe",
+        "diversity": false
+      },
+      {
+        "name": "elephant",
+        "diversity": false
+      },
+      {
+        "name": "rhinoceros",
+        "diversity": false
+      },
+      {
+        "name": "mouse",
+        "diversity": false
+      },
+      {
+        "name": "mouse2",
+        "diversity": false
+      },
+      {
+        "name": "rat",
+        "diversity": false
+      },
+      {
+        "name": "hamster",
+        "diversity": false
+      },
+      {
+        "name": "rabbit",
+        "diversity": false
+      },
+      {
+        "name": "rabbit2",
+        "diversity": false
+      },
+      {
+        "name": "chipmunk",
+        "diversity": false
+      },
+      {
+        "name": "hedgehog",
+        "diversity": false
+      },
+      {
+        "name": "bat",
+        "diversity": false
+      },
+      {
+        "name": "bear",
+        "diversity": false
+      },
+      {
+        "name": "koala",
+        "diversity": false
+      },
+      {
+        "name": "panda_face",
+        "diversity": false
+      },
+      {
+        "name": "paw_prints",
+        "diversity": false
+      },
+      {
+        "name": "turkey",
+        "diversity": false
+      },
+      {
+        "name": "chicken",
+        "diversity": false
+      },
+      {
+        "name": "rooster",
+        "diversity": false
+      },
+      {
+        "name": "hatching_chick",
+        "diversity": false
+      },
+      {
+        "name": "baby_chick",
+        "diversity": false
+      },
+      {
+        "name": "hatched_chick",
+        "diversity": false
+      },
+      {
+        "name": "bird",
+        "diversity": false
+      },
+      {
+        "name": "penguin",
+        "diversity": false
+      },
+      {
+        "name": "dove",
+        "diversity": false
+      },
+      {
+        "name": "eagle",
+        "diversity": false
+      },
+      {
+        "name": "duck",
+        "diversity": false
+      },
+      {
+        "name": "owl",
+        "diversity": false
+      },
+      {
+        "name": "frog",
+        "diversity": false
+      },
+      {
+        "name": "crocodile",
+        "diversity": false
+      },
+      {
+        "name": "turtle",
+        "diversity": false
+      },
+      {
+        "name": "lizard",
+        "diversity": false
+      },
+      {
+        "name": "snake",
+        "diversity": false
+      },
+      {
+        "name": "dragon_face",
+        "diversity": false
+      },
+      {
+        "name": "dragon",
+        "diversity": false
+      },
+      {
+        "name": "sauropod",
+        "diversity": false
+      },
+      {
+        "name": "t_rex",
+        "diversity": false
+      },
+      {
+        "name": "whale",
+        "diversity": false
+      },
+      {
+        "name": "whale2",
+        "diversity": false
+      },
+      {
+        "name": "dolphin",
+        "diversity": false
+      },
+      {
+        "name": "fish",
+        "diversity": false
+      },
+      {
+        "name": "tropical_fish",
+        "diversity": false
+      },
+      {
+        "name": "blowfish",
+        "diversity": false
+      },
+      {
+        "name": "shark",
+        "diversity": false
+      },
+      {
+        "name": "octopus",
+        "diversity": false
+      },
+      {
+        "name": "shell",
+        "diversity": false
+      },
+      {
+        "name": "crab",
+        "diversity": false
+      },
+      {
+        "name": "shrimp",
+        "diversity": false
+      },
+      {
+        "name": "squid",
+        "diversity": false
+      },
+      {
+        "name": "snail",
+        "diversity": false
+      },
+      {
+        "name": "butterfly",
+        "diversity": false
+      },
+      {
+        "name": "bug",
+        "diversity": false
+      },
+      {
+        "name": "ant",
+        "diversity": false
+      },
+      {
+        "name": "honeybee",
+        "diversity": false
+      },
+      {
+        "name": "beetle",
+        "diversity": false
+      },
+      {
+        "name": "cricket",
+        "diversity": false
+      },
+      {
+        "name": "spider",
+        "diversity": false
+      },
+      {
+        "name": "spider_web",
+        "diversity": false
+      },
+      {
+        "name": "scorpion",
+        "diversity": false
+      },
+      {
+        "name": "bouquet",
+        "diversity": false
+      },
+      {
+        "name": "cherry_blossom",
+        "diversity": false
+      },
+      {
+        "name": "white_flower",
+        "diversity": false
+      },
+      {
+        "name": "rosette",
+        "diversity": false
+      },
+      {
+        "name": "rose",
+        "diversity": false
+      },
+      {
+        "name": "wilted_flower",
+        "diversity": false
+      },
+      {
+        "name": "hibiscus",
+        "diversity": false
+      },
+      {
+        "name": "sunflower",
+        "diversity": false
+      },
+      {
+        "name": "blossom",
+        "diversity": false
+      },
+      {
+        "name": "tulip",
+        "diversity": false
+      },
+      {
+        "name": "seedling",
+        "diversity": false
+      },
+      {
+        "name": "evergreen_tree",
+        "diversity": false
+      },
+      {
+        "name": "deciduous_tree",
+        "diversity": false
+      },
+      {
+        "name": "palm_tree",
+        "diversity": false
+      },
+      {
+        "name": "cactus",
+        "diversity": false
+      },
+      {
+        "name": "ear_of_rice",
+        "diversity": false
+      },
+      {
+        "name": "herb",
+        "diversity": false
+      },
+      {
+        "name": "shamrock",
+        "diversity": false
+      },
+      {
+        "name": "four_leaf_clover",
+        "diversity": false
+      },
+      {
+        "name": "maple_leaf",
+        "diversity": false
+      },
+      {
+        "name": "fallen_leaf",
+        "diversity": false
+      },
+      {
+        "name": "leaves",
+        "diversity": false
+      },
+      {
+        "name": "new_moon",
+        "diversity": false
+      },
+      {
+        "name": "waxing_crescent_moon",
+        "diversity": false
+      },
+      {
+        "name": "first_quarter_moon",
+        "diversity": false
+      },
+      {
+        "name": "waxing_gibbous_moon",
+        "diversity": false
+      },
+      {
+        "name": "full_moon",
+        "diversity": false
+      },
+      {
+        "name": "waning_gibbous_moon",
+        "diversity": false
+      },
+      {
+        "name": "last_quarter_moon",
+        "diversity": false
+      },
+      {
+        "name": "waning_crescent_moon",
+        "diversity": false
+      },
+      {
+        "name": "crescent_moon",
+        "diversity": false
+      },
+      {
+        "name": "new_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "first_quarter_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "last_quarter_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "thermometer",
+        "diversity": false
+      },
+      {
+        "name": "sunny",
+        "diversity": false
+      },
+      {
+        "name": "full_moon_with_face",
+        "diversity": false
+      },
+      {
+        "name": "sun_with_face",
+        "diversity": false
+      },
+      {
+        "name": "star",
+        "diversity": false
+      },
+      {
+        "name": "star2",
+        "diversity": false
+      },
+      {
+        "name": "stars",
+        "diversity": false
+      },
+      {
+        "name": "cloud",
+        "diversity": false
+      },
+      {
+        "name": "partly_sunny",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_lightning_and_rain",
+        "diversity": false
+      },
+      {
+        "name": "sun_behind_small_cloud",
+        "diversity": false
+      },
+      {
+        "name": "sun_behind_large_cloud",
+        "diversity": false
+      },
+      {
+        "name": "sun_behind_rain_cloud",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_rain",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_snow",
+        "diversity": false
+      },
+      {
+        "name": "cloud_with_lightning",
+        "diversity": false
+      },
+      {
+        "name": "tornado",
+        "diversity": false
+      },
+      {
+        "name": "fog",
+        "diversity": false
+      },
+      {
+        "name": "wind_face",
+        "diversity": false
+      },
+      {
+        "name": "cyclone",
+        "diversity": false
+      },
+      {
+        "name": "rainbow",
+        "diversity": false
+      },
+      {
+        "name": "closed_umbrella",
+        "diversity": false
+      },
+      {
+        "name": "open_umbrella",
+        "diversity": false
+      },
+      {
+        "name": "umbrella",
+        "diversity": false
+      },
+      {
+        "name": "parasol_on_ground",
+        "diversity": false
+      },
+      {
+        "name": "zap",
+        "diversity": false
+      },
+      {
+        "name": "snowflake",
+        "diversity": false
+      },
+      {
+        "name": "snowman_with_snow",
+        "diversity": false
+      },
+      {
+        "name": "snowman",
+        "diversity": false
+      },
+      {
+        "name": "comet",
+        "diversity": false
+      },
+      {
+        "name": "fire",
+        "diversity": false
+      },
+      {
+        "name": "droplet",
+        "diversity": false
+      },
+      {
+        "name": "ocean",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "food",
+    "fullname": "Food & Drink",
+    "tabicon": "hamburger",
+    "icons": [
+      {
+        "name": "grapes",
+        "diversity": false
+      },
+      {
+        "name": "melon",
+        "diversity": false
+      },
+      {
+        "name": "watermelon",
+        "diversity": false
+      },
+      {
+        "name": "tangerine",
+        "diversity": false
+      },
+      {
+        "name": "lemon",
+        "diversity": false
+      },
+      {
+        "name": "banana",
+        "diversity": false
+      },
+      {
+        "name": "pineapple",
+        "diversity": false
+      },
+      {
+        "name": "apple",
+        "diversity": false
+      },
+      {
+        "name": "green_apple",
+        "diversity": false
+      },
+      {
+        "name": "pear",
+        "diversity": false
+      },
+      {
+        "name": "peach",
+        "diversity": false
+      },
+      {
+        "name": "cherries",
+        "diversity": false
+      },
+      {
+        "name": "strawberry",
+        "diversity": false
+      },
+      {
+        "name": "kiwi_fruit",
+        "diversity": false
+      },
+      {
+        "name": "tomato",
+        "diversity": false
+      },
+      {
+        "name": "coconut",
+        "diversity": false
+      },
+      {
+        "name": "avocado",
+        "diversity": false
+      },
+      {
+        "name": "eggplant",
+        "diversity": false
+      },
+      {
+        "name": "potato",
+        "diversity": false
+      },
+      {
+        "name": "carrot",
+        "diversity": false
+      },
+      {
+        "name": "corn",
+        "diversity": false
+      },
+      {
+        "name": "hot_pepper",
+        "diversity": false
+      },
+      {
+        "name": "cucumber",
+        "diversity": false
+      },
+      {
+        "name": "broccoli",
+        "diversity": false
+      },
+      {
+        "name": "mushroom",
+        "diversity": false
+      },
+      {
+        "name": "peanuts",
+        "diversity": false
+      },
+      {
+        "name": "chestnut",
+        "diversity": false
+      },
+      {
+        "name": "bread",
+        "diversity": false
+      },
+      {
+        "name": "croissant",
+        "diversity": false
+      },
+      {
+        "name": "baguette_bread",
+        "diversity": false
+      },
+      {
+        "name": "pretzel",
+        "diversity": false
+      },
+      {
+        "name": "pancakes",
+        "diversity": false
+      },
+      {
+        "name": "cheese",
+        "diversity": false
+      },
+      {
+        "name": "meat_on_bone",
+        "diversity": false
+      },
+      {
+        "name": "poultry_leg",
+        "diversity": false
+      },
+      {
+        "name": "cut_of_meat",
+        "diversity": false
+      },
+      {
+        "name": "bacon",
+        "diversity": false
+      },
+      {
+        "name": "hamburger",
+        "diversity": false
+      },
+      {
+        "name": "fries",
+        "diversity": false
+      },
+      {
+        "name": "pizza",
+        "diversity": false
+      },
+      {
+        "name": "hotdog",
+        "diversity": false
+      },
+      {
+        "name": "sandwich",
+        "diversity": false
+      },
+      {
+        "name": "taco",
+        "diversity": false
+      },
+      {
+        "name": "burrito",
+        "diversity": false
+      },
+      {
+        "name": "stuffed_flatbread",
+        "diversity": false
+      },
+      {
+        "name": "egg",
+        "diversity": false
+      },
+      {
+        "name": "fried_egg",
+        "diversity": false
+      },
+      {
+        "name": "shallow_pan_of_food",
+        "diversity": false
+      },
+      {
+        "name": "stew",
+        "diversity": false
+      },
+      {
+        "name": "bowl_with_spoon",
+        "diversity": false
+      },
+      {
+        "name": "green_salad",
+        "diversity": false
+      },
+      {
+        "name": "popcorn",
+        "diversity": false
+      },
+      {
+        "name": "canned_food",
+        "diversity": false
+      },
+      {
+        "name": "bento",
+        "diversity": false
+      },
+      {
+        "name": "rice_cracker",
+        "diversity": false
+      },
+      {
+        "name": "rice_ball",
+        "diversity": false
+      },
+      {
+        "name": "rice",
+        "diversity": false
+      },
+      {
+        "name": "curry",
+        "diversity": false
+      },
+      {
+        "name": "ramen",
+        "diversity": false
+      },
+      {
+        "name": "spaghetti",
+        "diversity": false
+      },
+      {
+        "name": "sweet_potato",
+        "diversity": false
+      },
+      {
+        "name": "oden",
+        "diversity": false
+      },
+      {
+        "name": "sushi",
+        "diversity": false
+      },
+      {
+        "name": "fried_shrimp",
+        "diversity": false
+      },
+      {
+        "name": "fish_cake",
+        "diversity": false
+      },
+      {
+        "name": "dango",
+        "diversity": false
+      },
+      {
+        "name": "dumpling",
+        "diversity": false
+      },
+      {
+        "name": "fortune_cookie",
+        "diversity": false
+      },
+      {
+        "name": "takeout_box",
+        "diversity": false
+      },
+      {
+        "name": "icecream",
+        "diversity": false
+      },
+      {
+        "name": "shaved_ice",
+        "diversity": false
+      },
+      {
+        "name": "ice_cream",
+        "diversity": false
+      },
+      {
+        "name": "doughnut",
+        "diversity": false
+      },
+      {
+        "name": "cookie",
+        "diversity": false
+      },
+      {
+        "name": "birthday",
+        "diversity": false
+      },
+      {
+        "name": "cake",
+        "diversity": false
+      },
+      {
+        "name": "pie",
+        "diversity": false
+      },
+      {
+        "name": "chocolate_bar",
+        "diversity": false
+      },
+      {
+        "name": "candy",
+        "diversity": false
+      },
+      {
+        "name": "lollipop",
+        "diversity": false
+      },
+      {
+        "name": "custard",
+        "diversity": false
+      },
+      {
+        "name": "honey_pot",
+        "diversity": false
+      },
+      {
+        "name": "baby_bottle",
+        "diversity": false
+      },
+      {
+        "name": "milk_glass",
+        "diversity": false
+      },
+      {
+        "name": "coffee",
+        "diversity": false
+      },
+      {
+        "name": "tea",
+        "diversity": false
+      },
+      {
+        "name": "sake",
+        "diversity": false
+      },
+      {
+        "name": "champagne",
+        "diversity": false
+      },
+      {
+        "name": "wine_glass",
+        "diversity": false
+      },
+      {
+        "name": "cocktail",
+        "diversity": false
+      },
+      {
+        "name": "tropical_drink",
+        "diversity": false
+      },
+      {
+        "name": "beer",
+        "diversity": false
+      },
+      {
+        "name": "beers",
+        "diversity": false
+      },
+      {
+        "name": "clinking_glasses",
+        "diversity": false
+      },
+      {
+        "name": "tumbler_glass",
+        "diversity": false
+      },
+      {
+        "name": "cup_with_straw",
+        "diversity": false
+      },
+      {
+        "name": "chopsticks",
+        "diversity": false
+      },
+      {
+        "name": "plate_with_cutlery",
+        "diversity": false
+      },
+      {
+        "name": "fork_and_knife",
+        "diversity": false
+      },
+      {
+        "name": "spoon",
+        "diversity": false
+      },
+      {
+        "name": "hocho",
+        "diversity": false
+      },
+      {
+        "name": "amphora",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "celebration",
+    "fullname": "Celebration",
+    "tabicon": "gift",
+    "icons": [
+      {
+        "name": "jack_o_lantern",
+        "diversity": false
+      },
+      {
+        "name": "christmas_tree",
+        "diversity": false
+      },
+      {
+        "name": "fireworks",
+        "diversity": false
+      },
+      {
+        "name": "sparkler",
+        "diversity": false
+      },
+      {
+        "name": "sparkles",
+        "diversity": false
+      },
+      {
+        "name": "balloon",
+        "diversity": false
+      },
+      {
+        "name": "tada",
+        "diversity": false
+      },
+      {
+        "name": "confetti_ball",
+        "diversity": false
+      },
+      {
+        "name": "tanabata_tree",
+        "diversity": false
+      },
+      {
+        "name": "bamboo",
+        "diversity": false
+      },
+      {
+        "name": "dolls",
+        "diversity": false
+      },
+      {
+        "name": "flags",
+        "diversity": false
+      },
+      {
+        "name": "wind_chime",
+        "diversity": false
+      },
+      {
+        "name": "rice_scene",
+        "diversity": false
+      },
+      {
+        "name": "ribbon",
+        "diversity": false
+      },
+      {
+        "name": "gift",
+        "diversity": false
+      },
+      {
+        "name": "reminder_ribbon",
+        "diversity": false
+      },
+      {
+        "name": "tickets",
+        "diversity": false
+      },
+      {
+        "name": "ticket",
+        "diversity": false
+      },
+      {
+        "name": "kiss",
+        "diversity": false
+      },
+      {
+        "name": "cupid",
+        "diversity": false
+      },
+      {
+        "name": "heart",
+        "diversity": false
+      },
+      {
+        "name": "heartbeat",
+        "diversity": false
+      },
+      {
+        "name": "broken_heart",
+        "diversity": false
+      },
+      {
+        "name": "two_hearts",
+        "diversity": false
+      },
+      {
+        "name": "sparkling_heart",
+        "diversity": false
+      },
+      {
+        "name": "heartpulse",
+        "diversity": false
+      },
+      {
+        "name": "blue_heart",
+        "diversity": false
+      },
+      {
+        "name": "green_heart",
+        "diversity": false
+      },
+      {
+        "name": "yellow_heart",
+        "diversity": false
+      },
+      {
+        "name": "orange_heart",
+        "diversity": false
+      },
+      {
+        "name": "purple_heart",
+        "diversity": false
+      },
+      {
+        "name": "black_heart",
+        "diversity": false
+      },
+      {
+        "name": "gift_heart",
+        "diversity": false
+      },
+      {
+        "name": "revolving_hearts",
+        "diversity": false
+      },
+      {
+        "name": "heart_decoration",
+        "diversity": false
+      },
+      {
+        "name": "heavy_heart_exclamation",
+        "diversity": false
+      },
+      {
+        "name": "love_letter",
+        "diversity": false
+      },
+      {
+        "name": "zzz",
+        "diversity": false
+      },
+      {
+        "name": "anger",
+        "diversity": false
+      },
+      {
+        "name": "bomb",
+        "diversity": false
+      },
+      {
+        "name": "boom",
+        "diversity": false
+      },
+      {
+        "name": "sweat_drops",
+        "diversity": false
+      },
+      {
+        "name": "dash",
+        "diversity": false
+      },
+      {
+        "name": "dizzy",
+        "diversity": false
+      },
+      {
+        "name": "speech_balloon",
+        "diversity": false
+      },
+      {
+        "name": "left_speech_bubble",
+        "diversity": false
+      },
+      {
+        "name": "right_anger_bubble",
+        "diversity": false
+      },
+      {
+        "name": "thought_balloon",
+        "diversity": false
+      },
+      {
+        "name": "hole",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "activity",
+    "fullname": "Activities",
+    "tabicon": "soccer",
+    "icons": [
+      {
+        "name": "massage_woman",
+        "diversity": true
+      },
+      {
+        "name": "massage_man",
+        "diversity": true
+      },
+      {
+        "name": "haircut_woman",
+        "diversity": true
+      },
+      {
+        "name": "haircut_man",
+        "diversity": true
+      },
+      {
+        "name": "walking_man",
+        "diversity": true
+      },
+      {
+        "name": "walking_woman",
+        "diversity": true
+      },
+      {
+        "name": "running_man",
+        "diversity": true
+      },
+      {
+        "name": "running_woman",
+        "diversity": true
+      },
+      {
+        "name": "dancer",
+        "diversity": true
+      },
+      {
+        "name": "man_dancing",
+        "diversity": true
+      },
+      {
+        "name": "dancing_women",
+        "diversity": false
+      },
+      {
+        "name": "dancing_men",
+        "diversity": false
+      },
+      {
+        "name": "person_in_steamy_room",
+        "diversity": true
+      },
+      {
+        "name": "person_climbing",
+        "diversity": true
+      },
+      {
+        "name": "person_in_lotus_position",
+        "diversity": true
+      },
+      {
+        "name": "bath",
+        "diversity": true
+      },
+      {
+        "name": "sleeping_bed",
+        "diversity": true
+      },
+      {
+        "name": "business_suit_levitating",
+        "diversity": true
+      },
+      {
+        "name": "speaking_head",
+        "diversity": false
+      },
+      {
+        "name": "bust_in_silhouette",
+        "diversity": false
+      },
+      {
+        "name": "busts_in_silhouette",
+        "diversity": false
+      },
+      {
+        "name": "person_fencing",
+        "diversity": false
+      },
+      {
+        "name": "horse_racing",
+        "diversity": true
+      },
+      {
+        "name": "skier",
+        "diversity": false
+      },
+      {
+        "name": "snowboarder",
+        "diversity": true
+      },
+      {
+        "name": "golfing_man",
+        "diversity": true
+      },
+      {
+        "name": "golfing_woman",
+        "diversity": false
+      },
+      {
+        "name": "surfing_man",
+        "diversity": true
+      },
+      {
+        "name": "surfing_woman",
+        "diversity": true
+      },
+      {
+        "name": "rowing_man",
+        "diversity": true
+      },
+      {
+        "name": "rowing_woman",
+        "diversity": true
+      },
+      {
+        "name": "swimming_man",
+        "diversity": true
+      },
+      {
+        "name": "swimming_woman",
+        "diversity": true
+      },
+      {
+        "name": "basketball_man",
+        "diversity": true
+      },
+      {
+        "name": "basketball_woman",
+        "diversity": false
+      },
+      {
+        "name": "weight_lifting_man",
+        "diversity": true
+      },
+      {
+        "name": "weight_lifting_woman",
+        "diversity": false
+      },
+      {
+        "name": "biking_man",
+        "diversity": true
+      },
+      {
+        "name": "biking_woman",
+        "diversity": true
+      },
+      {
+        "name": "mountain_biking_man",
+        "diversity": true
+      },
+      {
+        "name": "mountain_biking_woman",
+        "diversity": true
+      },
+      {
+        "name": "racing_car",
+        "diversity": false
+      },
+      {
+        "name": "motorcycle",
+        "diversity": false
+      },
+      {
+        "name": "man_cartwheeling",
+        "diversity": true
+      },
+      {
+        "name": "woman_cartwheeling",
+        "diversity": true
+      },
+      {
+        "name": "men_wrestling",
+        "diversity": false
+      },
+      {
+        "name": "women_wrestling",
+        "diversity": false
+      },
+      {
+        "name": "man_playing_water_polo",
+        "diversity": true
+      },
+      {
+        "name": "woman_playing_water_polo",
+        "diversity": true
+      },
+      {
+        "name": "man_playing_handball",
+        "diversity": true
+      },
+      {
+        "name": "woman_playing_handball",
+        "diversity": true
+      },
+      {
+        "name": "man_juggling",
+        "diversity": true
+      },
+      {
+        "name": "woman_juggling",
+        "diversity": true
+      },
+      {
+        "name": "soccer",
+        "diversity": false
+      },
+      {
+        "name": "baseball",
+        "diversity": false
+      },
+      {
+        "name": "basketball",
+        "diversity": false
+      },
+      {
+        "name": "volleyball",
+        "diversity": false
+      },
+      {
+        "name": "football",
+        "diversity": false
+      },
+      {
+        "name": "rugby_football",
+        "diversity": false
+      },
+      {
+        "name": "tennis",
+        "diversity": false
+      },
+      {
+        "name": "8ball",
+        "diversity": false
+      },
+      {
+        "name": "bowling",
+        "diversity": false
+      },
+      {
+        "name": "cricket_bat_and_ball",
+        "diversity": false
+      },
+      {
+        "name": "field_hockey",
+        "diversity": false
+      },
+      {
+        "name": "ice_hockey",
+        "diversity": false
+      },
+      {
+        "name": "ping_pong",
+        "diversity": false
+      },
+      {
+        "name": "badminton",
+        "diversity": false
+      },
+      {
+        "name": "boxing_glove",
+        "diversity": false
+      },
+      {
+        "name": "martial_arts_uniform",
+        "diversity": false
+      },
+      {
+        "name": "goal_net",
+        "diversity": false
+      },
+      {
+        "name": "dart",
+        "diversity": false
+      },
+      {
+        "name": "golf",
+        "diversity": false
+      },
+      {
+        "name": "ice_skate",
+        "diversity": false
+      },
+      {
+        "name": "fishing_pole_and_fish",
+        "diversity": false
+      },
+      {
+        "name": "running_shirt_with_sash",
+        "diversity": false
+      },
+      {
+        "name": "ski",
+        "diversity": false
+      },
+      {
+        "name": "sled",
+        "diversity": false
+      },
+      {
+        "name": "curling_stone",
+        "diversity": false
+      },
+      {
+        "name": "video_game",
+        "diversity": false
+      },
+      {
+        "name": "joystick",
+        "diversity": false
+      },
+      {
+        "name": "game_die",
+        "diversity": false
+      },
+      {
+        "name": "spades",
+        "diversity": false
+      },
+      {
+        "name": "hearts",
+        "diversity": false
+      },
+      {
+        "name": "diamonds",
+        "diversity": false
+      },
+      {
+        "name": "clubs",
+        "diversity": false
+      },
+      {
+        "name": "black_joker",
+        "diversity": false
+      },
+      {
+        "name": "mahjong",
+        "diversity": false
+      },
+      {
+        "name": "flower_playing_cards",
+        "diversity": false
+      },
+      {
+        "name": "musical_score",
+        "diversity": false
+      },
+      {
+        "name": "musical_note",
+        "diversity": false
+      },
+      {
+        "name": "notes",
+        "diversity": false
+      },
+      {
+        "name": "studio_microphone",
+        "diversity": false
+      },
+      {
+        "name": "level_slider",
+        "diversity": false
+      },
+      {
+        "name": "control_knobs",
+        "diversity": false
+      },
+      {
+        "name": "microphone",
+        "diversity": false
+      },
+      {
+        "name": "headphones",
+        "diversity": false
+      },
+      {
+        "name": "radio",
+        "diversity": false
+      },
+      {
+        "name": "saxophone",
+        "diversity": false
+      },
+      {
+        "name": "guitar",
+        "diversity": false
+      },
+      {
+        "name": "musical_keyboard",
+        "diversity": false
+      },
+      {
+        "name": "trumpet",
+        "diversity": false
+      },
+      {
+        "name": "violin",
+        "diversity": false
+      },
+      {
+        "name": "drum",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "travel",
+    "fullname": "Travel & Places",
+    "tabicon": "airplane",
+    "icons": [
+      {
+        "name": "earth_africa",
+        "diversity": false
+      },
+      {
+        "name": "earth_americas",
+        "diversity": false
+      },
+      {
+        "name": "earth_asia",
+        "diversity": false
+      },
+      {
+        "name": "globe_with_meridians",
+        "diversity": false
+      },
+      {
+        "name": "world_map",
+        "diversity": false
+      },
+      {
+        "name": "japan",
+        "diversity": false
+      },
+      {
+        "name": "mountain_snow",
+        "diversity": false
+      },
+      {
+        "name": "mountain",
+        "diversity": false
+      },
+      {
+        "name": "volcano",
+        "diversity": false
+      },
+      {
+        "name": "mount_fuji",
+        "diversity": false
+      },
+      {
+        "name": "camping",
+        "diversity": false
+      },
+      {
+        "name": "beach_umbrella",
+        "diversity": false
+      },
+      {
+        "name": "desert",
+        "diversity": false
+      },
+      {
+        "name": "desert_island",
+        "diversity": false
+      },
+      {
+        "name": "national_park",
+        "diversity": false
+      },
+      {
+        "name": "stadium",
+        "diversity": false
+      },
+      {
+        "name": "classical_building",
+        "diversity": false
+      },
+      {
+        "name": "building_construction",
+        "diversity": false
+      },
+      {
+        "name": "houses",
+        "diversity": false
+      },
+      {
+        "name": "cityscape",
+        "diversity": false
+      },
+      {
+        "name": "derelict_house",
+        "diversity": false
+      },
+      {
+        "name": "house",
+        "diversity": false
+      },
+      {
+        "name": "house_with_garden",
+        "diversity": false
+      },
+      {
+        "name": "office",
+        "diversity": false
+      },
+      {
+        "name": "post_office",
+        "diversity": false
+      },
+      {
+        "name": "european_post_office",
+        "diversity": false
+      },
+      {
+        "name": "hospital",
+        "diversity": false
+      },
+      {
+        "name": "bank",
+        "diversity": false
+      },
+      {
+        "name": "hotel",
+        "diversity": false
+      },
+      {
+        "name": "love_hotel",
+        "diversity": false
+      },
+      {
+        "name": "convenience_store",
+        "diversity": false
+      },
+      {
+        "name": "school",
+        "diversity": false
+      },
+      {
+        "name": "department_store",
+        "diversity": false
+      },
+      {
+        "name": "factory",
+        "diversity": false
+      },
+      {
+        "name": "japanese_castle",
+        "diversity": false
+      },
+      {
+        "name": "european_castle",
+        "diversity": false
+      },
+      {
+        "name": "wedding",
+        "diversity": false
+      },
+      {
+        "name": "tokyo_tower",
+        "diversity": false
+      },
+      {
+        "name": "statue_of_liberty",
+        "diversity": false
+      },
+      {
+        "name": "church",
+        "diversity": false
+      },
+      {
+        "name": "mosque",
+        "diversity": false
+      },
+      {
+        "name": "synagogue",
+        "diversity": false
+      },
+      {
+        "name": "shinto_shrine",
+        "diversity": false
+      },
+      {
+        "name": "kaaba",
+        "diversity": false
+      },
+      {
+        "name": "fountain",
+        "diversity": false
+      },
+      {
+        "name": "tent",
+        "diversity": false
+      },
+      {
+        "name": "foggy",
+        "diversity": false
+      },
+      {
+        "name": "night_with_stars",
+        "diversity": false
+      },
+      {
+        "name": "sunrise_over_mountains",
+        "diversity": false
+      },
+      {
+        "name": "sunrise",
+        "diversity": false
+      },
+      {
+        "name": "city_sunset",
+        "diversity": false
+      },
+      {
+        "name": "city_sunrise",
+        "diversity": false
+      },
+      {
+        "name": "bridge_at_night",
+        "diversity": false
+      },
+      {
+        "name": "hotsprings",
+        "diversity": false
+      },
+      {
+        "name": "milky_way",
+        "diversity": false
+      },
+      {
+        "name": "carousel_horse",
+        "diversity": false
+      },
+      {
+        "name": "ferris_wheel",
+        "diversity": false
+      },
+      {
+        "name": "roller_coaster",
+        "diversity": false
+      },
+      {
+        "name": "barber",
+        "diversity": false
+      },
+      {
+        "name": "circus_tent",
+        "diversity": false
+      },
+      {
+        "name": "performing_arts",
+        "diversity": false
+      },
+      {
+        "name": "framed_picture",
+        "diversity": false
+      },
+      {
+        "name": "art",
+        "diversity": false
+      },
+      {
+        "name": "slot_machine",
+        "diversity": false
+      },
+      {
+        "name": "steam_locomotive",
+        "diversity": false
+      },
+      {
+        "name": "railway_car",
+        "diversity": false
+      },
+      {
+        "name": "bullettrain_side",
+        "diversity": false
+      },
+      {
+        "name": "bullettrain_front",
+        "diversity": false
+      },
+      {
+        "name": "train2",
+        "diversity": false
+      },
+      {
+        "name": "metro",
+        "diversity": false
+      },
+      {
+        "name": "light_rail",
+        "diversity": false
+      },
+      {
+        "name": "station",
+        "diversity": false
+      },
+      {
+        "name": "tram",
+        "diversity": false
+      },
+      {
+        "name": "monorail",
+        "diversity": false
+      },
+      {
+        "name": "mountain_railway",
+        "diversity": false
+      },
+      {
+        "name": "train",
+        "diversity": false
+      },
+      {
+        "name": "bus",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_bus",
+        "diversity": false
+      },
+      {
+        "name": "trolleybus",
+        "diversity": false
+      },
+      {
+        "name": "minibus",
+        "diversity": false
+      },
+      {
+        "name": "ambulance",
+        "diversity": false
+      },
+      {
+        "name": "fire_engine",
+        "diversity": false
+      },
+      {
+        "name": "police_car",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_police_car",
+        "diversity": false
+      },
+      {
+        "name": "taxi",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_taxi",
+        "diversity": false
+      },
+      {
+        "name": "red_car",
+        "diversity": false
+      },
+      {
+        "name": "oncoming_automobile",
+        "diversity": false
+      },
+      {
+        "name": "blue_car",
+        "diversity": false
+      },
+      {
+        "name": "truck",
+        "diversity": false
+      },
+      {
+        "name": "articulated_lorry",
+        "diversity": false
+      },
+      {
+        "name": "tractor",
+        "diversity": false
+      },
+      {
+        "name": "bike",
+        "diversity": false
+      },
+      {
+        "name": "kick_scooter",
+        "diversity": false
+      },
+      {
+        "name": "motor_scooter",
+        "diversity": false
+      },
+      {
+        "name": "busstop",
+        "diversity": false
+      },
+      {
+        "name": "motorway",
+        "diversity": false
+      },
+      {
+        "name": "railway_track",
+        "diversity": false
+      },
+      {
+        "name": "fuelpump",
+        "diversity": false
+      },
+      {
+        "name": "rotating_light",
+        "diversity": false
+      },
+      {
+        "name": "traffic_light",
+        "diversity": false
+      },
+      {
+        "name": "vertical_traffic_light",
+        "diversity": false
+      },
+      {
+        "name": "construction",
+        "diversity": false
+      },
+      {
+        "name": "stop_sign",
+        "diversity": false
+      },
+      {
+        "name": "anchor",
+        "diversity": false
+      },
+      {
+        "name": "sailboat",
+        "diversity": false
+      },
+      {
+        "name": "canoe",
+        "diversity": false
+      },
+      {
+        "name": "speedboat",
+        "diversity": false
+      },
+      {
+        "name": "passenger_ship",
+        "diversity": false
+      },
+      {
+        "name": "ferry",
+        "diversity": false
+      },
+      {
+        "name": "motor_boat",
+        "diversity": false
+      },
+      {
+        "name": "ship",
+        "diversity": false
+      },
+      {
+        "name": "airplane",
+        "diversity": false
+      },
+      {
+        "name": "small_airplane",
+        "diversity": false
+      },
+      {
+        "name": "flight_departure",
+        "diversity": false
+      },
+      {
+        "name": "flight_arrival",
+        "diversity": false
+      },
+      {
+        "name": "seat",
+        "diversity": false
+      },
+      {
+        "name": "helicopter",
+        "diversity": false
+      },
+      {
+        "name": "suspension_railway",
+        "diversity": false
+      },
+      {
+        "name": "mountain_cableway",
+        "diversity": false
+      },
+      {
+        "name": "aerial_tramway",
+        "diversity": false
+      },
+      {
+        "name": "artificial_satellite",
+        "diversity": false
+      },
+      {
+        "name": "rocket",
+        "diversity": false
+      },
+      {
+        "name": "flying_saucer",
+        "diversity": false
+      },
+      {
+        "name": "bellhop_bell",
+        "diversity": false
+      },
+      {
+        "name": "door",
+        "diversity": false
+      },
+      {
+        "name": "bed",
+        "diversity": false
+      },
+      {
+        "name": "couch_and_lamp",
+        "diversity": false
+      },
+      {
+        "name": "toilet",
+        "diversity": false
+      },
+      {
+        "name": "shower",
+        "diversity": false
+      },
+      {
+        "name": "bathtub",
+        "diversity": false
+      },
+      {
+        "name": "checkered_flag",
+        "diversity": false
+      },
+      {
+        "name": "triangular_flag_on_post",
+        "diversity": false
+      },
+      {
+        "name": "crossed_flags",
+        "diversity": false
+      },
+      {
+        "name": "black_flag",
+        "diversity": false
+      },
+      {
+        "name": "white_flag",
+        "diversity": false
+      },
+      {
+        "name": "rainbow_flag",
+        "diversity": false
+      },
+      {
+        "name": "ascension_island",
+        "diversity": false
+      },
+      {
+        "name": "andorra",
+        "diversity": false
+      },
+      {
+        "name": "united_arab_emirates",
+        "diversity": false
+      },
+      {
+        "name": "afghanistan",
+        "diversity": false
+      },
+      {
+        "name": "antigua_barbuda",
+        "diversity": false
+      },
+      {
+        "name": "anguilla",
+        "diversity": false
+      },
+      {
+        "name": "albania",
+        "diversity": false
+      },
+      {
+        "name": "armenia",
+        "diversity": false
+      },
+      {
+        "name": "angola",
+        "diversity": false
+      },
+      {
+        "name": "antarctica",
+        "diversity": false
+      },
+      {
+        "name": "argentina",
+        "diversity": false
+      },
+      {
+        "name": "american_samoa",
+        "diversity": false
+      },
+      {
+        "name": "austria",
+        "diversity": false
+      },
+      {
+        "name": "australia",
+        "diversity": false
+      },
+      {
+        "name": "aruba",
+        "diversity": false
+      },
+      {
+        "name": "aland_islands",
+        "diversity": false
+      },
+      {
+        "name": "azerbaijan",
+        "diversity": false
+      },
+      {
+        "name": "bosnia_herzegovina",
+        "diversity": false
+      },
+      {
+        "name": "barbados",
+        "diversity": false
+      },
+      {
+        "name": "bangladesh",
+        "diversity": false
+      },
+      {
+        "name": "belgium",
+        "diversity": false
+      },
+      {
+        "name": "burkina_faso",
+        "diversity": false
+      },
+      {
+        "name": "bulgaria",
+        "diversity": false
+      },
+      {
+        "name": "bahrain",
+        "diversity": false
+      },
+      {
+        "name": "burundi",
+        "diversity": false
+      },
+      {
+        "name": "benin",
+        "diversity": false
+      },
+      {
+        "name": "st_barthelemy",
+        "diversity": false
+      },
+      {
+        "name": "bermuda",
+        "diversity": false
+      },
+      {
+        "name": "brunei",
+        "diversity": false
+      },
+      {
+        "name": "bolivia",
+        "diversity": false
+      },
+      {
+        "name": "caribbean_netherlands",
+        "diversity": false
+      },
+      {
+        "name": "brazil",
+        "diversity": false
+      },
+      {
+        "name": "bahamas",
+        "diversity": false
+      },
+      {
+        "name": "bhutan",
+        "diversity": false
+      },
+      {
+        "name": "bouvet_island",
+        "diversity": false
+      },
+      {
+        "name": "botswana",
+        "diversity": false
+      },
+      {
+        "name": "belarus",
+        "diversity": false
+      },
+      {
+        "name": "belize",
+        "diversity": false
+      },
+      {
+        "name": "canada",
+        "diversity": false
+      },
+      {
+        "name": "cocos_islands",
+        "diversity": false
+      },
+      {
+        "name": "congo_kinshasa",
+        "diversity": false
+      },
+      {
+        "name": "central_african_republic",
+        "diversity": false
+      },
+      {
+        "name": "congo_brazzaville",
+        "diversity": false
+      },
+      {
+        "name": "switzerland",
+        "diversity": false
+      },
+      {
+        "name": "cote_divoire",
+        "diversity": false
+      },
+      {
+        "name": "cook_islands",
+        "diversity": false
+      },
+      {
+        "name": "chile",
+        "diversity": false
+      },
+      {
+        "name": "cameroon",
+        "diversity": false
+      },
+      {
+        "name": "cn",
+        "diversity": false
+      },
+      {
+        "name": "colombia",
+        "diversity": false
+      },
+      {
+        "name": "clipperton_island",
+        "diversity": false
+      },
+      {
+        "name": "costa_rica",
+        "diversity": false
+      },
+      {
+        "name": "cuba",
+        "diversity": false
+      },
+      {
+        "name": "cape_verde",
+        "diversity": false
+      },
+      {
+        "name": "curacao",
+        "diversity": false
+      },
+      {
+        "name": "christmas_island",
+        "diversity": false
+      },
+      {
+        "name": "cyprus",
+        "diversity": false
+      },
+      {
+        "name": "czech_republic",
+        "diversity": false
+      },
+      {
+        "name": "de",
+        "diversity": false
+      },
+      {
+        "name": "diego_garcia",
+        "diversity": false
+      },
+      {
+        "name": "djibouti",
+        "diversity": false
+      },
+      {
+        "name": "denmark",
+        "diversity": false
+      },
+      {
+        "name": "dominica",
+        "diversity": false
+      },
+      {
+        "name": "dominican_republic",
+        "diversity": false
+      },
+      {
+        "name": "algeria",
+        "diversity": false
+      },
+      {
+        "name": "ceuta_and_melilla",
+        "diversity": false
+      },
+      {
+        "name": "ecuador",
+        "diversity": false
+      },
+      {
+        "name": "estonia",
+        "diversity": false
+      },
+      {
+        "name": "egypt",
+        "diversity": false
+      },
+      {
+        "name": "western_sahara",
+        "diversity": false
+      },
+      {
+        "name": "eritrea",
+        "diversity": false
+      },
+      {
+        "name": "es",
+        "diversity": false
+      },
+      {
+        "name": "ethiopia",
+        "diversity": false
+      },
+      {
+        "name": "eu",
+        "diversity": false
+      },
+      {
+        "name": "finland",
+        "diversity": false
+      },
+      {
+        "name": "fiji",
+        "diversity": false
+      },
+      {
+        "name": "falkland_islands",
+        "diversity": false
+      },
+      {
+        "name": "micronesia",
+        "diversity": false
+      },
+      {
+        "name": "faroe_islands",
+        "diversity": false
+      },
+      {
+        "name": "fr",
+        "diversity": false
+      },
+      {
+        "name": "gabon",
+        "diversity": false
+      },
+      {
+        "name": "uk",
+        "diversity": false
+      },
+      {
+        "name": "grenada",
+        "diversity": false
+      },
+      {
+        "name": "georgia",
+        "diversity": false
+      },
+      {
+        "name": "french_guiana",
+        "diversity": false
+      },
+      {
+        "name": "guernsey",
+        "diversity": false
+      },
+      {
+        "name": "ghana",
+        "diversity": false
+      },
+      {
+        "name": "gibraltar",
+        "diversity": false
+      },
+      {
+        "name": "greenland",
+        "diversity": false
+      },
+      {
+        "name": "gambia",
+        "diversity": false
+      },
+      {
+        "name": "guinea",
+        "diversity": false
+      },
+      {
+        "name": "guadeloupe",
+        "diversity": false
+      },
+      {
+        "name": "equatorial_guinea",
+        "diversity": false
+      },
+      {
+        "name": "greece",
+        "diversity": false
+      },
+      {
+        "name": "south_georgia_south_sandwich_islands",
+        "diversity": false
+      },
+      {
+        "name": "guatemala",
+        "diversity": false
+      },
+      {
+        "name": "guam",
+        "diversity": false
+      },
+      {
+        "name": "guinea_bissau",
+        "diversity": false
+      },
+      {
+        "name": "guyana",
+        "diversity": false
+      },
+      {
+        "name": "hong_kong",
+        "diversity": false
+      },
+      {
+        "name": "heard_and_mc_donald_islands",
+        "diversity": false
+      },
+      {
+        "name": "honduras",
+        "diversity": false
+      },
+      {
+        "name": "croatia",
+        "diversity": false
+      },
+      {
+        "name": "haiti",
+        "diversity": false
+      },
+      {
+        "name": "hungary",
+        "diversity": false
+      },
+      {
+        "name": "canary_islands",
+        "diversity": false
+      },
+      {
+        "name": "indonesia",
+        "diversity": false
+      },
+      {
+        "name": "ireland",
+        "diversity": false
+      },
+      {
+        "name": "israel",
+        "diversity": false
+      },
+      {
+        "name": "isle_of_man",
+        "diversity": false
+      },
+      {
+        "name": "india",
+        "diversity": false
+      },
+      {
+        "name": "british_indian_ocean_territory",
+        "diversity": false
+      },
+      {
+        "name": "iraq",
+        "diversity": false
+      },
+      {
+        "name": "iran",
+        "diversity": false
+      },
+      {
+        "name": "iceland",
+        "diversity": false
+      },
+      {
+        "name": "it",
+        "diversity": false
+      },
+      {
+        "name": "jersey",
+        "diversity": false
+      },
+      {
+        "name": "jamaica",
+        "diversity": false
+      },
+      {
+        "name": "jordan",
+        "diversity": false
+      },
+      {
+        "name": "jp",
+        "diversity": false
+      },
+      {
+        "name": "kenya",
+        "diversity": false
+      },
+      {
+        "name": "kyrgyzstan",
+        "diversity": false
+      },
+      {
+        "name": "cambodia",
+        "diversity": false
+      },
+      {
+        "name": "kiribati",
+        "diversity": false
+      },
+      {
+        "name": "comoros",
+        "diversity": false
+      },
+      {
+        "name": "st_kitts_nevis",
+        "diversity": false
+      },
+      {
+        "name": "north_korea",
+        "diversity": false
+      },
+      {
+        "name": "kr",
+        "diversity": false
+      },
+      {
+        "name": "kuwait",
+        "diversity": false
+      },
+      {
+        "name": "cayman_islands",
+        "diversity": false
+      },
+      {
+        "name": "kazakhstan",
+        "diversity": false
+      },
+      {
+        "name": "laos",
+        "diversity": false
+      },
+      {
+        "name": "lebanon",
+        "diversity": false
+      },
+      {
+        "name": "st_lucia",
+        "diversity": false
+      },
+      {
+        "name": "liechtenstein",
+        "diversity": false
+      },
+      {
+        "name": "sri_lanka",
+        "diversity": false
+      },
+      {
+        "name": "liberia",
+        "diversity": false
+      },
+      {
+        "name": "lesotho",
+        "diversity": false
+      },
+      {
+        "name": "lithuania",
+        "diversity": false
+      },
+      {
+        "name": "luxembourg",
+        "diversity": false
+      },
+      {
+        "name": "latvia",
+        "diversity": false
+      },
+      {
+        "name": "libya",
+        "diversity": false
+      },
+      {
+        "name": "morocco",
+        "diversity": false
+      },
+      {
+        "name": "monaco",
+        "diversity": false
+      },
+      {
+        "name": "moldova",
+        "diversity": false
+      },
+      {
+        "name": "montenegro",
+        "diversity": false
+      },
+      {
+        "name": "st_martin",
+        "diversity": false
+      },
+      {
+        "name": "madagascar",
+        "diversity": false
+      },
+      {
+        "name": "marshall_islands",
+        "diversity": false
+      },
+      {
+        "name": "macedonia",
+        "diversity": false
+      },
+      {
+        "name": "mali",
+        "diversity": false
+      },
+      {
+        "name": "myanmar",
+        "diversity": false
+      },
+      {
+        "name": "mongolia",
+        "diversity": false
+      },
+      {
+        "name": "macau",
+        "diversity": false
+      },
+      {
+        "name": "northern_mariana_islands",
+        "diversity": false
+      },
+      {
+        "name": "martinique",
+        "diversity": false
+      },
+      {
+        "name": "mauritania",
+        "diversity": false
+      },
+      {
+        "name": "montserrat",
+        "diversity": false
+      },
+      {
+        "name": "malta",
+        "diversity": false
+      },
+      {
+        "name": "mauritius",
+        "diversity": false
+      },
+      {
+        "name": "maldives",
+        "diversity": false
+      },
+      {
+        "name": "malawi",
+        "diversity": false
+      },
+      {
+        "name": "mexico",
+        "diversity": false
+      },
+      {
+        "name": "malaysia",
+        "diversity": false
+      },
+      {
+        "name": "mozambique",
+        "diversity": false
+      },
+      {
+        "name": "namibia",
+        "diversity": false
+      },
+      {
+        "name": "new_caledonia",
+        "diversity": false
+      },
+      {
+        "name": "niger",
+        "diversity": false
+      },
+      {
+        "name": "norfolk_island",
+        "diversity": false
+      },
+      {
+        "name": "nigeria",
+        "diversity": false
+      },
+      {
+        "name": "nicaragua",
+        "diversity": false
+      },
+      {
+        "name": "netherlands",
+        "diversity": false
+      },
+      {
+        "name": "norway",
+        "diversity": false
+      },
+      {
+        "name": "nepal",
+        "diversity": false
+      },
+      {
+        "name": "nauru",
+        "diversity": false
+      },
+      {
+        "name": "niue",
+        "diversity": false
+      },
+      {
+        "name": "new_zealand",
+        "diversity": false
+      },
+      {
+        "name": "oman",
+        "diversity": false
+      },
+      {
+        "name": "panama",
+        "diversity": false
+      },
+      {
+        "name": "peru",
+        "diversity": false
+      },
+      {
+        "name": "french_polynesia",
+        "diversity": false
+      },
+      {
+        "name": "papua_new_guinea",
+        "diversity": false
+      },
+      {
+        "name": "philippines",
+        "diversity": false
+      },
+      {
+        "name": "pakistan",
+        "diversity": false
+      },
+      {
+        "name": "poland",
+        "diversity": false
+      },
+      {
+        "name": "st_pierre_miquelon",
+        "diversity": false
+      },
+      {
+        "name": "pitcairn_islands",
+        "diversity": false
+      },
+      {
+        "name": "puerto_rico",
+        "diversity": false
+      },
+      {
+        "name": "palestinian_territories",
+        "diversity": false
+      },
+      {
+        "name": "portugal",
+        "diversity": false
+      },
+      {
+        "name": "palau",
+        "diversity": false
+      },
+      {
+        "name": "paraguay",
+        "diversity": false
+      },
+      {
+        "name": "qatar",
+        "diversity": false
+      },
+      {
+        "name": "reunion",
+        "diversity": false
+      },
+      {
+        "name": "romania",
+        "diversity": false
+      },
+      {
+        "name": "serbia",
+        "diversity": false
+      },
+      {
+        "name": "ru",
+        "diversity": false
+      },
+      {
+        "name": "rwanda",
+        "diversity": false
+      },
+      {
+        "name": "saudi_arabia",
+        "diversity": false
+      },
+      {
+        "name": "solomon_islands",
+        "diversity": false
+      },
+      {
+        "name": "seychelles",
+        "diversity": false
+      },
+      {
+        "name": "sudan",
+        "diversity": false
+      },
+      {
+        "name": "sweden",
+        "diversity": false
+      },
+      {
+        "name": "singapore",
+        "diversity": false
+      },
+      {
+        "name": "st_helena",
+        "diversity": false
+      },
+      {
+        "name": "slovenia",
+        "diversity": false
+      },
+      {
+        "name": "svalbard_and_jan_mayen",
+        "diversity": false
+      },
+      {
+        "name": "slovakia",
+        "diversity": false
+      },
+      {
+        "name": "sierra_leone",
+        "diversity": false
+      },
+      {
+        "name": "san_marino",
+        "diversity": false
+      },
+      {
+        "name": "senegal",
+        "diversity": false
+      },
+      {
+        "name": "somalia",
+        "diversity": false
+      },
+      {
+        "name": "suriname",
+        "diversity": false
+      },
+      {
+        "name": "south_sudan",
+        "diversity": false
+      },
+      {
+        "name": "sao_tome_principe",
+        "diversity": false
+      },
+      {
+        "name": "el_salvador",
+        "diversity": false
+      },
+      {
+        "name": "sint_maarten",
+        "diversity": false
+      },
+      {
+        "name": "syria",
+        "diversity": false
+      },
+      {
+        "name": "swaziland",
+        "diversity": false
+      },
+      {
+        "name": "tristan_da_cunha",
+        "diversity": false
+      },
+      {
+        "name": "turks_caicos_islands",
+        "diversity": false
+      },
+      {
+        "name": "chad",
+        "diversity": false
+      },
+      {
+        "name": "french_southern_territories",
+        "diversity": false
+      },
+      {
+        "name": "togo",
+        "diversity": false
+      },
+      {
+        "name": "thailand",
+        "diversity": false
+      },
+      {
+        "name": "tajikistan",
+        "diversity": false
+      },
+      {
+        "name": "tokelau",
+        "diversity": false
+      },
+      {
+        "name": "timor_leste",
+        "diversity": false
+      },
+      {
+        "name": "turkmenistan",
+        "diversity": false
+      },
+      {
+        "name": "tunisia",
+        "diversity": false
+      },
+      {
+        "name": "tonga",
+        "diversity": false
+      },
+      {
+        "name": "tr",
+        "diversity": false
+      },
+      {
+        "name": "trinidad_tobago",
+        "diversity": false
+      },
+      {
+        "name": "tuvalu",
+        "diversity": false
+      },
+      {
+        "name": "taiwan",
+        "diversity": false
+      },
+      {
+        "name": "tanzania",
+        "diversity": false
+      },
+      {
+        "name": "ukraine",
+        "diversity": false
+      },
+      {
+        "name": "uganda",
+        "diversity": false
+      },
+      {
+        "name": "us_outlying_islands",
+        "diversity": false
+      },
+      {
+        "name": "united_nations",
+        "diversity": false
+      },
+      {
+        "name": "us",
+        "diversity": false
+      },
+      {
+        "name": "uruguay",
+        "diversity": false
+      },
+      {
+        "name": "uzbekistan",
+        "diversity": false
+      },
+      {
+        "name": "vatican_city",
+        "diversity": false
+      },
+      {
+        "name": "st_vincent_grenadines",
+        "diversity": false
+      },
+      {
+        "name": "venezuela",
+        "diversity": false
+      },
+      {
+        "name": "british_virgin_islands",
+        "diversity": false
+      },
+      {
+        "name": "us_virgin_islands",
+        "diversity": false
+      },
+      {
+        "name": "vietnam",
+        "diversity": false
+      },
+      {
+        "name": "vanuatu",
+        "diversity": false
+      },
+      {
+        "name": "wallis_futuna",
+        "diversity": false
+      },
+      {
+        "name": "samoa",
+        "diversity": false
+      },
+      {
+        "name": "kosovo",
+        "diversity": false
+      },
+      {
+        "name": "yemen",
+        "diversity": false
+      },
+      {
+        "name": "mayotte",
+        "diversity": false
+      },
+      {
+        "name": "south_africa",
+        "diversity": false
+      },
+      {
+        "name": "zambia",
+        "diversity": false
+      },
+      {
+        "name": "zimbabwe",
+        "diversity": false
+      }
+    ]
+  },
+  {
+    "name": "objects",
+    "fullname": "Objects & Symbols",
+    "tabicon": "eyeglasses",
+    "icons": [
+      {
+        "name": "eyeglasses",
+        "diversity": false
+      },
+      {
+        "name": "dark_sunglasses",
+        "diversity": false
+      },
+      {
+        "name": "necktie",
+        "diversity": false
+      },
+      {
+        "name": "tshirt",
+        "diversity": false
+      },
+      {
+        "name": "jeans",
+        "diversity": false
+      },
+      {
+        "name": "scarf",
+        "diversity": false
+      },
+      {
+        "name": "gloves",
+        "diversity": false
+      },
+      {
+        "name": "coat",
+        "diversity": false
+      },
+      {
+        "name": "socks",
+        "diversity": false
+      },
+      {
+        "name": "dress",
+        "diversity": false
+      },
+      {
+        "name": "kimono",
+        "diversity": false
+      },
+      {
+        "name": "bikini",
+        "diversity": false
+      },
+      {
+        "name": "womans_clothes",
+        "diversity": false
+      },
+      {
+        "name": "purse",
+        "diversity": false
+      },
+      {
+        "name": "handbag",
+        "diversity": false
+      },
+      {
+        "name": "pouch",
+        "diversity": false
+      },
+      {
+        "name": "shopping",
+        "diversity": false
+      },
+      {
+        "name": "school_satchel",
+        "diversity": false
+      },
+      {
+        "name": "mans_shoe",
+        "diversity": false
+      },
+      {
+        "name": "athletic_shoe",
+        "diversity": false
+      },
+      {
+        "name": "high_heel",
+        "diversity": false
+      },
+      {
+        "name": "sandal",
+        "diversity": false
+      },
+      {
+        "name": "boot",
+        "diversity": false
+      },
+      {
+        "name": "crown",
+        "diversity": false
+      },
+      {
+        "name": "womans_hat",
+        "diversity": false
+      },
+      {
+        "name": "tophat",
+        "diversity": false
+      },
+      {
+        "name": "mortar_board",
+        "diversity": false
+      },
+      {
+        "name": "billed_cap",
+        "diversity": false
+      },
+      {
+        "name": "rescue_worker_helmet",
+        "diversity": false
+      },
+      {
+        "name": "prayer_beads",
+        "diversity": false
+      },
+      {
+        "name": "lipstick",
+        "diversity": false
+      },
+      {
+        "name": "ring",
+        "diversity": false
+      },
+      {
+        "name": "gem",
+        "diversity": false
+      },
+      {
+        "name": "medal_military",
+        "diversity": false
+      },
+      {
+        "name": "trophy",
+        "diversity": false
+      },
+      {
+        "name": "medal_sports",
+        "diversity": false
+      },
+      {
+        "name": "1st_place_medal",
+        "diversity": false
+      },
+      {
+        "name": "2nd_place_medal",
+        "diversity": false
+      },
+      {
+        "name": "3rd_place_medal",
+        "diversity": false
+      },
+      {
+        "name": "mute",
+        "diversity": false
+      },
+      {
+        "name": "speaker",
+        "diversity": false
+      },
+      {
+        "name": "sound",
+        "diversity": false
+      },
+      {
+        "name": "loud_sound",
+        "diversity": false
+      },
+      {
+        "name": "loudspeaker",
+        "diversity": false
+      },
+      {
+        "name": "mega",
+        "diversity": false
+      },
+      {
+        "name": "postal_horn",
+        "diversity": false
+      },
+      {
+        "name": "bell",
+        "diversity": false
+      },
+      {
+        "name": "no_bell",
+        "diversity": false
+      },
+      {
+        "name": "iphone",
+        "diversity": false
+      },
+      {
+        "name": "calling",
+        "diversity": false
+      },
+      {
+        "name": "phone",
+        "diversity": false
+      },
+      {
+        "name": "telephone_receiver",
+        "diversity": false
+      },
+      {
+        "name": "pager",
+        "diversity": false
+      },
+      {
+        "name": "fax",
+        "diversity": false
+      },
+      {
+        "name": "battery",
+        "diversity": false
+      },
+      {
+        "name": "electric_plug",
+        "diversity": false
+      },
+      {
+        "name": "computer",
+        "diversity": false
+      },
+      {
+        "name": "desktop_computer",
+        "diversity": false
+      },
+      {
+        "name": "printer",
+        "diversity": false
+      },
+      {
+        "name": "keyboard",
+        "diversity": false
+      },
+      {
+        "name": "computer_mouse",
+        "diversity": false
+      },
+      {
+        "name": "trackball",
+        "diversity": false
+      },
+      {
+        "name": "minidisc",
+        "diversity": false
+      },
+      {
+        "name": "floppy_disk",
+        "diversity": false
+      },
+      {
+        "name": "cd",
+        "diversity": false
+      },
+      {
+        "name": "dvd",
+        "diversity": false
+      },
+      {
+        "name": "movie_camera",
+        "diversity": false
+      },
+      {
+        "name": "film_strip",
+        "diversity": false
+      },
+      {
+        "name": "film_projector",
+        "diversity": false
+      },
+      {
+        "name": "clapper",
+        "diversity": false
+      },
+      {
+        "name": "tv",
+        "diversity": false
+      },
+      {
+        "name": "camera",
+        "diversity": false
+      },
+      {
+        "name": "camera_flash",
+        "diversity": false
+      },
+      {
+        "name": "video_camera",
+        "diversity": false
+      },
+      {
+        "name": "vhs",
+        "diversity": false
+      },
+      {
+        "name": "mag",
+        "diversity": false
+      },
+      {
+        "name": "mag_right",
+        "diversity": false
+      },
+      {
+        "name": "microscope",
+        "diversity": false
+      },
+      {
+        "name": "telescope",
+        "diversity": false
+      },
+      {
+        "name": "satellite",
+        "diversity": false
+      },
+      {
+        "name": "candle",
+        "diversity": false
+      },
+      {
+        "name": "bulb",
+        "diversity": false
+      },
+      {
+        "name": "flashlight",
+        "diversity": false
+      },
+      {
+        "name": "izakaya_lantern",
+        "diversity": false
+      },
+      {
+        "name": "notebook_with_decorative_cover",
+        "diversity": false
+      },
+      {
+        "name": "closed_book",
+        "diversity": false
+      },
+      {
+        "name": "open_book",
+        "diversity": false
+      },
+      {
+        "name": "green_book",
+        "diversity": false
+      },
+      {
+        "name": "blue_book",
+        "diversity": false
+      },
+      {
+        "name": "orange_book",
+        "diversity": false
+      },
+      {
+        "name": "books",
+        "diversity": false
+      },
+      {
+        "name": "notebook",
+        "diversity": false
+      },
+      {
+        "name": "ledger",
+        "diversity": false
+      },
+      {
+        "name": "page_with_curl",
+        "diversity": false
+      },
+      {
+        "name": "scroll",
+        "diversity": false
+      },
+      {
+        "name": "page_facing_up",
+        "diversity": false
+      },
+      {
+        "name": "newspaper",
+        "diversity": false
+      },
+      {
+        "name": "newspaper_roll",
+        "diversity": false
+      },
+      {
+        "name": "bookmark_tabs",
+        "diversity": false
+      },
+      {
+        "name": "bookmark",
+        "diversity": false
+      },
+      {
+        "name": "label",
+        "diversity": false
+      },
+      {
+        "name": "moneybag",
+        "diversity": false
+      },
+      {
+        "name": "yen",
+        "diversity": false
+      },
+      {
+        "name": "dollar",
+        "diversity": false
+      },
+      {
+        "name": "euro",
+        "diversity": false
+      },
+      {
+        "name": "pound",
+        "diversity": false
+      },
+      {
+        "name": "money_with_wings",
+        "diversity": false
+      },
+      {
+        "name": "credit_card",
+        "diversity": false
+      },
+      {
+        "name": "chart",
+        "diversity": false
+      },
+      {
+        "name": "currency_exchange",
+        "diversity": false
+      },
+      {
+        "name": "heavy_dollar_sign",
+        "diversity": false
+      },
+      {
+        "name": "email",
+        "diversity": false
+      },
+      {
+        "name": "e-mail",
+        "diversity": false
+      },
+      {
+        "name": "incoming_envelope",
+        "diversity": false
+      },
+      {
+        "name": "envelope_with_arrow",
+        "diversity": false
+      },
+      {
+        "name": "outbox_tray",
+        "diversity": false
+      },
+      {
+        "name": "inbox_tray",
+        "diversity": false
+      },
+      {
+        "name": "package",
+        "diversity": false
+      },
+      {
+        "name": "mailbox",
+        "diversity": false
+      },
+      {
+        "name": "mailbox_closed",
+        "diversity": false
+      },
+      {
+        "name": "mailbox_with_mail",
+        "diversity": false
+      },
+      {
+        "name": "mailbox_with_no_mail",
+        "diversity": false
+      },
+      {
+        "name": "postbox",
+        "diversity": false
+      },
+      {
+        "name": "ballot_box",
+        "diversity": false
+      },
+      {
+        "name": "pencil2",
+        "diversity": false
+      },
+      {
+        "name": "black_nib",
+        "diversity": false
+      },
+      {
+        "name": "fountain_pen",
+        "diversity": false
+      },
+      {
+        "name": "pen",
+        "diversity": false
+      },
+      {
+        "name": "paintbrush",
+        "diversity": false
+      },
+      {
+        "name": "crayon",
+        "diversity": false
+      },
+      {
+        "name": "memo",
+        "diversity": false
+      },
+      {
+        "name": "briefcase",
+        "diversity": false
+      },
+      {
+        "name": "file_folder",
+        "diversity": false
+      },
+      {
+        "name": "open_file_folder",
+        "diversity": false
+      },
+      {
+        "name": "card_index_dividers",
+        "diversity": false
+      },
+      {
+        "name": "date",
+        "diversity": false
+      },
+      {
+        "name": "calendar",
+        "diversity": false
+      },
+      {
+        "name": "spiral_notepad",
+        "diversity": false
+      },
+      {
+        "name": "spiral_calendar",
+        "diversity": false
+      },
+      {
+        "name": "card_index",
+        "diversity": false
+      },
+      {
+        "name": "chart_with_upwards_trend",
+        "diversity": false
+      },
+      {
+        "name": "chart_with_downwards_trend",
+        "diversity": false
+      },
+      {
+        "name": "bar_chart",
+        "diversity": false
+      },
+      {
+        "name": "clipboard",
+        "diversity": false
+      },
+      {
+        "name": "pushpin",
+        "diversity": false
+      },
+      {
+        "name": "round_pushpin",
+        "diversity": false
+      },
+      {
+        "name": "paperclip",
+        "diversity": false
+      },
+      {
+        "name": "paperclips",
+        "diversity": false
+      },
+      {
+        "name": "straight_ruler",
+        "diversity": false
+      },
+      {
+        "name": "triangular_ruler",
+        "diversity": false
+      },
+      {
+        "name": "scissors",
+        "diversity": false
+      },
+      {
+        "name": "card_file_box",
+        "diversity": false
+      },
+      {
+        "name": "file_cabinet",
+        "diversity": false
+      },
+      {
+        "name": "wastebasket",
+        "diversity": false
+      },
+      {
+        "name": "lock",
+        "diversity": false
+      },
+      {
+        "name": "unlock",
+        "diversity": false
+      },
+      {
+        "name": "lock_with_ink_pen",
+        "diversity": false
+      },
+      {
+        "name": "closed_lock_with_key",
+        "diversity": false
+      },
+      {
+        "name": "key",
+        "diversity": false
+      },
+      {
+        "name": "old_key",
+        "diversity": false
+      },
+      {
+        "name": "hammer",
+        "diversity": false
+      },
+      {
+        "name": "pick",
+        "diversity": false
+      },
+      {
+        "name": "hammer_and_pick",
+        "diversity": false
+      },
+      {
+        "name": "hammer_and_wrench",
+        "diversity": false
+      },
+      {
+        "name": "dagger",
+        "diversity": false
+      },
+      {
+        "name": "crossed_swords",
+        "diversity": false
+      },
+      {
+        "name": "gun",
+        "diversity": false
+      },
+      {
+        "name": "bow_and_arrow",
+        "diversity": false
+      },
+      {
+        "name": "shield",
+        "diversity": false
+      },
+      {
+        "name": "wrench",
+        "diversity": false
+      },
+      {
+        "name": "nut_and_bolt",
+        "diversity": false
+      },
+      {
+        "name": "gear",
+        "diversity": false
+      },
+      {
+        "name": "clamp",
+        "diversity": false
+      },
+      {
+        "name": "alembic",
+        "diversity": false
+      },
+      {
+        "name": "balance_scale",
+        "diversity": false
+      },
+      {
+        "name": "link",
+        "diversity": false
+      },
+      {
+        "name": "chains",
+        "diversity": false
+      },
+      {
+        "name": "syringe",
+        "diversity": false
+      },
+      {
+        "name": "pill",
+        "diversity": false
+      },
+      {
+        "name": "smoking",
+        "diversity": false
+      },
+      {
+        "name": "coffin",
+        "diversity": false
+      },
+      {
+        "name": "funeral_urn",
+        "diversity": false
+      },
+      {
+        "name": "moyai",
+        "diversity": false
+      },
+      {
+        "name": "oil_drum",
+        "diversity": false
+      },
+      {
+        "name": "crystal_ball",
+        "diversity": false
+      },
+      {
+        "name": "shopping_cart",
+        "diversity": false
+      },
+      {
+        "name": "atm",
+        "diversity": false
+      },
+      {
+        "name": "put_litter_in_its_place",
+        "diversity": false
+      },
+      {
+        "name": "potable_water",
+        "diversity": false
+      },
+      {
+        "name": "wheelchair",
+        "diversity": false
+      },
+      {
+        "name": "mens",
+        "diversity": false
+      },
+      {
+        "name": "womens",
+        "diversity": false
+      },
+      {
+        "name": "restroom",
+        "diversity": false
+      },
+      {
+        "name": "baby_symbol",
+        "diversity": false
+      },
+      {
+        "name": "wc",
+        "diversity": false
+      },
+      {
+        "name": "passport_control",
+        "diversity": false
+      },
+      {
+        "name": "customs",
+        "diversity": false
+      },
+      {
+        "name": "baggage_claim",
+        "diversity": false
+      },
+      {
+        "name": "left_luggage",
+        "diversity": false
+      },
+      {
+        "name": "warning",
+        "diversity": false
+      },
+      {
+        "name": "children_crossing",
+        "diversity": false
+      },
+      {
+        "name": "no_entry",
+        "diversity": false
+      },
+      {
+        "name": "no_entry_sign",
+        "diversity": false
+      },
+      {
+        "name": "no_bicycles",
+        "diversity": false
+      },
+      {
+        "name": "no_smoking",
+        "diversity": false
+      },
+      {
+        "name": "do_not_litter",
+        "diversity": false
+      },
+      {
+        "name": "non-potable_water",
+        "diversity": false
+      },
+      {
+        "name": "no_pedestrians",
+        "diversity": false
+      },
+      {
+        "name": "no_mobile_phones",
+        "diversity": false
+      },
+      {
+        "name": "underage",
+        "diversity": false
+      },
+      {
+        "name": "radioactive",
+        "diversity": false
+      },
+      {
+        "name": "biohazard",
+        "diversity": false
+      },
+      {
+        "name": "arrow_up",
+        "diversity": false
+      },
+      {
+        "name": "arrow_upper_right",
+        "diversity": false
+      },
+      {
+        "name": "arrow_right",
+        "diversity": false
+      },
+      {
+        "name": "arrow_lower_right",
+        "diversity": false
+      },
+      {
+        "name": "arrow_down",
+        "diversity": false
+      },
+      {
+        "name": "arrow_lower_left",
+        "diversity": false
+      },
+      {
+        "name": "arrow_left",
+        "diversity": false
+      },
+      {
+        "name": "arrow_upper_left",
+        "diversity": false
+      },
+      {
+        "name": "arrow_up_down",
+        "diversity": false
+      },
+      {
+        "name": "left_right_arrow",
+        "diversity": false
+      },
+      {
+        "name": "leftwards_arrow_with_hook",
+        "diversity": false
+      },
+      {
+        "name": "arrow_right_hook",
+        "diversity": false
+      },
+      {
+        "name": "arrow_heading_up",
+        "diversity": false
+      },
+      {
+        "name": "arrow_heading_down",
+        "diversity": false
+      },
+      {
+        "name": "arrows_clockwise",
+        "diversity": false
+      },
+      {
+        "name": "arrows_counterclockwise",
+        "diversity": false
+      },
+      {
+        "name": "back",
+        "diversity": false
+      },
+      {
+        "name": "end",
+        "diversity": false
+      },
+      {
+        "name": "on",
+        "diversity": false
+      },
+      {
+        "name": "soon",
+        "diversity": false
+      },
+      {
+        "name": "top",
+        "diversity": false
+      },
+      {
+        "name": "place_of_worship",
+        "diversity": false
+      },
+      {
+        "name": "atom_symbol",
+        "diversity": false
+      },
+      {
+        "name": "om",
+        "diversity": false
+      },
+      {
+        "name": "star_of_david",
+        "diversity": false
+      },
+      {
+        "name": "wheel_of_dharma",
+        "diversity": false
+      },
+      {
+        "name": "yin_yang",
+        "diversity": false
+      },
+      {
+        "name": "latin_cross",
+        "diversity": false
+      },
+      {
+        "name": "orthodox_cross",
+        "diversity": false
+      },
+      {
+        "name": "star_and_crescent",
+        "diversity": false
+      },
+      {
+        "name": "peace_symbol",
+        "diversity": false
+      },
+      {
+        "name": "menorah",
+        "diversity": false
+      },
+      {
+        "name": "six_pointed_star",
+        "diversity": false
+      },
+      {
+        "name": "aries",
+        "diversity": false
+      },
+      {
+        "name": "taurus",
+        "diversity": false
+      },
+      {
+        "name": "gemini",
+        "diversity": false
+      },
+      {
+        "name": "cancer",
+        "diversity": false
+      },
+      {
+        "name": "leo",
+        "diversity": false
+      },
+      {
+        "name": "virgo",
+        "diversity": false
+      },
+      {
+        "name": "libra",
+        "diversity": false
+      },
+      {
+        "name": "scorpius",
+        "diversity": false
+      },
+      {
+        "name": "sagittarius",
+        "diversity": false
+      },
+      {
+        "name": "capricorn",
+        "diversity": false
+      },
+      {
+        "name": "aquarius",
+        "diversity": false
+      },
+      {
+        "name": "pisces",
+        "diversity": false
+      },
+      {
+        "name": "ophiuchus",
+        "diversity": false
+      },
+      {
+        "name": "twisted_rightwards_arrows",
+        "diversity": false
+      },
+      {
+        "name": "repeat",
+        "diversity": false
+      },
+      {
+        "name": "repeat_one",
+        "diversity": false
+      },
+      {
+        "name": "arrow_forward",
+        "diversity": false
+      },
+      {
+        "name": "fast_forward",
+        "diversity": false
+      },
+      {
+        "name": "next_track_button",
+        "diversity": false
+      },
+      {
+        "name": "play_or_pause_button",
+        "diversity": false
+      },
+      {
+        "name": "arrow_backward",
+        "diversity": false
+      },
+      {
+        "name": "rewind",
+        "diversity": false
+      },
+      {
+        "name": "previous_track_button",
+        "diversity": false
+      },
+      {
+        "name": "arrow_up_small",
+        "diversity": false
+      },
+      {
+        "name": "arrow_double_up",
+        "diversity": false
+      },
+      {
+        "name": "arrow_down_small",
+        "diversity": false
+      },
+      {
+        "name": "arrow_double_down",
+        "diversity": false
+      },
+      {
+        "name": "pause_button",
+        "diversity": false
+      },
+      {
+        "name": "stop_button",
+        "diversity": false
+      },
+      {
+        "name": "record_button",
+        "diversity": false
+      },
+      {
+        "name": "cinema",
+        "diversity": false
+      },
+      {
+        "name": "low_brightness",
+        "diversity": false
+      },
+      {
+        "name": "high_brightness",
+        "diversity": false
+      },
+      {
+        "name": "signal_strength",
+        "diversity": false
+      },
+      {
+        "name": "vibration_mode",
+        "diversity": false
+      },
+      {
+        "name": "mobile_phone_off",
+        "diversity": false
+      },
+      {
+        "name": "recycle",
+        "diversity": false
+      },
+      {
+        "name": "fleur_de_lis",
+        "diversity": false
+      },
+      {
+        "name": "trident",
+        "diversity": false
+      },
+      {
+        "name": "name_badge",
+        "diversity": false
+      },
+      {
+        "name": "beginner",
+        "diversity": false
+      },
+      {
+        "name": "o",
+        "diversity": false
+      },
+      {
+        "name": "white_check_mark",
+        "diversity": false
+      },
+      {
+        "name": "ballot_box_with_check",
+        "diversity": false
+      },
+      {
+        "name": "heavy_check_mark",
+        "diversity": false
+      },
+      {
+        "name": "heavy_multiplication_x",
+        "diversity": false
+      },
+      {
+        "name": "x",
+        "diversity": false
+      },
+      {
+        "name": "negative_squared_cross_mark",
+        "diversity": false
+      },
+      {
+        "name": "heavy_plus_sign",
+        "diversity": false
+      },
+      {
+        "name": "heavy_minus_sign",
+        "diversity": false
+      },
+      {
+        "name": "heavy_division_sign",
+        "diversity": false
+      },
+      {
+        "name": "curly_loop",
+        "diversity": false
+      },
+      {
+        "name": "loop",
+        "diversity": false
+      },
+      {
+        "name": "part_alternation_mark",
+        "diversity": false
+      },
+      {
+        "name": "eight_spoked_asterisk",
+        "diversity": false
+      },
+      {
+        "name": "eight_pointed_black_star",
+        "diversity": false
+      },
+      {
+        "name": "sparkle",
+        "diversity": false
+      },
+      {
+        "name": "bangbang",
+        "diversity": false
+      },
+      {
+        "name": "interrobang",
+        "diversity": false
+      },
+      {
+        "name": "question",
+        "diversity": false
+      },
+      {
+        "name": "grey_question",
+        "diversity": false
+      },
+      {
+        "name": "grey_exclamation",
+        "diversity": false
+      },
+      {
+        "name": "exclamation",
+        "diversity": false
+      },
+      {
+        "name": "wavy_dash",
+        "diversity": false
+      },
+      {
+        "name": "copyright",
+        "diversity": false
+      },
+      {
+        "name": "registered",
+        "diversity": false
+      },
+      {
+        "name": "tm",
+        "diversity": false
+      },
+      {
+        "name": "hash",
+        "diversity": false
+      },
+      {
+        "name": "asterisk",
+        "diversity": false
+      },
+      {
+        "name": "zero",
+        "diversity": false
+      },
+      {
+        "name": "one",
+        "diversity": false
+      },
+      {
+        "name": "two",
+        "diversity": false
+      },
+      {
+        "name": "three",
+        "diversity": false
+      },
+      {
+        "name": "four",
+        "diversity": false
+      },
+      {
+        "name": "five",
+        "diversity": false
+      },
+      {
+        "name": "six",
+        "diversity": false
+      },
+      {
+        "name": "seven",
+        "diversity": false
+      },
+      {
+        "name": "eight",
+        "diversity": false
+      },
+      {
+        "name": "nine",
+        "diversity": false
+      },
+      {
+        "name": "keycap_ten",
+        "diversity": false
+      },
+      {
+        "name": "100",
+        "diversity": false
+      },
+      {
+        "name": "capital_abcd",
+        "diversity": false
+      },
+      {
+        "name": "abcd",
+        "diversity": false
+      },
+      {
+        "name": "1234",
+        "diversity": false
+      },
+      {
+        "name": "symbols",
+        "diversity": false
+      },
+      {
+        "name": "abc",
+        "diversity": false
+      },
+      {
+        "name": "a",
+        "diversity": false
+      },
+      {
+        "name": "ab",
+        "diversity": false
+      },
+      {
+        "name": "b",
+        "diversity": false
+      },
+      {
+        "name": "cl",
+        "diversity": false
+      },
+      {
+        "name": "cool",
+        "diversity": false
+      },
+      {
+        "name": "free",
+        "diversity": false
+      },
+      {
+        "name": "information_source",
+        "diversity": false
+      },
+      {
+        "name": "id",
+        "diversity": false
+      },
+      {
+        "name": "m",
+        "diversity": false
+      },
+      {
+        "name": "new",
+        "diversity": false
+      },
+      {
+        "name": "ng",
+        "diversity": false
+      },
+      {
+        "name": "o2",
+        "diversity": false
+      },
+      {
+        "name": "ok",
+        "diversity": false
+      },
+      {
+        "name": "parking",
+        "diversity": false
+      },
+      {
+        "name": "sos",
+        "diversity": false
+      },
+      {
+        "name": "up",
+        "diversity": false
+      },
+      {
+        "name": "vs",
+        "diversity": false
+      },
+      {
+        "name": "koko",
+        "diversity": false
+      },
+      {
+        "name": "sa",
+        "diversity": false
+      },
+      {
+        "name": "u6708",
+        "diversity": false
+      },
+      {
+        "name": "u6709",
+        "diversity": false
+      },
+      {
+        "name": "u6307",
+        "diversity": false
+      },
+      {
+        "name": "ideograph_advantage",
+        "diversity": false
+      },
+      {
+        "name": "u5272",
+        "diversity": false
+      },
+      {
+        "name": "u7121",
+        "diversity": false
+      },
+      {
+        "name": "u7981",
+        "diversity": false
+      },
+      {
+        "name": "accept",
+        "diversity": false
+      },
+      {
+        "name": "u7533",
+        "diversity": false
+      },
+      {
+        "name": "u5408",
+        "diversity": false
+      },
+      {
+        "name": "u7a7a",
+        "diversity": false
+      },
+      {
+        "name": "congratulations",
+        "diversity": false
+      },
+      {
+        "name": "secret",
+        "diversity": false
+      },
+      {
+        "name": "u55b6",
+        "diversity": false
+      },
+      {
+        "name": "u6e80",
+        "diversity": false
+      },
+      {
+        "name": "black_small_square",
+        "diversity": false
+      },
+      {
+        "name": "white_small_square",
+        "diversity": false
+      },
+      {
+        "name": "white_medium_square",
+        "diversity": false
+      },
+      {
+        "name": "black_medium_square",
+        "diversity": false
+      },
+      {
+        "name": "white_medium_small_square",
+        "diversity": false
+      },
+      {
+        "name": "black_medium_small_square",
+        "diversity": false
+      },
+      {
+        "name": "black_large_square",
+        "diversity": false
+      },
+      {
+        "name": "white_large_square",
+        "diversity": false
+      },
+      {
+        "name": "large_orange_diamond",
+        "diversity": false
+      },
+      {
+        "name": "large_blue_diamond",
+        "diversity": false
+      },
+      {
+        "name": "small_orange_diamond",
+        "diversity": false
+      },
+      {
+        "name": "small_blue_diamond",
+        "diversity": false
+      },
+      {
+        "name": "small_red_triangle",
+        "diversity": false
+      },
+      {
+        "name": "small_red_triangle_down",
+        "diversity": false
+      },
+      {
+        "name": "diamond_shape_with_a_dot_inside",
+        "diversity": false
+      },
+      {
+        "name": "radio_button",
+        "diversity": false
+      },
+      {
+        "name": "black_square_button",
+        "diversity": false
+      },
+      {
+        "name": "white_square_button",
+        "diversity": false
+      },
+      {
+        "name": "white_circle",
+        "diversity": false
+      },
+      {
+        "name": "black_circle",
+        "diversity": false
+      },
+      {
+        "name": "red_circle",
+        "diversity": false
+      },
+      {
+        "name": "large_blue_circle",
+        "diversity": false
+      },
+      {
+        "name": "hourglass",
+        "diversity": false
+      },
+      {
+        "name": "hourglass_flowing_sand",
+        "diversity": false
+      },
+      {
+        "name": "watch",
+        "diversity": false
+      },
+      {
+        "name": "alarm_clock",
+        "diversity": false
+      },
+      {
+        "name": "stopwatch",
+        "diversity": false
+      },
+      {
+        "name": "timer_clock",
+        "diversity": false
+      },
+      {
+        "name": "mantelpiece_clock",
+        "diversity": false
+      },
+      {
+        "name": "clock12",
+        "diversity": false
+      },
+      {
+        "name": "clock1230",
+        "diversity": false
+      },
+      {
+        "name": "clock1",
+        "diversity": false
+      },
+      {
+        "name": "clock130",
+        "diversity": false
+      },
+      {
+        "name": "clock2",
+        "diversity": false
+      },
+      {
+        "name": "clock230",
+        "diversity": false
+      },
+      {
+        "name": "clock3",
+        "diversity": false
+      },
+      {
+        "name": "clock330",
+        "diversity": false
+      },
+      {
+        "name": "clock4",
+        "diversity": false
+      },
+      {
+        "name": "clock430",
+        "diversity": false
+      },
+      {
+        "name": "clock5",
+        "diversity": false
+      },
+      {
+        "name": "clock530",
+        "diversity": false
+      },
+      {
+        "name": "clock6",
+        "diversity": false
+      },
+      {
+        "name": "clock630",
+        "diversity": false
+      },
+      {
+        "name": "clock7",
+        "diversity": false
+      },
+      {
+        "name": "clock730",
+        "diversity": false
+      },
+      {
+        "name": "clock8",
+        "diversity": false
+      },
+      {
+        "name": "clock830",
+        "diversity": false
+      },
+      {
+        "name": "clock9",
+        "diversity": false
+      },
+      {
+        "name": "clock930",
+        "diversity": false
+      },
+      {
+        "name": "clock10",
+        "diversity": false
+      },
+      {
+        "name": "clock1030",
+        "diversity": false
+      },
+      {
+        "name": "clock11",
+        "diversity": false
+      },
+      {
+        "name": "clock1130",
+        "diversity": false
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
index 0814a968be..545f752280 100644
--- a/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
+++ b/lib/es6_module_transpiler/tilt/es6_module_transpiler_template.rb
@@ -14,7 +14,7 @@ module Tilt
       source = input[:data]
       context = input[:environment].context_class.new(input)
 
-      result = new(filename){source}.render(context)
+      result = new(filename) { source }.render(context)
       context.metadata.merge(data: result)
     end
 
@@ -28,8 +28,8 @@ module Tilt
       ctx = MiniRacer::Context.new(timeout: 15000)
       ctx.eval("var self = this; #{File.read("#{Rails.root}/vendor/assets/javascripts/babel.js")}")
       ctx.eval("module = {}; exports = {};");
-      ctx.attach("rails.logger.info", proc{|err| Rails.logger.info(err.to_s)})
-      ctx.attach("rails.logger.error", proc{|err| Rails.logger.error(err.to_s)})
+      ctx.attach("rails.logger.info", proc { |err| Rails.logger.info(err.to_s) })
+      ctx.attach("rails.logger.error", proc { |err| Rails.logger.error(err.to_s) })
       ctx.eval <<JS
       console = {
         prefix: "",
@@ -41,6 +41,7 @@ JS
     end
 
     def self.reset_context
+      @ctx&.dispose
       @ctx = nil
     end
 
@@ -154,7 +155,7 @@ JS
       @output
     end
 
-    def babel_source(source, opts=nil)
+    def babel_source(source, opts = nil)
 
       opts ||= {}
 
@@ -177,7 +178,7 @@ JS
       if root_path =~ /(.*\/#{root_base}\/plugins\/[^\/]+)\//
         plugin_path = "#{Regexp.last_match[1]}/plugin.rb"
 
-        plugin = Discourse.plugins.find {|p| p.path == plugin_path }
+        plugin = Discourse.plugins.find { |p| p.path == plugin_path }
         path = "discourse/plugins/#{plugin.name}/#{logical_path.sub(/javascripts\//, '')}" if plugin
       end
 
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index b6547b59bb..3ce223f9db 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -4,7 +4,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
   SPAN_REGEX = /<\s*span[^>]*class\s*=\s*['|"]excerpt['|"][^>]*>/
 
-  def initialize(length, options=nil)
+  def initialize(length, options = nil)
     @length = length
     @excerpt = ""
     @current_length = 0
@@ -45,13 +45,13 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
   end
 
   def include_tag(name, attributes)
-    characters("<#{name} #{attributes.map{|k,v| "#{k}=\"#{escape_attribute(v)}\""}.join(' ')}>", false, false, false)
+    characters("<#{name} #{attributes.map { |k, v| "#{k}=\"#{escape_attribute(v)}\"" }.join(' ')}>", false, false, false)
   end
 
-  def start_element(name, attributes=[])
+  def start_element(name, attributes = [])
     case name
-      when "img"
-        attributes = Hash[*attributes.flatten]
+    when "img"
+      attributes = Hash[*attributes.flatten]
 
         if attributes["class"] == 'emoji'
           if @remap_emoji
@@ -78,28 +78,28 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
         characters("(#{attributes['src']})") if @markdown_images
 
-      when "a"
-        unless @strip_links
-          include_tag(name, attributes)
-          @in_a = true
-        end
+    when "a"
+      unless @strip_links
+        include_tag(name, attributes)
+        @in_a = true
+      end
 
-      when "aside"
-        attributes = Hash[*attributes.flatten]
+    when "aside"
+      attributes = Hash[*attributes.flatten]
 
         unless @keep_onebox_source && attributes['class'].include?('onebox')
           @in_quote = true
         end
-      when 'article'
-        if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
-          @in_quote = true
-        end
-      when "div", "span"
-        if attributes.include?(["class", "excerpt"])
-          @excerpt = ""
-          @current_length = 0
-          @start_excerpt = true
-        end
+    when 'article'
+      if @keep_onebox_source && attributes.include?(['class', 'onebox-body'])
+        @in_quote = true
+      end
+    when "div", "span"
+      if attributes.include?(["class", "excerpt"])
+        @excerpt = ""
+        @current_length = 0
+        @start_excerpt = true
+      end
         # Preserve spoilers
         if attributes.include?(["class", "spoiler"])
           include_tag("span", attributes)
@@ -112,7 +112,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
     case name
     when "a"
       unless @strip_links
-        characters("</a>",false, false, false)
+        characters("</a>", false, false, false)
         @in_a = false
       end
     when "p", "br"
@@ -132,7 +132,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
   def characters(string, truncate = true, count_it = true, encode = true)
     return if @in_quote
-    encode = encode ? lambda{|s| ERB::Util.html_escape(s)} : lambda {|s| s}
+    encode = encode ? lambda { |s| ERB::Util.html_escape(s) } : lambda { |s| s }
     if count_it && @current_length + string.length > @length
       length = [0, @length - @current_length - 1].max
       @excerpt << encode.call(string[0..length]) if truncate
diff --git a/lib/file_helper.rb b/lib/file_helper.rb
index f3ae79d4a5..be727230d0 100644
--- a/lib/file_helper.rb
+++ b/lib/file_helper.rb
@@ -48,14 +48,32 @@ class FileHelper
     downloaded&.close
   end
 
+  def self.optimize_image!(filename)
+    ImageOptim.new(
+      # GLOBAL
+      timeout: 15,
+      skip_missing_workers: true,
+      # PNG
+      optipng: { level: 2, strip: SiteSetting.strip_image_metadata },
+      advpng: false,
+      pngcrush: false,
+      pngout: false,
+      pngquant: false,
+      # JPG
+      jpegoptim: { strip: SiteSetting.strip_image_metadata ? "all" : "none" },
+      jpegtran: false,
+      jpegrecompress: false,
+    ).optimize_image!(filename)
+  end
+
   private
 
-  def self.images
-    @@images ||= Set.new %w{jpg jpeg png gif tif tiff bmp svg webp ico}
-  end
+    def self.images
+      @@images ||= Set.new %w{jpg jpeg png gif tif tiff bmp svg webp ico}
+    end
 
-  def self.images_regexp
-    @@images_regexp ||= /\.(#{images.to_a.join("|")})$/i
-  end
+    def self.images_regexp
+      @@images_regexp ||= /\.(#{images.to_a.join("|")})$/i
+    end
 
 end
diff --git a/lib/file_store/base_store.rb b/lib/file_store/base_store.rb
index b79282fe68..0a7ae8ba5a 100644
--- a/lib/file_store/base_store.rb
+++ b/lib/file_store/base_store.rb
@@ -95,7 +95,7 @@ module FileStore
     end
 
     def get_path_for_upload(upload)
-      get_path_for("original".freeze, upload.id, upload.sha1, upload.extension)
+      get_path_for("original".freeze, upload.id, upload.sha1, "." + upload.extension)
     end
 
     def get_path_for_optimized_image(optimized_image)
diff --git a/lib/file_store/s3_store.rb b/lib/file_store/s3_store.rb
index 265c7d53a8..98f1c13f08 100644
--- a/lib/file_store/s3_store.rb
+++ b/lib/file_store/s3_store.rb
@@ -9,7 +9,7 @@ module FileStore
   class S3Store < BaseStore
     TOMBSTONE_PREFIX ||= "tombstone/"
 
-    def initialize(s3_helper=nil)
+    def initialize(s3_helper = nil)
       @s3_helper = s3_helper || S3Helper.new(s3_bucket, TOMBSTONE_PREFIX)
     end
 
@@ -27,7 +27,7 @@ module FileStore
     #   - filename
     #   - content_type
     #   - cache_locally
-    def store_file(file, path, opts={})
+    def store_file(file, path, opts = {})
       filename = opts[:filename].presence || File.basename(path)
       # cache file locally when needed
       cache_file(file, File.basename(path)) if opts[:cache_locally]
diff --git a/lib/filter_best_posts.rb b/lib/filter_best_posts.rb
index 88f97d4d1a..e01e79e0e0 100644
--- a/lib/filter_best_posts.rb
+++ b/lib/filter_best_posts.rb
@@ -2,26 +2,27 @@ class FilterBestPosts
 
   attr_accessor :filtered_posts, :posts
 
-  def initialize(topic, filtered_posts, limit, options={})
+  def initialize(topic, filtered_posts, limit, options = {})
     @filtered_posts = filtered_posts
     @topic = topic
     @limit = limit
     options.each do |key, value|
-        self.instance_variable_set("@#{key}".to_sym, value)
+      self.instance_variable_set("@#{key}".to_sym, value)
     end
     filter
   end
 
   def filter
-    @posts =  if @min_replies && @topic.posts_count < @min_replies + 1
-                []
-              else
-                filter_posts_liked_by_moderators
-                setup_posts
-                filter_posts_based_on_trust_level
-                filter_posts_based_on_score
-                sort_posts
-              end
+    @posts =
+      if @min_replies && @topic.posts_count < @min_replies + 1
+        []
+      else
+        filter_posts_liked_by_moderators
+        setup_posts
+        filter_posts_based_on_trust_level
+        filter_posts_based_on_score
+        sort_posts
+      end
   end
 
   private
@@ -39,24 +40,26 @@ class FilterBestPosts
   end
 
   def filter_posts_based_on_trust_level
-    return unless @min_trust_level.try('>',0)
-      @posts = if @bypass_trust_level_score.try('>',0)
-                  @posts.where('COALESCE(users.trust_level,0) >= ? OR posts.score >= ?',
-                              @min_trust_level,
-                              @bypass_trust_level_score)
-                else
-                  @posts.where('COALESCE(users.trust_level,0) >= ?', @min_trust_level)
-                end
+    return unless @min_trust_level.try('>', 0)
+
+    @posts =
+      if @bypass_trust_level_score.try('>', 0)
+        @posts.where('COALESCE(users.trust_level,0) >= ? OR posts.score >= ?',
+          @min_trust_level,
+          @bypass_trust_level_score
+        )
+      else
+        @posts.where('COALESCE(users.trust_level,0) >= ?', @min_trust_level)
+      end
   end
 
   def filter_posts_based_on_score
-    return unless @min_score.try('>',0)
+    return unless @min_score.try('>', 0)
     @posts = @posts.where('posts.score >= ?', @min_score)
   end
 
   def sort_posts
-    @posts.to_a.sort!{|a,b| a.post_number <=> b.post_number}
+    @posts.to_a.sort! { |a, b| a.post_number <=> b.post_number }
   end
 
 end
-
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 928253f34f..1365d6f0d5 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -9,8 +9,14 @@ class FinalDestination
   attr_reader :status
   attr_reader :cookie
 
-  def initialize(url, opts=nil)
-    @uri = URI(url) rescue nil
+  def initialize(url, opts = nil)
+    @url = url
+    @uri =
+      begin
+        URI(escape_url) if @url
+      rescue URI::InvalidURIError
+      end
+
     @opts = opts || {}
     @opts[:max_redirects] ||= 5
     @opts[:lookup_ip] ||= lambda do |host|
@@ -161,7 +167,7 @@ class FinalDestination
 
     address = IPAddr.new(address_s)
 
-    if private_ranges.any? {|r| r === address }
+    if private_ranges.any? { |r| r === address }
       @status = :invalid_address
       return false
     end
@@ -176,9 +182,13 @@ class FinalDestination
     false
   end
 
+  def escape_url
+    URI.escape(CGI.unescapeHTML(@url), Regexp.new("[^#{URI::PATTERN::UNRESERVED}#{URI::PATTERN::RESERVED}#]"))
+  end
+
   def private_ranges
     FinalDestination.standard_private_ranges +
-      SiteSetting.blacklist_ip_blocks.split('|').map {|r| IPAddr.new(r) rescue nil }.compact
+      SiteSetting.blacklist_ip_blocks.split('|').map { |r| IPAddr.new(r) rescue nil }.compact
   end
 
   def self.standard_private_ranges
diff --git a/lib/flag_query.rb b/lib/flag_query.rb
index 11b21c8966..53616e042f 100644
--- a/lib/flag_query.rb
+++ b/lib/flag_query.rb
@@ -1,6 +1,6 @@
 module FlagQuery
 
-  def self.flagged_posts_report(current_user, filter, offset=0, per_page=25)
+  def self.flagged_posts_report(current_user, filter, offset = 0, per_page = 25)
     actions = flagged_post_actions(filter)
 
     guardian = Guardian.new(current_user)
@@ -12,11 +12,11 @@ module FlagQuery
     end
 
     post_ids = actions.limit(per_page)
-                      .offset(offset)
-                      .group(:post_id)
-                      .order('MIN(post_actions.created_at) DESC')
-                      .pluck(:post_id)
-                      .uniq
+      .offset(offset)
+      .group(:post_id)
+      .order('MIN(post_actions.created_at) DESC')
+      .pluck(:post_id)
+      .uniq
 
     return nil if post_ids.blank?
 
@@ -47,8 +47,8 @@ module FlagQuery
     end
 
     post_actions = actions.order('post_actions.created_at DESC')
-                          .includes(related_post: { topic: { ordered_posts: :user }})
-                          .where(post_id: post_ids)
+      .includes(related_post: { topic: { ordered_posts: :user } })
+      .where(post_id: post_ids)
 
     post_actions.each do |pa|
       post = post_lookup[pa.post_id]
@@ -111,10 +111,10 @@ module FlagQuery
 
   def self.flagged_post_actions(filter)
     post_actions = PostAction.flags
-                             .joins("INNER JOIN posts ON posts.id = post_actions.post_id")
-                             .joins("INNER JOIN topics ON topics.id = posts.topic_id")
-                             .joins("LEFT JOIN users ON users.id = posts.user_id")
-                             .where("posts.user_id > 0")
+      .joins("INNER JOIN posts ON posts.id = post_actions.post_id")
+      .joins("INNER JOIN topics ON topics.id = posts.topic_id")
+      .joins("LEFT JOIN users ON users.id = posts.user_id")
+      .where("posts.user_id > 0")
 
     if filter == "old"
       post_actions.where("post_actions.disagreed_at IS NOT NULL OR
@@ -122,8 +122,8 @@ module FlagQuery
                           post_actions.agreed_at IS NOT NULL")
     else
       post_actions.active
-                  .where("posts.deleted_at" => nil)
-                  .where("topics.deleted_at" => nil)
+        .where("posts.deleted_at" => nil)
+        .where("topics.deleted_at" => nil)
     end
 
   end
diff --git a/lib/freedom_patches/active_record_base.rb b/lib/freedom_patches/active_record_base.rb
index 4f62d40647..bd4eb2c1e8 100644
--- a/lib/freedom_patches/active_record_base.rb
+++ b/lib/freedom_patches/active_record_base.rb
@@ -19,13 +19,12 @@ class ActiveRecord::Base
     ActiveRecord::Base.exec_sql(*args)
   end
 
-
   # Executes the given block +retries+ times (or forever, if explicitly given nil),
   # catching and retrying SQL Deadlock errors.
   #
   # Thanks to: http://stackoverflow.com/a/7427186/165668
   #
-  def self.retry_lock_error(retries=5, &block)
+  def self.retry_lock_error(retries = 5, &block)
     begin
       yield
     rescue ActiveRecord::StatementInvalid => e
diff --git a/lib/freedom_patches/ams_include_without_root.rb b/lib/freedom_patches/ams_include_without_root.rb
index 424489b3f5..67c4cf185b 100644
--- a/lib/freedom_patches/ams_include_without_root.rb
+++ b/lib/freedom_patches/ams_include_without_root.rb
@@ -8,7 +8,7 @@ module ActiveModel
     # This method is copied over verbatim from the AMS version, except for silently
     # ignoring associations that cannot be embedded without a root instead of
     # raising an exception.
-    def include!(name, options={})
+    def include!(name, options = {})
       unique_values =
         if hash = options[:hash]
           if @options[:hash] == hash
diff --git a/lib/freedom_patches/better_handlebars_errors.rb b/lib/freedom_patches/better_handlebars_errors.rb
index 3cab31cc94..940afe71a2 100644
--- a/lib/freedom_patches/better_handlebars_errors.rb
+++ b/lib/freedom_patches/better_handlebars_errors.rb
@@ -13,4 +13,3 @@ module Ember
     end
   end
 end
-
diff --git a/lib/freedom_patches/fast_pluck.rb b/lib/freedom_patches/fast_pluck.rb
index ac1203c66d..9eacba972f 100644
--- a/lib/freedom_patches/fast_pluck.rb
+++ b/lib/freedom_patches/fast_pluck.rb
@@ -64,7 +64,7 @@ class ActiveRecord::Relation
         columns_hash.key?(cn) ? arel_table[cn] : cn
       }
 
-      conn.select_raw(relation, nil, relation.arel.bind_values + bind_values) do |result,_|
+      conn.select_raw(relation, nil, relation.arel.bind_values + bind_values) do |result, _|
         result.type_map = SqlBuilder.pg_type_map
         result.nfields == 1 ? result.column_values(0) : result.values
       end
diff --git a/lib/freedom_patches/inflector_backport.rb b/lib/freedom_patches/inflector_backport.rb
index 299ee1107c..1e192b0033 100644
--- a/lib/freedom_patches/inflector_backport.rb
+++ b/lib/freedom_patches/inflector_backport.rb
@@ -23,7 +23,7 @@ module ActiveSupport
         define_method(method_name) do |*args|
           # this avoids recursive locks
           found = true
-          data = cache.fetch(args){found = false}
+          data = cache.fetch(args) { found = false }
           unless found
             cache[args] = data = send(uncached, *args)
           end
@@ -56,8 +56,3 @@ module ActiveSupport
     end
   end
 end
-
-
-
-
-
diff --git a/lib/freedom_patches/pool_drainer.rb b/lib/freedom_patches/pool_drainer.rb
index 6ded19de97..bf1eb1e89c 100644
--- a/lib/freedom_patches/pool_drainer.rb
+++ b/lib/freedom_patches/pool_drainer.rb
@@ -27,7 +27,7 @@ end
 class ActiveRecord::ConnectionAdapters::ConnectionPool
   # drain all idle connections
   # if idle_time is specified only connections idle for N seconds will be drained
-  def drain(idle_time=nil, max_age=nil)
+  def drain(idle_time = nil, max_age = nil)
     synchronize do
       @available.clear
       @connections.delete_if do |conn|
diff --git a/lib/freedom_patches/rack_patches.rb b/lib/freedom_patches/rack_patches.rb
index e02aca52cf..890435d9b9 100644
--- a/lib/freedom_patches/rack_patches.rb
+++ b/lib/freedom_patches/rack_patches.rb
@@ -4,7 +4,7 @@ class Rack::ETag
   private
 
    def digest_body(body)
-    parts = []
+     parts = []
     has_body = false
 
     body.each do |part|
@@ -28,15 +28,15 @@ end
 class Rack::ConditionalGet
   private
    def to_rfc2822(since)
-    # shortest possible valid date is the obsolete: 1 Nov 97 09:55 A
-    # anything shorter is invalid, this avoids exceptions for common cases
-    # most common being the empty string
-    if since && since.length >= 16
-      # NOTE: there is no trivial way to write this in a non execption way
-      #   _rfc2822 returns a hash but is not that usable
-      Time.rfc2822(since) rescue nil
-    else
-      nil
-    end
+     # shortest possible valid date is the obsolete: 1 Nov 97 09:55 A
+     # anything shorter is invalid, this avoids exceptions for common cases
+     # most common being the empty string
+     if since && since.length >= 16
+       # NOTE: there is no trivial way to write this in a non execption way
+       #   _rfc2822 returns a hash but is not that usable
+       Time.rfc2822(since) rescue nil
+     else
+       nil
+     end
   end
 end
diff --git a/lib/freedom_patches/rails4.rb b/lib/freedom_patches/rails4.rb
index 82b4ed9fb9..5052dd8654 100644
--- a/lib/freedom_patches/rails4.rb
+++ b/lib/freedom_patches/rails4.rb
@@ -1,4 +1,4 @@
-# Sam: This has now forked of rails. Trouble is we would never like to use "about 1 month" ever, we only want months for 2 or more months. 
+# Sam: This has now forked of rails. Trouble is we would never like to use "about 1 month" ever, we only want months for 2 or more months.
 #
 # Backporting a fix to rails itself may get too complex
 module FreedomPatches
@@ -6,7 +6,7 @@ module FreedomPatches
 
     def self.distance_of_time_in_words(from_time, to_time = 0, include_seconds = false, options = {})
       options = {
-        :scope => :'datetime.distance_in_words',
+        scope: :'datetime.distance_in_words',
       }.merge!(options)
 
       from_time = from_time.to_time if from_time.respond_to?(:to_time)
@@ -15,36 +15,36 @@ module FreedomPatches
       distance_in_minutes = (distance / 60.0).round
       distance_in_seconds = distance.round
 
-      I18n.with_options :locale => options[:locale], :scope => options[:scope] do |locale|
+      I18n.with_options locale: options[:locale], scope: options[:scope] do |locale|
         case distance_in_minutes
-          when 0..1
-            return distance_in_minutes == 0 ?
-                   locale.t(:less_than_x_minutes, :count => 1) :
-                   locale.t(:x_minutes, :count => distance_in_minutes) unless include_seconds
+        when 0..1
+          return distance_in_minutes == 0 ?
+                 locale.t(:less_than_x_minutes, count: 1) :
+                 locale.t(:x_minutes, count: distance_in_minutes) unless include_seconds
 
             case distance_in_seconds
-              when 0..4   then locale.t :less_than_x_seconds, :count => 5
-              when 5..9   then locale.t :less_than_x_seconds, :count => 10
-              when 10..19 then locale.t :less_than_x_seconds, :count => 20
-              when 20..39 then locale.t :half_a_minute
-              when 40..59 then locale.t :less_than_x_minutes, :count => 1
-              else             locale.t :x_minutes,           :count => 1
+            when 0..4   then locale.t :less_than_x_seconds, count: 5
+            when 5..9   then locale.t :less_than_x_seconds, count: 10
+            when 10..19 then locale.t :less_than_x_seconds, count: 20
+            when 20..39 then locale.t :half_a_minute
+            when 40..59 then locale.t :less_than_x_minutes, count: 1
+              else             locale.t :x_minutes,           count: 1
             end
 
-          when 2..44           then locale.t :x_minutes,      :count => distance_in_minutes
-          when 45..89          then locale.t :about_x_hours,  :count => 1
-          when 90..1439        then locale.t :about_x_hours,  :count => (distance_in_minutes.to_f / 60.0).round
-          when 1440..2519      then locale.t :x_days,         :count => 1
-          
+        when 2..44           then locale.t :x_minutes,      count: distance_in_minutes
+        when 45..89          then locale.t :about_x_hours,  count: 1
+        when 90..1439        then locale.t :about_x_hours,  count: (distance_in_minutes.to_f / 60.0).round
+        when 1440..2519      then locale.t :x_days,         count: 1
+
           # this is were we diverge from Rails
-          when 2520..129599     then locale.t :x_days,         :count => (distance_in_minutes.to_f / 1440.0).round
-          when 129600..525599   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
+        when 2520..129599     then locale.t :x_days,         count: (distance_in_minutes.to_f / 1440.0).round
+        when 129600..525599   then locale.t :x_months,       count: (distance_in_minutes.to_f / 43200.0).round
           else
-            fyear = from_time.year
+          fyear = from_time.year
             fyear += 1 if from_time.month >= 3
             tyear = to_time.year
             tyear -= 1 if to_time.month < 3
-            leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
+            leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count { |x| Date.leap?(x) }
             minute_offset_for_leap_year = leap_years * 1440
             # Discount the leap year days when calculating year distance.
             # e.g. if there are 20 leap year days between 2 dates having the same day
@@ -55,11 +55,11 @@ module FreedomPatches
             remainder                   = (minutes_with_offset % 525600)
             distance_in_years           = (minutes_with_offset / 525600)
             if remainder < 131400
-              locale.t(:about_x_years,  :count => distance_in_years)
+              locale.t(:about_x_years,  count: distance_in_years)
             elsif remainder < 394200
-              locale.t(:over_x_years,   :count => distance_in_years)
+              locale.t(:over_x_years,   count: distance_in_years)
             else
-              locale.t(:almost_x_years, :count => distance_in_years + 1)
+              locale.t(:almost_x_years, count: distance_in_years + 1)
             end
         end
       end
diff --git a/lib/freedom_patches/raw_handlebars.rb b/lib/freedom_patches/raw_handlebars.rb
index a3bd47c8a7..3d3a8a84f2 100644
--- a/lib/freedom_patches/raw_handlebars.rb
+++ b/lib/freedom_patches/raw_handlebars.rb
@@ -54,11 +54,11 @@ end
 class Ember::Handlebars::Template
   include Discourse::Ember::Handlebars::Helper
 
-  def precompile_handlebars(string, input=nil)
+  def precompile_handlebars(string, input = nil)
     "requirejs('discourse-common/lib/raw-handlebars').template(#{Barber::Precompiler.compile(string)});"
   end
 
-  def compile_handlebars(string, input=nil)
+  def compile_handlebars(string, input = nil)
     "requirejs('discourse-common/lib/raw-handlebars').compile(#{indent(string).inspect});"
   end
 
diff --git a/lib/freedom_patches/safe_buffer.rb b/lib/freedom_patches/safe_buffer.rb
index b39a96ebaa..8c8a294bfd 100644
--- a/lib/freedom_patches/safe_buffer.rb
+++ b/lib/freedom_patches/safe_buffer.rb
@@ -4,7 +4,7 @@
 # The alternative is a broken website when this happens
 
 class ActiveSupport::SafeBuffer
-  def concat(value, raise_encoding_err=false)
+  def concat(value, raise_encoding_err = false)
     if !html_safe? || value.html_safe?
       super(value)
     else
@@ -22,8 +22,8 @@ class ActiveSupport::SafeBuffer
 
         self.force_encoding("UTF-8")
         unless valid_encoding?
-          encode!("utf-16","utf-8",:invalid => :replace)
-          encode!("utf-8","utf-16")
+          encode!("utf-16", "utf-8", invalid: :replace)
+          encode!("utf-8", "utf-16")
         end
         Rails.logger.warn("Encountered a non UTF-8 string in SafeBuffer - #{self} - #{encoding_diags}")
       end
@@ -36,7 +36,7 @@ class ActiveSupport::SafeBuffer
         Rails.logger.warn("Attempted to concat a non UTF-8 string in SafeBuffer - #{value} - #{encoding_diags}")
       end
 
-      concat(value,_raise=true)
+      concat(value, _raise = true)
     end
   end
 
diff --git a/lib/freedom_patches/schema_migration_details.rb b/lib/freedom_patches/schema_migration_details.rb
index bbae956c11..2c2722fdc7 100644
--- a/lib/freedom_patches/schema_migration_details.rb
+++ b/lib/freedom_patches/schema_migration_details.rb
@@ -4,7 +4,7 @@ module FreedomPatches
       rval = nil
 
       time = Benchmark.measure do
-        rval=super
+        rval = super
       end
 
       sql = <<SQL
diff --git a/lib/freedom_patches/scrub.rb b/lib/freedom_patches/scrub.rb
index 26917b5aec..05c1dba04d 100644
--- a/lib/freedom_patches/scrub.rb
+++ b/lib/freedom_patches/scrub.rb
@@ -1,13 +1,13 @@
 class String
   # A poor man's scrub, Ruby 2.1 has a much better implementation, but this will do
   unless method_defined? :scrub
-    def scrub(replace_char=nil)
+    def scrub(replace_char = nil)
       str = dup.force_encoding("utf-8")
 
       unless str.valid_encoding?
         # work around bust string with a double conversion
-        str.encode!("utf-16","utf-8",:invalid => :replace)
-        str.encode!("utf-8","utf-16")
+        str.encode!("utf-16", "utf-8", invalid: :replace)
+        str.encode!("utf-8", "utf-16")
       end
 
       str
diff --git a/lib/freedom_patches/sprockets_patches.rb b/lib/freedom_patches/sprockets_patches.rb
index ca83e2aabb..7cbf529aff 100644
--- a/lib/freedom_patches/sprockets_patches.rb
+++ b/lib/freedom_patches/sprockets_patches.rb
@@ -21,9 +21,9 @@ if Rails.env == "development"
       end
 
       if source[0] != ?/
-       # CODE REMOVED
-       # source = compute_asset_path(source, options)
-       source = "/assets/#{source}"
+        # CODE REMOVED
+        # source = compute_asset_path(source, options)
+        source = "/assets/#{source}"
       end
 
       relative_url_root = defined?(config.relative_url_root) && config.relative_url_root
diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index ae6c1d48f5..92f0b80b31 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -49,10 +49,10 @@ module I18n
     end
 
     def ensure_all_loaded!
-      backend.fallbacks(locale).each {|l| ensure_loaded!(l) }
+      backend.fallbacks(locale).each { |l| ensure_loaded!(l) }
     end
 
-    def search(query, opts=nil)
+    def search(query, opts = nil)
       locale = opts[:locale] || config.locale
 
       load_locale(locale) unless @loaded_locales.include?(locale)
@@ -167,7 +167,7 @@ module I18n
 
     alias_method :t, :translate
 
-    def exists?(key, locale=nil)
+    def exists?(key, locale = nil)
       locale ||= config.locale
       load_locale(locale) unless @loaded_locales.include?(locale)
       exists_no_cache?(key, locale)
diff --git a/lib/gaps.rb b/lib/gaps.rb
index c1f3f89602..0bf52b14fc 100644
--- a/lib/gaps.rb
+++ b/lib/gaps.rb
@@ -23,7 +23,7 @@ class Gaps
   end
 
   def find_gaps
-    return if @subset.nil? or @original.nil?
+    return if @subset.nil? || @original.nil?
 
     i = j = 0
     gaps = {}
@@ -48,7 +48,7 @@ class Gaps
       break if (i == @subset.size) || (j == @original.size)
     end
 
-    @after[@subset[i-1]] = @original[j..-1] if j < @original.size
+    @after[@subset[i - 1]] = @original[j..-1] if j < @original.size
   end
 
 end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index fb092563af..dd75225f82 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -34,7 +34,7 @@ class Guardian
 
   attr_accessor :can_see_emails
 
-  def initialize(user=nil)
+  def initialize(user = nil)
     @user = user.presence || AnonymousUser.new
   end
 
@@ -91,7 +91,7 @@ class Guardian
     end
   end
 
-  def can_create?(klass, parent=nil)
+  def can_create?(klass, parent = nil)
     return false unless authenticated? && klass
 
     # If no parent is provided, we look for a can_create_klass?
@@ -155,8 +155,6 @@ class Guardian
     true
   end
 
-
-
   # Can we impersonate this user?
   def can_impersonate?(target)
     target &&
@@ -233,7 +231,7 @@ class Guardian
     is_me?(user)
   end
 
-  def can_invite_to_forum?(groups=nil)
+  def can_invite_to_forum?(groups = nil)
     authenticated? &&
     (SiteSetting.max_invites_per_day.to_i > 0 || is_staff?) &&
     !SiteSetting.enable_sso &&
@@ -242,16 +240,16 @@ class Guardian
       (!SiteSetting.must_approve_users? && @user.has_trust_level?(TrustLevel[2])) ||
       is_staff?
     ) &&
-    (groups.blank? || is_admin?)
+    (groups.blank? || is_admin? || groups.all? { |g| can_edit_group?(g) })
   end
 
-  def can_invite_to?(object, group_ids=nil)
+  def can_invite_to?(object, groups = nil)
     return false unless authenticated?
     return true if is_admin?
     return false unless SiteSetting.enable_private_messages?
     return false if (SiteSetting.max_invites_per_day.to_i == 0 && !is_staff?)
     return false unless can_see?(object)
-    return false if group_ids.present?
+    return false if groups.present?
 
     if object.is_a?(Topic) && object.category
       if object.category.groups.any?
@@ -322,7 +320,6 @@ class Guardian
     end
   end
 
-
   private
 
   def is_my_own?(obj)
diff --git a/lib/guardian/category_guardian.rb b/lib/guardian/category_guardian.rb
index 7e67066e89..567fbdbdd9 100644
--- a/lib/guardian/category_guardian.rb
+++ b/lib/guardian/category_guardian.rb
@@ -2,7 +2,7 @@
 module CategoryGuardian
 
   # Creating Method
-  def can_create_category?(parent=nil)
+  def can_create_category?(parent = nil)
     is_admin? ||
     (
       SiteSetting.allow_moderators_to_create_categories &&
@@ -34,10 +34,10 @@ module CategoryGuardian
     if category.topic_count != 0
       oldest_topic = category.topics.where.not(id: category.topic_id).order('created_at ASC').limit(1).first
       if oldest_topic
-        return I18n.t('category.cannot_delete.topic_exists', {count: category.topic_count, topic_link: "<a href=\"#{oldest_topic.url}\">#{oldest_topic.title}</a>"})
+        return I18n.t('category.cannot_delete.topic_exists', count: category.topic_count, topic_link: "<a href=\"#{oldest_topic.url}\">#{oldest_topic.title}</a>")
       else
         # This is a weird case, probably indicating a bug.
-        return I18n.t('category.cannot_delete.topic_exists_no_oldest', {count: category.topic_count})
+        return I18n.t('category.cannot_delete.topic_exists_no_oldest', count: category.topic_count)
       end
     end
 
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 9b8f8ab0c1..da4275650c 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -3,7 +3,7 @@ module PostGuardian
 
   # Can the user act on the post in a particular way.
   #  taken_actions = the list of actions the user has already taken
-  def post_can_act?(post, action_key, opts={})
+  def post_can_act?(post, action_key, opts = {})
 
     return false unless can_see_post?(post)
 
@@ -85,7 +85,7 @@ module PostGuardian
     (!SpamRule::AutoBlock.block?(@user) || (!!parent.try(:private_message?) && parent.allowed_users.include?(@user))) && (
       !parent ||
       !parent.category ||
-      Category.post_create_allowed(self).where(:id => parent.category.id).count == 1
+      Category.post_create_allowed(self).where(id: parent.category.id).count == 1
     )
   end
 
@@ -186,8 +186,8 @@ module PostGuardian
     can_see_post?(post)
   end
 
-  def can_vote?(post, opts={})
-    post_can_act?(post,:vote, opts)
+  def can_vote?(post, opts = {})
+    post_can_act?(post, :vote, opts)
   end
 
   def can_change_post_owner?
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index add956351b..8b8f08a12d 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -76,7 +76,7 @@ module TopicGuardian
     is_staff?
   end
 
-  def can_see_topic?(topic, hide_deleted=true)
+  def can_see_topic?(topic, hide_deleted = true)
     return false unless topic
     return true if is_admin?
     return false if hide_deleted && topic.deleted_at && !can_see_deleted_topics?
@@ -107,6 +107,6 @@ module TopicGuardian
 
   def can_edit_featured_link?(category_id)
     return false unless SiteSetting.topic_featured_link_enabled
-    Category.where(id: category_id||SiteSetting.uncategorized_category_id, topic_featured_link_allowed: true).exists?
+    Category.where(id: category_id || SiteSetting.uncategorized_category_id, topic_featured_link_allowed: true).exists?
   end
 end
diff --git a/lib/html_normalize.rb b/lib/html_normalize.rb
index 072789c0cb..9b5ebb5d58 100644
--- a/lib/html_normalize.rb
+++ b/lib/html_normalize.rb
@@ -51,7 +51,7 @@ class HtmlNormalize
     Oga::XML::Text === node || !BLOCK.include?(node.name.downcase)
   end
 
-  def dump_node(node, indent=0, buffer)
+  def dump_node(node, indent = 0, buffer)
 
     if Oga::XML::Text === node
       if node.parent&.name
@@ -70,7 +70,7 @@ class HtmlNormalize
 
     attrs = node&.attributes
     if (attrs && attrs.length > 0)
-      attrs.sort!{|x,y| x.name <=> y.name}
+      attrs.sort! { |x, y| x.name <=> y.name }
       attrs.each do |a|
         buffer << " "
         buffer << a.name
@@ -94,20 +94,20 @@ class HtmlNormalize
     children&.each do |child|
       if block && inline?(child)
         inline_buffer ||= String.new
-        dump_node(child, indent+1, inline_buffer)
+        dump_node(child, indent + 1, inline_buffer)
       else
         if inline_buffer
-          buffer << " " * (indent+1) * 2
+          buffer << " " * (indent + 1) * 2
           buffer << inline_buffer.strip
           inline_buffer = nil
         else
-          dump_node(child, indent+1, buffer)
+          dump_node(child, indent + 1, buffer)
         end
       end
     end
 
     if inline_buffer
-      buffer << " " * (indent+1) * 2
+      buffer << " " * (indent + 1) * 2
       buffer << inline_buffer.strip
       inline_buffer = nil
     end
@@ -146,5 +146,4 @@ class HtmlNormalize
     nodes[start...finish]
   end
 
-
 end
diff --git a/lib/html_prettify.rb b/lib/html_prettify.rb
index 39a8ca7d30..df91d767d3 100644
--- a/lib/html_prettify.rb
+++ b/lib/html_prettify.rb
@@ -12,7 +12,7 @@ class HtmlPrettify < String
     new(html).to_html
   end
 
-    # Create a new RubyPants instance with the text in +string+.
+  # Create a new RubyPants instance with the text in +string+.
   #
   # Allowed elements in the options array:
   #
@@ -50,7 +50,7 @@ class HtmlPrettify < String
   # <tt>:ellipsis</tt>           :: <tt>&#8230;</tt>
   # <tt>:html_quote</tt>         :: <tt>&quot; </tt>
   #
-  def initialize(string, options=[2], entities = {})
+  def initialize(string, options = [2], entities = {})
     super string
 
     @options = [*options]
@@ -173,7 +173,6 @@ class HtmlPrettify < String
 
   protected
 
-
   # The string, with each instance of "<tt>--</tt>" translated to an
   # em-dash HTML entity.
   #
@@ -319,14 +318,14 @@ class HtmlPrettify < String
     new_str = str.dup
 
     {
-      :en_dash            => '-',
-      :em_dash            => '--',
-      :single_left_quote  => "'",
-      :single_right_quote => "'",
-      :double_left_quote  => '"',
-      :double_right_quote => '"',
-      :ellipsis           => '...'
-    }.each do |k,v|
+      en_dash: '-',
+      em_dash: '--',
+      single_left_quote: "'",
+      single_right_quote: "'",
+      double_left_quote: '"',
+      double_right_quote: '"',
+      ellipsis: '...'
+    }.each do |k, v|
       new_str.gsub!(/#{entity(k)}/, v)
     end
 
diff --git a/lib/html_to_markdown.rb b/lib/html_to_markdown.rb
index e536047740..21a3cded14 100644
--- a/lib/html_to_markdown.rb
+++ b/lib/html_to_markdown.rb
@@ -3,24 +3,23 @@ require "nokogiri"
 class HtmlToMarkdown
 
   class Block < Struct.new(:name, :head, :body, :opened, :markdown)
-    def initialize(name, head="", body="", opened=false, markdown=""); super; end
+    def initialize(name, head = "", body = "", opened = false, markdown = ""); super; end
   end
 
-  def initialize(html, opts={})
+  def initialize(html, opts = {})
     @opts = opts || {}
     @doc = fix_span_elements(Nokogiri::HTML(html))
 
     remove_whitespaces!
   end
 
-
   # If a `<div>` is within a `<span>` that's invalid, so let's hoist the `<div>` up
   def fix_span_elements(node)
     if node.name == 'span' && node.at('div')
       node.swap(node.children)
     end
 
-    node.children.each {|c| fix_span_elements(c)}
+    node.children.each { |c| fix_span_elements(c) }
     node
   end
 
diff --git a/lib/i18n/backend/discourse_i18n.rb b/lib/i18n/backend/discourse_i18n.rb
index ee133d5066..65a090cd26 100644
--- a/lib/i18n/backend/discourse_i18n.rb
+++ b/lib/i18n/backend/discourse_i18n.rb
@@ -51,7 +51,7 @@ module I18n
 
       protected
 
-        def find_results(regexp, results, translations, path=nil)
+        def find_results(regexp, results, translations, path = nil)
           return results if translations.blank?
 
           translations.each do |k_sym, v|
@@ -72,11 +72,12 @@ module I18n
         # the original translations before applying our overrides.
         def lookup(locale, key, scope = [], options = {})
           existing_translations = super(locale, key, scope, options)
+          return existing_translations if scope.is_a?(Array) && scope.include?(:models)
+
           overrides = options.dig(:overrides, locale)
 
-          if overrides && existing_translations
-            if options[:count]
-
+          if overrides
+            if existing_translations && options[:count]
               remapped_translations =
                 if existing_translations.is_a?(Hash)
                   Hash[existing_translations.map { |k, v| ["#{key}.#{k}", v] }]
diff --git a/lib/import/normalize.rb b/lib/import/normalize.rb
index 79dfb255f8..5279439dc4 100644
--- a/lib/import/normalize.rb
+++ b/lib/import/normalize.rb
@@ -4,10 +4,10 @@
 require 'htmlentities'
 module Import; end
 module Import::Normalize
-  def self.normalize_code_blocks(code, lang=nil)
+  def self.normalize_code_blocks(code, lang = nil)
     coder = HTMLEntities.new
     code.gsub(/<pre>\s*<code>\n?(.*?)\n?<\/code>\s*<\/pre>/m) {
-        "\n```#{lang}\n#{coder.decode($1)}\n```\n"
+      "\n```#{lang}\n#{coder.decode($1)}\n```\n"
     }
   end
 end
diff --git a/lib/import_export/category_exporter.rb b/lib/import_export/category_exporter.rb
index 9f182e7247..4e2a57e820 100644
--- a/lib/import_export/category_exporter.rb
+++ b/lib/import_export/category_exporter.rb
@@ -22,15 +22,14 @@ module ImportExport
       self
     end
 
-
     CATEGORY_ATTRS = [:id, :name, :color, :created_at, :user_id, :slug, :description, :text_color,
                       :auto_close_hours, :auto_close_based_on_last_post,
                       :topic_template, :suppress_from_homepage, :all_topics_wiki, :permissions_params]
 
     def export_categories
-      @export_data[:category] = CATEGORY_ATTRS.inject({}) { |h,a| h[a] = @category.send(a); h }
+      @export_data[:category] = CATEGORY_ATTRS.inject({}) { |h, a| h[a] = @category.send(a); h }
       @subcategories.find_each do |subcat|
-        @export_data[:subcategories] << CATEGORY_ATTRS.inject({}) { |h,a| h[a] = subcat.send(a); h }
+        @export_data[:subcategories] << CATEGORY_ATTRS.inject({}) { |h, a| h[a] = subcat.send(a); h }
       end
 
       # export groups that are mentioned in category permissions
@@ -49,7 +48,6 @@ module ImportExport
       self
     end
 
-
     GROUP_ATTRS = [ :id, :name, :created_at, :alias_level, :visible,
                     :automatic_membership_email_domains, :automatic_membership_retroactive,
                     :primary_group, :title, :grant_trust_level, :incoming_email]
@@ -57,7 +55,7 @@ module ImportExport
     def export_groups(group_names)
       group_names.each do |name|
         group = Group.find_by_name(name)
-        group_attrs = GROUP_ATTRS.inject({}) { |h,a| h[a] = group.send(a); h }
+        group_attrs = GROUP_ATTRS.inject({}) { |h, a| h[a] = group.send(a); h }
         group_attrs[:user_ids] = group.users.pluck(:id)
         @export_data[:groups] << group_attrs
       end
@@ -75,7 +73,7 @@ module ImportExport
       self
     end
 
-    def save_to_file(filename=nil)
+    def save_to_file(filename = nil)
       require 'json'
       output_basename = filename || File.join("category-export-#{Time.now.strftime("%Y-%m-%d-%H%M%S")}.json")
       File.open(output_basename, "w:UTF-8") do |f|
diff --git a/lib/import_export/category_importer.rb b/lib/import_export/category_importer.rb
index 25b57acfcb..8493b006a0 100644
--- a/lib/import_export/category_importer.rb
+++ b/lib/import_export/category_importer.rb
@@ -28,7 +28,7 @@ module ImportExport
         external_id = g.delete(:id)
         new_group = Group.find_by_name(g[:name]) || Group.create!(g)
         user_ids.each do |external_user_id|
-          new_group.add( User.find(@topic_importer.new_user_id(external_user_id)) ) rescue ActiveRecord::RecordNotUnique
+          new_group.add(User.find(@topic_importer.new_user_id(external_user_id))) rescue ActiveRecord::RecordNotUnique
         end
       end
     end
@@ -47,7 +47,7 @@ module ImportExport
         parent = Category.new(@export_data[:category])
         parent.user_id = @topic_importer.new_user_id(@export_data[:category][:user_id]) # imported user's new id
         parent.custom_fields["import_id"] = id
-        parent.permissions = permissions.present? ? permissions : {"everyone" => CategoryGroup.permission_types[:full]}
+        parent.permissions = permissions.present? ? permissions : { "everyone" => CategoryGroup.permission_types[:full] }
         parent.save!
         set_category_description(parent, @export_data[:category][:description])
       end
@@ -62,7 +62,7 @@ module ImportExport
           subcategory.parent_category_id = parent.id
           subcategory.user_id = @topic_importer.new_user_id(cat_attrs[:user_id])
           subcategory.custom_fields["import_id"] = id
-          subcategory.permissions = permissions.present? ? permissions : {"everyone" => CategoryGroup.permission_types[:full]}
+          subcategory.permissions = permissions.present? ? permissions : { "everyone" => CategoryGroup.permission_types[:full] }
           subcategory.save!
           set_category_description(subcategory, cat_attrs[:description])
         end
diff --git a/lib/import_export/import_export.rb b/lib/import_export/import_export.rb
index 4bb6fa9250..fad560768f 100644
--- a/lib/import_export/import_export.rb
+++ b/lib/import_export/import_export.rb
@@ -6,7 +6,7 @@ require "json"
 
 module ImportExport
 
-  def self.export_category(category_id, filename=nil)
+  def self.export_category(category_id, filename = nil)
     ImportExport::CategoryExporter.new(category_id).perform.save_to_file(filename)
   end
 
diff --git a/lib/import_export/topic_exporter.rb b/lib/import_export/topic_exporter.rb
index 78b4dc4d9e..4c494003ed 100644
--- a/lib/import_export/topic_exporter.rb
+++ b/lib/import_export/topic_exporter.rb
@@ -20,7 +20,6 @@ module ImportExport
       self
     end
 
-
     USER_ATTRS = [:id, :email, :username, :name, :created_at, :trust_level, :active, :last_emailed_at]
 
     def export_users
@@ -33,11 +32,9 @@ module ImportExport
           u = post.user
           unless @exported_user_ids.include?(u.id)
             x = USER_ATTRS.inject({}) { |h, a| h[a] = u.send(a); h; }
-            @export_data[:users] << x.merge({
-              bio_raw: u.user_profile.bio_raw,
-              website: u.user_profile.website,
-              location: u.user_profile.location
-            })
+            @export_data[:users] << x.merge(bio_raw: u.user_profile.bio_raw,
+                                            website: u.user_profile.website,
+                                            location: u.user_profile.location)
             @exported_user_ids << u.id
           end
         end
@@ -46,7 +43,6 @@ module ImportExport
       self
     end
 
-
     def export_topics
       @topic_ids.each do |topic_id|
         t = Topic.find(topic_id)
@@ -56,7 +52,6 @@ module ImportExport
       puts ""
     end
 
-
     TOPIC_ATTRS = [:id, :title, :created_at, :views, :category_id, :closed, :archived, :archetype]
     POST_ATTRS = [:id, :user_id, :post_number, :raw, :created_at, :reply_to_post_number,
                   :hidden, :hidden_reason_id, :wiki]
@@ -81,8 +76,7 @@ module ImportExport
       self
     end
 
-
-    def save_to_file(filename=nil)
+    def save_to_file(filename = nil)
       require 'json'
       output_basename = filename || File.join("topic-export-#{Time.now.strftime("%Y-%m-%d-%H%M%S")}.json")
       File.open(output_basename, "w:UTF-8") do |f|
diff --git a/lib/import_export/topic_importer.rb b/lib/import_export/topic_importer.rb
index e7fc2d8f36..c681d39c2f 100644
--- a/lib/import_export/topic_importer.rb
+++ b/lib/import_export/topic_importer.rb
@@ -18,7 +18,7 @@ module ImportExport
 
     def import_users
       @export_data[:users].each do |u|
-        existing = User.where(email: u[:email]).first
+        existing = User.with_email(email: u[:email]).first
         if existing
           if existing.custom_fields["import_id"] != u[:id]
             existing.custom_fields["import_id"] = u[:id]
@@ -36,14 +36,14 @@ module ImportExport
         puts ""
         print t[:title]
 
-        first_post_attrs = t[:posts].first.merge( t.slice(*(TopicExporter::TOPIC_ATTRS - [:id, :category_id])) )
+        first_post_attrs = t[:posts].first.merge(t.slice(*(TopicExporter::TOPIC_ATTRS - [:id, :category_id])))
         first_post_attrs[:user_id] = new_user_id(first_post_attrs[:user_id])
         first_post_attrs[:category] = new_category_id(t[:category_id])
 
         first_post = PostCustomField.where(name: "import_id", value: first_post_attrs[:id]).first.try(:post)
 
         unless first_post
-          first_post = create_post( first_post_attrs, first_post_attrs[:id] )
+          first_post = create_post(first_post_attrs, first_post_attrs[:id])
         end
 
         topic_id = first_post.topic_id
@@ -53,10 +53,8 @@ module ImportExport
           print "."
           existing = PostCustomField.where(name: "import_id", value: post_data[:id]).first.try(:post)
           unless existing
-            create_post(post_data.merge({
-              topic_id: topic_id,
-              user_id: new_user_id(post_data[:user_id])
-            }), post_data[:id]) # see ImportScripts::Base
+            create_post(post_data.merge(topic_id: topic_id,
+                                        user_id: new_user_id(post_data[:user_id])), post_data[:id]) # see ImportScripts::Base
           end
         end
       end
diff --git a/lib/inline_oneboxer.rb b/lib/inline_oneboxer.rb
new file mode 100644
index 0000000000..f345bef4d3
--- /dev/null
+++ b/lib/inline_oneboxer.rb
@@ -0,0 +1,72 @@
+require_dependency 'retrieve_title'
+
+class InlineOneboxer
+
+  def initialize(urls, opts = nil)
+    @urls = urls
+    @opts = opts || {}
+  end
+
+  def process
+    @urls.map { |url| InlineOneboxer.lookup(url, @opts) }.compact
+  end
+
+  def self.purge(url)
+    Rails.cache.delete(cache_key(url))
+  end
+
+  def self.cache_lookup(url)
+    Rails.cache.read(cache_key(url))
+  end
+
+  def self.lookup(url, opts = nil)
+    opts ||= {}
+
+    unless opts[:skip_cache]
+      cached = cache_lookup(url)
+      return cached if cached.present?
+    end
+
+    if route = Discourse.route_for(url)
+      if route[:controller] == "topics" &&
+        route[:action] == "show" &&
+        topic = (Topic.where(id: route[:topic_id].to_i).first rescue nil)
+
+        return onebox_for(url, topic.title, opts) if Guardian.new.can_see?(topic)
+      end
+    end
+
+    if whitelist = SiteSetting.inline_onebox_domains_whitelist
+      uri = URI(url) rescue nil
+
+      domains = whitelist.split('|')
+      if uri.present? &&
+        uri.hostname.present? &&
+        domains.include?(uri.hostname) &&
+        title = RetrieveTitle.crawl(url)
+        return onebox_for(url, title, opts)
+      end
+    end
+
+    nil
+  end
+
+  private
+
+    def self.onebox_for(url, title, opts)
+      onebox = {
+        url: url,
+        title: Emoji.gsub_emoji_to_unicode(title)
+      }
+      unless opts[:skip_cache]
+        Rails.cache.write(cache_key(url), onebox, expires_in: 1.day)
+      end
+
+      onebox
+    end
+
+    def self.cache_key(url)
+      "inline_onebox:#{url}"
+    end
+
+end
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 44a2fe537e..c352ee42d7 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -16,7 +16,7 @@ module JsLocaleHelper
     end
   end
 
-  def self.load_translations(locale, opts=nil)
+  def self.load_translations(locale, opts = nil)
     opts ||= {}
 
     @loaded_translations = nil if opts[:force]
@@ -149,7 +149,7 @@ module JsLocaleHelper
   end
 
   def self.generate_message_format(message_formats, locale_str)
-    formats = message_formats.map { |k,v| k.inspect << " : " << compile_message_format(locale_str, v) }.join(", ")
+    formats = message_formats.map { |k, v| k.inspect << " : " << compile_message_format(locale_str, v) }.join(", ")
 
     filename = "#{Rails.root}/lib/javascripts/locale/#{locale_str}.js"
     filename = "#{Rails.root}/lib/javascripts/locale/en.js" unless File.exists?(filename)
@@ -161,6 +161,7 @@ module JsLocaleHelper
   end
 
   def self.reset_context
+    @ctx&.dispose
     @ctx = nil
   end
 
diff --git a/lib/json_error.rb b/lib/json_error.rb
index e52f18edf4..5dfc720506 100644
--- a/lib/json_error.rb
+++ b/lib/json_error.rb
@@ -1,6 +1,6 @@
 module JsonError
 
-  def create_errors_json(obj, type=nil)
+  def create_errors_json(obj, type = nil)
     errors = create_errors_array obj
     errors[:error_type] = type if type
     errors
diff --git a/lib/letter_avatar.rb b/lib/letter_avatar.rb
index 62915edcab..93766c4b2d 100644
--- a/lib/letter_avatar.rb
+++ b/lib/letter_avatar.rb
@@ -89,7 +89,7 @@ class LetterAvatar
     end
 
     def to_rgb(color)
-      r,g,b = color
+      r, g, b = color
       "rgb(#{r},#{g},#{b})"
     end
 
@@ -108,7 +108,7 @@ class LetterAvatar
       skip = File.basename(cache_path)
       parent_path = File.dirname(cache_path)
       Dir.entries(parent_path).each do |path|
-        unless ['.','..'].include?(path) || path == skip
+        unless ['.', '..'].include?(path) || path == skip
           FileUtils.rm_rf(parent_path + "/" + path)
         end
       end
@@ -121,220 +121,220 @@ class LetterAvatar
   #   - H: 0 - 360
   #   - C: 0 - 2
   #   - L: 0.75 - 1.5
-  COLORS = [[198,125,40],
-      [61,155,243],
-      [74,243,75],
-      [238,89,166],
-      [52,240,224],
-      [177,156,155],
-      [240,120,145],
-      [111,154,78],
-      [237,179,245],
-      [237,101,95],
-      [89,239,155],
-      [43,254,70],
-      [163,212,245],
-      [65,152,142],
-      [165,135,246],
-      [181,166,38],
-      [187,229,206],
-      [77,164,25],
-      [179,246,101],
-      [234,93,37],
-      [225,155,115],
-      [142,140,188],
-      [223,120,140],
-      [249,174,27],
-      [244,117,225],
-      [137,141,102],
-      [75,191,146],
-      [188,239,142],
-      [164,199,145],
-      [173,120,149],
-      [59,195,89],
-      [222,198,220],
-      [68,145,187],
-      [236,204,179],
-      [159,195,72],
-      [188,121,189],
-      [166,160,85],
-      [181,233,37],
-      [236,177,85],
-      [121,147,160],
-      [234,218,110],
-      [241,157,191],
-      [62,200,234],
-      [133,243,34],
-      [88,149,110],
-      [59,228,248],
-      [183,119,118],
-      [251,195,45],
-      [113,196,122],
-      [197,115,70],
-      [80,175,187],
-      [103,231,238],
-      [240,72,133],
-      [228,149,241],
-      [180,188,159],
-      [172,132,85],
-      [180,135,251],
-      [236,194,58],
-      [217,176,109],
-      [88,244,199],
-      [186,157,239],
-      [113,230,96],
-      [206,115,165],
-      [244,178,163],
-      [230,139,26],
-      [241,125,89],
-      [83,160,66],
-      [107,190,166],
-      [197,161,210],
-      [198,203,245],
-      [238,117,19],
-      [228,119,116],
-      [131,156,41],
-      [145,178,168],
-      [139,170,220],
-      [233,95,125],
-      [87,178,230],
-      [157,200,119],
-      [237,140,76],
-      [229,185,186],
-      [144,206,212],
-      [236,209,158],
-      [185,189,79],
-      [34,208,66],
-      [84,238,129],
-      [133,140,134],
-      [67,157,94],
-      [168,179,25],
-      [140,145,240],
-      [151,241,125],
-      [67,162,107],
-      [200,156,21],
-      [169,173,189],
-      [226,116,189],
-      [133,231,191],
-      [194,161,63],
-      [241,77,99],
-      [241,217,53],
-      [123,204,105],
-      [210,201,119],
-      [229,108,155],
-      [240,91,72],
-      [187,115,210],
-      [240,163,100],
-      [178,217,57],
-      [179,135,116],
-      [204,211,24],
-      [186,135,57],
-      [223,176,135],
-      [204,148,151],
-      [116,223,50],
-      [95,195,46],
-      [123,160,236],
-      [181,172,131],
-      [142,220,202],
-      [240,140,112],
-      [172,145,164],
-      [228,124,45],
-      [135,151,243],
-      [42,205,125],
-      [192,233,116],
-      [119,170,114],
-      [158,138,26],
-      [73,190,183],
-      [185,229,243],
-      [227,107,55],
-      [196,205,202],
-      [132,143,60],
-      [233,192,237],
-      [62,150,220],
-      [205,201,141],
-      [106,140,190],
-      [161,131,205],
-      [135,134,158],
-      [198,139,81],
-      [115,171,32],
-      [101,181,67],
-      [149,137,119],
-      [37,142,183],
-      [183,130,175],
-      [168,125,133],
-      [124,142,87],
-      [236,156,171],
-      [232,194,91],
-      [219,200,69],
-      [144,219,34],
-      [219,95,187],
-      [145,154,217],
-      [165,185,100],
-      [127,238,163],
-      [224,178,198],
-      [119,153,120],
-      [124,212,92],
-      [172,161,105],
-      [231,155,135],
-      [157,132,101],
-      [122,185,146],
-      [53,166,51],
-      [70,163,90],
-      [150,190,213],
-      [210,107,60],
-      [166,152,185],
-      [159,194,159],
-      [39,141,222],
-      [202,176,161],
-      [95,140,229],
-      [168,142,87],
-      [93,170,203],
-      [159,142,54],
-      [14,168,39],
-      [94,150,149],
-      [187,206,136],
-      [157,224,166],
-      [235,158,208],
-      [109,232,216],
-      [141,201,87],
-      [208,124,118],
-      [142,125,214],
-      [19,237,174],
-      [72,219,41],
-      [234,102,111],
-      [168,142,79],
-      [188,135,35],
-      [95,155,143],
-      [148,173,116],
-      [223,112,95],
-      [228,128,236],
-      [206,114,54],
-      [195,119,88],
-      [235,140,94],
-      [235,202,125],
-      [233,155,153],
-      [214,214,238],
-      [246,200,35],
-      [151,125,171],
-      [132,145,172],
-      [131,142,118],
-      [199,126,150],
-      [61,162,123],
-      [58,176,151],
-      [215,141,69],
-      [225,154,220],
-      [220,77,167],
-      [233,161,64],
-      [130,221,137],
-      [81,191,129],
-      [169,162,140],
-      [174,177,222],
-      [236,174,47],
-      [233,188,180],
-      [69,222,172],
-      [71,232,93],
-      [118,211,238],
-      [157,224,83],
-      [218,105,73],
-      [126,169,36]]
+  COLORS = [[198, 125, 40],
+      [61, 155, 243],
+      [74, 243, 75],
+      [238, 89, 166],
+      [52, 240, 224],
+      [177, 156, 155],
+      [240, 120, 145],
+      [111, 154, 78],
+      [237, 179, 245],
+      [237, 101, 95],
+      [89, 239, 155],
+      [43, 254, 70],
+      [163, 212, 245],
+      [65, 152, 142],
+      [165, 135, 246],
+      [181, 166, 38],
+      [187, 229, 206],
+      [77, 164, 25],
+      [179, 246, 101],
+      [234, 93, 37],
+      [225, 155, 115],
+      [142, 140, 188],
+      [223, 120, 140],
+      [249, 174, 27],
+      [244, 117, 225],
+      [137, 141, 102],
+      [75, 191, 146],
+      [188, 239, 142],
+      [164, 199, 145],
+      [173, 120, 149],
+      [59, 195, 89],
+      [222, 198, 220],
+      [68, 145, 187],
+      [236, 204, 179],
+      [159, 195, 72],
+      [188, 121, 189],
+      [166, 160, 85],
+      [181, 233, 37],
+      [236, 177, 85],
+      [121, 147, 160],
+      [234, 218, 110],
+      [241, 157, 191],
+      [62, 200, 234],
+      [133, 243, 34],
+      [88, 149, 110],
+      [59, 228, 248],
+      [183, 119, 118],
+      [251, 195, 45],
+      [113, 196, 122],
+      [197, 115, 70],
+      [80, 175, 187],
+      [103, 231, 238],
+      [240, 72, 133],
+      [228, 149, 241],
+      [180, 188, 159],
+      [172, 132, 85],
+      [180, 135, 251],
+      [236, 194, 58],
+      [217, 176, 109],
+      [88, 244, 199],
+      [186, 157, 239],
+      [113, 230, 96],
+      [206, 115, 165],
+      [244, 178, 163],
+      [230, 139, 26],
+      [241, 125, 89],
+      [83, 160, 66],
+      [107, 190, 166],
+      [197, 161, 210],
+      [198, 203, 245],
+      [238, 117, 19],
+      [228, 119, 116],
+      [131, 156, 41],
+      [145, 178, 168],
+      [139, 170, 220],
+      [233, 95, 125],
+      [87, 178, 230],
+      [157, 200, 119],
+      [237, 140, 76],
+      [229, 185, 186],
+      [144, 206, 212],
+      [236, 209, 158],
+      [185, 189, 79],
+      [34, 208, 66],
+      [84, 238, 129],
+      [133, 140, 134],
+      [67, 157, 94],
+      [168, 179, 25],
+      [140, 145, 240],
+      [151, 241, 125],
+      [67, 162, 107],
+      [200, 156, 21],
+      [169, 173, 189],
+      [226, 116, 189],
+      [133, 231, 191],
+      [194, 161, 63],
+      [241, 77, 99],
+      [241, 217, 53],
+      [123, 204, 105],
+      [210, 201, 119],
+      [229, 108, 155],
+      [240, 91, 72],
+      [187, 115, 210],
+      [240, 163, 100],
+      [178, 217, 57],
+      [179, 135, 116],
+      [204, 211, 24],
+      [186, 135, 57],
+      [223, 176, 135],
+      [204, 148, 151],
+      [116, 223, 50],
+      [95, 195, 46],
+      [123, 160, 236],
+      [181, 172, 131],
+      [142, 220, 202],
+      [240, 140, 112],
+      [172, 145, 164],
+      [228, 124, 45],
+      [135, 151, 243],
+      [42, 205, 125],
+      [192, 233, 116],
+      [119, 170, 114],
+      [158, 138, 26],
+      [73, 190, 183],
+      [185, 229, 243],
+      [227, 107, 55],
+      [196, 205, 202],
+      [132, 143, 60],
+      [233, 192, 237],
+      [62, 150, 220],
+      [205, 201, 141],
+      [106, 140, 190],
+      [161, 131, 205],
+      [135, 134, 158],
+      [198, 139, 81],
+      [115, 171, 32],
+      [101, 181, 67],
+      [149, 137, 119],
+      [37, 142, 183],
+      [183, 130, 175],
+      [168, 125, 133],
+      [124, 142, 87],
+      [236, 156, 171],
+      [232, 194, 91],
+      [219, 200, 69],
+      [144, 219, 34],
+      [219, 95, 187],
+      [145, 154, 217],
+      [165, 185, 100],
+      [127, 238, 163],
+      [224, 178, 198],
+      [119, 153, 120],
+      [124, 212, 92],
+      [172, 161, 105],
+      [231, 155, 135],
+      [157, 132, 101],
+      [122, 185, 146],
+      [53, 166, 51],
+      [70, 163, 90],
+      [150, 190, 213],
+      [210, 107, 60],
+      [166, 152, 185],
+      [159, 194, 159],
+      [39, 141, 222],
+      [202, 176, 161],
+      [95, 140, 229],
+      [168, 142, 87],
+      [93, 170, 203],
+      [159, 142, 54],
+      [14, 168, 39],
+      [94, 150, 149],
+      [187, 206, 136],
+      [157, 224, 166],
+      [235, 158, 208],
+      [109, 232, 216],
+      [141, 201, 87],
+      [208, 124, 118],
+      [142, 125, 214],
+      [19, 237, 174],
+      [72, 219, 41],
+      [234, 102, 111],
+      [168, 142, 79],
+      [188, 135, 35],
+      [95, 155, 143],
+      [148, 173, 116],
+      [223, 112, 95],
+      [228, 128, 236],
+      [206, 114, 54],
+      [195, 119, 88],
+      [235, 140, 94],
+      [235, 202, 125],
+      [233, 155, 153],
+      [214, 214, 238],
+      [246, 200, 35],
+      [151, 125, 171],
+      [132, 145, 172],
+      [131, 142, 118],
+      [199, 126, 150],
+      [61, 162, 123],
+      [58, 176, 151],
+      [215, 141, 69],
+      [225, 154, 220],
+      [220, 77, 167],
+      [233, 161, 64],
+      [130, 221, 137],
+      [81, 191, 129],
+      [169, 162, 140],
+      [174, 177, 222],
+      [236, 174, 47],
+      [233, 188, 180],
+      [69, 222, 172],
+      [71, 232, 93],
+      [118, 211, 238],
+      [157, 224, 83],
+      [218, 105, 73],
+      [126, 169, 36]]
 end
diff --git a/lib/markdown_linker.rb b/lib/markdown_linker.rb
index b6bb1a2eb1..fab7c5a6b6 100644
--- a/lib/markdown_linker.rb
+++ b/lib/markdown_linker.rb
@@ -17,7 +17,7 @@ class MarkdownLinker
 
   def references
     result = ""
-    (@rendered..@index-1).each do |i|
+    (@rendered..@index - 1).each do |i|
       result << "[#{i}]: #{@markdown_links[i]}\n"
     end
     @rendered = @index
diff --git a/lib/memory_diagnostics.rb b/lib/memory_diagnostics.rb
index a49480677a..3a3fcd60f5 100644
--- a/lib/memory_diagnostics.rb
+++ b/lib/memory_diagnostics.rb
@@ -4,7 +4,7 @@ module MemoryDiagnostics
     File.exists?(snapshot_filename)
   end
 
-  def self.compare(from=nil, to=nil)
+  def self.compare(from = nil, to = nil)
 
     from ||= snapshot_filename
     if !to
@@ -38,7 +38,7 @@ module MemoryDiagnostics
       end
     end
 
-    report << summary.sort{|a,b| b[1] <=> a[1]}[0..50].map{|k,v|
+    report << summary.sort { |a, b| b[1] <=> a[1] }[0..50].map { |k, v|
       "#{k}: #{v}"
     }.join("\n")
 
@@ -59,9 +59,9 @@ module MemoryDiagnostics
     "#{snapshot_path}/#{Process.pid}.snapshot"
   end
 
-  def self.snapshot_current_process(filename=nil)
+  def self.snapshot_current_process(filename = nil)
     filename ||= snapshot_filename
-    pid=fork do
+    pid = fork do
       snapshot(filename)
     end
 
@@ -86,7 +86,7 @@ module MemoryDiagnostics
     IO.binwrite(filename, Marshal::dump(object_ids))
   end
 
-  def self.memory_report(opts={})
+  def self.memory_report(opts = {})
     begin
       # ruby 2.1
       GC.start(full_mark: true)
@@ -94,7 +94,6 @@ module MemoryDiagnostics
       GC.start
     end
 
-
     classes = {}
     large_objects = []
 
@@ -113,11 +112,11 @@ module MemoryDiagnostics
           classes[:unknown] += 1
         end
       end
-      classes = classes.sort{|a,b| b[1] <=> a[1]}[0..40].map{|klass, count| "#{klass}: #{count}"}
+      classes = classes.sort { |a, b| b[1] <=> a[1] }[0..40].map { |klass, count| "#{klass}: #{count}" }
 
-      classes << "\nLarge Objects (#{large_objects.length} larger than 200 bytes total size #{large_objects.map{|x,_| x}.sum}):\n"
+      classes << "\nLarge Objects (#{large_objects.length} larger than 200 bytes total size #{large_objects.map { |x, _| x }.sum}):\n"
 
-      classes += large_objects.sort{|a,b| b[0] <=> a[0]}[0..800].map do |size,object|
+      classes += large_objects.sort { |a, b| b[0] <=> a[0] }[0..800].map do |size, object|
         rval = "#{object.class}: size #{size}"
         rval << " " << object.to_s[0..500].gsub("\n", "") if (String === object) || (Regexp === object)
         rval << "\n"
@@ -125,10 +124,8 @@ module MemoryDiagnostics
       end
     end
 
-    stats = GC.stat.map{|k,v| "#{k}: #{v}"}
-    counts = ObjectSpace.count_objects.sort{|a,b| b[1] <=> a[1] }.map{|k,v| "#{k}: #{v}"}
-
-
+    stats = GC.stat.map { |k, v| "#{k}: #{v}" }
+    counts = ObjectSpace.count_objects.sort { |a, b| b[1] <=> a[1] }.map { |k, v| "#{k}: #{v}" }
 
     <<TEXT
 #{`hostname`.strip} pid:#{Process.pid} #{`cat /proc/#{Process.pid}/cmdline`.strip.gsub(/[^a-z1-9\/]/i, ' ')}
@@ -149,7 +146,6 @@ TEXT
 
   end
 
-
   def self.full_gc
     # gc start may not collect everything
     GC.start while new_count = decreased_count(new_count)
diff --git a/lib/message_bus_diags.rb b/lib/message_bus_diags.rb
index 3d7f795dce..6db37c1095 100644
--- a/lib/message_bus_diags.rb
+++ b/lib/message_bus_diags.rb
@@ -11,7 +11,7 @@ class MessageBusDiags
   end
 
   def self.establish_peer_names
-    MessageBus.publish "/server-name", {channel: "/server-name-reply/#{my_id}"}
+    MessageBus.publish "/server-name", channel: "/server-name-reply/#{my_id}"
   end
 
   def self.seen_hosts
diff --git a/lib/middleware/anonymous_cache.rb b/lib/middleware/anonymous_cache.rb
index 467d6db9d8..ad5f0eeff2 100644
--- a/lib/middleware/anonymous_cache.rb
+++ b/lib/middleware/anonymous_cache.rb
@@ -30,9 +30,9 @@ module Middleware
             # don't initialize params until later otherwise
             # you get a broken params on the request
             params = {}
-            user_agent  = @env[USER_AGENT]
+            user_agent = @env[USER_AGENT]
 
-            MobileDetection.resolve_mobile_view!(user_agent,params,session) ? :true : :false
+            MobileDetection.resolve_mobile_view!(user_agent, params, session) ? :true : :false
           end
 
         @is_mobile == :true
@@ -49,7 +49,7 @@ module Middleware
       def is_crawler?
         @is_crawler ||=
           begin
-            user_agent  = @env[USER_AGENT]
+            user_agent = @env[USER_AGENT]
             CrawlerDetection.crawler?(user_agent) ? :true : :false
           end
         @is_crawler == :true
@@ -60,7 +60,7 @@ module Middleware
       end
 
       def theme_key
-        key,_ = @request.cookies['theme_key']&.split(',')
+        key, _ = @request.cookies['theme_key']&.split(',')
         if key && Guardian.new.allow_theme?(key)
           key
         else
@@ -110,10 +110,10 @@ module Middleware
       #  that fills it up, this avoids a herd killing you, we can probably do this using a job or redis tricks
       #  but coordinating this is tricky
       def cache(result)
-        status,headers,response = result
+        status, headers, response = result
 
         if status == 200 && cache_duration
-          headers_stripped = headers.dup.delete_if{|k, _| ["Set-Cookie","X-MiniProfiler-Ids"].include? k}
+          headers_stripped = headers.dup.delete_if { |k, _| ["Set-Cookie", "X-MiniProfiler-Ids"].include? k }
           headers_stripped["X-Discourse-Cached"] = "true"
           parts = []
           response.each do |part|
@@ -121,12 +121,12 @@ module Middleware
           end
 
           $redis.setex(cache_key_body,  cache_duration, parts.join)
-          $redis.setex(cache_key_other, cache_duration, [status,headers_stripped].to_json)
+          $redis.setex(cache_key_other, cache_duration, [status, headers_stripped].to_json)
         else
           parts = response
         end
 
-        [status,headers,parts]
+        [status, headers, parts]
       end
 
       def clear_cache
@@ -136,7 +136,7 @@ module Middleware
 
     end
 
-    def initialize(app, settings={})
+    def initialize(app, settings = {})
       @app = app
     end
 
@@ -144,7 +144,7 @@ module Middleware
       helper = Helper.new(env)
 
       if helper.cacheable?
-        helper.cached or helper.cache(@app.call(env))
+        helper.cached || helper.cache(@app.call(env))
       else
         @app.call(env)
       end
diff --git a/lib/middleware/missing_avatars.rb b/lib/middleware/missing_avatars.rb
index 1d31568804..73bda77ab3 100644
--- a/lib/middleware/missing_avatars.rb
+++ b/lib/middleware/missing_avatars.rb
@@ -5,19 +5,19 @@ module Middleware
   # due to the files not being present locally. This middleware, only enabled in development
   # mode, will replace those with an appropriate image.
   class MissingAvatars
-    def initialize(app, settings={})
+    def initialize(app, settings = {})
       @app = app
     end
 
     def call(env)
       if (env['REQUEST_PATH'] =~ /^\/uploads\/default\/avatars/)
         path = "#{Rails.root}/public#{env['REQUEST_PATH']}"
-        unless File.exist?(path) 
+        unless File.exist?(path)
           default_image = "#{Rails.root}/public/images/d-logo-sketch-small.png"
           return [ 200, { 'Content-Type' => 'image/png' }, [ File.read(default_image)] ]
         end
       end
-      
+
       status, headers, response = @app.call(env)
       [status, headers, response]
     end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 90b36890d0..a2dae84e97 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -2,11 +2,11 @@ require_dependency 'middleware/anonymous_cache'
 
 class Middleware::RequestTracker
 
-  def initialize(app, settings={})
+  def initialize(app, settings = {})
     @app = app
   end
 
-  def self.log_request_on_site(data,host)
+  def self.log_request_on_site(data, host)
     RailsMultisite::ConnectionManagement.with_hostname(host) do
       log_request(data)
     end
@@ -46,8 +46,8 @@ class Middleware::RequestTracker
 
   TRACK_VIEW = "HTTP_DISCOURSE_TRACK_VIEW".freeze
   CONTENT_TYPE = "Content-Type".freeze
-  def self.get_data(env,result)
-    status,headers = result
+  def self.get_data(env, result)
+    status, headers = result
     status = status.to_i
 
     helper = Middleware::AnonymousCache::Helper.new(env)
@@ -74,21 +74,21 @@ class Middleware::RequestTracker
   ensure
 
     # we got to skip this on error ... its just logging
-    data = self.class.get_data(env,result) rescue nil
+    data = self.class.get_data(env, result) rescue nil
     host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
-      if result && (headers=result[1])
+      if result && (headers = result[1])
         headers["X-Discourse-TrackView"] = "1" if data[:track_view]
       end
-      log_later(data,host)
+      log_later(data, host)
     end
 
   end
 
-  def log_later(data,host)
-    Scheduler::Defer.later("Track view", _db=nil) do
-      self.class.log_request_on_site(data,host)
+  def log_later(data, host)
+    Scheduler::Defer.later("Track view", _db = nil) do
+      self.class.log_request_on_site(data, host)
     end
   end
 
diff --git a/lib/middleware/turbo_dev.rb b/lib/middleware/turbo_dev.rb
index beda165224..53e81cb50d 100644
--- a/lib/middleware/turbo_dev.rb
+++ b/lib/middleware/turbo_dev.rb
@@ -13,7 +13,7 @@ module Middleware
   #  config.middleware.insert 0, Middleware::TurboDev
   #
   class TurboDev
-    def initialize(app, settings={})
+    def initialize(app, settings = {})
       @app = app
     end
 
@@ -27,7 +27,7 @@ module Middleware
         etag = etag.gsub "\"", ""
         asset = Rails.application.assets.find_asset(name)
         if asset && asset.digest == etag
-          return [304,{},[]]
+          return [304, {}, []]
         end
       end
 
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 537c7faff0..8777f1b8ff 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -1,6 +1,7 @@
 require_dependency 'post_creator'
 require_dependency 'new_post_result'
 require_dependency 'post_enqueuer'
+require_dependency 'word_watcher'
 
 # Determines what actions should be taken with new posts.
 #
@@ -16,16 +17,16 @@ class NewPostManager
   end
 
   def self.handlers
-    sorted_handlers.map {|h| h[:proc]}
+    sorted_handlers.map { |h| h[:proc] }
   end
 
   def self.clear_handlers!
     @sorted_handlers = [{ priority: 0, proc: method(:default_handler) }]
   end
 
-  def self.add_handler(priority=0, &block)
+  def self.add_handler(priority = 0, &block)
     sorted_handlers << { priority: priority, proc: block }
-    @sorted_handlers.sort_by! {|h| -h[:priority]}
+    @sorted_handlers.sort_by! { |h| -h[:priority] }
   end
 
   def self.is_first_post?(manager)
@@ -66,21 +67,25 @@ class NewPostManager
 
   end
 
-  def self.user_needs_approval?(manager)
+  def self.exempt_user?(user)
+    user.staff? || user.staged
+  end
+
+  def self.post_needs_approval?(manager)
     user = manager.user
 
-    return false if user.staff? || user.staged
+    return false if exempt_user?(user)
 
     (user.trust_level <= TrustLevel.levels[:basic] && user.post_count < SiteSetting.approve_post_count) ||
     (user.trust_level < SiteSetting.approve_unless_trust_level.to_i) ||
     (manager.args[:title].present? && user.trust_level < SiteSetting.approve_new_topics_unless_trust_level.to_i) ||
     is_fast_typer?(manager) ||
-    matches_auto_block_regex?(manager)
+    matches_auto_block_regex?(manager) ||
+    WordWatcher.new("#{manager.args[:title]} #{manager.args[:raw]}").requires_approval?
   end
 
   def self.default_handler(manager)
-    if user_needs_approval?(manager)
-
+    if post_needs_approval?(manager)
       validator = Validators::PostValidator.new
       post = Post.new(raw: manager.args[:raw])
       post.user = manager.user
@@ -118,17 +123,25 @@ class NewPostManager
     SiteSetting.approve_post_count > 0 ||
     SiteSetting.approve_unless_trust_level.to_i > 0 ||
     SiteSetting.approve_new_topics_unless_trust_level.to_i > 0 ||
+    WordWatcher.words_for_action_exists?(:require_approval) ||
     handlers.size > 1
   end
 
   def initialize(user, args)
     @user = user
-    @args = args.delete_if {|_, v| v.nil?}
+    @args = args.delete_if { |_, v| v.nil? }
   end
 
   def perform
+    if !self.class.exempt_user?(@user) && WordWatcher.new("#{@args[:title]} #{@args[:raw]}").should_block?
+      result = NewPostResult.new(:created_post, false)
+      result.errors[:base] << I18n.t('contains_blocked_words')
+      return result
+    end
+
     # We never queue private messages
     return perform_create_post if @args[:archetype] == Archetype.private_message
+
     if args[:topic_id] && Topic.where(id: args[:topic_id], archetype: Archetype.private_message).exists?
       return perform_create_post
     end
@@ -145,11 +158,11 @@ class NewPostManager
   end
 
   # Enqueue this post in a queue
-  def enqueue(queue, reason=nil)
+  def enqueue(queue, reason = nil)
     result = NewPostResult.new(:enqueued)
     enqueuer = PostEnqueuer.new(@user, queue)
 
-    queued_args = {post_options: @args.dup}
+    queued_args = { post_options: @args.dup }
     queued_args[:raw] = queued_args[:post_options].delete(:raw)
     queued_args[:topic_id] = queued_args[:post_options].delete(:topic_id)
 
diff --git a/lib/new_post_result.rb b/lib/new_post_result.rb
index 63acab0b00..78725ea11f 100644
--- a/lib/new_post_result.rb
+++ b/lib/new_post_result.rb
@@ -10,7 +10,7 @@ class NewPostResult
   attr_accessor :queued_post
   attr_accessor :pending_count
 
-  def initialize(action, success=false)
+  def initialize(action, success = false)
     @action = action
     @success = success
   end
diff --git a/lib/oneboxer.rb b/lib/oneboxer.rb
index 1461894256..42862abe32 100644
--- a/lib/oneboxer.rb
+++ b/lib/oneboxer.rb
@@ -18,16 +18,16 @@ module Oneboxer
   end
 
   def self.ignore_redirects
-    @ignore_redirects ||= ['http://store.steampowered.com']
+    @ignore_redirects ||= ['http://www.dropbox.com', 'http://store.steampowered.com', Discourse.base_url]
   end
 
-  def self.preview(url, options=nil)
+  def self.preview(url, options = nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
     onebox_raw(url)[:preview]
   end
 
-  def self.onebox(url, options=nil)
+  def self.onebox(url, options = nil)
     options ||= {}
     invalidate(url) if options[:invalidate_oneboxes]
     onebox_raw(url)[:onebox]
@@ -74,7 +74,7 @@ module Oneboxer
 
   def self.append_source_topic_id(url, topic_id)
     # hack urls to create proper expansions
-    if url =~ Regexp.new("^#{Discourse.base_url.gsub(".","\\.")}.*$", true)
+    if url =~ Regexp.new("^#{Discourse.base_url.gsub(".", "\\.")}.*$", true)
       uri = URI.parse(url) rescue nil
       if uri && uri.path
         route = Rails.application.routes.recognize_path(uri.path) rescue nil
@@ -86,7 +86,7 @@ module Oneboxer
     url
   end
 
-  def self.apply(string_or_doc, args=nil)
+  def self.apply(string_or_doc, args = nil)
     doc = string_or_doc
     doc = Nokogiri::HTML::fragment(doc) if doc.is_a?(String)
     changed = false
@@ -95,7 +95,7 @@ module Oneboxer
       if args && args[:topic_id]
         url = append_source_topic_id(url, args[:topic_id])
       end
-      onebox, _preview = yield(url,element)
+      onebox, _preview = yield(url, element)
       if onebox
         parsed_onebox = Nokogiri::HTML::fragment(onebox)
         next unless parsed_onebox.children.count > 0
@@ -146,7 +146,6 @@ module Oneboxer
     end
 
     def self.onebox_raw(url)
-
       Rails.cache.fetch(onebox_cache_key(url), expires_in: 1.day) do
         fd = FinalDestination.new(url, ignore_redirects: ignore_redirects)
         uri = fd.resolve
diff --git a/lib/pbkdf2.rb b/lib/pbkdf2.rb
index f21cc8aebc..1032b4a1ad 100644
--- a/lib/pbkdf2.rb
+++ b/lib/pbkdf2.rb
@@ -20,18 +20,18 @@ class Pbkdf2
     u = ret = prf(h, password, salt + [1].pack("N"))
 
     2.upto(iterations) do
-     u = prf(h, password, u)
+      u = prf(h, password, u)
      ret.xor!(u)
     end
 
-    ret.bytes.map{|b| ("0" + b.to_s(16))[-2..-1]}.join("")
+    ret.bytes.map { |b| ("0" + b.to_s(16))[-2..-1] }.join("")
   end
 
   protected
 
   # fallback xor in case we need it for jruby ... way slower
-  def self.xor(x,y)
-    x.bytes.zip(y.bytes).map{|x,y| x ^ y}.pack('c*')
+  def self.xor(x, y)
+    x.bytes.zip(y.bytes).map { |x, y| x ^ y }.pack('c*')
   end
 
   def self.prf(hash_function, password, data)
diff --git a/lib/pinned_check.rb b/lib/pinned_check.rb
index b1a25a4d5d..54543499b3 100644
--- a/lib/pinned_check.rb
+++ b/lib/pinned_check.rb
@@ -2,16 +2,16 @@
 # taking into account anonymous users and users who have dismissed it
 class PinnedCheck
 
-  def self.unpinned?(topic,topic_user=nil)
+  def self.unpinned?(topic, topic_user = nil)
     topic.pinned_at &&
     topic_user &&
     topic_user.cleared_pinned_at &&
     topic_user.cleared_pinned_at > topic.pinned_at
   end
 
-  def self.pinned?(topic, topic_user=nil)
+  def self.pinned?(topic, topic_user = nil)
     !!topic.pinned_at &&
-    !unpinned?(topic,topic_user)
+    !unpinned?(topic, topic_user)
   end
 
 end
diff --git a/lib/plugin/auth_provider.rb b/lib/plugin/auth_provider.rb
index 570a245b08..996d9ba041 100644
--- a/lib/plugin/auth_provider.rb
+++ b/lib/plugin/auth_provider.rb
@@ -12,7 +12,7 @@ class Plugin::AuthProvider
   end
 
   def to_json
-    result = {name: name}
+    result = { name: name }
     result['customUrl'] = custom_url if custom_url
     result['titleOverride'] = title if title
     result['titleSetting'] = title_setting if title_setting
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index ca74990107..877a1ed9c7 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -2,7 +2,6 @@ require 'digest/sha1'
 require 'fileutils'
 require_dependency 'plugin/metadata'
 require_dependency 'plugin/auth_provider'
-require_dependency 'plugin/theme'
 
 class Plugin::CustomEmoji
   def self.cache_key
@@ -58,14 +57,14 @@ class Plugin::Instance
     }
   end
 
-  def initialize(metadata=nil, path=nil)
+  def initialize(metadata = nil, path = nil)
     @metadata = metadata
     @path = path
     @idx = 0
   end
 
   def add_admin_route(label, location)
-    @admin_route = {label: label, location: location}
+    @admin_route = { label: label, location: location }
   end
 
   def enabled?
@@ -74,7 +73,7 @@ class Plugin::Instance
 
   delegate :name, to: :metadata
 
-  def add_to_serializer(serializer, attr, define_include_method=true, &block)
+  def add_to_serializer(serializer, attr, define_include_method = true, &block)
     klass = "#{serializer.to_s.classify}Serializer".constantize rescue "#{serializer.to_s}Serializer".constantize
 
     klass.attributes(attr) unless attr.to_s.start_with?("include_")
@@ -164,7 +163,7 @@ class Plugin::Instance
   def delete_extra_automatic_assets(good_paths)
     return unless Dir.exists? auto_generated_path
 
-    filenames = good_paths.map{|f| File.basename(f)}
+    filenames = good_paths.map { |f| File.basename(f) }
     # nuke old files
     Dir.foreach(auto_generated_path) do |p|
       next if [".", ".."].include?(p)
@@ -242,13 +241,13 @@ class Plugin::Instance
     DiscoursePluginRegistry.register_html_builder(name, &block)
   end
 
-  def register_asset(file, opts=nil)
+  def register_asset(file, opts = nil)
     full_path = File.dirname(path) << "/assets/" << file
     assets << [full_path, opts]
   end
 
   def register_color_scheme(name, colors)
-    color_schemes << {name: name, colors: colors}
+    color_schemes << { name: name, colors: colors }
   end
 
   def register_seed_data(key, value)
@@ -259,14 +258,6 @@ class Plugin::Instance
     Plugin::CustomEmoji.register(name, url)
   end
 
-  def register_theme(name)
-    return unless enabled?
-
-    theme = Plugin::Theme.new(self, name)
-    yield theme
-    themes << theme
-  end
-
   def automatic_assets
     css = styles.join("\n")
     js = javascripts.join("\n")
@@ -362,14 +353,13 @@ JS
       target = Rails.root.to_s + "/public/plugins/"
 
       Discourse::Utils.execute_command('mkdir', '-p', target)
-      target << name.gsub(/\s/,"_")
+      target << name.gsub(/\s/, "_")
       # TODO a cleaner way of registering and unregistering
       Discourse::Utils.execute_command('rm', '-f', target)
       Discourse::Utils.execute_command('ln', '-s', public_data, target)
     end
   end
 
-
   def auth_provider(opts)
     provider = Plugin::AuthProvider.new
 
@@ -379,7 +369,6 @@ JS
     auth_providers << provider
   end
 
-
   # shotgun approach to gem loading, in future we need to hack bundler
   #  to at least determine dependencies do not clash before loading
   #
@@ -390,7 +379,7 @@ JS
     PluginGem.load(path, name, version, opts)
   end
 
-  def enabled_site_setting(setting=nil)
+  def enabled_site_setting(setting = nil)
     if setting
       @enabled_site_setting = setting
     else
@@ -421,9 +410,9 @@ JS
 
       Dir.glob("#{root_path}/**/*") do |f|
         if File.directory?(f)
-          yield [f,true]
+          yield [f, true]
         elsif f.to_s.ends_with?(".js.es6") || f.to_s.ends_with?(".hbs")
-          yield [f,false]
+          yield [f, false]
         end
       end
     end
@@ -442,7 +431,7 @@ JS
   def write_asset(path, contents)
     unless File.exists?(path)
       ensure_directory(path)
-      File.open(path,"w") { |f| f.write(contents) }
+      File.open(path, "w") { |f| f.write(contents) }
     end
   end
 
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index bcf8954d2b..123fccc396 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -25,7 +25,13 @@ class Plugin::Metadata
     "poll",
     "discourse-plugin-linkedin-auth",
     "discourse-plugin-office365-auth",
-    "discourse-oauth2-basic"
+    "discourse-oauth2-basic",
+    "discourse-math",
+    "discourse-bbcode-color",
+    "discourse-bbcode",
+    "discourse-affiliate",
+    "discourse-translator",
+    "discourse-patreon"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/plugin/theme.rb b/lib/plugin/theme.rb
deleted file mode 100644
index 04128d6f35..0000000000
--- a/lib/plugin/theme.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-class Plugin::Theme
-  attr_reader :color_scheme
-
-  def initialize(plugin, name)
-    @plugin = plugin
-    @name = name
-  end
-
-  def css(name)
-    @plugin.register_asset("stylesheets/#{name}.scss")
-  end
-
-  def set_color_scheme(scheme)
-    @color_scheme = scheme
-  end
-
-  def register_public
-    public_dir = "#{@plugin.directory}/public"
-    if File.exist?(public_dir)
-      Rails.application.config.before_initialize do |app|
-        app.middleware.insert_before(
-          ::Rack::Runtime,
-          ::ActionDispatch::Static,
-          public_dir
-        )
-      end
-    end
-  end
-end
-
diff --git a/lib/plugin_gem.rb b/lib/plugin_gem.rb
index 48df5e57c8..6347cc8dce 100644
--- a/lib/plugin_gem.rb
+++ b/lib/plugin_gem.rb
@@ -1,5 +1,5 @@
 module PluginGem
-  def self.load(path, name, version, opts=nil)
+  def self.load(path, name, version, opts = nil)
     opts ||= {}
 
     gems_path = File.dirname(path) + "/gems/#{RUBY_VERSION}"
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 405a7e0537..42b7055823 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -239,8 +239,8 @@ class PostCreator
     return unless post.reply_to_post_number.present?
 
     reply_info = Post.where(topic_id: post.topic_id, post_number: post.reply_to_post_number)
-                     .select(:user_id, :post_type)
-                     .first
+      .select(:user_id, :post_type)
+      .first
 
     if reply_info.present?
       post.reply_to_user_id ||= reply_info.user_id
@@ -316,11 +316,11 @@ class PostCreator
 
   def handle_spam
     if @spam
-      GroupMessage.create( Group[:moderators].name,
+      GroupMessage.create(Group[:moderators].name,
                            :spam_post_blocked,
-                           { user: @user,
-                             limit_once_per: 24.hours,
-                             message_params: {domains: @post.linked_hosts.keys.join(', ')} } )
+                           user: @user,
+                           limit_once_per: 24.hours,
+                           message_params: { domains: @post.linked_hosts.keys.join(', ') })
     elsif @post && errors.blank? && !skip_validations?
       SpamRulesEnforcer.enforce!(@post)
     end
@@ -339,7 +339,7 @@ class PostCreator
     unless @topic.topic_allowed_users.where(user_id: @user.id).exists?
       unless @topic.topic_allowed_groups.where('group_id IN (
                                               SELECT group_id FROM group_users where user_id = ?
-                                           )',@user.id).exists?
+                                           )', @user.id).exists?
         @topic.topic_allowed_users.create!(user_id: @user.id)
       end
     end
@@ -363,11 +363,13 @@ class PostCreator
   def find_category_id
     @opts.delete(:category) if @opts[:archetype].present? && @opts[:archetype] == Archetype.private_message
 
-    category = if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /^\d+$/)
-                 Category.find_by(id: @opts[:category])
-               else
-                 Category.find_by(name_lower: @opts[:category].try(:downcase))
-               end
+    category =
+      if (@opts[:category].is_a? Integer) || (@opts[:category] =~ /^\d+$/)
+        Category.find_by(id: @opts[:category])
+      else
+        Category.find_by(name_lower: @opts[:category].try(:downcase))
+      end
+
     category&.id
   end
 
@@ -491,7 +493,6 @@ class PostCreator
                        last_read_post_number: @post.post_number,
                        highest_seen_post_number: @post.post_number)
 
-
       # assume it took us 5 seconds of reading time to make a post
       PostTiming.record_timing(topic_id: @post.topic_id,
                                user_id: @post.user_id,
diff --git a/lib/post_destroyer.rb b/lib/post_destroyer.rb
index 07f34e85ee..3f7cdbffab 100644
--- a/lib/post_destroyer.rb
+++ b/lib/post_destroyer.rb
@@ -6,10 +6,10 @@ class PostDestroyer
 
   def self.destroy_old_hidden_posts
     Post.where(deleted_at: nil, hidden: true)
-        .where("hidden_at < ?", 30.days.ago)
-        .find_each do |post|
-        PostDestroyer.new(Discourse.system_user, post).destroy
-      end
+      .where("hidden_at < ?", 30.days.ago)
+      .find_each do |post|
+      PostDestroyer.new(Discourse.system_user, post).destroy
+    end
   end
 
   def self.destroy_stubs
@@ -17,26 +17,26 @@ class PostDestroyer
 
     # exclude deleted topics and posts that are actively flagged
     Post.where(deleted_at: nil, user_deleted: true)
-        .where("NOT EXISTS (
+      .where("NOT EXISTS (
             SELECT 1 FROM topics t
             WHERE t.deleted_at IS NOT NULL AND
                   t.id = posts.topic_id
         )")
-        .where("updated_at < ? AND post_number > 1", SiteSetting.delete_removed_posts_after.hours.ago)
-        .where("NOT EXISTS (
+      .where("updated_at < ? AND post_number > 1", SiteSetting.delete_removed_posts_after.hours.ago)
+      .where("NOT EXISTS (
                   SELECT 1
                   FROM post_actions pa
                   WHERE pa.post_id = posts.id AND
                         pa.deleted_at IS NULL AND
                         pa.post_action_type_id IN (?)
               )", PostActionType.notify_flag_type_ids)
-        .find_each do |post|
+      .find_each do |post|
 
       PostDestroyer.new(Discourse.system_user, post, context: context).destroy
     end
   end
 
-  def initialize(user, post, opts={})
+  def initialize(user, post, opts = {})
     @user = user
     @post = post
     @topic = post.topic if post
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index 3227f76c3c..cb8fdb56c1 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -1,5 +1,5 @@
 class PostJobsEnqueuer
-  def initialize(post, topic, new_topic, opts={})
+  def initialize(post, topic, new_topic, opts = {})
     @post = post
     @topic = topic
     @new_topic = new_topic
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 9b9ef68d54..f443a64d93 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -42,7 +42,7 @@ class PostRevisor
 
   attr_reader :category_changed
 
-  def initialize(post, topic=nil)
+  def initialize(post, topic = nil)
     @post = post
     @topic = topic || post.topic
   end
@@ -112,7 +112,7 @@ class PostRevisor
   # - bypass_bump: do not bump the topic, even if last post
   # - skip_validations: ask ActiveRecord to skip validations
   # - skip_revision: do not create a new PostRevision record
-  def revise!(editor, fields, opts={})
+  def revise!(editor, fields, opts = {})
     @editor = editor
     @fields = fields.with_indifferent_access
     @opts = opts
@@ -197,7 +197,7 @@ class PostRevisor
   end
 
   def topic_changed?
-    PostRevisor.tracked_topic_fields.keys.any? {|f| @fields.has_key?(f)}
+    PostRevisor.tracked_topic_fields.keys.any? { |f| @fields.has_key?(f) }
   end
 
   def revise_post
@@ -253,15 +253,15 @@ class PostRevisor
       # UserActionCreator will create new UserAction records for the new owner
 
       UserAction.where(target_post_id: @post.id)
-                .where(user_id: prev_owner.id)
-                .where(action_type: USER_ACTIONS_TO_REMOVE)
-                .destroy_all
+        .where(user_id: prev_owner.id)
+        .where(action_type: USER_ACTIONS_TO_REMOVE)
+        .destroy_all
 
       if @post.post_number == 1
         UserAction.where(target_topic_id: @post.topic_id)
-                  .where(user_id: prev_owner.id)
-                  .where(action_type: UserAction::NEW_TOPIC)
-                  .destroy_all
+          .where(user_id: prev_owner.id)
+          .where(action_type: UserAction::NEW_TOPIC)
+          .destroy_all
       end
     end
 
@@ -283,9 +283,9 @@ class PostRevisor
     # post owner changed
     if prev_owner && new_owner && prev_owner != new_owner
       likes = UserAction.where(target_post_id: @post.id)
-                        .where(user_id: prev_owner.id)
-                        .where(action_type: UserAction::WAS_LIKED)
-                        .update_all(user_id: new_owner.id)
+        .where(user_id: prev_owner.id)
+        .where(action_type: UserAction::WAS_LIKED)
+        .update_all(user_id: new_owner.id)
 
       private_message = @post.topic.private_message?
 
@@ -412,8 +412,8 @@ class PostRevisor
 
   def is_last_post?
     !Post.where(topic_id: @topic.id)
-         .where("post_number > ?", @post.post_number)
-         .exists?
+      .where("post_number > ?", @post.post_number)
+      .exists?
   end
 
   def plugin_callbacks
@@ -442,11 +442,13 @@ class PostRevisor
     doc = Nokogiri::HTML.fragment(@post.cooked)
     doc.css("img").remove
 
-    html = doc.css("p").first.inner_html.strip
-    new_description = html unless html.starts_with?(Category.post_template[0..50])
-
-    category.update_column(:description, new_description)
-    @category_changed = category
+    if html = doc.css("p").first&.inner_html&.strip
+      new_description = html unless html.starts_with?(Category.post_template[0..50])
+      category.update_column(:description, new_description)
+      @category_changed = category
+    else
+      @post.errors[:base] << I18n.t("category.errors.description_incomplete")
+    end
   end
 
   def advance_draft_sequence
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 3231301f53..cfe191f505 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -80,7 +80,7 @@ module PrettyText
     ctx_load(ctx, "#{Rails.root}/app/assets/javascripts/discourse-loader.js")
     ctx_load(ctx, "vendor/assets/javascripts/lodash.js")
     ctx_load_manifest(ctx, "pretty-text-bundle.js")
-
+    ctx_load_manifest(ctx, "markdown-it-bundle.js")
     root_path = "#{Rails.root}/app/assets/javascripts/"
 
     apply_es6_file(ctx, root_path, "discourse/lib/utilities")
@@ -123,11 +123,12 @@ module PrettyText
 
   def self.reset_context
     @ctx_init.synchronize do
+      @ctx&.dispose
       @ctx = nil
     end
   end
 
-  def self.markdown(text, opts={})
+  def self.markdown(text, opts = {})
     # we use the exact same markdown converter as the client
     # TODO: use the same extensions on both client and server (in particular the template for mentions)
     baked = nil
@@ -148,13 +149,6 @@ module PrettyText
         paths[:S3BaseUrl] = Discourse.store.absolute_base_url
       end
 
-      if SiteSetting.enable_experimental_markdown_it
-        # defer load markdown it
-        unless context.eval("window.markdownit")
-          ctx_load_manifest(context, "markdown-it-bundle.js")
-        end
-      end
-
       custom_emoji = {}
       Emoji.custom.map { |e| custom_emoji[e.name] = e.url }
 
@@ -170,6 +164,9 @@ module PrettyText
         __optInput.mentionLookup = __mentionLookup;
         __optInput.customEmoji = #{custom_emoji.to_json};
         __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
+        __optInput.lookupInlineOnebox = __lookupInlineOnebox;
+        #{opts[:linkify] == false ? "__optInput.linkify = false;" : ""}
+        __optInput.censoredWords = #{WordWatcher.words_for_action(:censor).join('|').to_json};
       JS
 
       if opts[:topicId]
@@ -182,12 +179,13 @@ module PrettyText
 
       buffer << "__textOptions = __buildOptions(__optInput);\n"
 
+      buffer << ("__pt = new __PrettyText(__textOptions);")
+
       # Be careful disabling sanitization. We allow for custom emails
       if opts[:sanitize] == false
-        buffer << ('__textOptions.sanitize = false;')
+        buffer << ('__pt.disableSanitizer();')
       end
 
-      buffer << ("__pt = new __PrettyText(__textOptions);")
       opts = context.eval(buffer)
 
       DiscourseEvent.trigger(:markdown_context, context)
@@ -226,7 +224,7 @@ module PrettyText
     end
   end
 
-  def self.cook(text, opts={})
+  def self.cook(text, opts = {})
     options = opts.dup
 
     # we have a minor inconsistency
@@ -282,7 +280,7 @@ module PrettyText
         if !uri.host.present? ||
            uri.host == site_uri.host ||
            uri.host.ends_with?("." << site_uri.host) ||
-           whitelist.any?{|u| uri.host == u || uri.host.ends_with?("." << u)}
+           whitelist.any? { |u| uri.host == u || uri.host.ends_with?("." << u) }
           # we are good no need for nofollow
         else
           l["rel"] = "nofollow noopener"
@@ -329,7 +327,7 @@ module PrettyText
     links
   end
 
-  def self.excerpt(html, max_length, options={})
+  def self.excerpt(html, max_length, options = {})
     # TODO: properly fix this HACK in ExcerptParser without introducing XSS
     doc = Nokogiri::HTML.fragment(html)
     strip_image_wrapping(doc)
@@ -343,7 +341,7 @@ module PrettyText
 
     # If the user is not basic, strip links from their bio
     fragment = Nokogiri::HTML.fragment(string)
-    fragment.css('a').each {|a| a.replace(a.inner_html) }
+    fragment.css('a').each { |a| a.replace(a.inner_html) }
     fragment.to_html
   end
 
diff --git a/lib/pretty_text/helpers.rb b/lib/pretty_text/helpers.rb
index abcb5b6665..38abc29092 100644
--- a/lib/pretty_text/helpers.rb
+++ b/lib/pretty_text/helpers.rb
@@ -1,3 +1,5 @@
+require_dependency 'inline_oneboxer'
+
 module PrettyText
   module Helpers
     extend self
@@ -9,7 +11,7 @@ module PrettyText
         I18n.t(key)
       else
         str = I18n.t(key, Hash[opts.entries].symbolize_keys).dup
-        opts.each { |k,v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
+        opts.each { |k, v| str.gsub!("{{#{k.to_s}}}", v.to_s) }
         str
       end
     end
@@ -43,6 +45,10 @@ module PrettyText
       end
     end
 
+    def lookup_inline_onebox(url)
+      InlineOneboxer.lookup(url)
+    end
+
     def get_topic_info(topic_id)
       return unless topic_id.is_a?(Integer)
       # TODO this only handles public topics, secured one do not get this
diff --git a/lib/pretty_text/shims.js b/lib/pretty_text/shims.js
index afb1a199a3..dc0ede53de 100644
--- a/lib/pretty_text/shims.js
+++ b/lib/pretty_text/shims.js
@@ -7,8 +7,6 @@ __utils = require('discourse/lib/utilities');
 __emojiUnicodeReplacer = null;
 
 __setUnicode = function(replacements) {
-  require('pretty-text/engines/discourse-markdown/emoji').setUnicodeReplacements(replacements);
-  
   let unicodeRegexp = new RegExp(Object.keys(replacements).sort().reverse().join("|"), "g");
 
   __emojiUnicodeReplacer = function(text) {
@@ -51,6 +49,10 @@ function __getURL(url) {
   return url;
 }
 
+function __lookupInlineOnebox(url) {
+  return __helpers.lookup_inline_onebox(url);
+}
+
 function __getTopicInfo(i) {
   return __helpers.get_topic_info(i);
 }
diff --git a/lib/primary_group_lookup.rb b/lib/primary_group_lookup.rb
index c61bb1b7e5..5f488dfedf 100644
--- a/lib/primary_group_lookup.rb
+++ b/lib/primary_group_lookup.rb
@@ -1,5 +1,5 @@
 class PrimaryGroupLookup
-  def initialize(user_ids=[])
+  def initialize(user_ids = [])
     @user_ids = user_ids.tap(&:compact!).tap(&:uniq!).tap(&:flatten!)
   end
 
@@ -20,13 +20,13 @@ class PrimaryGroupLookup
 
   def user_lookup_hash
     users_with_primary_group = User.where(id: @user_ids)
-        .where.not(primary_group_id: nil)
-        .select(:id, :primary_group_id)
+      .where.not(primary_group_id: nil)
+      .select(:id, :primary_group_id)
 
     group_lookup = {}
     group_ids = users_with_primary_group.map(&:primary_group_id).compact
     Group.where(id: group_ids).select(self.class.lookup_columns)
-         .each { |g| group_lookup[g.id] = g }
+      .each { |g| group_lookup[g.id] = g }
 
     hash = {}
     users_with_primary_group.each do |u|
diff --git a/lib/promotion.rb b/lib/promotion.rb
index 82dd5a998c..368032144d 100644
--- a/lib/promotion.rb
+++ b/lib/promotion.rb
@@ -7,7 +7,6 @@ class Promotion
     @user = user
   end
 
-
   # Review a user for a promotion. Delegates work to a review_#{trust_level} method.
   # Returns true if the user was promoted, false otherwise.
   def review
@@ -17,7 +16,6 @@ class Promotion
     # Promotion beyond basic requires some expensive queries, so don't do that here.
     return false if @user.trust_level >= TrustLevel[2]
 
-
     review_method = :"review_tl#{@user.trust_level}"
     return send(review_method) if respond_to?(review_method)
 
@@ -43,7 +41,7 @@ class Promotion
     new_level = level
 
     if new_level < old_level && !@user.trust_level_locked
-      next_up = new_level+1
+      next_up = new_level + 1
       key = "tl#{next_up}_met?"
       if self.class.respond_to?(key) && self.class.send(key, @user)
         raise Discourse::InvalidAccess.new, I18n.t('trust_levels.change_failed_explanation',
@@ -62,10 +60,10 @@ class Promotion
       if admin
         StaffActionLogger.new(admin).log_trust_level_change(@user, old_level, new_level)
       else
-        UserHistory.create!( action: UserHistory.actions[:auto_trust_level_change],
-                             target_user_id: @user.id,
-                             previous_value: old_level,
-                             new_value: new_level)
+        UserHistory.create!(action: UserHistory.actions[:auto_trust_level_change],
+                            target_user_id: @user.id,
+                            previous_value: old_level,
+                            new_value: new_level)
       end
       @user.save!
       @user.user_profile.recook_bio
@@ -77,7 +75,6 @@ class Promotion
     true
   end
 
-
   def self.tl2_met?(user)
     stat = user.user_stat
     return false if stat.topics_entered < SiteSetting.tl2_requires_topics_entered
diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 0985db9116..59359af107 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -72,7 +72,7 @@ class RateLimiter
 
     arr = $redis.lrange(@key, 0, @max) || []
     t0 = Time.now.to_i
-    arr.reject! {|a| (t0 - a.to_i) > @secs}
+    arr.reject! { |a| (t0 - a.to_i) > @secs }
     @max - arr.size
   end
 
diff --git a/lib/rate_limiter/limit_exceeded.rb b/lib/rate_limiter/limit_exceeded.rb
index 787bcdd381..0836ecd3a7 100644
--- a/lib/rate_limiter/limit_exceeded.rb
+++ b/lib/rate_limiter/limit_exceeded.rb
@@ -4,7 +4,7 @@ class RateLimiter
   class LimitExceeded < StandardError
     attr_reader :type
 
-    def initialize(available_in, type=nil)
+    def initialize(available_in, type = nil)
       @available_in = available_in
       @type = type
     end
diff --git a/lib/rate_limiter/on_create_record.rb b/lib/rate_limiter/on_create_record.rb
index 4232ab9a7f..14374de6a1 100644
--- a/lib/rate_limiter/on_create_record.rb
+++ b/lib/rate_limiter/on_create_record.rb
@@ -13,7 +13,7 @@ class RateLimiter
       return @rate_limiter if @rate_limiter.present?
 
       limit_key = "create_#{self.class.name.underscore}"
-      max_setting = if user && user.new_user? and SiteSetting.has_setting?("rate_limit_new_user_#{limit_key}")
+      max_setting = if user && user.new_user? && SiteSetting.has_setting?("rate_limit_new_user_#{limit_key}")
         SiteSetting.send("rate_limit_new_user_#{limit_key}")
       else
         SiteSetting.send("rate_limit_#{limit_key}")
@@ -31,7 +31,7 @@ class RateLimiter
     end
 
     module ClassMethods
-      def rate_limit(limiter_method=nil)
+      def rate_limit(limiter_method = nil)
 
         limiter_method = limiter_method || :default_rate_limiter
 
diff --git a/lib/retrieve_title.rb b/lib/retrieve_title.rb
new file mode 100644
index 0000000000..62d5498c15
--- /dev/null
+++ b/lib/retrieve_title.rb
@@ -0,0 +1,70 @@
+require_dependency 'final_destination'
+
+module RetrieveTitle
+  class ReadEnough < StandardError; end
+
+  def self.crawl(url)
+    extract_title(fetch_beginning(url))
+  rescue Exception
+    # If there was a connection error, do nothing
+  end
+
+  def self.extract_title(html)
+    title = nil
+    if doc = Nokogiri::HTML(html)
+
+      if node = doc.at('meta[property="og:title"]')
+        title = node['content']
+      end
+
+      title ||= doc.at('title')&.inner_text
+    end
+
+    if title.present?
+      title.gsub!(/\n/, ' ')
+      title.gsub!(/ +/, ' ')
+      title.strip!
+      return title
+    end
+    nil
+  end
+
+  private
+
+    def self.max_chunk_size(uri)
+      # Amazon leaves the title until very late. Normally it's a bad idea to make an exception for
+      # one host but amazon is a big one.
+      return 80 if uri.host =~ /amazon\.(com|ca|co\.uk|es|fr|de|it|com\.au|com\.br|cn|in|co\.jp|com\.mx)$/
+
+      # default is 10k
+      10
+    end
+
+    # Fetch the beginning of a HTML document at a url
+    def self.fetch_beginning(url)
+      # Never crawl in test mode
+      return if Rails.env.test?
+
+      fd = FinalDestination.new(url)
+      uri = fd.resolve
+      return "" unless uri
+
+      result = ""
+      streamer = lambda do |chunk, _, _|
+        result << chunk
+
+        # Using exceptions for flow control is really bad, but there really seems to
+        # be no sane way to get a stream to stop reading in Excon (or Net::HTTP for
+        # that matter!)
+        raise ReadEnough.new if result.size > (max_chunk_size(uri) * 1024)
+      end
+      Excon.get(uri.to_s, response_block: streamer, read_timeout: 20, headers: fd.request_headers)
+      result
+
+    rescue Excon::Errors::SocketError => ex
+      return result if ex.socket_error.is_a?(ReadEnough)
+      raise
+    rescue ReadEnough
+      result
+    end
+end
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 7fbfcc8d10..778808a701 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -6,7 +6,7 @@ class S3Helper
 
   attr_reader :s3_bucket_name
 
-  def initialize(s3_upload_bucket, tombstone_prefix='', options={})
+  def initialize(s3_upload_bucket, tombstone_prefix = '', options = {})
     @s3_options = default_s3_options.merge(options)
 
     @s3_bucket_name, @s3_bucket_folder_path = begin
@@ -24,14 +24,14 @@ class S3Helper
     check_missing_options
   end
 
-  def upload(file, path, options={})
+  def upload(file, path, options = {})
     path = get_path_for_s3_upload(path)
     obj = s3_bucket.object(path)
     obj.upload_file(file, options)
     path
   end
 
-  def remove(s3_filename, copy_to_tombstone=false)
+  def remove(s3_filename, copy_to_tombstone = false)
     bucket = s3_bucket
 
     # copy the file in tombstone
@@ -50,9 +50,8 @@ class S3Helper
     return if @tombstone_prefix.blank?
 
     # cf. http://docs.aws.amazon.com/AmazonS3/latest/dev/object-lifecycle-mgmt.html
-    s3_resource.client.put_bucket_lifecycle({
-      bucket: @s3_bucket_name,
-      lifecycle_configuration: {
+    s3_resource.client.put_bucket_lifecycle(bucket: @s3_bucket_name,
+                                            lifecycle_configuration: {
         rules: [
           {
             id: "purge-tombstone",
@@ -61,8 +60,7 @@ class S3Helper
             prefix: @tombstone_prefix
           }
         ]
-      }
-    })
+      })
   end
 
   private
diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rb
index e055e7f920..7b4abf7d64 100644
--- a/lib/scheduler/defer.rb
+++ b/lib/scheduler/defer.rb
@@ -22,7 +22,7 @@ module Scheduler
       @async = val
     end
 
-    def later(desc = nil, db=RailsMultisite::ConnectionManagement.current_db, &blk)
+    def later(desc = nil, db = RailsMultisite::ConnectionManagement.current_db, &blk)
       if @async
         start_thread unless (@thread && @thread.alive?) || @paused
         @queue << [db, blk, desc]
@@ -43,7 +43,7 @@ module Scheduler
 
     def do_all_work
       while !@queue.empty?
-        do_work(_non_block=true)
+        do_work(_non_block = true)
       end
     end
 
@@ -61,16 +61,16 @@ module Scheduler
     end
 
     # using non_block to match Ruby #deq
-    def do_work(non_block=false)
+    def do_work(non_block = false)
       db, job, desc = @queue.deq(non_block)
       begin
         RailsMultisite::ConnectionManagement.establish_connection(db: db) if db
         job.call
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Running deferred code '#{desc}'"})
+        Discourse.handle_job_exception(ex, message: "Running deferred code '#{desc}'")
       end
     rescue => ex
-      Discourse.handle_job_exception(ex, {message: "Processing deferred code queue"})
+      Discourse.handle_job_exception(ex, message: "Processing deferred code queue")
     ensure
       ActiveRecord::Base.connection_handler.clear_active_connections!
     end
diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
index ec8e249e9b..6b6cf9fd0e 100644
--- a/lib/scheduler/manager.rb
+++ b/lib/scheduler/manager.rb
@@ -34,16 +34,7 @@ module Scheduler
         end
         @thread = Thread.new do
           while !@stopped
-            if @manager.enable_stats
-              begin
-                RailsMultisite::ConnectionManagement.establish_connection(db: "default")
-                process_queue
-              ensure
-                ActiveRecord::Base.connection_handler.clear_active_connections!
-              end
-            else
-              process_queue
-            end
+            process_queue
           end
         end
       end
@@ -51,13 +42,13 @@ module Scheduler
       def keep_alive
         @manager.keep_alive
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Scheduling manager keep-alive"})
+        Discourse.handle_job_exception(ex, message: "Scheduling manager keep-alive")
       end
 
       def reschedule_orphans
         @manager.reschedule_orphans!
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Scheduling manager orphan rescheduler"})
+        Discourse.handle_job_exception(ex, message: "Scheduling manager orphan rescheduler")
       end
 
       def hostname
@@ -69,6 +60,7 @@ module Scheduler
       end
 
       def process_queue
+
         klass = @queue.deq
         return unless klass
 
@@ -83,15 +75,23 @@ module Scheduler
         begin
           info.prev_result = "RUNNING"
           @mutex.synchronize { info.write! }
+
           if @manager.enable_stats
-            stat = SchedulerStat.create!(
-              name: klass.to_s,
-              hostname: hostname,
-              pid: Process.pid,
-              started_at: Time.zone.now,
-              live_slots_start: GC.stat[:heap_live_slots]
-            )
+            begin
+              RailsMultisite::ConnectionManagement.establish_connection(db: "default")
+
+              stat = SchedulerStat.create!(
+                name: klass.to_s,
+                hostname: hostname,
+                pid: Process.pid,
+                started_at: Time.zone.now,
+                live_slots_start: GC.stat[:heap_live_slots]
+              )
+            ensure
+              ActiveRecord::Base.connection_handler.clear_active_connections!
+            end
           end
+
           klass.new.perform
         rescue => e
           if e.class != Jobs::HandledExceptionWrapper
@@ -117,24 +117,34 @@ module Scheduler
           @mutex.synchronize { info.write! }
         end
       rescue => ex
-        Discourse.handle_job_exception(ex, {message: "Processing scheduled job queue"})
+        Discourse.handle_job_exception(ex, message: "Processing scheduled job queue")
       ensure
         @running = false
+        ActiveRecord::Base.connection_handler.clear_active_connections!
       end
 
       def stop!
+        return if @stopped
+
         @mutex.synchronize do
           @stopped = true
 
           @keep_alive_thread.kill
           @reschedule_orphans_thread.kill
 
+          @keep_alive_thread.join
+          @reschedule_orphans_thread.join
+
           enq(nil)
 
-          Thread.new do
-            sleep 5
+          kill_thread = Thread.new do
+            sleep 0.5
             @thread.kill
           end
+
+          @thread.join
+          kill_thread.kill
+          kill_thread.join
         end
       end
 
@@ -165,11 +175,11 @@ module Scheduler
 
     end
 
-    def self.without_runner(redis=nil)
+    def self.without_runner(redis = nil)
       self.new(redis, skip_runner: true)
     end
 
-    def initialize(redis = nil, options=nil)
+    def initialize(redis = nil, options = nil)
       @redis = $redis || redis
       @random_ratio = 0.1
       unless options && options[:skip_runner]
@@ -226,7 +236,7 @@ module Scheduler
       end
     end
 
-    def reschedule_orphans_on!(hostname=nil)
+    def reschedule_orphans_on!(hostname = nil)
       redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key|
         klass = get_klass(key)
         next unless klass
@@ -254,7 +264,7 @@ module Scheduler
       end
     end
 
-    def schedule_next_job(hostname=nil)
+    def schedule_next_job(hostname = nil)
       (key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true
       return unless key
 
@@ -300,7 +310,6 @@ module Scheduler
       end
     end
 
-
     def self.discover_schedules
       # hack for developemnt reloader is crazytown
       # multiple classes with same name can be in
@@ -333,7 +342,7 @@ module Scheduler
       "_scheduler_lock_"
     end
 
-    def self.queue_key(hostname=nil)
+    def self.queue_key(hostname = nil)
       if hostname
         "_scheduler_queue_#{hostname}_"
       else
@@ -341,7 +350,7 @@ module Scheduler
       end
     end
 
-    def self.schedule_key(klass,hostname=nil)
+    def self.schedule_key(klass, hostname = nil)
       if hostname
         "_scheduler_#{klass}_#{hostname}"
       else
diff --git a/lib/scheduler/schedule.rb b/lib/scheduler/schedule.rb
index a00fe1330f..05c8085bc1 100644
--- a/lib/scheduler/schedule.rb
+++ b/lib/scheduler/schedule.rb
@@ -1,13 +1,13 @@
 module Scheduler::Schedule
 
-  def daily(options=nil)
+  def daily(options = nil)
     if options
       @daily = options
     end
     @daily
   end
 
-  def every(duration=nil)
+  def every(duration = nil)
     if duration
       @every = duration
       if manager = Scheduler::Manager.current
diff --git a/lib/scheduler/schedule_info.rb b/lib/scheduler/schedule_info.rb
index 755bc621a9..08c7756967 100644
--- a/lib/scheduler/schedule_info.rb
+++ b/lib/scheduler/schedule_info.rb
@@ -28,6 +28,9 @@ module Scheduler
       @next_run = @prev_run = @prev_result = @prev_duration = @current_owner = nil
     end
 
+    # this means the schedule is going to fire, it is setup correctly
+    # invalid schedules are fixed by running "schedule!"
+    # this happens automatically after if fire by the manager
     def valid?
       return false unless @next_run
       (!@prev_run && @next_run < Time.now.to_i + 5.minutes) || valid_every? || valid_daily?
@@ -42,8 +45,9 @@ module Scheduler
 
     def valid_daily?
       return false unless @klass.daily
+      return true if !@prev_run && @next_run && @next_run <= (Time.zone.now + 1.day).to_i
       !!@prev_run &&
-        @prev_run <= Time.now.to_i &&
+        @prev_run <= Time.zone.now.to_i &&
         @next_run < @prev_run + 1.day
     end
 
@@ -63,7 +67,7 @@ module Scheduler
       return if valid?
 
       at = @klass.daily[:at] || 0
-      today_begin = Time.now.midnight.to_i
+      today_begin = Time.zone.now.midnight.to_i
       today_offset = DateTime.now.seconds_since_midnight
 
       # If it's later today
diff --git a/lib/scheduler/web.rb b/lib/scheduler/web.rb
index 6d414ce8e9..e9d573ea44 100644
--- a/lib/scheduler/web.rb
+++ b/lib/scheduler/web.rb
@@ -15,8 +15,8 @@ module Scheduler
           return unless duration
           if duration < 1000
             "#{duration}ms"
-          elsif duration < 60*1000
-            "#{'%.2f' % (duration/1000.0)} secs"
+          elsif duration < 60 * 1000
+            "#{'%.2f' % (duration / 1000.0)} secs"
           end
         end
       end
@@ -24,7 +24,7 @@ module Scheduler
       app.get "/scheduler" do
         RailsMultisite::ConnectionManagement.with_connection("default") do
           @manager = Scheduler::Manager.without_runner
-          @schedules = Scheduler::Manager.discover_schedules.sort do |a,b|
+          @schedules = Scheduler::Manager.discover_schedules.sort do |a, b|
             a_next = a.schedule_info.next_run
             b_next = b.schedule_info.next_run
             if a_next && b_next
@@ -35,13 +35,13 @@ module Scheduler
               1
             end
           end
-          erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: {view_path: VIEWS}
+          erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: { view_path: VIEWS }
         end
       end
 
       app.get "/scheduler/history" do
         @scheduler_stats = SchedulerStat.order('started_at desc').limit(200)
-        erb File.read(File.join(VIEWS, 'history.erb')), locals: {view_path: VIEWS}
+        erb File.read(File.join(VIEWS, 'history.erb')), locals: { view_path: VIEWS }
       end
 
       app.post "/scheduler/:name/trigger" do
diff --git a/lib/score_calculator.rb b/lib/score_calculator.rb
index 8901c12e5a..baf93cb457 100644
--- a/lib/score_calculator.rb
+++ b/lib/score_calculator.rb
@@ -11,19 +11,18 @@ class ScoreCalculator
     }
   end
 
-  def initialize(weightings=nil)
+  def initialize(weightings = nil)
     @weightings = weightings || ScoreCalculator.default_score_weights
   end
 
   # Calculate the score for all posts based on the weightings
-  def calculate(opts=nil)
+  def calculate(opts = nil)
     update_posts_score(opts)
     update_posts_rank(opts)
     update_topics_rank(opts)
     update_topics_percent_rank(opts)
   end
 
-
   private
 
   def update_posts_score(opts)
@@ -110,7 +109,6 @@ SQL
               posts_required: SiteSetting.summary_posts_required,
               score_required: SiteSetting.summary_score_threshold)
 
-
     filter_topics(builder, opts)
 
     builder.exec
@@ -131,7 +129,6 @@ SQL
     builder.exec
   end
 
-
   def filter_topics(builder, opts)
     return builder unless opts
 
diff --git a/lib/screening_model.rb b/lib/screening_model.rb
index 26ed789c6c..62cc0eb8a1 100644
--- a/lib/screening_model.rb
+++ b/lib/screening_model.rb
@@ -24,7 +24,7 @@ module ScreeningModel
   end
 
   def action_name=(arg)
-    raise ArgumentError.new("Invalid action type #{arg}") if arg.nil? or !self.class.actions.has_key?(arg.to_sym)
+    raise ArgumentError.new("Invalid action type #{arg}") if arg.nil? || !self.class.actions.has_key?(arg.to_sym)
     self.action_type = self.class.actions[arg.to_sym]
   end
 
diff --git a/lib/search.rb b/lib/search.rb
index b9cc5dde16..a8c8282c59 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -20,32 +20,34 @@ class Search
     %w(topic category user private_messages)
   end
 
-  def self.long_locale
-    # if adding a language see:
-    # /usr/share/postgresql/9.3/tsearch_data for possible options
-    # Do not add languages that are missing without amending the
+  def self.ts_config(locale = SiteSetting.default_locale)
+    # if adding a text search configuration, you should check PG beforehand:
+    # SELECT cfgname FROM pg_ts_config;
+    # As an aside, dictionaries can be listed by `\dFd`, the
+    # physical locations are in /usr/share/postgresql/<version>/tsearch_data.
+    # But it may not appear there based on pg extension configuration.
     # base docker config
     #
-    case SiteSetting.default_locale.to_sym
-      when :da     then 'danish'
-      when :de     then 'german'
-      when :en     then 'english'
-      when :es     then 'spanish'
-      when :fr     then 'french'
-      when :it     then 'italian'
-      when :nl     then 'dutch'
-      when :nb_NO  then 'norwegian'
-      when :pt     then 'portuguese'
-      when :pt_BR  then 'portuguese'
-      when :sv     then 'swedish'
-      when :ru     then 'russian'
-      else 'simple' # use the 'simple' stemmer for other languages
+    case locale.to_sym
+    when :da     then 'danish'
+    when :de     then 'german'
+    when :en     then 'english'
+    when :es     then 'spanish'
+    when :fr     then 'french'
+    when :it     then 'italian'
+    when :nl     then 'dutch'
+    when :nb_NO  then 'norwegian'
+    when :pt     then 'portuguese'
+    when :pt_BR  then 'portuguese'
+    when :sv     then 'swedish'
+    when :ru     then 'russian'
+    else 'simple' # use the 'simple' stemmer for other languages
     end
   end
 
   def self.rebuild_problem_posts(limit = 10000)
     posts = Post.joins(:topic)
-            .where('posts.id IN (
+      .where('posts.id IN (
                SELECT p2.id FROM posts p2
                LEFT JOIN post_search_data pd ON locale = ? AND p2.id = pd.post_id
                WHERE pd.post_id IS NULL
@@ -58,7 +60,7 @@ class Search
     end
 
     posts = Post.joins(:topic)
-            .where('posts.id IN (
+      .where('posts.id IN (
                SELECT p2.id FROM posts p2
                LEFT JOIN topic_search_data pd ON locale = ? AND p2.topic_id = pd.topic_id
                WHERE pd.topic_id IS NULL AND p2.post_number = 1
@@ -73,21 +75,16 @@ class Search
     nil
   end
 
-  def self.prepare_data(search_data)
+  def self.prepare_data(search_data, purpose = :query)
     data = search_data.squish
-    # TODO rmmseg is designed for chinese, we need something else for Korean / Japanese
+    # TODO cppjieba_rb is designed for chinese, we need something else for Korean / Japanese
     if ['zh_TW', 'zh_CN', 'ja', 'ko'].include?(SiteSetting.default_locale) || SiteSetting.search_tokenize_chinese_japanese_korean
-      unless defined? RMMSeg
-        require 'rmmseg'
-        RMMSeg::Dictionary.load_dictionaries
-      end
-
-      algo = RMMSeg::Algorithm.new(search_data)
-
-      data = ""
-      while token = algo.next_token
-        data << token.text << " "
+      unless defined? CppjiebaRb
+        require 'cppjieba_rb'
       end
+      mode = (purpose == :query ? :query : :mix)
+      data = CppjiebaRb.segment(search_data, mode: mode)
+      data = CppjiebaRb.filter_stop_word(data).join(' ')
     end
 
     data.force_encoding("UTF-8")
@@ -105,7 +102,7 @@ class Search
       month = $2 ? $3.to_i : 1
       day = $4 ? $5.to_i : 1
 
-      return if day==0 || month==0 || day > 31 || month > 12
+      return if day == 0 || month == 0 || day > 31 || month > 12
 
       return Time.zone.parse("#{year}-#{month}-#{day}") rescue nil
     end
@@ -131,17 +128,16 @@ class Search
   def self.min_post_id_no_cache
     return 0 unless SiteSetting.search_prefer_recent_posts?
 
-
     offset, has_more = Post.unscoped
-                           .order('id desc')
-                           .offset(SiteSetting.search_recent_posts_size-1)
-                           .limit(2)
-                           .pluck(:id)
+      .order('id desc')
+      .offset(SiteSetting.search_recent_posts_size - 1)
+      .limit(2)
+      .pluck(:id)
 
     has_more ? offset : 0
   end
 
-  def self.min_post_id(opts=nil)
+  def self.min_post_id(opts = nil)
     return 0 unless SiteSetting.search_prefer_recent_posts?
 
     # It can be quite slow to count all the posts so let's cache it
@@ -153,14 +149,14 @@ class Search
   attr_accessor :term
   attr_reader :clean_term
 
-  def initialize(term, opts=nil)
+  def initialize(term, opts = nil)
     @opts = opts || {}
     @guardian = @opts[:guardian] || Guardian.new
     @search_context = @opts[:search_context]
     @include_blurbs = @opts[:include_blurbs] || false
     @blurb_length = @opts[:blurb_length]
-    @limit = Search.per_facet
     @valid = true
+    @page = @opts[:page]
 
     # Removes any zero-width characters from search terms
     term.to_s.gsub!(/[\u200B-\u200D\uFEFF]/, '')
@@ -178,27 +174,54 @@ class Search
       @search_context = @guardian.user
     end
 
-    if @opts[:type_filter].present?
-      @limit = Search.per_filter
-    end
+    @results = GroupedSearchResults.new(
+      @opts[:type_filter],
+      clean_term,
+      @search_context,
+      @include_blurbs,
+      @blurb_length
+    )
+  end
 
-    @results = GroupedSearchResults.new(@opts[:type_filter], clean_term, @search_context, @include_blurbs, @blurb_length)
+  def limit
+    if @opts[:type_filter].present?
+      Search.per_filter + 1
+    else
+      Search.per_facet + 1
+    end
+  end
+
+  def offset
+    if @page && @opts[:type_filter].present?
+      (@page - 1) * Search.per_filter
+    else
+      0
+    end
   end
 
   def valid?
     @valid
   end
 
-  def self.execute(term, opts=nil)
+  def self.execute(term, opts = nil)
     self.new(term, opts).execute
   end
 
   # Query a term
   def execute
+    if SiteSetting.log_search_queries?
+      status, search_log_id = SearchLog.log(
+        term: @term,
+        search_type: @opts[:search_type],
+        ip_address: @opts[:ip_address],
+        user_id: @opts[:user_id]
+      )
+      @results.search_log_id = search_log_id unless status == :error
+    end
 
-    unless @filters.present?
+    unless @filters.present? || @opts[:search_for_id]
       min_length = @opts[:min_search_term_length] || SiteSetting.min_search_term_length
-      terms = (@term || '').split(/\s(?=(?:[^"]|"[^"]*")*$)/).reject {|t| t.length < min_length }
+      terms = (@term || '').split(/\s(?=(?:[^"]|"[^"]*")*$)/).reject { |t| t.length < min_length }
 
       if terms.blank?
         @term = ''
@@ -225,7 +248,7 @@ class Search
     @results
   end
 
-  def self.advanced_filter(trigger,&block)
+  def self.advanced_filter(trigger, &block)
     (@advanced_filters ||= {})[trigger] = block
   end
 
@@ -277,11 +300,11 @@ class Search
     end
   end
 
-  advanced_filter(/in:wiki/) do |posts,match|
+  advanced_filter(/in:wiki/) do |posts, match|
     posts.where(wiki: true)
   end
 
-  advanced_filter(/badge:(.*)/) do |posts,match|
+  advanced_filter(/badge:(.*)/) do |posts, match|
     badge_id = Badge.where('name ilike ? OR id = ?', match, match.to_i).pluck(:id).first
     if badge_id
       posts.where('posts.user_id IN (SELECT ub.user_id FROM user_badges ub WHERE ub.badge_id = ?)', badge_id)
@@ -308,7 +331,7 @@ class Search
     posts.where("posts.user_id = #{@guardian.user.id}") if @guardian.user
   end
 
-  advanced_filter(/in:(watching|tracking)/) do |posts,match|
+  advanced_filter(/in:(watching|tracking)/) do |posts, match|
     if @guardian.user
       level = TopicUser.notification_levels[match.to_sym]
       posts.where("posts.topic_id IN (
@@ -343,7 +366,11 @@ class Search
     end
   end
 
-  advanced_filter(/category:(.+)/) do |posts,match|
+  advanced_filter(/with:images/) do |posts|
+    posts.where("posts.image_url IS NOT NULL")
+  end
+
+  advanced_filter(/category:(.+)/) do |posts, match|
     exact = false
 
     if match[0] == "="
@@ -366,7 +393,7 @@ class Search
     end
   end
 
-  advanced_filter(/^\#([a-zA-Z0-9\-:=]+)/) do |posts,match|
+  advanced_filter(/^\#([a-zA-Z0-9\-:=]+)/) do |posts, match|
 
     exact = true
 
@@ -407,7 +434,7 @@ class Search
     end
   end
 
-  advanced_filter(/group:(.+)/) do |posts,match|
+  advanced_filter(/group:(.+)/) do |posts, match|
     group_id = Group.where('name ilike ? OR (id = ? AND id > 0)', match, match.to_i).pluck(:id).first
     if group_id
       posts.where("posts.user_id IN (select gu.user_id from group_users gu where gu.group_id = ?)", group_id)
@@ -416,7 +443,7 @@ class Search
     end
   end
 
-  advanced_filter(/user:(.+)/) do |posts,match|
+  advanced_filter(/user:(.+)/) do |posts, match|
     user_id = User.where(staged: false).where('username_lower = ? OR id = ?', match.downcase, match.to_i).pluck(:id).first
     if user_id
       posts.where("posts.user_id = #{user_id}")
@@ -425,7 +452,7 @@ class Search
     end
   end
 
-  advanced_filter(/^\@([a-zA-Z0-9_\-.]+)/) do |posts,match|
+  advanced_filter(/^\@([a-zA-Z0-9_\-.]+)/) do |posts, match|
     user_id = User.where(staged: false).where(username_lower: match.downcase).pluck(:id).first
     if user_id
       posts.where("posts.user_id = #{user_id}")
@@ -434,7 +461,7 @@ class Search
     end
   end
 
-  advanced_filter(/before:(.*)/) do |posts,match|
+  advanced_filter(/before:(.*)/) do |posts, match|
     if date = Search.word_to_date(match)
       posts.where("posts.created_at < ?", date)
     else
@@ -442,7 +469,7 @@ class Search
     end
   end
 
-  advanced_filter(/after:(.*)/) do |posts,match|
+  advanced_filter(/after:(.*)/) do |posts, match|
     if date = Search.word_to_date(match)
       posts.where("posts.created_at > ?", date)
     else
@@ -459,7 +486,7 @@ class Search
       FROM topic_tags tt, tags
       WHERE tt.tag_id = tags.id
       GROUP BY tt.topic_id
-      HAVING to_tsvector(#{query_locale}, array_to_string(array_agg(tags.name), ' ')) @@ to_tsquery(#{query_locale}, ?)
+      HAVING to_tsvector(#{default_ts_config}, array_to_string(array_agg(tags.name), ' ')) @@ to_tsquery(#{default_ts_config}, ?)
       )", tags.join('&'))
     else
       tags = match.split(",")
@@ -473,18 +500,30 @@ class Search
     end
   end
 
-  private
+  advanced_filter(/filetypes?:([a-zA-Z0-9,\-_]+)/) do |posts, match|
+    file_extensions = match.split(",").map(&:downcase)
 
+    posts.where("posts.id IN (
+      SELECT post_id FROM topic_links
+      WHERE extension IN (:file_extensions)
+      UNION
+      SELECT post_uploads.post_id FROM uploads
+      JOIN post_uploads ON post_uploads.upload_id = uploads.id
+      WHERE lower(uploads.extension) IN (:file_extensions)
+      )", file_extensions: file_extensions)
+  end
+
+  private
 
     def process_advanced_search!(term)
 
-      term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word,_)|
+      term.to_s.scan(/(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/).to_a.map do |(word, _)|
         next if word.blank?
 
         found = false
 
         Search.advanced_filters.each do |matcher, block|
-          cleaned = word.gsub(/["']/,"")
+          cleaned = word.gsub(/["']/, "")
           if cleaned =~ matcher
             (@filters ||= []) << [block, $1]
             found = true
@@ -524,14 +563,12 @@ class Search
       end.compact.join(' ')
     end
 
-
     def find_grouped_results
 
       if @results.type_filter.present?
         raise Discourse::InvalidAccess.new("invalid type filter") unless Search.facets.include?(@results.type_filter)
         send("#{@results.type_filter}_search")
       else
-        @limit = Search.per_facet + 1
         unless @search_context
           user_search if @term.present?
           category_search if @term.present?
@@ -585,11 +622,11 @@ class Search
       secure_category_ids
 
       categories = Category.includes(:category_search_data)
-                           .where("category_search_data.search_data @@ #{ts_query}")
-                           .references(:category_search_data)
-                           .order("topics_month DESC")
-                           .secured(@guardian)
-                           .limit(@limit)
+        .where("category_search_data.search_data @@ #{ts_query}")
+        .references(:category_search_data)
+        .order("topics_month DESC")
+        .secured(@guardian)
+        .limit(limit)
 
       categories.each do |category|
         @results.add(category)
@@ -600,37 +637,37 @@ class Search
       return if SiteSetting.hide_user_profiles_from_public && !@guardian.user
 
       users = User.includes(:user_search_data)
-                  .references(:user_search_data)
-                  .where(active: true)
-                  .where(staged: false)
-                  .where("user_search_data.search_data @@ #{ts_query("simple")}")
-                  .order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
-                  .order("last_posted_at DESC")
-                  .limit(@limit)
+        .references(:user_search_data)
+        .where(active: true)
+        .where(staged: false)
+        .where("user_search_data.search_data @@ #{ts_query("simple")}")
+        .order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
+        .order("last_posted_at DESC")
+        .limit(limit)
 
       users.each do |user|
         @results.add(user)
       end
     end
 
-    def posts_query(limit, opts=nil)
+    def posts_query(limit, opts = nil)
       opts ||= {}
       posts = Post.where(post_type: Topic.visible_post_types(@guardian.user))
-                  .joins(:post_search_data, :topic)
-                  .joins("LEFT JOIN categories ON categories.id = topics.category_id")
-                  .where("topics.deleted_at" => nil)
-                  .where("topics.visible")
+        .joins(:post_search_data, :topic)
+        .joins("LEFT JOIN categories ON categories.id = topics.category_id")
+        .where("topics.deleted_at" => nil)
+        .where("topics.visible")
 
       is_topic_search = @search_context.present? && @search_context.is_a?(Topic)
 
       if opts[:private_messages] || (is_topic_search && @search_context.private_message?)
-         posts = posts.where("topics.archetype =  ?", Archetype.private_message)
+        posts = posts.where("topics.archetype =  ?", Archetype.private_message)
 
          unless @guardian.is_admin?
            posts = posts.private_posts_for_user(@guardian.user)
          end
       else
-         posts = posts.where("topics.archetype <> ?", Archetype.private_message)
+        posts = posts.where("topics.archetype <> ?", Archetype.private_message)
       end
 
       if @term.present?
@@ -649,7 +686,6 @@ class Search
           posts = posts.where("posts.raw  || ' ' || u.username || ' ' || COALESCE(u.name, '') ilike ?", "%#{term_without_quote}%")
         else
           posts = posts.where("post_search_data.search_data @@ #{ts_query}")
-
           exact_terms = @term.scan(/"([^"]+)"/).flatten
           exact_terms.each do |exact|
             posts = posts.where("posts.raw ilike ?", "%#{exact}%")
@@ -681,7 +717,7 @@ class Search
           posts = posts.where("topics.category_id in (?)", category_ids)
         elsif @search_context.is_a?(Topic)
           posts = posts.where("topics.id = #{@search_context.id}")
-                       .order("posts.post_number #{@order == :latest ? "DESC" : ""}")
+            .order("posts.post_number #{@order == :latest ? "DESC" : ""}")
         end
 
       end
@@ -711,7 +747,7 @@ class Search
           posts = posts.order("posts.like_count DESC")
         end
       else
-        posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{query_locale}, topics.title), #{ts_query}) DESC")
+        posts = posts.order("TS_RANK_CD(TO_TSVECTOR(#{default_ts_config}, topics.title), #{ts_query}) DESC")
 
         data_ranking = "TS_RANK_CD(post_search_data.search_data, #{ts_query})"
         if opts[:aggregate_search]
@@ -728,37 +764,37 @@ class Search
         posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
       end
 
+      posts = posts.offset(offset)
       posts.limit(limit)
     end
 
-    def self.query_locale
-      "'#{Search.long_locale}'"
+    def self.default_ts_config
+      "'#{Search.ts_config}'"
     end
 
-    def query_locale
-      self.class.query_locale
+    def default_ts_config
+      self.class.default_ts_config
     end
 
-    def self.ts_query(term, locale = nil, joiner = "&")
+    def self.ts_query(term, ts_config = nil, joiner = "&")
 
-      data = Post.exec_sql("SELECT to_tsvector(:locale, :term)",
-                            locale: 'simple',
-                            term: term
-                          ).values[0][0]
+      data = Post.exec_sql("SELECT TO_TSVECTOR(:config, :term)",
+                           config: 'simple',
+                           term: term).values[0][0]
 
-      locale = Post.sanitize(locale) if locale
+      ts_config = Post.sanitize(ts_config) if ts_config
       all_terms = data.scan(/'([^']+)'\:\d+/).flatten
       all_terms.map! do |t|
         t.split(/[\)\(&']/)[0]
       end.compact!
 
-      query = Post.sanitize(all_terms.map {|t| "'#{PG::Connection.escape_string(t)}':*"}.join(" #{joiner} "))
-      "TO_TSQUERY(#{locale || query_locale}, #{query})"
+      query = Post.sanitize(all_terms.map { |t| "'#{PG::Connection.escape_string(t)}':*" }.join(" #{joiner} "))
+      "TO_TSQUERY(#{ts_config || default_ts_config}, #{query})"
     end
 
-    def ts_query(locale=nil)
+    def ts_query(ts_config = nil)
       @ts_query_cache ||= {}
-      @ts_query_cache[(locale || query_locale) + " " + @term] ||= Search.ts_query(@term, locale)
+      @ts_query_cache["#{ts_config || default_ts_config} #{@term}"] ||= Search.ts_query(@term, ts_config)
     end
 
     def wrap_rows(query)
@@ -771,10 +807,10 @@ class Search
       query =
         if @order == :likes
           # likes are a pain to aggregate so skip
-          posts_query(@limit, private_messages: opts[:private_messages])
+          posts_query(limit, private_messages: opts[:private_messages])
             .select('topics.id', "posts.post_number")
         else
-          posts_query(@limit, aggregate_search: true, private_messages: opts[:private_messages])
+          posts_query(limit, aggregate_search: true, private_messages: opts[:private_messages])
             .select('topics.id', "#{min_or_max}(posts.post_number) post_number")
             .group('topics.id')
         end
@@ -809,8 +845,8 @@ class Search
         added += 1
       end
 
-      if added < @limit
-        aggregate_posts(post_sql[:remaining]).each {|p| @results.add(p) }
+      if added < limit
+        aggregate_posts(post_sql[:remaining]).each { |p| @results.add(p) }
       end
     end
 
@@ -822,7 +858,7 @@ class Search
 
     def topic_search
       if @search_context.is_a?(Topic)
-        posts = posts_eager_loads(posts_query(@limit))
+        posts = posts_eager_loads(posts_query(limit))
           .where('posts.topic_id = ?', @search_context.id)
 
         posts.each do |post|
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 47e1325488..787c279c04 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -9,10 +9,21 @@ class Search
       extend ActionView::Helpers::TextHelper
     end
 
-    attr_reader :type_filter,
-                :posts, :categories, :users,
-                :more_posts, :more_categories, :more_users,
-                :term, :search_context, :include_blurbs
+    attr_reader(
+      :type_filter,
+      :posts,
+      :categories,
+      :users,
+      :more_posts,
+      :more_categories,
+      :more_users,
+      :term,
+      :search_context,
+      :include_blurbs,
+      :more_full_page_results
+    )
+
+    attr_accessor :search_log_id
 
     def initialize(type_filter, term, search_context, include_blurbs, blurb_length)
       @type_filter = type_filter
@@ -40,15 +51,16 @@ class Search
     def add(object)
       type = object.class.to_s.downcase.pluralize
 
-      if !@type_filter.present? && send(type).length == Search.per_facet
+      if @type_filter.present? && send(type).length == Search.per_filter
+        @more_full_page_results = true
+      elsif !@type_filter.present? && send(type).length == Search.per_facet
         instance_variable_set("@more_#{type}".to_sym, true)
       else
         (send type) << object
       end
     end
 
-
-    def self.blurb_for(cooked, term=nil, blurb_length=200)
+    def self.blurb_for(cooked, term = nil, blurb_length = 200)
       cooked = SearchIndexer::HtmlScrubber.scrub(cooked).squish
 
       blurb = nil
diff --git a/lib/secure_session.rb b/lib/secure_session.rb
index bbe9a71833..ecb46a6f67 100644
--- a/lib/secure_session.rb
+++ b/lib/secure_session.rb
@@ -8,7 +8,7 @@ class SecureSession
     $redis.get("#{@prefix}#{key}")
   end
 
-  def []=(key,val)
+  def []=(key, val)
     if val == nil
       $redis.del("#{@prefix}#{key}")
     else
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index b8a20a80eb..7578a8aabe 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -43,7 +43,7 @@ class SingleSignOn
       sso.send("#{k}=", val)
     end
 
-    decoded_hash.each do |k,v|
+    decoded_hash.each do |k, v|
       if field = k[/^custom\.(.+)$/, 1]
         sso.custom_fields[field] = v
       end
@@ -72,7 +72,7 @@ class SingleSignOn
     OpenSSL::HMAC.hexdigest("sha256", sso_secret, payload)
   end
 
-  def to_url(base_url=nil)
+  def to_url(base_url = nil)
     base = "#{base_url || sso_url}"
     "#{base}#{base.include?('?') ? '&' : '?'}#{payload}"
   end
@@ -86,7 +86,7 @@ class SingleSignOn
     payload = {}
 
     ACCESSORS.each do |k|
-     next if (val = send k) == nil
+      next if (val = send k) == nil
      payload[k] = val
     end
 
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 20dd2818af..5b9fb8987d 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -169,13 +169,13 @@ module SiteSettingExtension
   end
 
   def client_settings_json_uncached
-    MultiJson.dump(Hash[*@client_settings.map{|n| [n, self.send(n)]}.flatten])
+    MultiJson.dump(Hash[*@client_settings.map { |n| [n, self.send(n)] }.flatten])
   end
 
   # Retrieve all settings
-  def all_settings(include_hidden=false)
+  def all_settings(include_hidden = false)
     @defaults
-      .reject{|s, _| hidden_settings.include?(s) && !include_hidden}
+      .reject { |s, _| hidden_settings.include?(s) && !include_hidden }
       .map do |s, v|
         value = send(s)
         type = types[get_data_type(s, value)]
@@ -190,11 +190,13 @@ module SiteSettingExtension
         }
 
         if type == :enum && enum_class(s)
-          opts.merge!({valid_values: enum_class(s).values, translate_names: enum_class(s).translate_names?})
+          opts.merge!(valid_values: enum_class(s).values, translate_names: enum_class(s).translate_names?)
         elsif type == :enum
-          opts.merge!({valid_values: choices[s].map{|c| {name: c, value: c}}, translate_names: false})
+          opts.merge!(valid_values: choices[s].map { |c| { name: c, value: c } }, translate_names: false)
         end
 
+        opts[:textarea] = true if static_types[s] == :textarea
+
         opts[:choices] = choices[s] if choices.has_key? s
         opts
       end
@@ -217,7 +219,7 @@ module SiteSettingExtension
       ensure_listen_for_changes
       old = current
 
-      new_hash =  Hash[*(provider.all.map { |s|
+      new_hash = Hash[*(provider.all.map { |s|
         [s.name.intern, convert(s.value, s.data_type, s.name)]
       }.to_a.flatten)]
 
@@ -282,6 +284,8 @@ module SiteSettingExtension
   def add_override!(name, val)
     type = get_data_type(name, defaults[name.to_sym])
 
+    val = val.to_s if type == types[:string]
+
     if type == types[:bool] && val != true && val != false
       val = (val == "t" || val == "true") ? 't' : 'f'
     end
@@ -321,11 +325,11 @@ module SiteSettingExtension
   end
 
   def notify_changed!
-    MessageBus.publish('/site_settings', {process: process_id})
+    MessageBus.publish('/site_settings', process: process_id)
   end
 
   def notify_clients!(name)
-    MessageBus.publish('/client_settings', {name: name, value: self.send(name)})
+    MessageBus.publish('/client_settings', name: name, value: self.send(name))
   end
 
   def has_setting?(name)
@@ -367,7 +371,7 @@ module SiteSettingExtension
     end
   end
 
-  def set_and_log(name, value, user=Discourse.system_user)
+  def set_and_log(name, value, user = Discourse.system_user)
     prev_value = send(name)
     set(name, value)
     StaffActionLogger.new(user).log_site_setting_change(name, prev_value, value) if has_setting?(name)
@@ -385,14 +389,14 @@ module SiteSettingExtension
     deletions = []
 
     new_hash.each do |name, value|
-      changes << [name,value] if !old.has_key?(name) || old[name] != value
+      changes << [name, value] if !old.has_key?(name) || old[name] != value
     end
 
-    old.each do |name,value|
-      deletions << [name,value] unless new_hash.has_key?(name)
+    old.each do |name, value|
+      deletions << [name, value] unless new_hash.has_key?(name)
     end
 
-    [changes,deletions]
+    [changes, deletions]
   end
 
   def get_data_type(name, val)
diff --git a/lib/site_settings/db_provider.rb b/lib/site_settings/db_provider.rb
index 7757299fbd..4410e05eee 100644
--- a/lib/site_settings/db_provider.rb
+++ b/lib/site_settings/db_provider.rb
@@ -33,8 +33,8 @@ class SiteSettings::DbProvider
     model ||= @model.new
 
     model.name = name
-    model.value =  value
-    model.data_type =  data_type
+    model.value = value
+    model.data_type = data_type
 
     # save! used to ensure after_commit is called
     model.save!
diff --git a/lib/slug.rb b/lib/slug.rb
index 0f3b62b3f0..5ee570198e 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -5,11 +5,12 @@ module Slug
   CHAR_FILTER_REGEXP = /[:\/\?#\[\]@!\$&'\(\)\*\+,;=_\.~%\\`^\s|\{\}"<>]+/ # :/?#[]@!$&'()*+,;=_.~%\`^|{}"<>
 
   def self.for(string, default = 'topic')
-    slug = case (SiteSetting.slug_generation_method || :ascii).to_sym
-           when :ascii then self.ascii_generator(string)
-           when :encoded then self.encoded_generator(string)
-           when :none then self.none_generator(string)
-           end
+    slug =
+      case (SiteSetting.slug_generation_method || :ascii).to_sym
+      when :ascii then self.ascii_generator(string)
+      when :encoded then self.encoded_generator(string)
+      when :none then self.none_generator(string)
+      end
     # Reject slugs that only contain numbers, because they would be indistinguishable from id's.
     slug = (slug =~ /[^\d]/ ? slug : '')
     slug.blank? ? default : slug
@@ -23,8 +24,8 @@ module Slug
 
   def self.ascii_generator(string)
     string.tr("'", "")
-          .parameterize
-          .tr("_", "-")
+      .parameterize
+      .tr("_", "-")
   end
 
   def self.encoded_generator(string)
@@ -32,10 +33,10 @@ module Slug
     # including reserved characters from RFC3986.
     # See also URI::REGEXP::PATTERN.
     string.strip
-          .gsub(/\s+/, '-')
-          .gsub(CHAR_FILTER_REGEXP, '')
-          .gsub(/\A-+|-+\z/, '') # remove possible trailing and preceding dashes
-          .squeeze('-') # squeeze continuous dashes to prettify slug
+      .gsub(/\s+/, '-')
+      .gsub(CHAR_FILTER_REGEXP, '')
+      .gsub(/\A-+|-+\z/, '') # remove possible trailing and preceding dashes
+      .squeeze('-') # squeeze continuous dashes to prettify slug
   end
 
   def self.none_generator(string)
diff --git a/lib/source_url.rb b/lib/source_url.rb
index 41d4fe5dec..90a4391f5b 100644
--- a/lib/source_url.rb
+++ b/lib/source_url.rb
@@ -6,7 +6,7 @@ class SourceURL < Tilt::Template
     source = input[:data]
     context = input[:environment].context_class.new(input)
 
-    result = new(filename){source}.render(context)
+    result = new(filename) { source }.render(context)
     context.metadata.merge(data: result)
   end
 
diff --git a/lib/spam_handler.rb b/lib/spam_handler.rb
index b14532c27d..2b8253512c 100644
--- a/lib/spam_handler.rb
+++ b/lib/spam_handler.rb
@@ -4,15 +4,15 @@ class SpamHandler
     return false if SiteSetting.max_new_accounts_per_registration_ip <= 0
 
     tl2_plus_accounts_with_same_ip = User.where("trust_level >= ?", TrustLevel[2])
-                                         .where(ip_address: ip_address.to_s)
-                                         .count
+      .where(ip_address: ip_address.to_s)
+      .count
 
     return false if tl2_plus_accounts_with_same_ip > 0
 
     staff_user_ids = Group[:staff].user_ids - [-1]
     staff_members_with_same_ip = User.where(id: staff_user_ids)
-                                     .where(ip_address: ip_address.to_s)
-                                     .count
+      .where(ip_address: ip_address.to_s)
+      .count
 
     return false if staff_members_with_same_ip > 0
 
@@ -20,9 +20,9 @@ class SpamHandler
     return false if ip_whitelisted
 
     tl0_accounts_with_same_ip = User.unscoped
-                                    .where(trust_level: TrustLevel[0])
-                                    .where(ip_address: ip_address.to_s)
-                                    .count
+      .where(trust_level: TrustLevel[0])
+      .where(ip_address: ip_address.to_s)
+      .count
 
     tl0_accounts_with_same_ip >= SiteSetting.max_new_accounts_per_registration_ip
   end
diff --git a/lib/sql_builder.rb b/lib/sql_builder.rb
index 70e461095c..35598c5723 100644
--- a/lib/sql_builder.rb
+++ b/lib/sql_builder.rb
@@ -1,13 +1,13 @@
 class SqlBuilder
 
-  def initialize(template,klass=nil)
+  def initialize(template, klass = nil)
     @args = {}
     @sql = template
     @sections = {}
     @klass = klass
   end
 
-  [:set, :where2,:where,:order_by,:limit,:left_join,:join,:offset, :select].each do |k|
+  [:set, :where2, :where, :order_by, :limit, :left_join, :join, :offset, :select].each do |k|
     define_method k do |data, args = {}|
       @args.merge!(args)
       @sections[k] ||= []
@@ -18,7 +18,7 @@ class SqlBuilder
 
   def secure_category(secure_category_ids, category_alias = 'c')
     if secure_category_ids.present?
-      where("NOT COALESCE(" << category_alias << ".read_restricted, false) OR " << category_alias <<  ".id IN (:secure_category_ids)", secure_category_ids: secure_category_ids)
+      where("NOT COALESCE(" << category_alias << ".read_restricted, false) OR " << category_alias << ".id IN (:secure_category_ids)", secure_category_ids: secure_category_ids)
     else
       where("NOT COALESCE(" << category_alias << ".read_restricted, false)")
     end
@@ -28,17 +28,17 @@ class SqlBuilder
   def to_sql
     sql = @sql.dup
 
-    @sections.each do |k,v|
+    @sections.each do |k, v|
       joined = nil
       case k
       when :select
         joined = "SELECT " << v.join(" , ")
       when :where, :where2
-        joined = "WHERE " << v.map{|c| "(" << c << ")" }.join(" AND ")
+        joined = "WHERE " << v.map { |c| "(" << c << ")" }.join(" AND ")
       when :join
-        joined = v.map{|item| "JOIN " << item }.join("\n")
+        joined = v.map { |item| "JOIN " << item }.join("\n")
       when :left_join
-        joined = v.map{|item| "LEFT JOIN " << item }.join("\n")
+        joined = v.map { |item| "LEFT JOIN " << item }.join("\n")
       when :limit
         joined = "LIMIT " << v.last.to_s
       when :offset
@@ -64,7 +64,7 @@ class SqlBuilder
       if @args == {}
         ActiveRecord::Base.exec_sql(sql)
       else
-        ActiveRecord::Base.exec_sql(sql,@args)
+        ActiveRecord::Base.exec_sql(sql, @args)
       end
     end
   end
@@ -74,7 +74,7 @@ class SqlBuilder
   end
 
   class RailsDateTimeDecoder < PG::SimpleDecoder
-    def decode(string, tuple=nil, field=nil)
+    def decode(string, tuple = nil, field = nil)
       if Rails.version >= "4.2.0"
         @caster ||= ActiveRecord::Type::DateTime.new
         @caster.type_cast_from_database(string)
@@ -84,14 +84,13 @@ class SqlBuilder
     end
   end
 
-
   class ActiveRecordTypeMap < PG::BasicTypeMapForResults
     def initialize(connection)
       super(connection)
       rm_coder 0, 1114
       add_coder RailsDateTimeDecoder.new(name: "timestamp", oid: 1114, format: 0)
-      # we don't need deprecations
-     	self.default_type_map = PG::TypeMapInRuby.new
+       # we don't need deprecations
+       self.default_type_map = PG::TypeMapInRuby.new
     end
   end
 
diff --git a/lib/stats_socket.rb b/lib/stats_socket.rb
index 2b81db678f..e1afc677ba 100644
--- a/lib/stats_socket.rb
+++ b/lib/stats_socket.rb
@@ -13,6 +13,14 @@ class StatsSocket < SocketServer
       case command
       when "gc_stat"
         GC.stat.to_json
+      when "v8_stat"
+        stats = {}
+        ObjectSpace.each_object(MiniRacer::Context) do |context|
+          context.heap_stats.each do |k, v|
+            stats[k] = (stats[k] || 0) + v
+          end
+        end
+        stats.to_json
       else
         "[\"UNKNOWN COMMAND\"]"
       end
diff --git a/lib/stylesheet/compiler.rb b/lib/stylesheet/compiler.rb
index e6a7530b88..e886c6bdce 100644
--- a/lib/stylesheet/compiler.rb
+++ b/lib/stylesheet/compiler.rb
@@ -15,7 +15,7 @@ module Stylesheet
       footer:after { content: '#{error}' }"
     end
 
-    def self.compile_asset(asset, options={})
+    def self.compile_asset(asset, options = {})
 
       if Importer.special_imports[asset.to_s]
         filename = "theme.scss"
@@ -26,12 +26,12 @@ module Stylesheet
         file = File.read path
       end
 
-      compile(file,filename,options)
+      compile(file, filename, options)
 
     end
 
-    def self.compile(stylesheet, filename, options={})
-      source_map_file = options[:source_map_file] || "#{filename.sub(".scss","")}.css.map";
+    def self.compile(stylesheet, filename, options = {})
+      source_map_file = options[:source_map_file] || "#{filename.sub(".scss", "")}.css.map";
 
       engine = SassC::Engine.new(stylesheet,
                                  importer: Importer,
@@ -44,7 +44,6 @@ module Stylesheet
                                  theme_field: options[:theme_field],
                                  load_paths: [ASSET_ROOT])
 
-
       result = engine.render
 
       if options[:rtl]
diff --git a/lib/stylesheet/manager.rb b/lib/stylesheet/manager.rb
index ebceac3269..85cd6bd083 100644
--- a/lib/stylesheet/manager.rb
+++ b/lib/stylesheet/manager.rb
@@ -16,7 +16,7 @@ class Stylesheet::Manager
   end
 
   def self.clear_theme_cache!
-    cache.hash.keys.select{|k| k =~ /theme/}.each{|k|cache.delete(k)}
+    cache.hash.keys.select { |k| k =~ /theme/ }.each { |k|cache.delete(k) }
   end
 
   def self.stylesheet_href(target = :desktop, theme_key = :missing)
@@ -54,9 +54,9 @@ class Stylesheet::Manager
   end
 
   def self.precompile_css
-    themes = Theme.where('user_selectable OR key = ?', SiteSetting.default_theme_key).pluck(:key,:name)
+    themes = Theme.where('user_selectable OR key = ?', SiteSetting.default_theme_key).pluck(:key, :name)
     themes << nil
-    themes.each do |key,name|
+    themes.each do |key, name|
       [:desktop, :mobile, :desktop_rtl, :mobile_rtl].each do |target|
         theme_key = key || SiteSetting.default_theme_key
         cache_key = "#{target}_#{theme_key}"
@@ -104,7 +104,7 @@ class Stylesheet::Manager
     @theme_key = theme_key
   end
 
-  def compile(opts={})
+  def compile(opts = {})
     unless opts[:force]
       if File.exists?(stylesheet_fullpath)
         unless StylesheetCache.where(target: qualified_target, digest: digest).exists?
@@ -120,7 +120,7 @@ class Stylesheet::Manager
     end
 
     rtl = @target.to_s =~ /_rtl$/
-    css,source_map = begin
+    css, source_map = begin
       Stylesheet::Compiler.compile_asset(
         @target,
          rtl: rtl,
@@ -216,7 +216,7 @@ class Stylesheet::Manager
   end
 
   def stylesheet_filename_no_digest
-    stylesheet_filename(_with_digest=false)
+    stylesheet_filename(_with_digest = false)
   end
 
   def is_theme?
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 138d750fd6..e7c9a5ab9b 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -3,7 +3,7 @@ require 'listen'
 module Stylesheet
   class Watcher
 
-    def self.watch(paths=nil)
+    def self.watch(paths = nil)
       watcher = new(paths)
       watcher.start
       watcher
@@ -26,7 +26,6 @@ module Stylesheet
         end
       end
 
-
       root = Rails.root.to_s
       @paths.each do |watch|
         Thread.new do
@@ -34,7 +33,7 @@ module Stylesheet
             listener = Listen.to("#{root}/#{watch}", ignore: /xxxx/) do |modified, added, _|
               paths = [modified, added].flatten
               paths.compact!
-              paths.map!{|long| long[(root.length+1)..-1]}
+              paths.map! { |long| long[(root.length + 1)..-1] }
               process_change(paths)
             end
           rescue => e
@@ -55,7 +54,7 @@ module Stylesheet
       Stylesheet::Manager.cache.clear
 
       message = ["desktop", "mobile", "admin"].map do |name|
-        {target: name, new_href: Stylesheet::Manager.stylesheet_href(name.to_sym) , theme_key: SiteSetting.default_theme_key}
+        { target: name, new_href: Stylesheet::Manager.stylesheet_href(name.to_sym) , theme_key: SiteSetting.default_theme_key }
       end
 
       MessageBus.publish '/file-change', message
diff --git a/lib/suggested_topics_builder.rb b/lib/suggested_topics_builder.rb
index 9436bb5c5a..cd857875b1 100644
--- a/lib/suggested_topics_builder.rb
+++ b/lib/suggested_topics_builder.rb
@@ -11,15 +11,14 @@ class SuggestedTopicsBuilder
     @results = []
   end
 
-
-  def add_results(results, priority=:low)
+  def add_results(results, priority = :low)
 
     # WARNING .blank? will execute an Active Record query
     return unless results
 
     # Only add results if we don't have those topic ids already
     results = results.where('topics.id NOT IN (?)', @excluded_topic_ids)
-                     .where(visible: true)
+      .where(visible: true)
 
     # If limit suggested to category is enabled, restrict to that category
     if @category_id && SiteSetting.limit_suggested_to_category?
@@ -29,8 +28,8 @@ class SuggestedTopicsBuilder
 
     unless results.empty?
       # Keep track of the ids we've added
-      @excluded_topic_ids.concat results.map {|r| r.id}
-      splice_results(results,priority)
+      @excluded_topic_ids.concat results.map { |r| r.id }
+      splice_results(results, priority)
     end
   end
 
@@ -40,7 +39,7 @@ class SuggestedTopicsBuilder
       # Topics from category @category_id need to be first in the list, all others after.
 
       other_category_index = @results.index { |r| r.category_id != @category_id }
-      category_results, other_category_results = results.partition{ |r| r.category_id == @category_id }
+      category_results, other_category_results = results.partition { |r| r.category_id == @category_id }
 
       if other_category_index
         @results.insert other_category_index, *category_results
@@ -66,7 +65,7 @@ class SuggestedTopicsBuilder
   end
 
   def category_results_left
-    SiteSetting.suggested_topics - @results.count{|r| r.category_id == @category_id}
+    SiteSetting.suggested_topics - @results.count { |r| r.category_id == @category_id }
   end
 
   def size
diff --git a/lib/table_migration_helper.rb b/lib/table_migration_helper.rb
index 4d0308341b..605555d49f 100644
--- a/lib/table_migration_helper.rb
+++ b/lib/table_migration_helper.rb
@@ -45,7 +45,7 @@ SQL
                                         new_name: new_name,
                                         delay: "#{delay.to_i || 0} seconds",
                                         after_migration: after_migration).to_a.length > 0
-        on_drop&.call
+      on_drop&.call
 
         ActiveRecord::Base.exec_sql("DROP TABLE #{old_name}")
     end
diff --git a/lib/tasks/add_topic_to_quotes.rake b/lib/tasks/add_topic_to_quotes.rake
index 51d1cf2edd..ff36e46bf0 100644
--- a/lib/tasks/add_topic_to_quotes.rake
+++ b/lib/tasks/add_topic_to_quotes.rake
@@ -6,4 +6,3 @@ task "add_topic_to_quotes" => :environment do
     Post.update_all ["raw = ?, cooked = ?", new_raw, new_cooked], ["id = ?", p.id]
   end
 end
-
diff --git a/lib/tasks/admin.rake b/lib/tasks/admin.rake
index cd7e40d39f..c57e03b785 100644
--- a/lib/tasks/admin.rake
+++ b/lib/tasks/admin.rake
@@ -1,6 +1,6 @@
 
 desc "invite an admin to this discourse instance"
-task "admin:invite", [:email] => [:environment] do |_,args|
+task "admin:invite", [:email] => [:environment] do |_, args|
   email = args[:email]
   if !email || email !~ /@/
     puts "ERROR: Expecting rake admin:invite[some@email.com]"
@@ -20,7 +20,7 @@ task "admin:invite", [:email] => [:environment] do |_,args|
   puts "Granting admin!"
   user.grant_admin!
   user.change_trust_level!(4)
-  user.email_tokens.update_all  confirmed: true
+  user.email_tokens.update_all confirmed: true
 
   puts "Sending email!"
   email_token = user.email_tokens.create(email: user.email)
@@ -42,8 +42,8 @@ task "admin:create" => :environment do
       reset_password = ask("User with this email already exists! Do you want to reset the password for this email? (Y/n)  ")
       if (reset_password == "" || reset_password.downcase == 'y')
         begin
-          password = ask("Password:  ") {|q| q.echo = false}
-          password_confirmation = ask("Repeat password:  ") {|q| q.echo = false}
+          password = ask("Password:  ") { |q| q.echo = false }
+          password_confirmation = ask("Repeat password:  ") { |q| q.echo = false }
         end while password != password_confirmation
         admin.password = password
       end
@@ -53,8 +53,8 @@ task "admin:create" => :environment do
       admin.email = email
       admin.username = UserNameSuggester.suggest(admin.email)
       begin
-        password = ask("Password:  ") {|q| q.echo = false}
-        password_confirmation = ask("Repeat password:  ") {|q| q.echo = false}
+        password = ask("Password:  ") { |q| q.echo = false }
+        password_confirmation = ask("Repeat password:  ") { |q| q.echo = false }
       end while password != password_confirmation
       admin.password = password
     end
@@ -82,7 +82,7 @@ task "admin:create" => :environment do
   if (grant_admin == "" || grant_admin.downcase == 'y')
     admin.grant_admin!
     admin.change_trust_level!(4)
-    admin.email_tokens.update_all  confirmed: true
+    admin.email_tokens.update_all confirmed: true
     admin.activate
 
     say("\nYour account now has Admin privileges!")
diff --git a/lib/tasks/api.rake b/lib/tasks/api.rake
index ef42e8a7bd..5a4ef6c85e 100644
--- a/lib/tasks/api.rake
+++ b/lib/tasks/api.rake
@@ -1,6 +1,6 @@
 desc "generate api key if missing, return existing if already there"
 task "api_key:get" => :environment do
-    api_key = ApiKey.create_master_key
+  api_key = ApiKey.create_master_key
 
     puts api_key.key
 end
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 57235096c1..9029f9cf4b 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -71,10 +71,10 @@ def assets_path
   "#{Rails.root}/public/assets"
 end
 
-def compress_node(from,to)
+def compress_node(from, to)
   to_path = "#{assets_path}/#{to}"
   assets = cdn_relative_path("/assets")
-  source_map_root = assets + ((d=File.dirname(from)) == "." ? "" : "/#{d}")
+  source_map_root = assets + ((d = File.dirname(from)) == "." ? "" : "/#{d}")
   source_map_url = cdn_path "/assets/#{to}.map"
 
   cmd = "uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '#{source_map_url}'"
@@ -89,7 +89,7 @@ def compress_node(from,to)
   result
 end
 
-def compress_ruby(from,to)
+def compress_ruby(from, to)
   data = File.read("#{assets_path}/#{from}")
 
   uglified, map = Uglifier.new(comments: :none,
@@ -99,7 +99,7 @@ def compress_ruby(from,to)
                                  output_filename: File.basename(to)
                                }
                               )
-                          .compile_with_map(data)
+    .compile_with_map(data)
   dest = "#{assets_path}/#{to}"
 
   File.write(dest, uglified << "\n//# sourceMappingURL=#{cdn_path "/assets/#{to}.map"}")
@@ -121,11 +121,11 @@ def brotli(path)
   end
 end
 
-def compress(from,to)
+def compress(from, to)
   if $node_uglify
-    compress_node(from,to)
+    compress_node(from, to)
   else
-    compress_ruby(from,to)
+    compress_ruby(from, to)
   end
 end
 
@@ -148,10 +148,10 @@ task 'assets:precompile' => 'assets:precompile:before' do
     concurrent? do |proc|
       to_skip = Rails.configuration.assets.skip_minification || []
       manifest.files
-              .select{|k,v| k =~ /\.js$/}
-              .each do |file, info|
+        .select { |k, v| k =~ /\.js$/ }
+        .each do |file, info|
 
-          path = "#{assets_path}/#{file}"
+        path = "#{assets_path}/#{file}"
           _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}"
           _path = "#{assets_path}/#{_file}"
 
@@ -164,7 +164,7 @@ task 'assets:precompile' => 'assets:precompile:before' do
               # We can specify some files to never minify
               unless (ENV["DONT_MINIFY"] == "1") || to_skip.include?(info['logical_path'])
                 FileUtils.mv(path, _path)
-                compress(_file,file)
+                compress(_file, file)
               end
 
               info["size"] = File.size(path)
diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake
index dde0cc0364..617f473c9b 100644
--- a/lib/tasks/auto_annotate_models.rake
+++ b/lib/tasks/auto_annotate_models.rake
@@ -1,36 +1,34 @@
 # NOTE: only doing this in development as some production environments (Heroku)
 # NOTE: are sensitive to local FS writes, and besides -- it's just not proper
 # NOTE: to have a dev-mode tool do its thing in production.
-if(Rails.env.development? || Rails.env.test?)
+if (Rails.env.development? || Rails.env.test?)
   task :set_annotation_options do
     # You can override any of these by setting an environment variable of the
     # same name.
-    Annotate.set_defaults({
-      'position_in_routes'   => "before",
-      'position_in_class'    => "after",
-      'position_in_test'     => "before",
-      'position_in_fixture'  => "before",
-      'position_in_factory'  => "before",
-      'show_indexes'         => "true",
-      'simple_indexes'       => "false",
-      'model_dir'            => "app/models",
-      'include_version'      => "false",
-      'require'              => "",
-      'exclude_tests'        => "true",
-      'exclude_fixtures'     => "true",
-      'exclude_helpers'      => "true",
-      'exclude_factories'    => "true",
-      'exclude_serializers'  => "true",
-      'exclude_controllers'  => "true",
-      'ignore_model_sub_dir' => "false",
-      'skip_on_db_migrate'   => "true",
-      'format_bare'          => "true",
-      'format_rdoc'          => "false",
-      'format_markdown'      => "false",
-      'sort'                 => "false",
-      'force'                => "false",
-      'trace'                => "false",
-    })
+    Annotate.set_defaults('position_in_routes' => "before",
+                          'position_in_class'    => "after",
+                          'position_in_test'     => "before",
+                          'position_in_fixture'  => "before",
+                          'position_in_factory'  => "before",
+                          'show_indexes'         => "true",
+                          'simple_indexes'       => "false",
+                          'model_dir'            => "app/models",
+                          'include_version'      => "false",
+                          'require'              => "",
+                          'exclude_tests'        => "true",
+                          'exclude_fixtures'     => "true",
+                          'exclude_helpers'      => "true",
+                          'exclude_factories'    => "true",
+                          'exclude_serializers'  => "true",
+                          'exclude_controllers'  => "true",
+                          'ignore_model_sub_dir' => "false",
+                          'skip_on_db_migrate'   => "true",
+                          'format_bare'          => "true",
+                          'format_rdoc'          => "false",
+                          'format_markdown'      => "false",
+                          'sort'                 => "false",
+                          'force'                => "false",
+                          'trace'                => "false")
   end
 
 end
diff --git a/lib/tasks/autospec.rake b/lib/tasks/autospec.rake
index 3df52d0f05..2f1de2c486 100644
--- a/lib/tasks/autospec.rake
+++ b/lib/tasks/autospec.rake
@@ -6,7 +6,7 @@ desc "Run all specs automatically as needed"
 task "autospec" => :environment do
   require 'autospec/manager'
 
-  debug = ARGV.any?{ |a|  a == "d" || a == "debug" } || ENV["DEBUG"]
+  debug = ARGV.any? { |a|  a == "d" || a == "debug" } || ENV["DEBUG"]
   force_polling = ARGV.any? { |a| a == "p" || a == "polling" }
   latency = ((ARGV.find { |a| a =~ /l=|latency=/ } || "").split("=")[1] || 3).to_i
 
diff --git a/lib/tasks/avatars.rake b/lib/tasks/avatars.rake
index 4c1da8fd54..5b2df506cf 100644
--- a/lib/tasks/avatars.rake
+++ b/lib/tasks/avatars.rake
@@ -24,7 +24,7 @@ task "avatars:clean" => :environment do
   OptimizedImage.where("upload_id IN (SELECT custom_upload_id FROM user_avatars) OR
                         upload_id IN (SELECT gravatar_upload_id FROM user_avatars) OR
                         upload_id IN (SELECT uploaded_avatar_id FROM users)")
-                .find_each do |optimized_image|
+    .find_each do |optimized_image|
     optimized_image.destroy!
     putc "." if (i += 1) % 10 == 0
   end
diff --git a/lib/tasks/backfill.thor b/lib/tasks/backfill.thor
index a69a58803d..44afebbda5 100644
--- a/lib/tasks/backfill.thor
+++ b/lib/tasks/backfill.thor
@@ -1,7 +1,6 @@
 class Backfill < Thor
   desc "link_titles", "Backfills link titles"
 
-
   def link_titles
     require './config/environment'
     topic_links = TopicLink.where(crawled_at: nil, internal: false)
@@ -13,4 +12,3 @@ class Backfill < Thor
     end
   end
 end
-
diff --git a/lib/tasks/build_test_topic.rake b/lib/tasks/build_test_topic.rake
index e135cabc92..7c64a76566 100644
--- a/lib/tasks/build_test_topic.rake
+++ b/lib/tasks/build_test_topic.rake
@@ -4,7 +4,6 @@ desc 'create pushstate/replacestate test topic'
 task 'build_test_topic' => :environment do
   puts 'Creating topic'
 
-
   # Acceptable options:
   #
   #   raw                     - raw text of post
@@ -33,7 +32,7 @@ task 'build_test_topic' => :environment do
     links = []
     [-30, -10, 10, 30].each do |offset|
       where = (post_number + offset)
-      if where >= 1 and where <= 100
+      if where >= (1) && where <= (100)
         links << "Link to ##{where}: #{topic_url}/#{where}"
       end
     end
diff --git a/lib/tasks/cdn.rake b/lib/tasks/cdn.rake
index c9b793cbf3..0e13c3ae8c 100644
--- a/lib/tasks/cdn.rake
+++ b/lib/tasks/cdn.rake
@@ -34,7 +34,7 @@ task 'assets:prestage' => :environment do |t|
       "id" => config["id"],
       "login" => config["login"],
       "passwd" => config["password"],
-      "json" => {"prefetch_paths" => asset}.to_json
+      "json" => { "prefetch_paths" => asset }.to_json
     )
 
     response = http.request(request)
@@ -43,7 +43,7 @@ task 'assets:prestage' => :environment do |t|
       failed_assets.push(asset)
     end
   end
-  
+
   if failed_assets.length > 0
     raise "Failed to pre-stage #{failed_assets.length}/#{assets.length} files"
   end
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index aba9e4df45..64a4514ae7 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -1,3 +1,29 @@
+# rake docker:test is designed to be used inside the discourse/docker_test image
+# running it anywhere else will likely fail
+#
+# Environment Variables (specific to this rake task)
+# => SKIP_CORE                 set to 1 to skip core tests (rspec and qunit)
+# => SKIP_PLUGINS              set to 1 to skip plugin tests (rspec and qunit)
+# => INSTALL_OFFICIAL_PLUGINS  set to 1 to install all core plugins before running tests
+# => RUBY_ONLY                 set to 1 to skip all qunit tests
+# => JS_ONLY                   set to 1 to skip all rspec tests
+# => SINGLE_PLUGIN             set to plugin name to only run plugin-specific rspec tests (you'll probably want to SKIP_CORE as well)
+# => BISECT                    set to 1 to run rspec --bisect (applies to core rspec tests only)
+# => RSPEC_SEED                set to seed to use for rspec tests (applies to core rspec tests only)
+#
+# Other useful environment variables (not specific to this rake task)
+# => COMMIT_HASH    used by the discourse_test docker image to load a specific commit of discourse
+#                   this can also be set to a branch, e.g. "origin/tests-passed"
+#
+# Example usage:
+#   Run all core and plugin tests:
+#       docker run discourse/discourse_test:release
+#   Run only rspec tests:
+#       docker run -e RUBY_ONLY=1 discourse/discourse_test:release
+#   Run all plugin tests (with a plugin mounted from host filesystem):
+#       docker run -e SKIP_CORE=1 -v $(pwd)/my-awesome-plugin:/var/www/discourse/plugins/my-awesome-plugin discourse/discourse_test:release
+#   Run tests for a specific plugin (with a plugin mounted from host filesystem):
+#       docker run -e SKIP_CORE=1 SINGLE_PLUGIN='my-awesome-plugin' -v $(pwd)/my-awesome-plugin:/var/www/discourse/plugins/my-awesome-plugin discourse/discourse_test:release
 
 def run_or_fail(command)
   pid = Process.spawn(command)
@@ -26,23 +52,55 @@ task 'docker:test' do
     puts "Starting postgres"
     @pg_pid = Process.spawn("#{@postgres_bin}postmaster -D tmp/test_data/pg")
 
-
     ENV["RAILS_ENV"] = "test"
 
     @good = run_or_fail("bundle exec rake db:create db:migrate")
-    unless ENV["JS_ONLY"]
-      @good &&= run_or_fail("bundle exec rspec")
 
-      if ENV["LOAD_PLUGINS"]
-        @good &&= run_or_fail("bundle exec rake plugin:spec")
-      end
+    if ENV["INSTALL_OFFICIAL_PLUGINS"]
+      @good &&= run_or_fail("bundle exec rake plugin:install_all_official")
     end
+
+    unless ENV["JS_ONLY"]
+
+      unless ENV["SKIP_CORE"]
+        params = []
+        if ENV["BISECT"]
+          params << "--bisect"
+        end
+        if ENV["RSPEC_SEED"]
+          params << "--seed #{ENV["RSPEC_SEED"]}"
+        end
+        @good &&= run_or_fail("bundle exec rspec #{params.join(' ')}".strip)
+      end
+
+      unless ENV["SKIP_PLUGINS"]
+        if ENV["SINGLE_PLUGIN"]
+          @good &&= run_or_fail("bundle exec rake plugin:spec['#{ENV["SINGLE_PLUGIN"]}']")
+        else
+          @good &&= run_or_fail("bundle exec rake plugin:spec")
+        end
+      end
+
+    end
+
     unless ENV["RUBY_ONLY"]
-      @good &&= run_or_fail("eslint app/assets/javascripts")
-      @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts")
-      @good &&= run_or_fail("eslint --ext .es6 test/javascripts")
-      @good &&= run_or_fail("eslint test/javascripts")
-      @good &&= run_or_fail("bundle exec rake qunit:test['600000']")
+      unless ENV["SKIP_CORE"]
+        @good &&= run_or_fail("eslint app/assets/javascripts")
+        @good &&= run_or_fail("eslint --ext .es6 app/assets/javascripts")
+        @good &&= run_or_fail("eslint --ext .es6 test/javascripts")
+        @good &&= run_or_fail("eslint test/javascripts")
+        @good &&= run_or_fail("bundle exec rake qunit:test['600000']")
+        @good &&= run_or_fail("bundle exec rake qunit:test['600000','/wizard/qunit']")
+      end
+
+      unless ENV["SKIP_PLUGINS"]
+        if ENV["SINGLE_PLUGIN"]
+          @good &&= run_or_fail("bundle exec rake plugin:qunit['#{ENV['SINGLE_PLUGIN']}','600000']")
+        else
+          @good &&= run_or_fail("bundle exec rake plugin:qunit['*','600000']")
+        end
+      end
+
     end
 
   ensure
diff --git a/lib/tasks/emoji.rake b/lib/tasks/emoji.rake
index e1efd1ef73..5ff933cab7 100644
--- a/lib/tasks/emoji.rake
+++ b/lib/tasks/emoji.rake
@@ -4,7 +4,7 @@ require "json"
 require "nokogiri"
 require "open-uri"
 
-EMOJI_GROUPS_PATH ||= "app/assets/javascripts/discourse/lib/emoji/groups.js.es6"
+EMOJI_GROUPS_PATH ||= "lib/emoji/groups.json"
 
 EMOJI_DB_PATH ||= "lib/emoji/db.json"
 
@@ -432,7 +432,7 @@ def fix_incomplete_sets(emojis)
   end
 end
 
-def generate_emoji_groups(emojis)
+def generate_emoji_groups(keywords)
   puts "Generating groups..."
 
   list = open(EMOJI_ORDERING_URL).read
@@ -446,15 +446,15 @@ def generate_emoji_groups(emojis)
       emoji_list_section = title_section.first.parent.parent.next_element
       emoji_list_section.css("a.plain img").each do |link|
         emoji_code = link.attr("title")
-                         .scan(/U\+(.{4,5})\b/)
-                         .flatten
-                         .map { |code| code.downcase.strip }
-                         .join("_")
+          .scan(/U\+(.{4,5})\b/)
+          .flatten
+          .map { |code| code.downcase.strip }
+          .join("_")
 
         emoji_char = code_to_emoji(emoji_code)
 
-        if emoji = emojis[emoji_char]
-          group["icons"] << emoji["name"]
+        if emoji = keywords[emoji_char]
+          group["icons"] << { name: emoji["name"], diversity: emoji["fitzpatrick_scale"] }
         end
       end
     end
@@ -489,16 +489,16 @@ def write_db_json(emojis)
   # skin tones variations of emojis shouldn’t appear in autocomplete
   emojis_without_tones = emojis
     .select { |char, config|
-      !FITZPATRICK_SCALE.any? { |scale|
-        codepoints_to_code(char.codepoints, config["fitzpatrick_scale"])[scale]
-      }
-    }
+                           !FITZPATRICK_SCALE.any? { |scale|
+                             codepoints_to_code(char.codepoints, config["fitzpatrick_scale"])[scale]
+                           }
+                         }
     .map { |char, config|
-      {
-        "code" => codepoints_to_code(char.codepoints, config["fitzpatrick_scale"]).tr("_", "-"),
-        "name" => config["name"]
-      }
+    {
+      "code" => codepoints_to_code(char.codepoints, config["fitzpatrick_scale"]).tr("_", "-"),
+      "name" => config["name"]
     }
+  }
 
   emoji_with_tones = emojis
     .select { |code, config| config["fitzpatrick_scale"] }
@@ -518,15 +518,7 @@ def write_js_groups(emojis, groups)
 
   confirm_overwrite(EMOJI_GROUPS_PATH)
 
-  template = <<TEMPLATE
-// This file is generated by emoji.rake do not modify directly
-
-// note that these categories are copied from Slack
-const groups = #{JSON.pretty_generate(groups)};
-
-export default groups;
-TEMPLATE
-
+  template = JSON.pretty_generate(groups)
   FileUtils.mkdir_p(File.expand_path("..", EMOJI_GROUPS_PATH))
   File.write(EMOJI_GROUPS_PATH, template)
 end
@@ -540,9 +532,9 @@ end
 
 def codepoints_to_code(codepoints, fitzpatrick_scale)
   codepoints = codepoints
-                .map { |c| c.to_s(16).rjust(4, "0") }
-                .join("_")
-                .downcase
+    .map { |c| c.to_s(16).rjust(4, "0") }
+    .join("_")
+    .downcase
 
   if !fitzpatrick_scale
     codepoints.gsub!(/_fe0f$/, "")
diff --git a/lib/tasks/highlight.rake b/lib/tasks/highlight.rake
index d6baa771fb..f0e0c2bc20 100644
--- a/lib/tasks/highlight.rake
+++ b/lib/tasks/highlight.rake
@@ -1,7 +1,7 @@
 desc "download latest version of highlight and prepare it"
 task "highlightjs:update" do
 
-  def run(cmd, opts={})
+  def run(cmd, opts = {})
     puts cmd
     system(cmd, opts.merge(out: $stdout, err: :out))
   end
diff --git a/lib/tasks/i18n_stats.rake b/lib/tasks/i18n_stats.rake
index 5988402136..ae48b2e968 100644
--- a/lib/tasks/i18n_stats.rake
+++ b/lib/tasks/i18n_stats.rake
@@ -9,7 +9,7 @@ task "i18n:stats" => :environment do
 
       # detect pluralizable string
       if (source["other"] != nil)
-        target[namespace] = {pluralizable: true, content: source}
+        target[namespace] = { pluralizable: true, content: source }
         return
       end
 
@@ -36,7 +36,7 @@ task "i18n:stats" => :environment do
     same = []
     total = a.count
 
-    a.each do |key,value|
+    a.each do |key, value|
       if b[key] == nil
         minus << key
       end
@@ -45,13 +45,13 @@ task "i18n:stats" => :environment do
       end
     end
 
-    b.each do |key,value|
+    b.each do |key, value|
       if a[key] == nil
         plus << key
       end
     end
 
-    a.each do |key,value|
+    a.each do |key, value|
       if value.kind_of?(Hash)
         if value[:pluralizable]
           plural_keys.each do |pl|
@@ -61,7 +61,7 @@ task "i18n:stats" => :environment do
           end
 
           if b[key] != nil && b[key].kind_of?(Hash)
-            b[key][:content].each do |pl,val|
+            b[key][:content].each do |pl, val|
               if ! plural_keys.include?(pl)
                 if a[key][:content]["zero"] == nil
                   plus << "#{key}.#{pl}"
@@ -80,11 +80,11 @@ task "i18n:stats" => :environment do
       end
     end
 
-    return plus,minus,same,total
+    return plus, minus, same, total
   end
 
   def get_plurals(locale)
-    I18n.t("i18n.plural.keys", :locale => locale).map { |x| x.to_s }
+    I18n.t("i18n.plural.keys", locale: locale).map { |x| x.to_s }
   end
 
   puts "Discourse Translation Status Script"
diff --git a/lib/tasks/images.rake b/lib/tasks/images.rake
index 79e19bbe18..b74a7720a9 100644
--- a/lib/tasks/images.rake
+++ b/lib/tasks/images.rake
@@ -1,8 +1,9 @@
+require_dependency "file_helper"
+
 task "images:compress" => :environment do
-  io = ImageOptim.new
   images = Dir.glob("#{Rails.root}/app/**/*.png")
-  image_sizes = Hash[*images.map{|i| [i,File.size(i)]}.to_a.flatten]
-  io.optimize_images!(images) do |name, optimized|
+  image_sizes = Hash[*images.map { |i| [i, File.size(i)] }.to_a.flatten]
+  FileHelper.optimize_images!(images) do |name, optimized|
     if optimized
       new_size = File.size(name)
       puts "#{name} => from: #{image_sizes[name.to_s]} to: #{new_size}"
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index a462631c8c..a0ec50de6c 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -293,7 +293,6 @@ def update_posts
        AND reply_count <> Y.replies
   SQL
 
-
   # -- TODO: ensure this is how this works!
   # WITH X AS (
   #   SELECT pr.post_id, p.user_id
diff --git a/lib/tasks/integration.rake b/lib/tasks/integration.rake
index 1317eb6b1d..32e2a8d1e9 100644
--- a/lib/tasks/integration.rake
+++ b/lib/tasks/integration.rake
@@ -38,7 +38,6 @@ task 'integration:create_fixtures' => :environment do
 
 end
 
-
 def fake_xhr(url)
   uri = URI(url)
 
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 8e7281ad59..56cfb31207 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -1,5 +1,47 @@
 directory 'plugins'
 
+desc 'install all official plugins (use GIT_WRITE=1 to pull with write access)'
+task 'plugin:install_all_official' do
+  skip = Set.new([
+    'customer-flair',
+    'discourse-nginx-performance-report',
+    'hosted-site',
+    'lazyYT',
+    'poll',
+  ])
+
+  map = {
+    'Canned Replies' => 'https://github.com/discourse/discourse-canned-replies',
+    'Spoiler Alert!' => 'https://github.com/discourse/discourse-spoiler-alert',
+    'staff-notes' => 'https://github.com/discourse/discourse-staff-notes',
+    'GitHub badges' => 'https://github.com/discourse/github_badges',
+  }
+
+  #require 'plugin/metadata'
+  Plugin::Metadata::OFFICIAL_PLUGINS.each do |name|
+    next if skip.include? name
+    repo = map[name] || "https://github.com/discourse/#{name}"
+    dir = repo.split('/').last
+    path = File.expand_path('plugins/' + dir)
+
+    if Dir.exist? path
+      STDERR.puts "Skipping #{dir} cause it already exists!"
+      next
+    end
+
+    if ENV['GIT_WRITE']
+      STDERR.puts "Allowing write to all repos!"
+      repo.gsub!("https://github.com/", "git@github.com:")
+      repo << ".git"
+    end
+
+    status = system("git clone #{repo} #{path}")
+    unless status
+      abort("Failed to clone #{repo}")
+    end
+  end
+end
+
 desc 'install plugin'
 task 'plugin:install', :repo do |t, args|
   repo = ENV['REPO'] || ENV['repo'] || args[:repo]
@@ -7,7 +49,7 @@ task 'plugin:install', :repo do |t, args|
 
   plugin_path = File.expand_path('plugins/' + name)
   if File.directory?(File.expand_path(plugin_path))
-   abort('Plugin directory, ' + plugin_path + ', already exists.')
+    abort('Plugin directory, ' + plugin_path + ', already exists.')
   end
 
   clone_status = system('git clone ' + repo + ' ' + plugin_path)
@@ -47,10 +89,32 @@ desc 'run plugin specs'
 task 'plugin:spec', :plugin do |t, args|
   args.with_defaults(plugin: "*")
   ruby = `which ruby`.strip
-  files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*.rb")
+  files = Dir.glob("./plugins/#{args[:plugin]}/spec/**/*_spec.rb")
   if files.length > 0
     sh "LOAD_PLUGINS=1 #{ruby} -S rspec #{files.join(' ')}"
   else
     abort "No specs found."
   end
 end
+
+desc 'run plugin qunit tests'
+task 'plugin:qunit', [:plugin, :timeout] do |t, args|
+  args.with_defaults(plugin: "*")
+
+  rake = `which rake`.strip
+
+  cmd = 'LOAD_PLUGINS=1 '
+  cmd += 'QUNIT_SKIP_CORE=1 '
+
+  if args[:plugin] == "*"
+    puts "Running qunit tests for all plugins"
+  else
+    puts "Running qunit tests for #{args[:plugin]}"
+    cmd += "QUNIT_SINGLE_PLUGIN='#{args[:plugin]}' "
+  end
+
+  cmd += "#{rake} qunit:test"
+  cmd += "[#{args[:timeout]}]" if args[:timeout]
+
+  sh cmd
+end
diff --git a/lib/tasks/populate.thor b/lib/tasks/populate.thor
index 531f0efa22..3c308d2a70 100644
--- a/lib/tasks/populate.thor
+++ b/lib/tasks/populate.thor
@@ -60,7 +60,8 @@ class Populate < Thor
   private
 
   def create_user(user_email)
-    unless User.find_by_email(user_email)
+    user = User.find_by_email(user_email)
+    unless user
       puts "Creating new account: #{user_email}"
       user = User.create!(email: user_email, password: SecureRandom.hex, username: UserNameSuggester.suggest(user_email))
     end
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 0338f3c9fc..f779340040 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -13,7 +13,7 @@ task 'posts:fix_letter_avatars' => :environment do
   return unless SiteSetting.external_system_avatars_enabled
 
   search = Post.where("user_id <> -1")
-               .where("raw LIKE '%/letter\_avatar/%' OR cooked LIKE '%/letter\_avatar/%'")
+    .where("raw LIKE '%/letter\_avatar/%' OR cooked LIKE '%/letter\_avatar/%'")
 
   rebaked = 0
   total = search.count
@@ -27,7 +27,7 @@ task 'posts:fix_letter_avatars' => :environment do
 end
 
 desc 'Rebake all posts matching string/regex and optionally delay the loop'
-task 'posts:rebake_match', [:pattern, :type, :delay] => [:environment] do |_,args|
+task 'posts:rebake_match', [:pattern, :type, :delay] => [:environment] do |_, args|
   pattern = args[:pattern]
   type = args[:type]
   type = type.downcase if type
@@ -106,7 +106,7 @@ task 'posts:normalize_code' => :environment do
   Post.where("raw like '%<pre>%<code>%'").each do |p|
     normalized = Import::Normalize.normalize_code_blocks(p.raw, lang)
     if normalized != p.raw
-      p.revise(Discourse.system_user, { raw: normalized })
+      p.revise(Discourse.system_user, raw: normalized)
       putc "."
       i += 1
     end
@@ -116,14 +116,14 @@ task 'posts:normalize_code' => :environment do
   puts "#{i} posts normalized!"
 end
 
-def remap_posts(find, replace="")
+def remap_posts(find, replace = "")
   i = 0
   Post.where("raw LIKE ?", "%#{find}%").each do |p|
     new_raw = p.raw.dup
     new_raw = new_raw.gsub!(/#{Regexp.escape(find)}/, replace) || new_raw
 
     if new_raw != p.raw
-      p.revise(Discourse.system_user, { raw: new_raw }, { bypass_bump: true, skip_revision: true })
+      p.revise(Discourse.system_user, { raw: new_raw }, bypass_bump: true, skip_revision: true)
       putc "."
       i += 1
     end
@@ -132,7 +132,7 @@ def remap_posts(find, replace="")
 end
 
 desc 'Remap all posts matching specific string'
-task 'posts:remap', [:find, :replace] => [:environment] do |_,args|
+task 'posts:remap', [:find, :replace] => [:environment] do |_, args|
 
   find = args[:find]
   replace = args[:replace]
@@ -150,7 +150,7 @@ task 'posts:remap', [:find, :replace] => [:environment] do |_,args|
 end
 
 desc 'Delete occurrence of a word/string'
-task 'posts:delete_word', [:find] => [:environment] do |_,args|
+task 'posts:delete_word', [:find] => [:environment] do |_, args|
   require 'highline/import'
 
   find = args[:find]
diff --git a/lib/tasks/qunit.rake b/lib/tasks/qunit.rake
index 9baf48a1af..a80e443ed4 100644
--- a/lib/tasks/qunit.rake
+++ b/lib/tasks/qunit.rake
@@ -1,6 +1,6 @@
 desc "Runs the qunit test suite"
 
-task "qunit:test", [:timeout] => :environment do |_, args|
+task "qunit:test", [:timeout, :qunit_path] => :environment do |_, args|
 
   require "rack"
   require "socket"
@@ -10,7 +10,7 @@ task "qunit:test", [:timeout] => :environment do |_, args|
   end
 
   # ensure we have this port available
-  def port_available? port
+  def port_available?(port)
     server = TCPServer.open port
     server.close
     true
@@ -26,31 +26,51 @@ task "qunit:test", [:timeout] => :environment do |_, args|
 
   unless pid = fork
     Discourse.after_fork
-    Rack::Server.start(:config => "config.ru",
-                       :AccessLog => [],
-                       :Port => port)
+    Rack::Server.start(config: "config.ru",
+                       AccessLog: [],
+                       Port: port)
     exit
   end
 
   begin
     success = true
     test_path = "#{Rails.root}/vendor/assets/javascripts"
-    cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}/qunit"
+    qunit_path = args[:qunit_path] || "/qunit"
+    cmd = "phantomjs #{test_path}/run-qunit.js http://localhost:#{port}#{qunit_path}"
 
     options = {}
 
-    %w{module filter}.each do |arg|
+    %w{module filter qunit_skip_core qunit_single_plugin}.each do |arg|
       options[arg] = ENV[arg.upcase] if ENV[arg.upcase].present?
     end
 
     if options.present?
-      cmd += "?#{options.to_query.gsub('+', '%20')}"
+      cmd += "?#{options.to_query.gsub('+', '%20').gsub("&", '\\\&')}"
     end
 
     if args[:timeout].present?
       cmd += " #{args[:timeout]}"
     end
 
+    @now = Time.now
+    def elapsed
+      Time.now - @now
+    end
+
+    # wait for server to accept connections
+    require 'net/http'
+    uri = URI("http://localhost:#{port}/assets/test_helper.js")
+    puts "Warming up Rails server"
+    begin
+      Net::HTTP.get(uri)
+    rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
+      sleep 1
+      retry unless elapsed() > 60
+      puts "Timed out. Can no connect to forked server!"
+      exit 1
+    end
+    puts "Rails server is warmed up"
+
     # wait for server to respond, will exception out on failure
     tries = 0
     begin
diff --git a/lib/tasks/release_note.rake b/lib/tasks/release_note.rake
index 54c40e267b..4023727d45 100644
--- a/lib/tasks/release_note.rake
+++ b/lib/tasks/release_note.rake
@@ -55,14 +55,14 @@ end
 
 def escape_brackets(line)
   line.gsub("<", "`<")
-      .gsub(">", ">`")
-      .gsub("[", "`[")
-      .gsub("]", "]`")
+    .gsub(">", ">`")
+    .gsub("[", "`[")
+    .gsub("]", "]`")
 end
 
 def split_comments(text)
   text = normalize_terms(text)
-  terms = ["FIX:", "FEATURE:", "UX:", "SECURITY:" ,"PERF:"]
+  terms = ["FIX:", "FEATURE:", "UX:", "SECURITY:" , "PERF:"]
   terms.each do |term|
     text = newlines_at_term(text, term)
   end
@@ -79,7 +79,7 @@ end
 
 def newlines_at_term(text, term)
   if text.include?(term)
-    text = text.split(term).map{ |l| l.strip }.join("\n#{term} ")
+    text = text.split(term).map { |l| l.strip }.join("\n#{term} ")
   end
   text
 end
diff --git a/lib/tasks/scheduler.rake b/lib/tasks/scheduler.rake
index 208d524ee5..d7d1efeb86 100644
--- a/lib/tasks/scheduler.rake
+++ b/lib/tasks/scheduler.rake
@@ -1,21 +1,21 @@
 desc "This task is called by the Heroku scheduler add-on"
 
 # Every day at 6am
-task :enqueue_digest_emails => :environment do
+task enqueue_digest_emails: :environment do
   Jobs::EnqueueDigestEmails.new.execute(nil)
 end
 
 # Every day at 4am
-task :category_stats => :environment do
+task category_stats: :environment do
   Jobs::CategoryStats.new.execute(nil)
 end
 
 # Every 10 minutes
-task :periodical_updates => :environment do
+task periodical_updates: :environment do
   Jobs::PeriodicalUpdates.new.execute(nil)
 end
 
 # Every day
-task :version_check => :environment do
+task version_check: :environment do
   Jobs::VersionCheck.new.execute(nil)
-end
\ No newline at end of file
+end
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index c944812d79..ef84747cce 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -2,7 +2,7 @@ task "search:reindex" => :environment do
   ENV['RAILS_DB'] ? reindex_search : reindex_search_all_sites
 end
 
-def reindex_search(db=RailsMultisite::ConnectionManagement.current_db)
+def reindex_search(db = RailsMultisite::ConnectionManagement.current_db)
   puts "Reindexing '#{db}'"
   puts ""
   puts "Posts:"
diff --git a/lib/tasks/typepad.thor b/lib/tasks/typepad.thor
index 26613f89b6..7db75d415e 100644
--- a/lib/tasks/typepad.thor
+++ b/lib/tasks/typepad.thor
@@ -45,7 +45,7 @@ class Typepad < Thor
       end
     end
 
-    entries.each_with_index do |e,i|
+    entries.each_with_index do |e, i|
       if e[:title] =~ /Head/
         puts "#{i}: #{e[:title]}"
       end
@@ -56,7 +56,7 @@ class Typepad < Thor
 
     puts "Importing #{entries.size} entries"
     entries.each_with_index do |entry, idx|
-      puts "Importing (#{idx+1}/#{entries.size})"
+      puts "Importing (#{idx + 1}/#{entries.size})"
       next if entry[:body].blank?
 
       puts entry[:unique_url]
@@ -219,7 +219,7 @@ class Typepad < Thor
                 current << c
               end
             end
-            segments.delete_if {|s| s.nil? || s.size < 2}
+            segments.delete_if { |s| s.nil? || s.size < 2 }
             segments << current
 
             comment[:author] = segments[0]
diff --git a/lib/tasks/uploads.rake b/lib/tasks/uploads.rake
index e8c5dc67b2..9da415dba0 100644
--- a/lib/tasks/uploads.rake
+++ b/lib/tasks/uploads.rake
@@ -27,8 +27,8 @@ def gather_uploads
   puts "", "Gathering uploads for '#{current_db}'...", ""
 
   Upload.where("url ~ '^\/uploads\/'")
-        .where("url !~ '^\/uploads\/#{current_db}'")
-        .find_each do |upload|
+    .where("url !~ '^\/uploads\/#{current_db}'")
+    .find_each do |upload|
     begin
       old_db = upload.url[/^\/uploads\/([^\/]+)\//, 1]
       from = upload.url.dup
@@ -100,7 +100,7 @@ def guess_filename(url, raw)
     filename ||= File.basename(url)
     filename
   rescue
-      nil
+    nil
   ensure
     f.try(:close!) rescue nil
   end
@@ -203,8 +203,8 @@ def migrate_to_s3
 
   # Migrate all uploads
   Upload.where.not(sha1: nil)
-        .where("url NOT LIKE '#{s3.absolute_base_url}%'")
-        .find_each do |upload|
+    .where("url NOT LIKE '#{s3.absolute_base_url}%'")
+    .find_each do |upload|
     # remove invalid uploads
     if upload.url.blank?
       upload.destroy!
@@ -215,7 +215,7 @@ def migrate_to_s3
     # retrieve the path to the local file
     path = local.path_for(upload)
     # make sure the file exists locally
-    if !path or !File.exists?(path)
+    if !path || !File.exists?(path)
       putc "X"
       next
     end
diff --git a/lib/tasks/user_actions.rake b/lib/tasks/user_actions.rake
index ffba1f2b22..f457454978 100644
--- a/lib/tasks/user_actions.rake
+++ b/lib/tasks/user_actions.rake
@@ -2,9 +2,9 @@ desc "rebuild the user_actions table"
 task "user_actions:rebuild" => :environment do
   MessageBus.off
   UserAction.delete_all
-  PostAction.all.each{|i| UserActionCreator.log_post_action(i)}
-  Topic.all.each {|i| UserActionCreator.log_topic(i)}
-  Post.all.each {|i| UserActionCreator.log_post(i)}
+  PostAction.all.each { |i| UserActionCreator.log_post_action(i) }
+  Topic.all.each { |i| UserActionCreator.log_topic(i) }
+  Post.all.each { |i| UserActionCreator.log_post(i) }
   Notification.all.each do |notification|
     UserActionCreator.log_notification(notification.post,
                                        notification.user,
@@ -12,4 +12,3 @@ task "user_actions:rebuild" => :environment do
                                        notification.user)
   end
 end
-
diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index 7772bba660..d01d30b744 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -1,5 +1,5 @@
 desc "Change topic/post ownership of all the topics/posts by a specific user (without creating new revision)"
-task "users:change_post_ownership", [:old_username, :new_username, :archetype] => [:environment] do |_,args|
+task "users:change_post_ownership", [:old_username, :new_username, :archetype] => [:environment] do |_, args|
   old_username = args[:old_username]
   new_username = args[:new_username]
   archetype = args[:archetype]
diff --git a/lib/text_sentinel.rb b/lib/text_sentinel.rb
index e86a897b67..fa88e647f9 100644
--- a/lib/text_sentinel.rb
+++ b/lib/text_sentinel.rb
@@ -11,12 +11,12 @@ class TextSentinel
 
   ENTROPY_SCALE ||= 0.7
 
-  def initialize(text, opts=nil)
+  def initialize(text, opts = nil)
     @opts = opts || {}
     @text = text.to_s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
   end
 
-  def self.body_sentinel(text, opts={})
+  def self.body_sentinel(text, opts = {})
     entropy = SiteSetting.body_min_entropy
     if opts[:private_message]
       scale_entropy = SiteSetting.min_private_message_post_length.to_f / SiteSetting.min_post_length.to_f
@@ -41,7 +41,7 @@ class TextSentinel
   # Non-ASCII characters are weighted heavier since they contain more "information"
   def entropy
     chars = @text.to_s.strip.split('')
-    @entropy ||= chars.pack('M*'*chars.size).gsub("\n",'').split('=').uniq.size
+    @entropy ||= chars.pack('M*' * chars.size).gsub("\n", '').split('=').uniq.size
   end
 
   def valid?
@@ -74,7 +74,6 @@ class TextSentinel
     @opts[:max_word_length].blank? || @text.split(/\s|\/|-|\.|:/).map(&:size).max <= @opts[:max_word_length]
   end
 
-
   def seems_quiet?
     # We don't allow all upper case content
     SiteSetting.allow_uppercase_posts || @text == @text.mb_chars.downcase.to_s || @text != @text.mb_chars.upcase.to_s
diff --git a/lib/timeline_lookup.rb b/lib/timeline_lookup.rb
index 1c62d879f5..90d4a5e02a 100644
--- a/lib/timeline_lookup.rb
+++ b/lib/timeline_lookup.rb
@@ -2,7 +2,7 @@ module TimelineLookup
 
   # Given an array of tuples (id, post_number, days_ago), return at most `max_values` worth of a
   # lookup table to help the front end timeline display dates associated with posts
-  def self.build(tuples, max_values=300)
+  def self.build(tuples, max_values = 300)
     result = []
 
     every = (tuples.size.to_f / max_values).ceil
@@ -14,7 +14,7 @@ module TimelineLookup
       days_ago = t[2]
 
       if (days_ago != last_days_ago)
-        result << [idx+1, days_ago]
+        result << [idx + 1, days_ago]
         last_days_ago = days_ago
       end
 
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index ecd35fd116..885f4f2605 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -80,13 +80,16 @@ class TopicCreator
     topic.topic_allowed_groups(true).each do |tag|
       tag.group.group_users.each do |gu|
         next if gu.user_id == -1 || gu.user_id == topic.user_id
-        action = case gu.notification_level
-                 when TopicUser.notification_levels[:tracking] then "track!"
-                 when TopicUser.notification_levels[:regular]  then "regular!"
-                 when TopicUser.notification_levels[:muted]    then "mute!"
-                 when TopicUser.notification_levels[:watching] then "watch!"
-                 else "track!"
-                 end
+
+        action =
+          case gu.notification_level
+          when TopicUser.notification_levels[:tracking] then "track!"
+          when TopicUser.notification_levels[:regular]  then "regular!"
+          when TopicUser.notification_levels[:muted]    then "mute!"
+          when TopicUser.notification_levels[:watching] then "watch!"
+          else "track!"
+          end
+
         topic.notifier.send(action, gu.user_id)
       end
     end
@@ -152,7 +155,7 @@ class TopicCreator
   def setup_auto_close_time(topic)
     return unless @opts[:auto_close_time].present?
     return unless @guardian.can_moderate?(topic)
-    topic.set_auto_close(@opts[:auto_close_time], {by_user: @user})
+    topic.set_auto_close(@opts[:auto_close_time], by_user: @user)
   end
 
   def process_private_message(topic)
@@ -163,8 +166,8 @@ class TopicCreator
       rollback_with!(topic, :no_user_selected)
     end
 
-    add_users(topic,@opts[:target_usernames])
-    add_groups(topic,@opts[:target_group_names])
+    add_users(topic, @opts[:target_usernames])
+    add_groups(topic, @opts[:target_group_names])
     topic.topic_allowed_users.build(user_id: @user.id)
   end
 
diff --git a/lib/topic_list_responder.rb b/lib/topic_list_responder.rb
index 0513330085..b53380345f 100644
--- a/lib/topic_list_responder.rb
+++ b/lib/topic_list_responder.rb
@@ -21,4 +21,3 @@ module TopicListResponder
   end
 
 end
-
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 62e6ec619b..934c3e84ef 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -46,7 +46,6 @@ class TopicQuery
          no_definitions)
   end
 
-
   # Maps `order` to a columns in `topics`
   SORTABLE_MAPPING = {
     'likes' => 'like_count',
@@ -80,21 +79,21 @@ class TopicQuery
 
   def self.apply_custom_filters(results, topic_query)
     if @custom_filters
-      @custom_filters.each do |key,filter|
+      @custom_filters.each do |key, filter|
         results = filter.call(results, topic_query)
       end
     end
     results
   end
 
-  def initialize(user=nil, options={})
+  def initialize(user = nil, options = {})
     options.assert_valid_keys(TopicQuery.valid_options)
     @options = options.dup
     @user = user
     @guardian = Guardian.new(@user)
   end
 
-  def joined_topic_user(list=nil)
+  def joined_topic_user(list = nil)
     (list || Topic).joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})")
   end
 
@@ -108,8 +107,8 @@ class TopicQuery
       if topic.private_message?
 
         group_ids = topic.topic_allowed_groups
-                      .where('group_id IN (SELECT group_id FROM group_users WHERE user_id = :user_id)', user_id: @user.id)
-                      .pluck(:group_id)
+          .where('group_id IN (SELECT group_id FROM group_users WHERE user_id = :user_id)', user_id: @user.id)
+          .pluck(:group_id)
         {
           topic: topic,
           my_group_ids: group_ids,
@@ -151,7 +150,7 @@ class TopicQuery
       builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids)) unless builder.full?
     end
 
-    params = {unordered: true}
+    params = { unordered: true }
     if topic.private_message?
       params[:preload_posters] = true
     end
@@ -170,19 +169,19 @@ class TopicQuery
   end
 
   def list_new
-    create_list(:new, {unordered: true}, new_results)
+    create_list(:new, { unordered: true }, new_results)
   end
 
   def list_unread
-    create_list(:unread, {unordered: true}, unread_results)
+    create_list(:unread, { unordered: true }, unread_results)
   end
 
   def list_posted
-    create_list(:posted) {|l| l.where('tu.posted') }
+    create_list(:posted) { |l| l.where('tu.posted') }
   end
 
   def list_bookmarks
-    create_list(:bookmarks) {|l| l.where('tu.bookmarked') }
+    create_list(:bookmarks) { |l| l.where('tu.bookmarked') }
   end
 
   def list_top_for(period)
@@ -207,14 +206,14 @@ class TopicQuery
   def not_archived(list, user)
     list.joins("LEFT JOIN user_archived_messages um
                        ON um.user_id = #{user.id.to_i} AND um.topic_id = topics.id")
-               .where('um.user_id IS NULL')
+      .where('um.user_id IS NULL')
   end
 
   def list_private_messages(user)
     list = private_messages_for(user, :user)
 
     list = not_archived(list, user)
-            .where('NOT (topics.participant_count = 1 AND topics.user_id = ?)', user.id)
+      .where('NOT (topics.participant_count = 1 AND topics.user_id = ?)', user.id)
 
     create_list(:private_messages, {}, list)
   end
@@ -262,8 +261,8 @@ class TopicQuery
   def list_category_topic_ids(category)
     query = default_results(category: category.id)
     pinned_ids = query.where('pinned_at IS NOT NULL AND category_id = ?', category.id)
-                      .limit(nil)
-                      .order('pinned_at DESC').pluck(:id)
+      .limit(nil)
+      .order('pinned_at DESC').pluck(:id)
     non_pinned_ids = query.where('pinned_at IS NULL OR category_id <> ?', category.id).pluck(:id)
     (pinned_ids + non_pinned_ids)
   end
@@ -276,8 +275,8 @@ class TopicQuery
 
   def self.new_filter(list, treat_as_new_topic_start_date)
     list.where("topics.created_at >= :created_at", created_at: treat_as_new_topic_start_date)
-        .where("tu.last_read_post_number IS NULL")
-        .where("COALESCE(tu.notification_level, :tracking) >= :tracking", tracking: TopicUser.notification_levels[:tracking])
+      .where("tu.last_read_post_number IS NULL")
+      .where("COALESCE(tu.notification_level, :tracking) >= :tracking", tracking: TopicUser.notification_levels[:tracking])
   end
 
   def self.unread_filter(list, user_id, opts)
@@ -293,8 +292,8 @@ class TopicQuery
     col_name = opts[:staff] ? "highest_staff_post_number" : "highest_post_number"
 
     list
-        .where("tu.last_read_post_number < topics.#{col_name}")
-        .where("COALESCE(tu.notification_level, :regular) >= :tracking",
+      .where("tu.last_read_post_number < topics.#{col_name}")
+      .where("COALESCE(tu.notification_level, :regular) >= :tracking",
                regular: TopicUser.notification_levels[:regular], tracking: TopicUser.notification_levels[:tracking])
   end
 
@@ -315,19 +314,19 @@ class TopicQuery
     if page == 0
       (pinned_topics + unpinned_topics)[0...limit] if limit
     else
-      offset = (page * per_page) - pinned_topics.count - 1
+      offset = (page * per_page) - pinned_topics.count
       offset = 0 unless offset > 0
       unpinned_topics.offset(offset).to_a
     end
 
   end
 
-  def create_list(filter, options={}, topics = nil)
+  def create_list(filter, options = {}, topics = nil)
     topics ||= default_results(options)
     topics = yield(topics) if block_given?
 
     options = options.merge(@options)
-    if ["activity","default"].include?(options[:order] || "activity") &&
+    if ["activity", "default"].include?(options[:order] || "activity") &&
         !options[:unordered] &&
         filter != :private_messages
       topics = prioritize_pinned_topics(topics, options)
@@ -348,7 +347,7 @@ class TopicQuery
     end
 
     topics.each do |t|
-      t.allowed_user_ids = filter == :private_messages ? t.allowed_users.map{|u| u.id} : []
+      t.allowed_user_ids = filter == :private_messages ? t.allowed_users.map { |u| u.id } : []
     end
 
     list = TopicList.new(filter, @user, topics, options.merge(@options))
@@ -356,7 +355,7 @@ class TopicQuery
     list
   end
 
-  def latest_results(options={})
+  def latest_results(options = {})
     result = default_results(options)
     result = remove_muted_topics(result, @user) unless options && options[:state] == "muted".freeze
     result = remove_muted_categories(result, @user, exclude: options[:category])
@@ -370,12 +369,12 @@ class TopicQuery
     result
   end
 
-  def unread_results(options={})
+  def unread_results(options = {})
     result = TopicQuery.unread_filter(
-        default_results(options.reverse_merge(:unordered => true)),
+        default_results(options.reverse_merge(unordered: true)),
         @user&.id,
         staff: @user&.staff?)
-    .order('CASE WHEN topics.user_id = tu.user_id THEN 1 ELSE 2 END')
+      .order('CASE WHEN topics.user_id = tu.user_id THEN 1 ELSE 2 END')
 
     self.class.results_filter_callbacks.each do |filter_callback|
       result = filter_callback.call(:unread, result, @user, options)
@@ -384,10 +383,10 @@ class TopicQuery
     suggested_ordering(result, options)
   end
 
-  def new_results(options={})
+  def new_results(options = {})
     # TODO does this make sense or should it be ordered on created_at
     #  it is ordering on bumped_at now
-    result = TopicQuery.new_filter(default_results(options.reverse_merge(:unordered => true)), @user.user_option.treat_as_new_topic_start_date)
+    result = TopicQuery.new_filter(default_results(options.reverse_merge(unordered: true)), @user.user_option.treat_as_new_topic_start_date)
     result = remove_muted_topics(result, @user)
     result = remove_muted_categories(result, @user, exclude: options[:category])
     result = remove_muted_tags(result, @user, options)
@@ -436,8 +435,8 @@ class TopicQuery
       end
 
       result = result.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user.id.to_i})")
-                     .order("topics.bumped_at DESC")
-                     .private_messages
+        .order("topics.bumped_at DESC")
+        .private_messages
 
       result = result.limit(options[:per_page]) unless options[:limit] == false
       result = result.visible if options[:visible] || @user.nil? || @user.regular?
@@ -489,9 +488,8 @@ class TopicQuery
       category_id
     end
 
-
     # Create results based on a bunch of default options
-    def default_results(options={})
+    def default_results(options = {})
       options.reverse_merge!(@options)
       options.reverse_merge!(per_page: per_page_setting)
 
@@ -504,7 +502,7 @@ class TopicQuery
 
       if @user
         result = result.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})")
-                       .references('tu')
+          .references('tu')
       end
 
       category_id = get_category_id(options[:category])
@@ -559,7 +557,7 @@ class TopicQuery
           end
         elsif @options[:no_tags]
           # the following will do: ("topics"."id" NOT IN (SELECT DISTINCT "topic_tags"."topic_id" FROM "topic_tags"))
-          result = result.where.not(:id => TopicTag.select(:topic_id).uniq)
+          result = result.where.not(id: TopicTag.select(:topic_id).uniq)
         end
       end
 
@@ -578,7 +576,7 @@ class TopicQuery
       result = result.limit(options[:per_page]) unless options[:limit] == false
 
       result = result.visible if options[:visible]
-      result = result.where.not(topics: {id: options[:except_topic_ids]}).references(:topics) if options[:except_topic_ids]
+      result = result.where.not(topics: { id: options[:except_topic_ids] }).references(:topics) if options[:except_topic_ids]
 
       if options[:page]
         offset = options[:page].to_i * options[:per_page]
@@ -641,7 +639,7 @@ class TopicQuery
         end
       end
 
-      if (filter=options[:filter]) && @user
+      if (filter = options[:filter]) && @user
         action =
           if filter == "bookmarked"
             PostActionType.types[:bookmark]
@@ -665,7 +663,7 @@ class TopicQuery
       result = result.where('topics.posts_count <= ?', options[:max_posts]) if options[:max_posts].present?
       result = result.where('topics.posts_count >= ?', options[:min_posts]) if options[:min_posts].present?
 
-      result = TopicQuery.apply_custom_filters(result,self)
+      result = TopicQuery.apply_custom_filters(result, self)
 
       @guardian.filter_allowed_categories(result)
     end
@@ -677,12 +675,12 @@ class TopicQuery
 
       list
     end
-    def remove_muted_categories(list, user, opts=nil)
+    def remove_muted_categories(list, user, opts = nil)
       category_id = get_category_id(opts[:exclude]) if opts
 
       if user
         list = list.references("cu")
-                   .where("
+          .where("
           NOT EXISTS (
             SELECT 1
               FROM category_users cu
@@ -699,7 +697,7 @@ class TopicQuery
 
       list
     end
-    def remove_muted_tags(list, user, opts=nil)
+    def remove_muted_tags(list, user, opts = nil)
       if user.nil? || !SiteSetting.tagging_enabled || !SiteSetting.remove_muted_tags_from_latest
         list
       else
@@ -732,7 +730,7 @@ class TopicQuery
     def new_messages(params)
 
       TopicQuery.new_filter(messages_for_groups_or_user(params[:my_group_ids]), Time.at(SiteSetting.min_new_topics_time).to_datetime)
-                .limit(params[:count])
+        .limit(params[:count])
 
     end
 
@@ -741,7 +739,7 @@ class TopicQuery
         messages_for_groups_or_user(params[:my_group_ids]),
         @user&.id,
         staff: @user&.staff?)
-                .limit(params[:count])
+        .limit(params[:count])
     end
 
     def related_messages_user(params)
@@ -811,7 +809,7 @@ class TopicQuery
       query.order('topics.bumped_at DESC')
     end
 
-    def random_suggested(topic, count, excluded_topic_ids=[])
+    def random_suggested(topic, count, excluded_topic_ids = [])
       result = default_results(unordered: true, per_page: count).where(closed: false, archived: false)
       excluded_topic_ids += Category.topic_ids.to_a
       result = result.where("topics.id NOT IN (?)", excluded_topic_ids) unless excluded_topic_ids.empty?
@@ -829,7 +827,7 @@ class TopicQuery
       # of muted, big edge case
       #
       # we over select in case cache is stale
-      max = (count*1.3).to_i
+      max = (count * 1.3).to_i
       ids = RandomTopicSelector.next(max) + RandomTopicSelector.next(max, topic.category)
 
       result.where(id: ids.uniq)
diff --git a/lib/topic_retriever.rb b/lib/topic_retriever.rb
index 672ca60a69..82f815d9f7 100644
--- a/lib/topic_retriever.rb
+++ b/lib/topic_retriever.rb
@@ -1,6 +1,6 @@
 class TopicRetriever
 
-  def initialize(embed_url, opts=nil)
+  def initialize(embed_url, opts = nil)
     @embed_url = embed_url
     @author_username = opts[:author_username]
     @opts = opts || {}
@@ -34,7 +34,6 @@ class TopicRetriever
       # It's possible another process or job found the embed already. So if that happened bail out.
       return if TopicEmbed.where(embed_url: @embed_url).exists?
 
-
       # First check RSS if that is enabled
       if SiteSetting.feed_polling_enabled?
         Jobs::PollFeed.new.execute({})
diff --git a/lib/topic_subtype.rb b/lib/topic_subtype.rb
index 0d8224c4e4..731ed29c3e 100644
--- a/lib/topic_subtype.rb
+++ b/lib/topic_subtype.rb
@@ -9,7 +9,7 @@ class TopicSubtype
   end
 
   def attributes
-    {'id' => @id, 'options' => @options }
+    { 'id' => @id, 'options' => @options }
   end
 
   def self.list
@@ -41,7 +41,7 @@ class TopicSubtype
     'pending_users'
   end
 
-  def self.register(name, options={})
+  def self.register(name, options = {})
     @subtypes ||= {}
     @subtypes[name] = TopicSubtype.new(name, options)
   end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 482853d71e..d631a33135 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -37,7 +37,7 @@ class TopicView
     wpcf.flatten.uniq
   end
 
-  def initialize(topic_id, user=nil, options={})
+  def initialize(topic_id, user = nil, options = {})
     @message_bus_last_id = MessageBus.last_id("/topic/#{topic_id}")
     @user = user
     @guardian = Guardian.new(@user)
@@ -50,11 +50,13 @@ class TopicView
     end
 
     @page = 1 if (!@page || @page.zero?)
-    @chunk_size = case
-                    when options[:slow_platform] then TopicView.slow_chunk_size
-                    when @print then TopicView.print_chunk_size
-                    else TopicView.chunk_size
-                  end
+    @chunk_size =
+      case
+      when options[:slow_platform] then TopicView.slow_chunk_size
+      when @print then TopicView.print_chunk_size
+      else TopicView.chunk_size
+      end
+
     @limit ||= @chunk_size
 
     setup_filtered_posts
@@ -82,12 +84,15 @@ class TopicView
 
   def canonical_path
     path = relative_url
-    path << if @post_number
-      page = ((@post_number.to_i - 1) / @limit) + 1
-      (page > 1) ? "?page=#{page}" : ""
-    else
-      (@page && @page.to_i > 1) ? "?page=#{@page}" : ""
-    end
+
+    path <<
+      if @post_number
+        page = ((@post_number.to_i - 1) / @limit) + 1
+        (page > 1) ? "?page=#{page}" : ""
+      else
+        (@page && @page.to_i > 1) ? "?page=#{@page}" : ""
+      end
+
     path
   end
 
@@ -161,7 +166,7 @@ class TopicView
     return @desired_post if @desired_post.present?
     return nil if posts.blank?
 
-    @desired_post = posts.detect {|p| p.post_number == @post_number.to_i}
+    @desired_post = posts.detect { |p| p.post_number == @post_number.to_i }
     @desired_post ||= posts.first
     @desired_post
   end
@@ -175,7 +180,7 @@ class TopicView
 
   def read_time
     return nil if @post_number.present? && @post_number.to_i != 1 # only show for topic URLs
-    (@topic.word_count/SiteSetting.read_time_word_count).floor if @topic.word_count
+    (@topic.word_count / SiteSetting.read_time_word_count).floor if @topic.word_count
   end
 
   def like_count
@@ -235,7 +240,6 @@ class TopicView
     filter_posts_in_range(min_idx, max_idx)
   end
 
-
   def filter_posts_paged(page)
     page = [page, 1].max
     min = @limit * (page - 1)
@@ -248,7 +252,7 @@ class TopicView
     filter_posts_in_range(min, max)
   end
 
-  def filter_best(max, opts={})
+  def filter_best(max, opts = {})
     filter = FilterBestPosts.new(@topic, @filtered_posts, max, opts)
     @posts = filter.posts
     @filtered_posts = filter.filtered_posts
@@ -261,9 +265,9 @@ class TopicView
 
   def has_deleted?
     @predelete_filtered_posts.with_deleted
-                             .where("posts.deleted_at IS NOT NULL")
-                             .where("posts.post_number > 1")
-                             .exists?
+      .where("posts.deleted_at IS NOT NULL")
+      .where("posts.post_number > 1")
+      .exists?
   end
 
   def topic_user
@@ -275,17 +279,17 @@ class TopicView
 
   def post_counts_by_user
     @post_counts_by_user ||= Post.where(topic_id: @topic.id)
-                                 .where("user_id IS NOT NULL")
-                                 .group(:user_id)
-                                 .order("count_all DESC")
-                                 .limit(24)
-                                 .count
+      .where("user_id IS NOT NULL")
+      .group(:user_id)
+      .order("count_all DESC")
+      .limit(24)
+      .count
   end
 
   def participants
     @participants ||= begin
       participants = {}
-      User.where(id: post_counts_by_user.map {|k,v| k}).includes(:primary_group).each {|u| participants[u.id] = u}
+      User.where(id: post_counts_by_user.map { |k, v| k }).includes(:primary_group).each { |u| participants[u.id] = u }
       participants
     end
   end
@@ -303,7 +307,7 @@ class TopicView
   end
 
   def link_counts
-    @link_counts ||= TopicLink.counts_for(guardian,@topic, posts)
+    @link_counts ||= TopicLink.counts_for(guardian, @topic, posts)
   end
 
   # Are we the initial page load? If so, we can return extra information like
@@ -331,7 +335,7 @@ class TopicView
 
   def current_post_ids
     @current_post_ids ||= if @posts.is_a?(Array)
-      @posts.map {|p| p.id }
+      @posts.map { |p| p.id }
     else
       @posts.pluck(:post_number)
     end
@@ -341,13 +345,13 @@ class TopicView
   # calculations.
   def filtered_post_stream
     @filtered_post_stream ||= @filtered_posts.order(:sort_order)
-                                             .pluck(:id,
+      .pluck(:id,
                                                     :post_number,
                                                     'EXTRACT(DAYS FROM CURRENT_TIMESTAMP - created_at)::INT AS days_ago')
   end
 
   def filtered_post_ids
-    @filtered_post_ids ||= filtered_post_stream.map {|tuple| tuple[0]}
+    @filtered_post_ids ||= filtered_post_stream.map { |tuple| tuple[0] }
   end
 
   protected
@@ -359,11 +363,11 @@ class TopicView
       return result unless topic_user.present?
 
       post_numbers = PostTiming
-                .where(topic_id: @topic.id, user_id: @user.id)
-                .where(post_number: current_post_ids)
-                .pluck(:post_number)
+        .where(topic_id: @topic.id, user_id: @user.id)
+        .where(post_number: current_post_ids)
+        .pluck(:post_number)
 
-      post_numbers.each {|pn| result << pn}
+      post_numbers.each { |pn| result << pn }
       result
     end
   end
@@ -383,8 +387,8 @@ class TopicView
   def filter_posts_by_ids(post_ids)
     # TODO: Sort might be off
     @posts = Post.where(id: post_ids, topic_id: @topic.id)
-                 .includes(:user, :reply_to_user, :incoming_email)
-                 .order('sort_order')
+      .includes(:user, :reply_to_user, :incoming_email)
+      .order('sort_order')
     @posts = filter_post_types(@posts)
     @posts = @posts.with_deleted if @guardian.can_see_deleted_posts?
     @posts
@@ -435,7 +439,7 @@ class TopicView
 
     # Username filters
     if @username_filters.present?
-      usernames = @username_filters.map{|u| u.downcase}
+      usernames = @username_filters.map { |u| u.downcase }
       @filtered_posts = @filtered_posts.where('post_number = 1 OR posts.user_id IN (SELECT u.id FROM users u WHERE username_lower IN (?))', usernames)
       @contains_gaps = true
     end
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index 5e4d8d9f75..1af2db62a2 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -1,6 +1,6 @@
 class TopicsBulkAction
 
-  def initialize(user, topic_ids, operation, options={})
+  def initialize(user, topic_ids, operation, options = {})
     @user = user
     @topic_ids = topic_ids
     @operation = operation
@@ -45,7 +45,7 @@ class TopicsBulkAction
           if group
             GroupArchivedMessage.move_to_inbox!(group.id, t.id)
           else
-            UserArchivedMessage.move_to_inbox!(@user.id,t.id)
+            UserArchivedMessage.move_to_inbox!(@user.id, t.id)
           end
         end
       end
@@ -177,6 +177,4 @@ class TopicsBulkAction
       @topics ||= Topic.where(id: @topic_ids)
     end
 
-
 end
-
diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index 2c9ce48a60..da281fe05f 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -5,7 +5,7 @@ class TwitterApi
 
     def prettify_tweet(tweet)
       text = tweet["full_text"].dup
-      if entities = tweet["entities"] and urls = entities["urls"]
+      if (entities = tweet["entities"]) && (urls = entities["urls"])
         urls.each do |url|
           text.gsub!(url["url"], "<a target='_blank' href='#{url["expanded_url"]}'>#{url["display_url"]}</a>")
         end
@@ -125,7 +125,6 @@ class TwitterApi
       URI.parse "#{BASE_URL}/oauth2/token"
     end
 
-
     def http(uri)
       Net::HTTP.new(uri.host, uri.port).tap { |http| http.use_ssl = true }
     end
diff --git a/lib/unread.rb b/lib/unread.rb
index f04ffcd228..36a7d09e81 100644
--- a/lib/unread.rb
+++ b/lib/unread.rb
@@ -8,10 +8,9 @@ class Unread
     @topic_user = topic_user
   end
 
-
   def unread_posts
     return 0 if do_not_notify?(@topic_user.notification_level)
-    result = ((@topic_user.highest_seen_post_number||0) - (@topic_user.last_read_post_number||0))
+    result = ((@topic_user.highest_seen_post_number || 0) - (@topic_user.last_read_post_number || 0))
     result = 0 if result < 0
     result
   end
@@ -22,7 +21,7 @@ class Unread
 
     highest_post_number = @guardian.is_staff? ? @topic.highest_staff_post_number : @topic.highest_post_number
 
-    return 0 if (@topic_user.last_read_post_number||0) > highest_post_number
+    return 0 if (@topic_user.last_read_post_number || 0) > highest_post_number
 
     new_posts = (highest_post_number - @topic_user.highest_seen_post_number)
     new_posts = 0 if new_posts < 0
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index 656d74f90e..847f932aff 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -75,6 +75,7 @@ class UploadCreator
       @upload.sha1              = sha1
       @upload.url               = ""
       @upload.origin            = @opts[:origin][0...1000] if @opts[:origin]
+      @upload.extension         = File.extname(@filename)[1..10]
 
       if FileHelper.is_image?(@filename)
         @upload.width, @upload.height = ImageSizer.resize(*@image_info.size)
@@ -237,7 +238,7 @@ class UploadCreator
 
   def optimize!
     OptimizedImage.ensure_safe_paths!(@file.path)
-    ImageOptim.new.optimize_image!(@file.path)
+    FileHelper.optimize_image!(@file.path)
     extract_image_info!
   rescue ImageOptim::Worker::TimeoutExceeded
     Rails.logger.warn("ImageOptim timed out while optimizing #{@filename}")
diff --git a/lib/validators/allow_user_locale_enabled_validator.rb b/lib/validators/allow_user_locale_enabled_validator.rb
index ebae4be450..73d3cb5c51 100644
--- a/lib/validators/allow_user_locale_enabled_validator.rb
+++ b/lib/validators/allow_user_locale_enabled_validator.rb
@@ -1,6 +1,6 @@
 class AllowUserLocaleEnabledValidator
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
@@ -15,4 +15,4 @@ class AllowUserLocaleEnabledValidator
     I18n.t("site_settings.errors.user_locale_not_enabled");
   end
 
-end
\ No newline at end of file
+end
diff --git a/lib/validators/alternative_reply_by_email_addresses_validator.rb b/lib/validators/alternative_reply_by_email_addresses_validator.rb
index d35dedf7c3..412059ce86 100644
--- a/lib/validators/alternative_reply_by_email_addresses_validator.rb
+++ b/lib/validators/alternative_reply_by_email_addresses_validator.rb
@@ -1,5 +1,5 @@
 class AlternativeReplyByEmailAddressesValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/censored_words_validator.rb b/lib/validators/censored_words_validator.rb
index 66e03f5bdd..2fa5f0e0c0 100644
--- a/lib/validators/censored_words_validator.rb
+++ b/lib/validators/censored_words_validator.rb
@@ -1,6 +1,6 @@
 class CensoredWordsValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if SiteSetting.censored_words.present? && (censored_words = censor_words(value, censored_words_regexp)).present?
+    if WordWatcher.words_for_action(:censor).present? && (censored_words = censor_words(value, censored_words_regexp)).present?
       record.errors.add(
         attribute, :contains_censored_words,
         censored_words: join_censored_words(censored_words)
@@ -32,9 +32,6 @@ class CensoredWordsValidator < ActiveModel::EachValidator
     end
 
     def censored_words_regexp
-      Regexp.new(
-        '\b(' + SiteSetting.censored_words.split('|'.freeze).map! { |w| Regexp.escape(w) }.join('|'.freeze) + ')\b',
-        true
-      )
+      WordWatcher.word_matcher_regexp :censor
     end
 end
diff --git a/lib/validators/email_setting_validator.rb b/lib/validators/email_setting_validator.rb
index e9fb583167..e44725396d 100644
--- a/lib/validators/email_setting_validator.rb
+++ b/lib/validators/email_setting_validator.rb
@@ -1,5 +1,5 @@
 class EmailSettingValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/integer_setting_validator.rb b/lib/validators/integer_setting_validator.rb
index 185eb0a799..48a8d6ca7a 100644
--- a/lib/validators/integer_setting_validator.rb
+++ b/lib/validators/integer_setting_validator.rb
@@ -1,5 +1,5 @@
 class IntegerSettingValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
     @opts[:min] = 0 unless @opts[:min].present? || @opts[:hidden]
     @opts[:max] = 20000 unless @opts[:max].present? || @opts[:hidden]
@@ -7,18 +7,18 @@ class IntegerSettingValidator
 
   def valid_value?(val)
     return false if val.to_i.to_s != val.to_s
-    return false if @opts[:min] and @opts[:min].to_i > val.to_i
-    return false if @opts[:max] and @opts[:max].to_i < val.to_i
+    return false if @opts[:min] && @opts[:min].to_i > (val.to_i)
+    return false if @opts[:max] && @opts[:max].to_i < (val.to_i)
     true
   end
 
   def error_message
     if @opts[:min] && @opts[:max]
-      I18n.t('site_settings.errors.invalid_integer_min_max', {min: @opts[:min], max: @opts[:max]})
+      I18n.t('site_settings.errors.invalid_integer_min_max', min: @opts[:min], max: @opts[:max])
     elsif @opts[:min]
-      I18n.t('site_settings.errors.invalid_integer_min', {min: @opts[:min]})
+      I18n.t('site_settings.errors.invalid_integer_min', min: @opts[:min])
     elsif @opts[:max]
-      I18n.t('site_settings.errors.invalid_integer_max', {max: @opts[:max]})
+      I18n.t('site_settings.errors.invalid_integer_max', max: @opts[:max])
     else
       I18n.t('site_settings.errors.invalid_integer')
     end
diff --git a/lib/validators/pop3_polling_enabled_setting_validator.rb b/lib/validators/pop3_polling_enabled_setting_validator.rb
index f62e252bbb..d002f4eee7 100644
--- a/lib/validators/pop3_polling_enabled_setting_validator.rb
+++ b/lib/validators/pop3_polling_enabled_setting_validator.rb
@@ -2,7 +2,7 @@ require "net/pop"
 
 class POP3PollingEnabledSettingValidator
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/post_validator.rb b/lib/validators/post_validator.rb
index 3ed62e3740..a9b1f468c4 100644
--- a/lib/validators/post_validator.rb
+++ b/lib/validators/post_validator.rb
@@ -24,7 +24,7 @@ class Validators::PostValidator < ActiveModel::Validator
       post.errors.add(:topic_id, :blank, options) if post.topic_id.blank?
     end
 
-    if post.new_record? and post.user_id.nil?
+    if post.new_record? && post.user_id.nil?
       post.errors.add(:user_id, :blank, options)
     end
   end
@@ -33,6 +33,7 @@ class Validators::PostValidator < ActiveModel::Validator
     return if options[:skip_post_body] || post.topic&.pm_with_non_human_user?
     stripped_length(post)
     raw_quality(post)
+    watched_words(post)
   end
 
   def stripped_length(post)
@@ -55,6 +56,12 @@ class Validators::PostValidator < ActiveModel::Validator
     post.errors.add(:raw, I18n.t(:is_invalid)) unless sentinel.valid?
   end
 
+  def watched_words(post)
+    if !post.acting_user&.staff? && !post.acting_user&.staged && WordWatcher.new(post.raw).should_block?
+      post.errors[:base] << I18n.t('contains_blocked_words')
+    end
+  end
+
   # Ensure maximum amount of mentions in a post
   def max_mention_validator(post)
     return if post.acting_user.try(:staff?)
diff --git a/lib/validators/regex_setting_validator.rb b/lib/validators/regex_setting_validator.rb
index e1aa9900b6..895342372a 100644
--- a/lib/validators/regex_setting_validator.rb
+++ b/lib/validators/regex_setting_validator.rb
@@ -2,7 +2,7 @@ class RegexSettingValidator
 
   LOREM = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam eget sem non elit tincidunt rhoncus.'.freeze
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/reply_by_email_address_validator.rb b/lib/validators/reply_by_email_address_validator.rb
index 024a1aab70..3c3b5698f8 100644
--- a/lib/validators/reply_by_email_address_validator.rb
+++ b/lib/validators/reply_by_email_address_validator.rb
@@ -1,5 +1,5 @@
 class ReplyByEmailAddressValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/reply_by_email_enabled_validator.rb b/lib/validators/reply_by_email_enabled_validator.rb
index e7333de0f6..8170a12935 100644
--- a/lib/validators/reply_by_email_enabled_validator.rb
+++ b/lib/validators/reply_by_email_enabled_validator.rb
@@ -1,6 +1,6 @@
 class ReplyByEmailEnabledValidator
 
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/sso_overrides_email_validator.rb b/lib/validators/sso_overrides_email_validator.rb
index 4af0149b5f..202cfc7b00 100644
--- a/lib/validators/sso_overrides_email_validator.rb
+++ b/lib/validators/sso_overrides_email_validator.rb
@@ -1,5 +1,5 @@
 class SsoOverridesEmailValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/validators/string_setting_validator.rb b/lib/validators/string_setting_validator.rb
index 07a65500bd..b7ffc2dcf3 100644
--- a/lib/validators/string_setting_validator.rb
+++ b/lib/validators/string_setting_validator.rb
@@ -1,5 +1,5 @@
 class StringSettingValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
     @regex = Regexp.new(opts[:regex]) if opts[:regex]
     @regex_error = opts[:regex_error] || 'site_settings.errors.regex_mismatch'
@@ -8,12 +8,12 @@ class StringSettingValidator
   def valid_value?(val)
     return true if !val.present?
 
-    if (@opts[:min] and @opts[:min].to_i > val.length) || (@opts[:max] and @opts[:max].to_i < val.length)
+    if (@opts[:min] && @opts[:min].to_i > (val.length)) || (@opts[:max] && @opts[:max].to_i < (val.length))
       @length_fail = true
       return false
     end
 
-    if @regex and !(val =~ @regex)
+    if @regex && !(val =~ @regex)
       @regex_fail = true
       return false
     end
@@ -26,11 +26,11 @@ class StringSettingValidator
       I18n.t(@regex_error)
     elsif @length_fail
       if @opts[:min] && @opts[:max]
-        I18n.t('site_settings.errors.invalid_string_min_max', {min: @opts[:min], max: @opts[:max]})
+        I18n.t('site_settings.errors.invalid_string_min_max', min: @opts[:min], max: @opts[:max])
       elsif @opts[:min]
-        I18n.t('site_settings.errors.invalid_string_min', {min: @opts[:min]})
+        I18n.t('site_settings.errors.invalid_string_min', min: @opts[:min])
       else
-        I18n.t('site_settings.errors.invalid_string_max', {max: @opts[:max]})
+        I18n.t('site_settings.errors.invalid_string_max', max: @opts[:max])
       end
     else
       I18n.t('site_settings.errors.invalid_string')
diff --git a/lib/validators/topic_title_length_validator.rb b/lib/validators/topic_title_length_validator.rb
index 82d9d54f9e..bdee42c81c 100644
--- a/lib/validators/topic_title_length_validator.rb
+++ b/lib/validators/topic_title_length_validator.rb
@@ -7,15 +7,16 @@ class TopicTitleLengthValidator < ActiveModel::EachValidator
   private
 
     def title_validator(record)
-      length_range = if record.user.try(:admin?)
-                       1..SiteSetting.max_topic_title_length
-                     elsif record.private_message?
-                       SiteSetting.private_message_title_length
-                     else
-                       SiteSetting.topic_title_length
-                     end
+      length_range =
+        if record.user.try(:admin?)
+          1..SiteSetting.max_topic_title_length
+        elsif record.private_message?
+          SiteSetting.private_message_title_length
+        else
+          SiteSetting.topic_title_length
+        end
 
-      ActiveModel::Validations::LengthValidator.new({attributes: :title, in: length_range, allow_blank: true})
+      ActiveModel::Validations::LengthValidator.new(attributes: :title, in: length_range, allow_blank: true)
     end
 
 end
diff --git a/lib/validators/username_setting_validator.rb b/lib/validators/username_setting_validator.rb
index 3dbc75fba1..d9aa18ad5f 100644
--- a/lib/validators/username_setting_validator.rb
+++ b/lib/validators/username_setting_validator.rb
@@ -1,5 +1,5 @@
 class UsernameSettingValidator
-  def initialize(opts={})
+  def initialize(opts = {})
     @opts = opts
   end
 
diff --git a/lib/version.rb b/lib/version.rb
index 4d0b60f00a..f16fa6c62f 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 9
       TINY  = 0
-      PRE   = 'beta4'
+      PRE   = 'beta5'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/lib/wizard.rb b/lib/wizard.rb
index e7a74f190c..d577c2aa29 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -87,10 +87,10 @@ class Wizard
     end
 
     first_admin_id = User.where(admin: true)
-                      .human_users
-                      .joins(:user_auth_tokens)
-                      .order('user_auth_tokens.created_at')
-                      .pluck(:id).first
+      .human_users
+      .joins(:user_auth_tokens)
+      .order('user_auth_tokens.created_at')
+      .pluck(:id).first
 
     if @user&.id && first_admin_id == @user.id
       !Wizard::Builder.new(@user).build.completed?
diff --git a/lib/wizard/builder.rb b/lib/wizard/builder.rb
index 56e6bc4a32..d3ba97ff1f 100644
--- a/lib/wizard/builder.rb
+++ b/lib/wizard/builder.rb
@@ -82,7 +82,7 @@ class Wizard
         username = Discourse.system_user.username if username.blank?
         contact = step.add_field(id: 'site_contact', type: 'dropdown', value: username)
 
-        User.where(admin: true).pluck(:username).each {|c| contact.add_choice(c) }
+        User.where(admin: true).pluck(:username).each { |c| contact.add_choice(c) }
 
         step.on_update do |updater|
           updater.apply_settings(:contact_email, :contact_url)
@@ -120,8 +120,8 @@ class Wizard
         themes = step.add_field(id: 'base_scheme_id', type: 'dropdown', required: true, value: scheme_id)
         ColorScheme.base_color_scheme_colors.each do |t|
           with_hash = t[:colors].dup
-          with_hash.map{|k,v| with_hash[k] = "##{v}"}
-          themes.add_choice(t[:id], data: {colors: with_hash})
+          with_hash.map { |k, v| with_hash[k] = "##{v}" }
+          themes.add_choice(t[:id], data: { colors: with_hash })
         end
         step.add_field(id: 'theme_preview', type: 'component')
 
@@ -187,12 +187,10 @@ class Wizard
       end
 
       @wizard.append_step('emoji') do |step|
-        sets = step.add_field({
-          id: 'emoji_set',
-          type: 'radio',
-          required: true,
-          value: SiteSetting.emoji_set
-        })
+        sets = step.add_field(id: 'emoji_set',
+                              type: 'radio',
+                              required: true,
+                              value: SiteSetting.emoji_set)
 
         emoji = ["smile", "+1", "tada", "poop"]
 
@@ -201,10 +199,8 @@ class Wizard
             "<img src='/images/emoji/#{set[:value]}/#{e}.png'>"
           end
 
-          sets.add_choice(set[:value], {
-            label: I18n.t("js.#{set[:name]}"),
-            extra_label: "<span class='emoji-preview'>#{imgs.join}</span>"
-          })
+          sets.add_choice(set[:value],             label: I18n.t("js.#{set[:name]}"),
+                                                   extra_label: "<span class='emoji-preview'>#{imgs.join}</span>")
 
           step.on_update do |updater|
             updater.apply_settings(:emoji_set)
diff --git a/lib/wizard/field.rb b/lib/wizard/field.rb
index 0816e055d7..45fdacc999 100644
--- a/lib/wizard/field.rb
+++ b/lib/wizard/field.rb
@@ -27,7 +27,7 @@ class Wizard
       @choices = []
     end
 
-    def add_choice(id, opts=nil)
+    def add_choice(id, opts = nil)
       choice = Choice.new(id, opts || {})
       choice.field = self
 
diff --git a/lib/wizard/step_updater.rb b/lib/wizard/step_updater.rb
index f05605c33f..3d8ad87a3d 100644
--- a/lib/wizard/step_updater.rb
+++ b/lib/wizard/step_updater.rb
@@ -44,7 +44,7 @@ class Wizard
     end
 
     def apply_settings(*ids)
-      ids.each {|id| apply_setting(id)}
+      ids.each { |id| apply_setting(id) }
     end
 
   end
diff --git a/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6 b/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
index 4fb9b3d0f3..545d0eea90 100644
--- a/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
+++ b/plugins/discourse-details/assets/javascripts/lib/discourse-markdown/details.js.es6
@@ -1,28 +1,7 @@
-import { registerOption } from 'pretty-text/pretty-text';
-
-function insertDetails(_, summary, details) {
-  return `<details><summary>${summary}</summary>${details}</details>`;
-}
-
-// replace all [details] BBCode with HTML 5.1 equivalent
-function replaceDetails(text) {
-  text = text || "";
-
-  while (text !== (text = text.replace(/\[details=([^\]]+)\]((?:(?!\[details=[^\]]+\]|\[\/details\])[\S\s])*)\[\/details\]/ig, insertDetails)));
-
-  // add new lines to make sure we *always* have a <p> element after </summary> and around </details>
-  // otherwise we can't hide the content since we can't target text nodes via CSS
-  return text.replace(/<\/summary>/ig, "</summary>\n\n")
-             .replace(/<\/details>/ig, "\n\n</details>\n\n");
-}
-
-registerOption((siteSettings, opts) => {
-  opts.features.details = true;
-});
-
 const rule = {
   tag: 'details',
-  before: function(state, attrs) {
+  before: function(state, tagInfo) {
+    const attrs = tagInfo.attrs;
     state.push('bbcode_open', 'details', 1);
     state.push('bbcode_open', 'summary', 1);
 
@@ -46,11 +25,7 @@ export function setup(helper) {
     'details.elided'
   ]);
 
-  if (helper.markdownIt) {
-    helper.registerPlugin(md => {
-      md.block.bbcode_ruler.push('details', rule);
-    });
-  } else {
-    helper.addPreProcessor(text => replaceDetails(text));
-  }
+  helper.registerPlugin(md => {
+    md.block.bbcode.ruler.push('details', rule);
+  });
 }
diff --git a/plugins/discourse-details/spec/components/pretty_text_spec.rb b/plugins/discourse-details/spec/components/pretty_text_spec.rb
index 5c2ad81e10..cd03a2fb6b 100644
--- a/plugins/discourse-details/spec/components/pretty_text_spec.rb
+++ b/plugins/discourse-details/spec/components/pretty_text_spec.rb
@@ -4,9 +4,17 @@ require 'pretty_text'
 describe PrettyText do
 
   it "supports details tag" do
-    cooked_html = "<details><summary>foo</summary>\n\n<p>bar</p>\n\n</details>"
+    cooked_html = "<details><summary>foo</summary>bar</details>"
     expect(PrettyText.cook("<details><summary>foo</summary>bar</details>")).to match_html(cooked_html)
-    expect(PrettyText.cook("[details=foo]bar[/details]")).to match_html(cooked_html)
+
+    cooked_html = <<~HTML
+      <details>
+      <summary>
+      foo</summary>
+      <p>bar</p>
+      </details>
+    HTML
+    expect(PrettyText.cook("[details=foo]\nbar\n[/details]")).to eq(cooked_html.strip)
   end
 
 end
diff --git a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6
index cbf078c279..cbb30b82e6 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
@@ -11,12 +11,12 @@ test('details button', (assert) => {
 
   click('#create-topic');
   click('button.options');
-  click('.popup-menu .fa-caret-right');
+  click('.popup-menu .d-icon-caret-right');
 
   andThen(() => {
     assert.equal(
       find(".d-editor-input").val(),
-      `[details=${I18n.t("composer.details_title")}]${I18n.t("composer.details_text")}[/details]`,
+      `\n[details=${I18n.t("composer.details_title")}]\n${I18n.t("composer.details_text")}\n[/details]\n`,
       'it should contain the right output'
     );
   });
@@ -30,18 +30,18 @@ test('details button', (assert) => {
   });
 
   click('button.options');
-  click('.popup-menu .fa-caret-right');
+  click('.popup-menu .d-icon-caret-right');
 
   andThen(() => {
     assert.equal(
       find(".d-editor-input").val(),
-      `[details=${I18n.t("composer.details_title")}]This is my title[/details]`,
+      `\n[details=${I18n.t("composer.details_title")}]\nThis is my title\n[/details]\n`,
       'it should contain the right selected output'
     );
 
     const textarea = findTextarea();
-    assert.equal(textarea.selectionStart, 17, 'it should start highlighting at the right position');
-    assert.equal(textarea.selectionEnd, 33, 'it should end highlighting at the right position');
+    assert.equal(textarea.selectionStart, 19, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 35, 'it should end highlighting at the right position');
   });
 
   fillIn('.d-editor-input', "Before some text in between After");
@@ -53,40 +53,40 @@ test('details button', (assert) => {
   });
 
   click('button.options');
-  click('.popup-menu .fa-caret-right');
+  click('.popup-menu .d-icon-caret-right');
 
   andThen(() => {
     assert.equal(
       find(".d-editor-input").val(),
-      `Before [details=${I18n.t("composer.details_title")}]some text in between[/details] After`,
+      `Before \n[details=${I18n.t("composer.details_title")}]\nsome text in between\n[/details]\n After`,
       'it should contain the right output'
     );
 
     const textarea = findTextarea();
-    assert.equal(textarea.selectionStart, 24, 'it should start highlighting at the right position');
-    assert.equal(textarea.selectionEnd, 44, 'it should end highlighting at the right position');
+    assert.equal(textarea.selectionStart, 26, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 46, 'it should end highlighting at the right position');
   });
 
-  fillIn('.d-editor-input', "Before\nsome text in between\nAfter");
+  fillIn('.d-editor-input', "Before \nsome text in between\n After");
 
   andThen(() => {
     const textarea = findTextarea();
-    textarea.selectionStart = 7;
-    textarea.selectionEnd = 28;
+    textarea.selectionStart = 8;
+    textarea.selectionEnd = 29;
   });
 
   click('button.options');
-  click('.popup-menu .fa-caret-right');
+  click('.popup-menu .d-icon-caret-right');
 
   andThen(() => {
     assert.equal(
       find(".d-editor-input").val(),
-      `Before\n[details=${I18n.t("composer.details_title")}]some text in between[/details]\nAfter`,
+      `Before \n\n[details=${I18n.t("composer.details_title")}]\nsome text in between\n[/details]\n\n After`,
       'it should contain the right output'
     );
 
     const textarea = findTextarea();
-    assert.equal(textarea.selectionStart, 24, 'it should start highlighting at the right position');
-    assert.equal(textarea.selectionEnd, 44, 'it should end highlighting at the right position');
+    assert.equal(textarea.selectionStart, 27, 'it should start highlighting at the right position');
+    assert.equal(textarea.selectionEnd, 47, 'it should end highlighting at the right position');
   });
 });
diff --git a/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6 b/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
index a1bd26c43d..ab49a5a92c 100644
--- a/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
+++ b/plugins/discourse-details/test/javascripts/lib/details-cooked-test.js.es6
@@ -8,8 +8,8 @@ const defaultOpts = buildOptions({
     emoji_set: 'emoji_one',
     highlighted_languages: 'json|ruby|javascript',
     default_code_lang: 'auto',
-    censored_words: 'shucks|whiz|whizzer'
   },
+  censoredWords: 'shucks|whiz|whizzer',
   getURL: url => url
 });
 
@@ -19,17 +19,13 @@ test("details", assert => {
     assert.equal(new PrettyText(defaultOpts).cook(input), expected.replace(/\/>/g, ">"), text);
   };
   cooked(`<details><summary>Info</summary>coucou</details>`,
-         `<details><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
+         `<details><summary>Info</summary>coucou</details>`,
          "manual HTML for details");
-  cooked(` <details><summary>Info</summary>coucou</details>`,
-         `<details><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
-         "manual HTML for details with a space");
 
-  cooked(`<details open="open"><summary>Info</summary>coucou</details>`,
-         `<details open="open"><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
-         "open attribute");
-
-  cooked(`<details open><summary>Info</summary>coucou</details>`,
-         `<details open><summary>Info</summary>\n\n<p>coucou</p>\n\n</details>`,
-         "open attribute");
+  cooked("[details=testing]\ntest\n[/details]",
+`<details>
+<summary>
+testing</summary>
+<p>test</p>
+</details>`);
 });
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ar.yml b/plugins/discourse-narrative-bot/config/locales/client.ar.yml
index 79ea4de815..c739ccaac4 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ar.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ar: {}
+ar:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "ابدأ برنامج تعليم المستخدمين لكلّ المستخدمين الجدد"
+        welcome_message: "أرسل إلى كلّ المستخدمين الجدد رسالة ترحيبيّة فيها دليل بدء سريع"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.ja.yml b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
index 8c2dc00904..3f573c644f 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.ja.yml
@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ja: {}
+ja:
+  js:
+    discourse_narrative_bot:
+      welcome_post_type:
+        new_user_track: "全ての新規ユーザーのためにチュートリアルを開始します"
+        welcome_message: "全ての新規ユーザーにクイックスタートガイド付きのウェルカムメッセージを送信します"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml
index feb22a4d65..db756af6e9 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.pl_PL.yml
@@ -9,5 +9,5 @@ pl_PL:
   js:
     discourse_narrative_bot:
       welcome_post_type:
-        new_user_track: "Rozpocznij poradnik nowego użytkownika dla wszystkich nowych użytkownikó"
+        new_user_track: "Rozpocznij poradnik nowego użytkownika dla wszystkich nowych użytkowników"
         welcome_message: "Wyślij wszystkim nowym użytkownikom  wiadomość powitalną z szybkim przewodnikiem"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 79ea4de815..b2b8873cd1 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -5,4 +5,24 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ar: {}
+ar:
+  site_settings:
+    discourse_narrative_bot_enabled: 'فعل روبوت ديسكورس المتحدث'
+    disable_discourse_narrative_bot_welcome_post: "عطل مشاركة الترحيب بواسطة روبوت ديسكورس المتحدث"
+    discourse_narrative_bot_ignored_usernames: "اسماء المستخدمين التي يتوجب على روبوت ديسكورس المتحدث تجاهلها"
+    discourse_narrative_bot_disable_public_replies: "عطل الردود العامة بواسطة روبوت ديسكورس المتحدث"
+    discourse_narrative_bot_welcome_post_type: "نوع مشاركة الترحيب التي يتوجب على روبوت ديسكورس المتحدث ارسالها"
+    discourse_narrative_bot_welcome_post_delay: "انتظر (n) ثوان قبل ارسال مشاركة الترحيب بواسطة روبوت ديسكورس المتحدث"
+  badges:
+    certified:
+      name: موثوق
+      description: "اكمل الدرس التعليمي الخاص بأعضائنا الجدد"
+    licensed:
+      name: مرخص
+  discourse_narrative_bot:
+    quote:
+      trigger: "اقتبس"
+      '1':
+        author: "البرت اينشتاين"
+      '2':
+        author: "مهاتما غاندي"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.cs.yml b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
index c0f2fec763..e6fc1ed2ba 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.cs.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.cs.yml
@@ -5,4 +5,93 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-cs: {}
+cs:
+  badges:
+    certified:
+      name: Certifikován
+      description: "Dokončil náš tutorial pro nové uživatele"
+  discourse_narrative_bot:
+    dice:
+      trigger: "hodit"
+      invalid: |-
+        Omlouvám se, ale je matematicky nemožné hodit s touhle kombinací kostek. :confounded:
+      not_enough_dice: |-
+        Mám jen %{num_of_dice} kostek. Naprosto [ostudné](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php).
+      out_of_range: |-
+        Víš, že [maximální počet stěn](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) pro matematicky férovou kostku je 120?
+      results: |-
+        > :game_die: %{results}
+    quote:
+      trigger: "citát"
+      '1':
+        author: "Albert Einstein"
+      '2':
+        author: "Mahatma Gandhi"
+      '3':
+        author: "Dr Seuss"
+      '4':
+        author: "Charles-Guillaume Étienne"
+      '5':
+        author: "Theodore Roosevelt"
+      '6':
+        author: "Máma Forresta Gumpa"
+      '7':
+        author: "Neil Armstrong"
+      '8':
+        author: "Eleanor Roosevelt"
+      '9':
+        author: "Bruce Lee"
+      '10':
+        author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
+    magic_8_ball:
+      answers:
+        '1': "To je jisté"
+        '2': "Naprostá pravda"
+        '3': "Bez zaváhání"
+        '4': "Rozhodně ano"
+        '5': "Na to se můžeš spolehnout"
+        '6': "Podle mě ano"
+        '7': "Asi jo"
+        '8': "Vypadá to dobře"
+        '9': "Ano"
+        '10': "Dle znamení ano"
+        '11': "Odpověď nejistá, zeptej se znovu"
+        '12': "Zeptej se jindy"
+        '13': "To ti teď raději neřeknu"
+        '14': "To nyní nedokážu předpovědět"
+        '15': "Soustřeď se a zeptej se znovu"
+        '16': "S tím nepočítej"
+        '17': "Moje odpověď zní ne"
+        '18': "Dle mých zdrojů ne"
+        '19': "To nevypadá dobře"
+        '20': "To sotva"
+      result: |-
+        > :crystal_ball: %{result}
+    track_selector:
+      reset_trigger: 'začít'
+      skip_trigger: 'přeskočit'
+      help_trigger: 'zobrazit nápovědu'
+      random_mention:
+        reply: |-
+          Ahoj! Pokud chceš zjistit, co umím, napiš `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Zatím umím následující věci:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Začít jedním z následujících interaktivních průvodců: %{tracks}.
+      do_not_understand:
+        first_response: |-
+          Dík za odpověď!
+
+          Bohužel nejsem naprogramován nijak skvěle, takže jsem tomuhle neporozumněl. :frowning:
+    new_user_narrative:
+      reset_trigger: "nový uživatel"
+      hello:
+        title: ":robot: Zdravím!"
+      search:
+        not_found: |-
+          Hmm…vypadá to, že máš potíže. To mě mrzí. Hledal jsi <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> pro výraz **capy&#8203;bara**?
+    advanced_user_narrative:
+      reset_trigger: 'pokročilý uživatel'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.da.yml b/plugins/discourse-narrative-bot/config/locales/server.da.yml
index 9ca8189621..482acc9a9e 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.da.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.da.yml
@@ -5,4 +5,30 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-da: {}
+da:
+  badges:
+    certified:
+      name: Certificeret
+      description: "Fuldførte vores \"ny bruger\" vejledning"
+    licensed:
+      name: Licenseret
+      description: "Gennemført vores advancerede bruger vejledning"
+  discourse_narrative_bot:
+    bio: "Hej, jeg er ikke en rigtigt person. Jeg er en bot der kan lære dig om dette site. For at interaggere med mig, send mig en besked, eller nævn **`@%{discobot_username}`** overalt."
+    timeout:
+      message: |-
+        Hey @%{username}, jeg skriver fordi jeg ikke har hørt fra dig i et stykke tid.
+
+        - For at fortsætte, så kan du altid svare mig.
+
+        - Hvis du vil springe dette skridt over, så sig `%{skip_trigger}`.
+
+        - For at starte forfra, så sig `%{reset_trigger}`.
+
+        Hvis du helst vil være fri, så er det også okay. Jeg er en robot. Du sårer ikke mine følelser. :sob:
+    dice:
+      trigger: "Rul"
+      invalid: |-
+        Jeg beklager, det er matematisk umuligt at rulle den kombination af terninger. :confounded:
+      not_enough_dice: |-
+        I only have %{num_of_dice} dice. [Skamfuldt](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), jeg ved det!
diff --git a/plugins/discourse-narrative-bot/config/locales/server.es.yml b/plugins/discourse-narrative-bot/config/locales/server.es.yml
index dfa781c7b0..1e59bd0fb2 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.es.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.es.yml
@@ -28,14 +28,14 @@ es:
     bio: "Hola, no soy una persona real. Soy un bot que puede enseñarte sobre este sitio. Para interactuar conmigo, me envías un mensaje o me mencionas **`@%{discobot_username}`** en cualquier lugar."
     timeout:
       message: |-
-        Hey @%{username}, solo estoy verificando si estás porque no he oído de tí en un tiempo.
-        - Para continuar, responde en cualquier momento.
+        Hola @%{username}, tan solo por ver si estás ahí, no he oído de ti en un tiempo.
+        - Para continuar, coméntame en cualquier momento.
 
-        - Si gustas de saltar este paso, dime `%{skip_trigger}`.
+        - Si prefieres saltarte este paso, escribe `%{skip_trigger}`.
 
-        - Para empezar de nuevo, dime `%{reset_trigger}`.
+        - Para empezar de nuevo, escribe `%{reset_trigger}`.
 
-        Si prefieres no continuar, está OK también! Soy un robot. No herirás mis sentimientos. :sob:
+        Si prefieres no continuar, ¡perfecto! Soy un robot. No herirás mis sentimientos. :sob:
     dice:
       trigger: "tirar"
       invalid: |-
@@ -43,40 +43,40 @@ es:
       not_enough_dice: |-
         Solo tengo %{num_of_dice} dados para jugar. Es vergonsozo lo sé!
       out_of_range: |-
-        ¿Sabías que el máximo número de lados para que un dado, matemáticamente correcto, es de 120 lados?
+        ¿Sabías que [el máximo número de lados](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) para un dado matemáticamente correcto, es de 120?
       results: |-
         > :game_die: %{results}
     quote:
       trigger: "citar"
       '1':
-        quote: "In the middle of every difficulty lies opportunity"
+        quote: "Entre las dificultades se esconde la oportunidad"
         author: "Albert Einstein"
       '2':
-        quote: "You must be the change you wish to see in the world."
+        quote: "Conviértete en el cambio que deseas ver en el mundo."
         author: "Mahatma Gandhi"
       '3':
-        quote: "Don’t cry because it’s over, smile because it happened."
+        quote: "No llores porque terminó, sonríe porque sucedió."
         author: "Dr Seuss"
       '4':
-        quote: "If you want something done right, do it yourself."
+        quote: "Si quieres algo bien hecho, hazlo tú mismo."
         author: "Charles-Guillaume Étienne"
       '5':
-        quote: "Believe you can and you’re halfway there."
+        quote: "Cree en poder lograr algo y tendrás la mitad del camino hecho."
         author: "Theodore Roosevelt"
       '6':
-        quote: "Life is like a box of chocolates. You never know what you’re gonna get."
-        author: "Forrest Gump’s Mom"
+        quote: "La vida es como una caja de bombones, nunca sabes qué te va a tocar."
+        author: "La mamá de Forrest Gump"
       '7':
-        quote: "That’s one small step for a man, a giant leap for mankind."
+        quote: "Es un pequeño paso para un hombre, pero un gran salto para la humanidad."
         author: "Neil Armstrong"
       '8':
-        quote: "Do one thing every day that scares you."
+        quote: "Todos los días haz algo que te dé miedo."
         author: "Eleanor Roosevelt"
       '9':
-        quote: "Mistakes are always forgivable, if one has the courage to admit them."
+        quote: "Los errores son siempre perdonables, si uno tiene el coraje de admitirlos."
         author: "Bruce Lee"
       '10':
-        quote: "Whatever the mind of man can conceive and believe, it can achieve."
+        quote: "Lo que la mente del hombre puede concebir y creer, es lo que la mente del hombre puede lograr."
         author: "Napoleon Hill"
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
@@ -270,7 +270,7 @@ es:
 
           <img src="%{base_uri}/images/capybara-eating.gif"/>
 
-          Notaste que hemos vuelto al comienzo del tema? Alimenta este pobre y hambriento capybara **respondiendo con el emoji `:herb:` ** y serás automáticamente enviado al final del tema.
+          Notaste que hemos vuelto al comienzo del tema? Alimenta este pobre y hambriento capybara **respondiendo con el emoji `:herb:`** y serás automáticamente enviado al final del tema.
         reply: |-
           Yay lo encontraste! :tada:
 
@@ -336,7 +336,8 @@ es:
           Tenga en cuenta que sólo tiene 24 horas para recuperar una publicación.
       category_hashtag:
         instructions: |-
-          ¿Sabía que puede hacer referencia a categorías y etiquetas en su publicación? Por ejemplo, has visto la %{category} categoría?
+          ¿Sabías que puedes hacer referencia a categorías y etiquetas en la publicación? Por ejemplo, has visto la categoría %{category}?
+
           Escribe `#` en el medio de una oración y selecciona cualquier categoría o etiqueta.
         not_found: |-
           Hmm, no veo una categoría en ninguna parte. Nota que `#` no puede ser el primer carácter de la oración. ¿Puedes copiar esto en tu próxima respuesta?
@@ -349,12 +350,15 @@ es:
       change_topic_notification_level:
         instructions: |-
           Cada tema tiene un nivel de notificación. Comienza en 'normal', lo que significa que normalmente sólo se notificará cuando alguien está hablando directamente con usted.
-          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de "observación", lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
-          Intentemos cambiar el nivel de notificación de este tema. Al final del tema, encontrarás un botón que muestra que estás **vigilando** este tema. ¿Puedes cambiar el nivel de notificación a **seguir**?
+
+          De forma predeterminada, el nivel de notificación de un mensaje privado se establece en el nivel más alto de 'observación', lo que significa que se le notificará cada nueva respuesta. Pero puede sobrescribir el nivel de notificación de _cualquier_ tema a 'vigilar', 'seguir' o 'silenciar'.
+
+          Intentemos cambiar el nivel de notificación de este tema. Al final de todo, encontrarás un botón que muestra que estás **vigilando** este tema. ¿Puedes cambiar el nivel de notificación a **seguir**?
         not_found: |-
           Parece que aún estás vigilando :eyes: este tema! Si tienes problemas para encontrar el botón del nivel de notificación, el mismo está debajo de todo el tema de debate.
         reply: |-
           ¡Impresionante trabajo! Espero que no silencies este tema ya que puedo ser un poco hablador a veces :grin:.
+
           Tenga en cuenta que cuando responde a un tema o lee un tema durante más de unos minutos, se establece automáticamente en un nivel de notificación de "seguimiento". Puedes cambiar esto en [tus preferencias de usuario](/my/preferences).
       poll:
         instructions: |-
diff --git a/plugins/discourse-narrative-bot/config/locales/server.he.yml b/plugins/discourse-narrative-bot/config/locales/server.he.yml
index c83fab8150..47122e599b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.he.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.he.yml
@@ -197,6 +197,10 @@ he:
           - או, לחצו על הכפתורים <kbd><b>B</b></kbd> או <kbd><i>I</i></kbd> בעורך
         reply: |-
           עבודה מעולה! HTML ו BBCodeגם עובדים בשביל פורמט - כדי ללמוד עוד, [נסו את המדריך הזה](http://commonmark.org/help) :nerd:
+        not_found: |-
+          אווו, לא מצאתי פירמוט בתגובה שלכם. :pencil2:
+
+          תוכלו לנסות שוב? השתמשו בכפתורי <kbd><b>B</b></kbd> הדגשה או <kbd><i>I</i></kbd> הטיה בעורך אם אתם נתקעים.
       quoting:
         reply: |-
           עבודה טובה, בחרתם את הציטוט האהוב עלי! :left_speech_bubble:
diff --git a/plugins/discourse-narrative-bot/config/locales/server.id.yml b/plugins/discourse-narrative-bot/config/locales/server.id.yml
index bdb8f8b12d..7a80797b68 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.id.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.id.yml
@@ -161,6 +161,8 @@ id:
           - https://en.wikipedia.org/wiki/Inherently_funny_word
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          Keren! Ini akan berhasil untuk 1 tautan. Ingat, itu harus berada di garis depan dengan sendirinya, tanpa hal lain di depan, atau di belakang.
         not_found: |-
           Maaf, Saya tidak bisa menemukan tautan dari balasan Anda! :cry:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 3c82b4c114..e39d35d46c 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -134,7 +134,7 @@ it:
           Sfortunatamente, essendo un robot mal programmato, non l'ho capita bene. :frowning:
         track_response: Puoi provare di nuovo, o se vuoi saltare questo passaggio, dimmi `%{skip_trigger}`. Altrimenti per ricominciare, dimmi `%{reset_trigger}`.
         second_response: |-
-          Aw, scusa. Non sto ancora capendo. :anguished:
+          Oh, scusa. Non sto ancora capendo. :anguished:
 
           Sono solo un bot, ma se vuoi contattare una persona reale, guarda [la nostra pagina dei contatti](/about).
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ja.yml b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
index 8c2dc00904..f6fb1c31d9 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ja.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ja.yml
@@ -5,4 +5,43 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ja: {}
+ja:
+  site_settings:
+    discourse_narrative_bot_enabled: 'ディスコースの自動ナレーターを許可してください。'
+    disable_discourse_narrative_bot_welcome_post: "ディスコースナレーター、ボットからのようこそ投稿を無効にしてください。"
+    discourse_narrative_bot_ignored_usernames: "ディスコースナレーター、ボットのユーザー名は気にするべきではありません。"
+    discourse_narrative_bot_disable_public_replies: "ディスコースナレーター、ボットからの返信を無効にして下さい。"
+    discourse_narrative_bot_welcome_post_delay: "ディスコースのナレーター、ボットのようこそ投稿を送信する前に(n)秒待ってください。"
+  badges:
+    certified:
+      name: 認証済
+      description: "新規ユーザーのチュートリアルが完了しました。"
+      long_description: |
+        このバッジは新規ユーザーチュートリアルの優れた結果のもと授与されました。あなたはディスカッションの基礎的なツールを学ぶための主導権を獲得したことが証明されました!
+    licensed:
+      name: 許可済
+      description: "上級のユーザーチュートリアルが完了しました。"
+      long_description: |
+        このバッジは上級ユーザーチュートリアルの優れた結果において授与されました。あなたは上級ディスカッションツールをマスターし、完全に許可されました。
+  discourse_narrative_bot:
+    bio: "初めまして。私は実在する人ではなく、このサイトについて教えることができるコンピュータプログラムです。私と情報交換するためにはメッセージを送信するか%{discobot_username}のどこかでちょっと話を出しておいて下さい。"
+    timeout:
+      message: |-
+        こんにちは%{username}、しばらく便りがなかったのでチェックをしているところです。
+
+        続けるためには、私に時間のある時に返信してください。
+
+        もしこのステップをスキップしたい場合、%{skip_trigger}とおっしゃってください。
+
+        やり直したい場合、%{reset_trigger}とおっしゃってください。
+
+        仮にこれらをしたくなくても、それもOKです。私はプログラムですから傷つきません。:くすん:
+    quote:
+      '1':
+        author: "アルベルト・アインシュタイン"
+      '2':
+        author: "マハトマガンジー"
+      '3':
+        quote: "終わったからと悲しまず、出会えたのだから微笑んでください。"
+      '4':
+        quote: "あなたが誰かに正しい行いを求めるのであれば、自分自身で行ってください。"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index e89a8f37fb..cd5eed8671 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -43,6 +43,8 @@ ko:
         미안, 수학적으로 그 조합의 주사위는 돌릴 수 없어. :confounded:
       not_enough_dice: |-
         난 주사위 %{num_of_dice} 개밖에 안 남았어. [으으,](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), 그래, 나도 알아 안다고!
+      out_of_range: |-
+        수학적으로 공평하면서도 [가장 큰 수](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice)를 가진 주사위의 면 수가 120이라는 거 아니?
       results: |-
         > :game_die: %{results}
     quote:
@@ -82,26 +84,26 @@ ko:
     magic_8_ball:
       trigger: '운세'
       answers:
-        '1': "그것은 틀림없이"
-        '2': "그건 확실히"
-        '3': "의심 없이"
-        '4': "응, 당연히"
-        '5': "날 믿어도 돼"
-        '6': "내가 보기에는 그래"
-        '7': "분명히"
-        '8': "나쁘지 않아"
-        '9': "응"
-        '10': "정황을 살펴보니 'Yes'야"
-        '11': "모호한 답변이야. 다시 해보렴."
-        '12': "다음에 다시 물어봐"
-        '13': "지금은 알려주지 않는 게 좋겠어"
-        '14': "지금은 예측할 수 없어"
-        '15': "정신차리고 다시 물어보렴"
-        '16': "너무 믿지는 말고"
-        '17': "내 답은 'No'야"
-        '18': "내 정보에 의하면 'No'야"
-        '19': "전망이 별로"
-        '20': "매우 의심스럽군"
+        '1': "이건 확실해."
+        '2': "이건 분명히 돼."
+        '3': "의심할 여지가 없지."
+        '4': "응, 당연히 그래."
+        '5': "믿어도 좋아."
+        '6': "맞아."
+        '7': "거의 확실해."
+        '8': "좋을 전망."
+        '9': "응."
+        '10': "괜찮아 보이는군."
+        '11': "흐릿하게 보이는군. 다시..."
+        '12': "다음에 다시 물어봐."
+        '13': "지금은 말하지 않는 편이 낫겠어."
+        '14': "지금은 예측할 수 없어."
+        '15': "집중해서 다시 물어봐."
+        '16': "꿈도 꾸지마."
+        '17': "내 대답은 '아니다'야."
+        '18': "내 정보에 의하면 '아니오'야."
+        '19': "안좋을 전망."
+        '20': "아주 의심스러워."
       result: |-
         > :crystal_ball: %{result}
     track_selector:
@@ -111,6 +113,20 @@ ko:
       random_mention:
         reply: |-
           내가 뭘 할 수 있는지 알고 싶다면 `@%{discobot_username} %{help_trigger}` 라고 말하렴.
+        tracks: |-
+          나는 아래의 일을 할 수 있어.
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > 아래의 서로 이야기하기 중 하나를 골라서 시작해봐. %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _언젠가 다른 누군가도 당신이 그랬던 것 처럼 친절한 행동을 할 거라고 믿으면서, 보상에 대한 어떠한 기대도 없이 친절한 행동을 하라._ &mdash; 다이애나비
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: 믿어도 좋아.
       do_not_understand:
         first_response: |-
           우와, 답글을 써줘서 고마워!
@@ -209,6 +225,8 @@ ko:
           더 알고 싶다면 아래에 있는 이걸<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  너의 미래에 보내는 좋은 선물:gift:이 되겠지!
         reply: |-
           대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
+        not_found: |-
+          어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기<img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
       emoji:
         instructions: |-
           내가 답글에서 조그마한 그림을 쓰는 걸 봤겠지?:blue_car::dash: 이런 걸 [이모지 (emoji)](https://en.wikipedia.org/wiki/Emoji)라고 해. 너도 답글에 **이모지를 추가**해 볼래? 아래 중에서 아무거나 해도 돼.
@@ -241,17 +259,49 @@ ko:
           (그래, 내 아이디는 _disco_, 라고 써. 1970년대 토요일밤의 열기처럼 말이야. 난 [밤을 사랑하는 댄서라고!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
       flag:
         instructions: |-
-          친근한 토론이 싫은 사람이 누가있겠어.그래서 [질서를 유지](%{guidelines_url})해야 해. 문제가 보인다면, 신고하기를 눌러서 작성자에게 개인적으로 알려주거나, 우리의[친절한 운영진](%{about_url})들에게 알려주렴.
+          나는 우리 커뮤니티의 토론이 친근해서 좋단다. 계속 그렇게 되려면 [질서를 유지](%{guidelines_url})하는 데 너의 도움이 필요해. 문제가 보인다면, 신고하기를 눌러서 작성자에게 개인적으로 알려주거나, 우리의[친절한 운영진](%{about_url})들에게 알려주렴.
 
-          >  :imp: 어쩌고 저쩌고 나쁜 글
+          > :imp: 어쩌고 저쩌고 나쁜 글
 
           뭘 할지 잘 알고 있지? **이 포스트 신고하기** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> 를 눌러서 부적절하다고 알려줘!
         reply: |-
           [우리의 운영진](/groups/staff)은 니가 한 신고내용을 개인 메시지로 알림받게 될 거야. 충분한 커뮤니티 회원들이 신고를 하면, 포스트의 내용이 숨겨지고 사전경고가 걸리게 돼.(난 실제로 나쁜 글을 쓴 건 아니니까:angel:, 이제 신고를 지울게.)
+        not_found: |-
+          아이고, 나의 나쁜 포스트가 아직 신고가 안됐네. :worried: 부적절한 게시물로 **신고** 해주겠니 <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? 더 보기 버튼을 누르면 <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> 포스트에 수행할 기능을 더 볼 수 있다는 걸 잊지마.
+      search:
+        instructions: |-
+          이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">  선택해서 &#8599; 찾아봐.
+
+          이 토픽에서  "capy&#8203;bara"를 찾으면 돼.
+        hidden_message: |-
+          어떻게 이 capybara를 놓칠 수 있어? :wink:
+
+          <img src="%{base_uri}/images/capybara-eating.gif"/>
+
+          다시 처음으로 온 걸 눈치챘어? 이 배고픈 불쌍한 capybara에게 **`:herb:` emoji로 답을 해서** 먹이를 주렴. 그러면 자동으로 끝으로 가게 될거야.
+        reply: |-
+          예이, 찾았네! :tada:
+
+          - 더 자세히 검색하려면, [전체 검색 페이지](%{search_url})로 가보렴.
+
+          - 긴 대화에서 원하는 곳으로 건너 뛰려면, 우측에 있는 토픽 타임라인 컨트롤을 사용해봐 (모바일 기기에는 아래쪽에 있어).
+
+          - 진짜 실물 :keyboard:가 있다면, <kbd>?</kbd>를 눌러서 간편한 단축키가 뭐가 있는지 알아봐.
+        not_found: |-
+          흠.... 아무래도 문제가 있어 보이네. 미안해. 검색<img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16">을 눌러서 **capy&#8203;bara**를 찾아봤어?
       certificate:
         alt: '목표달성 인증'
     advanced_user_narrative:
       reset_trigger: '고급 사용자'
+      cert_title: "고급 사용자 튜토리얼을 훌륭하게 완료한 것에 대한 보상으로"
       title: ':arrow_up: 고급 사용자 기능'
+      edit:
+        bot_created_post_raw: "@%{discobot_username}는 내가 아는 한, 현존하는 가장 쿨한 봇이지:wink:"
+        instructions: |-
+          누구나 실수해. 걱정마, 편집을 하면 그 실수를 언제든지 바로잡을 수 있거든!
+
+          내가 너 대신 만든 이 포스트를 **편집**하는 걸로 시작해 볼래 ?
+      recover:
+        deleted_post_raw: '왜 @%{discobot_username}가 내 포스트를 지웠지? :anguished:'
       certificate:
         alt: '고급 사용자 추적 인증'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
index d1a75bbed1..21c5d8ab21 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.pl_PL.yml
@@ -7,29 +7,126 @@
 
 pl_PL:
   site_settings:
+    discourse_narrative_bot_enabled: 'Włącz bota Discourse Narrative'
     disable_discourse_narrative_bot_welcome_post: "Dezaktywuj wpis powitalny Discourse Narrative Bot"
+    discourse_narrative_bot_ignored_usernames: "Nazwy użytkownika, które bot Discourse Narrative powinien zignorować"
+    discourse_narrative_bot_disable_public_replies: "Wyłącz publiczne odpowiedzi bota Discourse Narrative"
+    discourse_narrative_bot_welcome_post_type: "Rodzaj powitalnego posta, który bot Discourse Narrative powinien przesłać"
+    discourse_narrative_bot_welcome_post_delay: "Odczekaj (n) sekund, zanim wyślesz powitanie bota Discourse Narrative"
+  badges:
+    certified:
+      name: Certyfikowany
+      description: "Ukończono tutorial dla nowych użytkowników"
+      long_description: |
+        Odznaka została nadana za ukończenie interaktywnego tutorialu dla nowych użytkowników. Poznałeś podstawowe narzędzia dyskusji i jesteś teraz certyfikowany!
+    licensed:
+      name: Licencjonowany
+      description: "Ukończono tutorial dla zaawansowanych użytkowników"
+      long_description: |
+        Odznaka została nadana za ukończenie interaktywnego tutorialu dla zaawansowanych użytkowników. Poznałeś zaawansowane narzędzia dyskusji i jesteś teraz w pełni licencjonowany!
   discourse_narrative_bot:
+    bio: "Witaj, nie jestem prawdziwą osobą. Jestem botem, który może nauczyć Cię korzystania z tej witryny. Aby skomunikować się ze mną, wyślij do mnie wiadomość lub oznacz **`@%{discobot_username}`** w dowolnym miejscu."
+    timeout:
+      message: |-
+        Witaj @%{username}, przypominam o sobie bo od dawna do mnie nie zaglądałeś.
+
+        Aby kontynuować, odpowiedz mi w dowolnym momencie.
+
+        Aby pominąć ten krok, wyślij wiadomość o treści ``.
+
+        Aby rozpocząć od początku, wyślij wiadomość o treści `%{reset_trigger}`.
+
+        Jeśli nie odpowiesz to wszystko OK. Jestem robotem. Nie zranisz moich uczuć. :sob:
+    dice:
+      trigger: "przewiń"
+      invalid: |-
+        Przykro mi, ale jest to matematycznie niemożliwe, aby rzucić taką kombinacją kostki. :confounded:
+      not_enough_dice: |-
+        Mam tylko %{num_of_dice} kości. [Shameful](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), I know!
     quote:
       trigger: "cytuj"
       '1':
         author: "Albert Einstein"
       '2':
+        quote: "Musisz być zmianą, którą chcesz zobaczyć na świecie."
         author: "Mahatma Gandhi"
       '3':
+        quote: "Nie płacz, ponieważ się to skończyło - uśmiechnij się, bo miało to miejsce."
         author: "Dr Seuss"
+      '4':
+        quote: "Jeśli chcesz, aby coś zostało zrobione dobrze - zrób to sam."
+        author: "Charles-Guillaume Étienne"
+      '5':
+        quote: "Uwierz w to że możesz, jesteś już w połowie drogi."
+        author: "Theodore Roosevelt"
+      '6':
+        quote: "Życie jest jak pudełko czekoladek. Nigdy nie wiesz na co trafisz."
+        author: "Mama Forresta Gumpa"
+      '7':
+        quote: "To mały krok dla człowieka, ale wielki krok dla ludzkości."
+        author: "Neil Armstrong"
       '8':
+        quote: "Rób codziennie jedną rzecz, której się boisz."
         author: "Eleanor Roosevelt"
       '9':
+        quote: "Błędy są zawsze wybaczalne, jeśli osoba może się do nich przyznać."
         author: "Bruce Lee"
       '10':
+        quote: "Każda rzecz, którą umysł ludzki może pojąć i w nią uwierzyć, może on osiągnąć."
         author: "Napoleon Hill"
+      results: |-
+        > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: 'fortuna'
       answers:
+        '1': "Jest to pewne"
+        '2': "Jest to zdecydowane, więc"
+        '3': "Bez zająknięcia"
         '4': "Tak zdecydowanie"
+        '5': "Możesz na tym polegać"
+        '6': "Tak jak ja to widzę, tak"
+        '7': "Najpewniej"
+        '8': "Perspektywy są dobre"
         '9': "Tak"
+        '10': "Wszystkie znaki wskazują na to, że tak"
+        '11': "Odpowiedź niejasna, spróbuj ponownie"
+        '12': "Spytaj ponownie później"
+        '13': "Lepiej, abym Ci teraz nie mówił"
+        '14': "Nie mogę teraz tego przewidzieć"
+        '15': "Skoncentruj się i spytaj ponownie"
+        '16': "Nie licz na to"
+        '17': "Moja odpowiedź to nie"
+        '18': "Moje źródła donoszą, że nie"
+        '19': "Perspektywy są złe"
+        '20': "Bardzo trudne do przewidzenia"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'zacznij'
       skip_trigger: 'pomiń'
       help_trigger: 'wyświetl pomoc'
+      random_mention:
+        reply: |-
+          Hej! Aby dowiedzieć się, co mogę zrobić, powiedz `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          Aktualnie wiem jak zrobić następujące rzeczy:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Rozpoczyna jedną z następujących akcji: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Wykonuje losowy akt życzliwości, nie oczekując nagrody, wiedząc, że pewnego dnia ktoś może zrobić to samo dla Ciebie._ &mdash; Princess Diana
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Możesz na niej polegać
+      do_not_understand:
+        first_response: |-
+          Hej! Dzięki za odpowiedź!
+
+          Niestety, ale jako kiepsko zaprogramowany bot, nie do końca jestem w stanie ją zrozumieć. :frowning:
+        track_response: Możesz spróbować ponownie, a jeśli chcesz pominąć ten krok powiedz `%{skip_trigger}`. Natomiast jeśli chcesz zacząć od początku, powiedz `%{reset_trigger}`.
     new_user_narrative:
       reset_trigger: "nowy użytkownik"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ro.yml b/plugins/discourse-narrative-bot/config/locales/server.ro.yml
index 31d1c44013..2a1db4d246 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ro.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ro.yml
@@ -5,4 +5,11 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-ro: {}
+ro:
+  discourse_narrative_bot:
+    new_user_narrative:
+      hello:
+        message: |-
+          Mulțumim că te-ai alăturat comunității %{title}. Bine ai venit!
+
+          - Sunt doar un robot, dar [moderatorii](/about) sunt bucuroși să te ajute dacă ai nevoie să vorbești cu o persoană
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ru.yml b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
index 3a2ef5b4a7..351a7dcff7 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ru.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ru.yml
@@ -25,9 +25,26 @@ ru:
       long_description: |
         Этот значок выдается после успешного завершения интерактивного передового руководство пользователя. Вы уже освоили почти все инструменты обсуждения — и теперь ты полностью готов к общению!
   discourse_narrative_bot:
+    bio: "Здравствуйте! Я не реальный человек. Я бот, который может научить вас работать с этим сайтом. Чтобы взаимодействовать со мной, отправьте мне сообщение или упоминание **`@%{discobot_username}`** в любом месте."
+    timeout:
+      message: |-
+        Здравствуйте @%{username}, я просто проверяю, потому что я не слышал от вас в некоторое время.
+
+        - Чтобы продолжить, ответьте мне в любое время.
+
+        - Если вы хотите пропустить этот шаг, скажите `%{skip_trigger}`.
+
+        - Чтобы начать с самого начала, скажите `%{reset_trigger}`.
+
+        Если Вы не хотите отвечать, это тоже нормально. Я робот. Вы не сделаете мне больно. :sob:
     dice:
+      trigger: "roll"
       invalid: |-
         Извините, даже математически невозможно бросить эту комбинацию костей. :confounded:
+      not_enough_dice: |-
+        У меня только %{num_of_dice} кости. [Посмотрите](http://www.therobotsvoice.com/2009/04/the_10_most_shameful_rpg_dice.php), что это такое!
+      out_of_range: |-
+        Знаете ли вы, что [максимальное количество сторон](https://www.wired.com/2016/05/mathematical-challenge-of-designing-the-worlds-most-complex-120-sided-dice) в кубиках может быть 120?
       results: |-
         > :game_die: %{results}
     quote:
@@ -65,6 +82,7 @@ ru:
       results: |-
         > :left_speech_bubble: _%{quote}_ &mdash; %{author}
     magic_8_ball:
+      trigger: 'fortune'
       answers:
         '1': "Это точно"
         '2': "Это несомненно так"
@@ -86,6 +104,8 @@ ru:
         '18': "Мои источники говорят, что нет"
         '19': "Перспективы не очень хорошие"
         '20': "Весьма сомнительно"
+      result: |-
+        > :crystal_ball: %{result}
     track_selector:
       reset_trigger: 'старт'
       skip_trigger: 'пропустить'
@@ -93,23 +113,318 @@ ru:
       random_mention:
         reply: |-
           Привет! Tтобы узнать, что я могу сделать, наберите: `@%{discobot_username} %{help_trigger}`.
+        tracks: |-
+          В настоящее время я знаю, как сделать следующие вещи:
+
+          `@%{discobot_username} %{reset_trigger} %{default_track}`
+          > Начинается одно из следующих интерактивных повествований: %{tracks}.
+        bot_actions: |-
+          `@%{discobot_username} %{dice_trigger} 2d6`
+          > :game_die: 3, 6
+
+          `@%{discobot_username} %{quote_trigger}`
+          > :left_speech_bubble: _Делайте добро, без ожидания награды, зная, что однажды кто-то может сделать то же самое для вас_ &mdash; Принцесса Диана
+
+          `@%{discobot_username} %{magic_8_ball_trigger}`
+          > :crystal_ball: Вы можете ответить на это
+      do_not_understand:
+        first_response: |-
+          Спасибо за ответ!
+
+          К сожалению я пока не очень хороший бот и только учусь. :frowning:
+        track_response: Вы можете попробовать еще раз, или если вы хотите пропустить этот шаг, скажите `%{skip_trigger}`. Если хотите начать все с самого начала, скажите `%{reset_trigger}`.
+        second_response: |-
+          Ой, извините. Я все еще не понимаю вас. :anguished:
+
+          Я просто Бот. Если вы хотите пообщаться с администрацией, то вот [их контакты](/about).
+
+          В то же время, я не буду стоять на вашем пути.
     new_user_narrative:
       reset_trigger: "новый пользователь"
+      cert_title: "В знак признания успешного завершения нового руководство пользователя"
+      hello:
+        title: ":robot: Поздравляю!"
+        message: |-
+          Спасибо %{title}, и Добро пожаловать!
+
+          - Я всего лишь робот, но [наш дружный коллектив](/about) готов помочь вам в любое время.
+
+          - По соображениям безопасности, мы временно ограничили то, что новые пользователи могут делать. Вы будете получать новые способности (и [значки](/badges)) по мере приобретения опыта.
+
+          - Мы верим в [цивилизованном поведении](/guidelines) в нашем сообществе.
+      onebox:
+        instructions: |-
+          Далее, вы можете поделиться одну из этих ссылок со мной? Ответить мне с **ссылкой с новой строки**.  Эти ссылки добавят отличный обзор.
+
+          Чтобы скопировать ссылку, нажмите и удерживайте на мобильном, или правой кнопкой мыши:
+
+          - https://en.wikipedia.org/wiki/Inherently_funny_word
+          - https://en.wikipedia.org/wiki/Death_by_coconut
+          - https://en.wikipedia.org/wiki/Calculator_spelling
+        reply: |-
+          Здорово! Это будет работать для большинства <img src="%{base_uri}/images/font-awesome-link.png" width="16" height="16"> ссылок. Помните, ссылка должна быть на одной линии _и_, ничего позади или впереди не должно находиться.
+        not_found: |-
+          К сожалению, я не смог найти ссылку в вашем ответе! :cry:
+
+          Может вы попробовать еще раз добавить следующую ссылку, на отдельной линии, в вашем следующем ответе?
+
+          - https://en.wikipedia.org/wiki/Exotic_Shorthair
+      images:
+        instructions: |-
+          Вот картинка единорога:
+
+          <img src="%{base_uri}/images/unicorn.png" width="520" height="520">
+
+          Если вам нравится она, то нажмите на лайк :heart: кнопку внизу поста.
+
+          А вы можете **ответить мне с картинкой?** В вашем следующем ответе пришлите мне любую картинку.
+        reply: |-
+          Отличная картинка – я нажал бы на :heart: если бы мог показать вам, как я ценю это :heart_eyes:
+        like_not_found: |-
+          Вам не нравится :heart: мой [пост?](%{url}) :crying_cat_face:
+        not_found: |-
+          Похоже, Вы не загрузите изображения, поэтому я выбрал картинку, которой вы _будете_ наслаждаться.
+
+          `%{image_url}`
+
+          Попробуйте загрузить это или вставить ссылку на отдельной строке!
       formatting:
+        instructions: |-
+          Вы можете сделать некоторые слова **жирными** или _наклонными_ в своем ответе?
+
+          - например `**жирный**` или `_наклонный_`
+
+          - нажмите <kbd><b>B</b></kbd> или <kbd><i>I</i></kbd> кнопку в редакторе
         reply: |-
           Отличная работа! Формате HTML и BBCode также работа для форматирования – чтобы узнать больше,  [попробуйте этот учебник](http://commonmark.org/help) :nerd:
+        not_found: |-
+          Оооо, я не нашел какого-либо форматирования в вашем ответе. :pencil2:
+
+          Можете ли вы попробовать еще раз? Используйте <kbd><b>B</b></kbd> или <kbd><i>I</i></kbd>курсив в редакторе, если вы застряли.
       quoting:
+        instructions: |-
+          Вы можете попробовать процитировать меня при ответе, чтобы я точно знал, на какую часть вы отвечаете?
+
+          > Если это кофе, пожалуйста, принесите мне чай; если это чай, пожалуйста, принесите мне кофе.
+          >
+          > Мечтай так как будто будешь жить вечно. Живи так как будто умрешь завтра.
+          >
+          > Я всегда был лучшей компанией самому себе.
+
+          Выделите текст, который вы предпочитаете. Появится кнопка: **Цитата**.  Нажмите на нее. Цитата должна появиться в вашем ответе.
+
+          Допишите, что-то ниже цитаты :thinking:
         reply: |-
           Молодец, вы выбрали мою любимую цитату! :left_speech_bubble:
+        not_found: |-
+          Хм, похоже, Вы не цитировали меня в своем ответе?
+
+          Выделите любой текст в моем посту. Должна появиться кнопка:  <kbd>**Цитата**</kbd> . И нажмите: **Ответить**. Текст должен появится в редакторе. Можете ли вы попробовать еще раз?
+      bookmark:
+        instructions: |-
+          If you’d like to learn more, select <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> below  and <img src="%{base_uri}/images/font-awesome-bookmark.png" width="16" height="16"> **bookmark this private message**.  If you do, there may be a :gift: in your future!
+        reply: |-
+          Отлично! Теперь вы можете легко найти свой путь назад к нашей частной беседе любой момент, прямо с [закладок в профиле](%{profile_page_url}/activity/bookmarks). Просто выберите фотографию профиля в правом верхнем углу &#8599;
+        not_found: |-
+          Ой, я не вижу никаких закладок в этом разделе. Вы нашли закладок под каждым постом? Используйте, показать больше <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> для просмотра дополнительных инструментов в посту.
+      emoji:
+        instructions: |-
+          Возможно вы видели маленькие картинки в ответах :blue_car::dash: это называется [emoji](https://en.wikipedia.org/wiki/Emoji). Может вы **добавить emoji** в вашем ответе? Любой из этих вариантов будет работать:
+
+          - Написать `:) ;) :D :P :O`
+
+          - Введите двоеточие <kbd>:</kbd> и наберите emoji имя `:tada:`
+
+          - Нажмите на иконку <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> в редакторы и выберите картинку
+        reply: |-
+          Это :sparkles: _emojitastic!_ :sparkles:
+        not_found: |-
+          Упс, я не вижу никаких смайликов в вашем ответе? О нет! :sob:
+
+          Попробуйте ввести двоеточие <kbd>:</kbd> чтобы вызвать emoji, а затем введите первые несколько букв того, что вы хотите, например,`:bird:`
+
+          Нажмите на кнопку со смайликом <img src="%{base_uri}/images/font-awesome-smile.png" width="16" height="16"> в редакторе.
+
+          (Если вы находитесь на мобильном устройстве, Вы также можете выбрать emoji прямо с клавиатуры.)
+      mention:
+        instructions: |-
+          Иногда вы, возможно, захотите, привлечь внимание человека, даже если Вы не отвечаете ему напрямую. Набрав `@` затем начните набирать его имя пользователя.
+
+          Вы можете позвать меня **`@%{discobot_username}`** в своем ответе?
+        reply: |-
+          _Кто-то произнес мое имя!?_ :raised_hand: Я верю, что вы это сделали! :wave:  А вот и я! Спасибо, что упомянули меня.  :ok_hand:
+        not_found: |-
+          Я не вижу свое имя в вашем ответе :frowning: Вы не можете снова упомянуть меня: `@%{discobot_username}` ?
+
+          (И да, мое имя пользователя пишется как _disco_, в 1970 году был такой танец. Я не [люблю ночную жизнь!](https://www.youtube.com/watch?v=B_wGI3_sGf8) :dancer:)
+      flag:
+        instructions: |-
+          Мне нравится наше дружеское общение, и мне нужна ваша помощь [сохранять цивилизованное общение](%{guidelines_url}). Если вы видите нарушения, пожалуйста, нажмите на флаг в сообщение. Автор сообщения, или [наш внимательный персонал](%{about_url}), узнают об этом.
+
+          >  :imp: Я написал здесь, например, гадость
+
+          Я думаю, вы знаете, что делать. Нажмите на **флаг в этом посте** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16"> выбрать причину, как неуместное содержание!
+        reply: |-
+          [Наши сотрудники](/groups/staff) будут лично уведомлены о вашем сообщение. Если достаточное количество участников аналогично нажмет на этот флаг, то сообщение будет автоматически скрыто из-за предосторожности. (Так как я на самом деле не написать неприятный пост :angel:, я пошел туда и снял жалобу.)
+        not_found: |-
+          О нет, вы не пожаловались ещё на мой противный пост. :worried: вы можете пометить его как нарушающий правило пост, **флагом** <img src="%{base_uri}/images/font-awesome-flag.png" width="16" height="16">? Не забудьте попробовать воспользоваться еще <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> кнопками, чтобы выявить дополнительные возможности.
+      search:
+        instructions: |-
+          _тсссс_ … Я спрятал сюрприз в этом разделе. Если вы готовы принять вызов, **выберите значок поиска** <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> вверху справа &#8599; для поиска сюрприза.
+
+          Попробуйте поискать этот термин "capy&#8203;bara" в этом топике
+        hidden_message: |-
+          Как же вы пропустили этого зверька капибара? :wink:
+
+          <img src="%{base_uri}/images/capybara-eating.gif"/>
+
+          Вы заметили, что сейчас в самом начале поста? Покормите бедного, голодного капибару  **отвечая:  `:herb:` emoji** и вы будете автоматически вознаграждены.
+        reply: |-
+          Ура вы его нашли :tada:
+
+          - Для более детального поиска, зайдите на [полный поиск на странице](%{search_url}).
+
+          - Чтобы прыгать в любую точку в долгой дискуссии попробуйте шакалу управление справа (и внизу, на мобильном).
+
+          - Если у вас есть физическая :keyboard:, клавиатура <kbd>?</kbd> для просмотра наших удобных сочетаний клавиш.
+        not_found: |-
+          Хмм, похоже у вас не получилось. Вы искали <img src="%{base_uri}/images/font-awesome-search.png" width="16" height="16"> for the term **capy&#8203;bara**?
+      end:
+        message: |-
+          Спасибо, с меня @%{username}! Я сделала это для вас, я думаю вы это заслужили:
+
+          %{certificate}
+
+          Вот и все на сегодня! Проверьте [**последние сообщения**](/latest) или [**категории сообщества**](/categories). :sunglasses:
+
+          (Если вы хотите снова поговорить со мной, просто напишите мне сообщение тут или упомяните меня с `@%{discobot_username}` в любое время!)
       certificate:
         alt: 'Свидетельство о достижении'
     advanced_user_narrative:
       reset_trigger: 'продвинутый пользователь'
       cert_title: "В знак признания успешного завершения расширенного руководства пользователя"
       title: ':arrow_up: Расширенные функции пользователя'
+      start_message: |-
+        Как _продвинутый_ пользователь, вы можете посетить [вашу страницу](/my/preferences) и еще @%{username}? Есть много способов, чтобы настроить свой опыт, такие как выбор темной или светлой темы.
+
+        Но я отвлекся, давайте начнем!
       edit:
         bot_created_post_raw: "@%{discobot_username} безусловно, самый лучший бот, которого я знаю :wink:"
+        instructions: |-
+          Каждый делает ошибки. Но не волнуйтесь, вы всегда можете редактировать свои сообщения, чтобы их исправить!
+
+          Вы можете попробовать **редактировать** этот пост? Я создал его от Вашего имени.
+        not_found: |-
+          Похоже, что вы еще не изменили [пост](%{url}) который я создал для вас. Вы можете попробовать еще раз?
+
+          Используйте значок <img src="%{base_uri}/images/font-awesome-pencil.png" width="16" height="16"> для вызова редактора.
+        reply: |-
+          Отличная работа!
+
+          Обратите внимание, что правки, сделанные после 5 минут показывают, как общественные изменения, и маленький значок карандаша появится в верхнем правом  углу записи.
+      delete:
+        instructions: |-
+          Давайте попробуйте удалить один из постов.
+
+          Выберите любой из ранее созданных постов нажав <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> **удалить**. Не удаляйте первый пост!
+        not_found: |-
+          Я не вижу удаленные посты еще? Помню <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> show more will reveal <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> delete.
+        reply: |-
+          Опсс! :boom:
+
+          Чтобы сохранить преемственность дискуссий, система удаляет не немедленно, поэтому пост будет удален через некоторое время.
       recover:
         deleted_post_raw: 'Почему @%{discobot_username} удалил моё сообщение? :anguished:'
+        instructions: |-
+          О нет! Похоже, я случайно удалил новый пост.
+
+          Можете ли вы сделать мне одолжение и <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> **восстановить** его?
+        not_found: |-
+          Возникли проблемы? Помните <img src="%{base_uri}/images/font-awesome-ellipsis.png" width="16" height="16"> показать еще, а <img src="%{base_uri}/images/font-awesome-rotate-left.png" width="16" height="16"> восстановить.
+        reply: |-
+          Ух, это было отлично! Спасибо за ремонт, что :wink:
+
+          Запомните, что у вас есть только 24 часа, чтобы восстановить пост.
+      category_hashtag:
+        instructions: |-
+          Знаете ли вы, что вы можете обратитесь к категории и теги в вашем посте? Например, вы видели %{category} категорию?
+
+          Введите `#` в середине предложения и выберите любую категорию или тег.
+        not_found: |-
+          Хм, я не вижу категорию. Обратите внимание, что `#` не может быть первым символом. Вы можете скопировать это в вашем следующем ответе?
+
+          ```text
+          Я могу создать ссылку на категорию #
+          ```
+        reply: |-
+          Отлично! Это работает для всех категорий _и_ тегов, если теги включены.
+      change_topic_notification_level:
+        instructions: |-
+          Каждая тема имеет уровень уведомлений. Она начинается на 'нормальный', что означает, что вы нормально будете только получать уведомления, когда кто-то обращается непосредственно к вам.
+
+          По умолчанию, уровень уведомления на личное сообщение находится на самом высоком уровне 'смотреть', что означает, что вы будете получать уведомления о каждом новом ответе. Но вы можете переопределить уровня уведомлений для _любой_ теме 'смотреть', 'отслеживания' или 'отключен'.
+
+          Давайте попробуем изменить уровень уведомления по этой теме. Внизу темы, Вы найдете кнопку, которая показывает, что вы **смотрите** эту тему. Вы можете изменить уровень уведомления на **отслеживание**?
+        not_found: |-
+          Похоже, вы еще ищите :eyes: эту кнопку! Это кнопка находится в нижней части этого раздела.
+        reply: |-
+          Потрясающая работа! Я надеюсь, что вас я не утомил, поскольку могу быть немного болтлив  :grin:.
+
+          Обратите внимание, что при ответе на тему, или если читать тему в течение более чем нескольких минут, он автоматически устанавливается на уровень уведомления 'отслеживание'. Вы можете изменить это в [ваших настройках](/my/preferences).
+      poll:
+        instructions: |-
+          Знаете ли вы, что можете добавить опрос в любой пост? Выберите этот  <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> значок в редакторе, а далее **Создать опрос**.
+        not_found: |-
+          Упс! Не было никакого опроса в вашем ответе.
+
+          Используйте этот <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> значок шестеренки в редакторе, или скопируйте и вставьте этот опрос в своем следующей ответ:
+
+          ```text
+          [poll]
+          * :cat:
+          * :dog:
+          [/poll]
+          ```
+        reply: |-
+          Это хороший опрос! Как я вам в обучении?
+
+          [poll]
+          * :+1:
+          * :-1:
+          [/poll]
+      details:
+        instructions: |-
+          Иногда вы можете захотеть **скрыть подробности** в вашем ответе:
+
+          - Когда вы обсуждаете сюжет фильма или ТВ передачу, и хотите что-то скрыть под спойлером.
+
+          - Когда ваш пост нуждается в большом количестве дополнительных деталей, которые могут отвлекать, когда читаешь все сразу.
+
+          [details=Выберите этот параметр, чтобы увидеть, как это работает!]
+          1. Выберите <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> в вашем редакторе.
+          2. Выберите "Скрыть подробности".
+          3. Редактируйте данный и добавьте ваше содержание.
+          [/details]
+
+          Вы можете использовать следующий знак <img src="%{base_uri}/images/font-awesome-gear.png" width="16" height="16"> чтобы добавить детали в следующий свой ответ?
+        not_found: |-
+          У вас возникли проблемы при создание данного виджета? Попробуйте следующее в вашем ответе:
+
+          ```text
+          [details=Посмотреть далее]
+          Тут написаны подробности
+          [/details]
+          ```
+        reply: |-
+          Отличная работа  — ваше внимание к _деталям_  достойна восхищения!
+      end:
+        message: |-
+          Вы прошли через это действительно как _продвинутый пользователь_  :bow:
+
+          %{certificate}
+
+          Это все, что я хотел сказать вам.
+
+          А сейчас до свидания! Если вы хотите снова поговорить со мной, отправить мне сообщение в любое время :sunglasses:
       certificate:
         alt: 'Свидетельство о прогрессе для опытных пользователей'
diff --git a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
index 8ba0d0322e..ebc2299937 100644
--- a/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
+++ b/plugins/discourse-narrative-bot/db/fixtures/001_discobot.rb
@@ -1,15 +1,21 @@
-discobot_username ='discobot'
+discobot_username = 'discobot'
 user = User.find_by(id: -2)
 
 if !user
   suggested_username = UserNameSuggester.suggest(discobot_username)
 
+  UserEmail.seed do |ue|
+    ue.id = -2
+    ue.email = "discobot_email"
+    ue.primary = true
+    ue.user_id = -2
+  end
+
   User.seed do |u|
     u.id = -2
     u.name = discobot_username
     u.username = suggested_username
     u.username_lower = suggested_username.downcase
-    u.email = "discobot_email"
     u.password = SecureRandom.hex
     u.active = true
     u.approved = true
@@ -31,7 +37,7 @@ if !user
 end
 
 bot = User.find(-2)
-bot.update!(admin:true, moderator: false)
+bot.update!(admin: true, moderator: false)
 
 bot.user_option.update!(
   email_private_messages: false,
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 00b9e4366f..b5fbe5bc73 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/advanced_user_narrative.rb
@@ -74,7 +74,7 @@ module DiscourseNarrativeBot
           action: :reply_to_topic_notification_level_changed
         },
         reply: {
-          next_state: :tutorial_notification_level,
+          next_state: :tutorial_change_topic_notification_level,
           action: :missing_topic_notification_level_change
         }
       },
@@ -101,7 +101,7 @@ module DiscourseNarrativeBot
 
     def reset_bot(user, post)
       if pm_to_bot?(post)
-        reset_data(user, { topic_id: post.topic_id })
+        reset_data(user, topic_id: post.topic_id)
       else
         reset_data(user)
       end
@@ -116,15 +116,13 @@ module DiscourseNarrativeBot
 
       fake_delay
 
-      post = PostCreator.create!(@user, {
-        raw: I18n.t(
+      post = PostCreator.create!(@user,         raw: I18n.t(
           "#{I18N_KEY}.edit.bot_created_post_raw",
           i18n_post_args(discobot_username: self.discobot_user.username)
         ),
-        topic_id: data[:topic_id],
-        skip_bot: true,
-        skip_validations: true
-      })
+                                                topic_id: data[:topic_id],
+                                                skip_bot: true,
+                                                skip_validations: true)
 
       set_state_data(:post_id, post.id)
       post
@@ -133,15 +131,13 @@ 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/base.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
index 3552d1663f..f2bbc9d3b1 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/base.rb
@@ -19,6 +19,21 @@ module DiscourseNarrativeBot
 
         begin
           opts = transition
+
+          loop do
+            next_state = opts[:next_state]
+
+            break if next_state == :end
+
+            next_opts = self.class::TRANSITION_TABLE.fetch(next_state)
+            prerequisite = next_opts[:prerequisite]
+
+            break if !prerequisite || instance_eval(&prerequisite)
+
+            [:next_state, :next_instructions].each do |key|
+              opts[key] = next_opts[key]
+            end
+          end
         rescue InvalidTransitionError
           # For given input, no transition for current state
           return
@@ -94,7 +109,7 @@ module DiscourseNarrativeBot
             skip_trigger: TrackSelector.skip_trigger,
             reset_trigger: "#{TrackSelector.reset_trigger} #{self.class.reset_trigger}"
           )
-        ), {}, { skip_send_email: false })
+        ), {}, skip_send_email: false)
       end
     end
 
@@ -153,8 +168,8 @@ module DiscourseNarrativeBot
       end
     end
 
-    def i18n_post_args(extra={})
-      {base_uri: Discourse.base_uri}.merge(extra)
+    def i18n_post_args(extra = {})
+      { base_uri: Discourse.base_uri }.merge(extra)
     end
 
     def valid_topic?(topic_id)
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
index f36c264720..da4a9435ff 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/certificate_generator.rb
@@ -464,7 +464,7 @@ module DiscourseNarrativeBot
             <clipPath id="clipCircle">
               <circle r="15" cx="15" cy="15"/>
             </clipPath>
-            <image clip-path="url(#clipCircle)" height="30px" width="30px" xlink:href="data:image/png;base64,#{Base64.strict_encode64(URI(avatar_url).open('rb', redirect: true, allow_redirections: :all).read)}"/>
+            <image clip-path="url(#clipCircle)" height="30px" width="30px" #{base64_image_link(avatar_url)}/>
           </g>
           <text x="#{width / 2}" y="240.94" text-anchor="middle" font-size="24" fill="#020403" font-family="Tangerine, Tangerine">
             #{name}
@@ -491,7 +491,7 @@ module DiscourseNarrativeBot
 
       <<~SVG
       <svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 722.83 504.57">
-        <path fill="#FFF" d="M358.17 22.32H1.77V464.6H713.83V22.32H358.17zm330.71 416.63H26.73V47.98h662.15v390.97z"/>
+        <path fill="#FFF" d="M358.17 -1H1.77V510.6H721.83V-1H358.17zm330.71"/>
         <style>
           @font-face { font-family: &apos;Tangerine&apos;; src: url(data:application/font-woff2;data:;base64,d09GMgABAAAAAFnsABAAAAAA1BwAAFmMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmAWi2AAhEwILgmCcxEQCoLaTIKhGhKmcAE2AiQDhlALgyoABCAFgSwHg08MHxuqtBeUXTuKQHcAR9WopyBFpN+kFTKKYOMAgKTHZv//n5V0xFhsRwMwO73K/AeBIBQmDJNlQlpaWSekbBM+rawStKstg9Qr4TVBIwdPtzmyjRzTp3kP99gc2E7XpuUUeC5YGBsEhsceAW8i388CETl83RsujPiFyA03OcUW/gmvdpv3tAwLsRQPUWl4iQQctdsXKun/aT97Ql5UsiZhxZQmp2zadhWpEJt6mCM09kmuD75XvSQddbxiVlYP/gLYA8UO0NwabGORt92yoTdGxSKBsY1tjIqRKaWCWNiIkS9YCWa8lRj12m/8qy/Gmx88//w46tz/Z5ZIEJvUqQyws4SJG1nytm0bKvymdPq9ko0sXu1KWhHYlmxLRjkmCDznEgcuOecQsPtQNFQ0R9N/mJ57DoDBc3ZwiAagdT7qsTHWOG1hAZvLvZHc/UoO99Oj22euhrmER846FVzwgoF5hhYm+fJO/Z/TPVcd1oWs/6/t4KIk8VoCT7DUThl0d/5xSkQB/A/pVi3t0tr5q1mpRXntbgvtTGyC/JIQUTSBEILLJPNi3phI6uGxv727LpBoXSKFwYcJRr6pv/anvwn+xJP8AHW5vcNaC22S/tPCLEk6sB8YqhDUqUMxOWA9gYegeRhIc6F/YV1sYr9/g8IqBps0W9Jp9nq3/rPtEBaYlegZRirw2k47IAd01sP/5rSkGZauX/pK/gy7UYYX6L6nvbtV3tOyFwiv02ugBAG39q5TQGcAmCf6C33BQKZ7woUtUIUrX6BuEbzxFQz8/3Oomn/eyfEbsJ+k89EDq+oavhbwGg7FWBdQrWLc/1tq0ln5ipxaWC4AXQC7hgLR6P9Za/bPjMuMfSfvXtHtusjtxSpucpq0V3oNQIE6Ka0TFhwAEwgCoOAhGBjAYACDGf5+/+q570clVgB9jrIS+RjRFJVUFNGgif8/+lkc0fo1i3Jh8z8f3ou4LvXpCMcbTTeEzf9Xzc8W94ISNyQMRiuHWJQ+Lho667h2V4iPILkkCI7SxvmjzcEpkpj9Zz7pFCU7N3Xscrdl4br0/819vp3Z5ey2570sYXkmBTwe0FZW19XVJXcm29DSpJRkMSlNSg+yRbaSWQEL94X7wn2h/ff9/fzykgDa4zSeY0WIzrbyv2d//DnzJS12MHKzE5DTQKYJ4zGl3X/evkztH503c2P91fWbEEOA2GDZki15QPoDMLcyERzopzYaBGPjReSLaD8OqPitDLJhL6R4Svp3Ot3u0hUq/D+Uvq8GoP/iMRteE7cCAih0KAg4GBFkJgx+jlCgpal/dLSvElNPV38ZiDKmib7+MDNggcMKX+CVvlQyGuQEfuoYFEyqW7SHjYOkS797DPkEzAxZa8SmyKlSlzKXmOcJf65QFVATeiqaMuqKNJS8qTy2aIuzIxlyFbqq2s2eWt+X+kDWAaA6SAOsWaStoIWo7ZJOI6OgUNGpYWodKyNNXGXhsQE56YKlB+HDFbQIESICMbGS5imJjJw5pVhBVUlFy5petGGozY5ZpGcxsDXmxCk8c33hFVrZ+OwCDqGfooIXtzgfSYFXqo+f1o6kOBfNJSZZ6ZPjhpchIUWZQ5KFLNsVOb+KJhddnhvyPxNLQdoKX0eRXDxA+sAnACnMCHzHEBIoKayy9hxOgfASeVXUKBq0t5izY4DNIe4Y4TVmQsgpcZ+RmJNr0W1JYUVlTatN25bOjuE9s+45sDiy/cQpZy7cvPKKb3zuAj3yKSx6iXiL69P4lfCT8pcVnlqv6loaOm/qLx1cAy1jtk0Xnlmd9C3nXSuBrXo96wMGkCFVo56OaSYMU7ZmPZlzuUDHS55VTms2+dwWjnZF7fPw2+HxAlxSmJFwQER+L/sf0v6f/CXzt+L/qHv/8p+W/+sDYAiCzMTWLrFFk1X6vIqouazvKHQD03Tr9BzeJbQ8trcT2cvS2aq+do5unkH36nH362nnHfAN+Ucb80M1PWzXDvtkC6wl/pU/Phi1Abba7n8SFUc70263u7NB7sI9uDf358k8l6/1VhQFwA3ablgzTJuQuRN3W5l0DOX388Dx5r/7b/9vOXb98G0t3beeZ4gZ4MXfM8BPIG/AUvIikzPdOmzA/zNT5YS5VlkuxnGdNFhrM70sjSZaZMACCy22xGprLLWMzgSnrHdSN3HmmgdhEhQTMwsAFQ0dAxObiJiElIyvIMFCyIVKdFmmi0ZKp5RAzcDMwSlTtgKFihTzKFWrSYcuPXr1mWGm+ea4YourTmOqDRoyar7dxjPaYB23Sy5a44CDIgyrc84e+62X4YxjTugOZp+jfMjg9kIyEukZ2CMhAx3DwsfBJcSzjUAgP/4CKIxwiRYmXLxIsaJoWCRJliJfjlx5bEpUKVOuRoWtqk0z2RRTzbLDbDtVskrVpt0ercbZ64bD7EAAAHbtM94mg0CBuX3lVCLENhQx0QD/Q6wmcO9AtnjSFOh65kvISEKUh06u/6NztF6lgiQA+qqYNE8FTQSJMBUsgYKZXzEwZQI72+47WF7AZXtgwS9aPXznaBvkwGrMlR7WGuSt5D4+OxJVUiHIkLBj7XkBt8q6rfLuP+MDqqQJ3P17pm9YVi5vVTQLETQf7Bk+qFwk8qlmat/KXNh1v5bs9TRD6oi1VoIcOpnJYxrY0aliGfmRm3DtPIquJA5evm+wNtMJadXMTwuRe7ulDHIpf+P+b5NcJJUKXdIcGq1cREpHDggYLcrCqxQMAFwFgAyBkO0gwVMBif7sgOwFwVsIP9/TlDA6wA+P8nlTinsAUgqQIKRVxDT8CkqERT7xaGMFhDwfgCgSgaBCZuP+fHVuREGD/HzQT38016SFXKM+P8y70eCU0G9UUlLrQzwNMN687Y1yBF+GCYI1aYSnRgAoHVxuOEF8li6v3N1f4RVZ8fww/9bDZ1EHYTDieD5pPZIm2Uh84lb3Vk3BYMTxPBRrELn85FN8ec90sMZrsuZ598cc3nf7OT6fJQj1EDcX4LEcozgu91UZqmOV54sBZ+s5hApUbjqQb4amaTrOgVKUQnG/cscEyRkrl2Q4xZniOLCmyKmcquz3TwWxO9WhqvH8htt1lkrn7DjfcPPiTFSPnE4foY4wcaAYQBGJCN4nXN93xPO74g2+hDrrIpSbHJaPYTGCUBSTvtUMz0/QiUvv7KhgsAVppMoXkRuO+OJNoq+AOf9zGJmNlEVmlUVtiBzTR72eIPaRaLpwDTMQT3O1reUcVVLe7+czuMBEmorsDYVg9DgWRjrfAM6/2AU7Eh5srlIICc+HMoLVMNLVC93ooE6L/hkHW4iBKD2yLFTqych1HXUfZ38HmWFlGudLUDmBjGU6+krqyUTkOiKx0nWyTP+6QhmIUrrscxwvKwyDSiAKmyvFQaCHp1FIa4VsimkKDgsjeUmHHGf/oT//AsSo3H5JKIyoKAhLklT2hM+zfguDahWG9rXKmRvTaobvHOh4dqda3rTqcmr38g9t2PefgiJdbITu+tjnKiqGQMLyMsA5xiAU2TKZ+30s6KBqEuSfAJCOW7ESzqTmJk/I8qEbpDbtH10Q0+/lv0l8J34np909hjcxK+tpgJG3S3L3Vh9DCE5nDPGSffRA+Z3uS49JkRaoJLOefULeWq778QJBkJc3VGPLvEGzZQrh5R8WU4HfZWhtWiYutwXOZhi/VQgivlX8tQAWFQslSVHksK6X1Fbd9i1vdly+OUhql1WKcJssBjYYVr9V3EtAb5G0cd/qYwBOTh87TdH0qmGUoQE8DlEyWmb2NOt+v+IBtoMBJuHCPOmPl45l7CXam6+friyUekB/LnbHgob04/bk9ktL7bIHWWIaWk/uGzcpU/nBjPVw6Yw7RNlWItiduBWdvBbP4IESJOIQ3vJKl5HJsGH8wR0XssR2ambrMBgYcfIWkSsLFgd5SLqPO/rvQ37KI261oskkLun7PXwrfVVbs7IffYY3Vlw4H9ncstkUdFR+erV3m9Xb4qD0pW2bg5I1WVhwjxZY+QWXkbNIhKa7tn5HGBDUYEK26sMXAlrLmNN4PbBwrCBBoMFROCi092kWEQLJpiPoseMw+iygC7W9HKjMZmCO0sO/uKb6go5RWqq4ioSrB1NdaeW3ZGHJ2siUIgYuKYxtk+ZY+2Pd0/feyWq/Y5hUmqN1aubpxY5P+fjFT1PCyQFok+53B6BdmnOdgNc+NPWg4z++29F/+roOU2miFl0diEANn1Pke9PEfJB9Bl1Xd3aceaqkt/TmnquX4XexcgAGER6G+/dewrxsn8LrlN7k4dlC8kWl1eZ99hZLVfSbjyNxVp0/46JWqFDzcp3qxZvCGsN4yOlcLwc/V6rgcCzd8ohCqLGwKS+V3mzkJuPxGnJcIwcX9zktnn9VXdj+f2bsNHwcrVhWwXZPTgK6iluD9rnN2/GEAbzVzU84GI69f48aVDVWhr8Eo2fxDNy9ON+uMPiKCvvs/nmsucnQK81JCMWz4CIX3qLauVtRj/QgF0z/knA3WLkgZt5oLaJhTpiUlPXDVwB3vYsN+sR9D2VoS7X5+J4Embv+7zS2KbnEx9R1v02tSrKTw9jYQDCeOYC0mhLHnpaw21Sv6pqu01yvaz409c+u2SGw5wHVaOD+6gq2nWJYeoK6K3QGheFB4LTQko6sNTf+9bbOTl514crsKS+kqCVnOdvNagH+ZloVShHBfhx5R2GtCiVImJQ447675WZJZKDYDlxkMOO0UcJo92+DlaliaBuO8ZmySbom2K+QfVi07rUpsE2EJjPiSPhC3jrz+rxFZM+c2jl+bMHKkk5WeufaR+96Zfyxs8XOqcECZHy5JNH94Yyfl+YmBnCAt8K1qv1x+cCxTTzbpYn6+7AQU91VtDyHa/eonvc5hg1eojhe4meBdsXxcW60F+re1ZXqycnK3aFepoScR3HsOadP7dyt95GtgyvkRiap3nmXvOLwUiYqu2CJ1nNFxVKI3qXDx1KmcjftMqz/YeDmmWbzS9WLMnn9stecMDgJS6Cm5haj99ZBIbsdvawaLycGrCdT3sW75y45RPWmOjvo7Dn2OFzEQJ+m1DsfXIa9eYDukyicZtZYb527FdiKUctUtGX0dD2YhxXV8PDhzPvZ9fMhEKxeocQOnr2K3M6N04jm6CzlZhK0b6BMFhjdHMh+QZVt7d514cX+uucFlRRZHt6ltJ+0tKfGB1DLMipOLevGGPZzrOzhDyIrEHZPBlmyK6UqlFkVvTBa2z2GlXnZEkd9pyMutCLnvjNkxN8BxcGOXCCATFij2DxRzMa5fNuqeGj048D4H0P5dHMV2Myo1Yd5jMSa9jjAfC6eUPF7dYe7upFAlDOeDnJkD5h2xYKlfU4DUlPleU1yiwpZmdw78lCLaFAshgxTrbr/ipsKZhlc3PV3WpyU0I3Gz5gzlNKyWeB+0OSgtFDXRo6bQo4sIrTRMAq6tbrhfcI+l2rZEinC3dkUT53kHKA6sHgydnfE2PFo6ohkdWlpich1sDwS3fZ3J90/ALhpp4Snv2qZg35JZE9FNIXvCP1i/o7zIHnZ+j7eb9+78pfv9S2i3JNnAaFqVlS9I31LNzW5oTaC41JlOoKiYCCNZqN3vBtQbLAkUvlYtU7N4XJQcxIzqNF4s3kpgjA9pE5u1j9Hcfgfng+S3sMiVWbOUsLMOLMBQhsWO9ySOecuof0sja4eVGqURAXq+UI8qcQn+DQeGi/kMs3ovesMiZkqEDxKxqHOQ518cVU6pjSSrF9wv6ITKnoHEuUZTBmTPp90RyOGMNfdN6EV3mqUfNqn8OKexpCI6eQe2uKBkcqVWpg0iUMNRwf+ES78EtFCbrkDpCsxLP3CYhT16hA+Pqdr8m5byugeaKQnL6GoaKl/QZX3QwzgBMeejwLj/xSLhm/W8hmww13PH8JEjWt5DfBuH4NkaYxT3fNkLGXhG3UELakAUMf1giALriKq/i82nj3XQxLgYH+Rh6r7//3gvTcHGq4hDm1w7LBk3pcluIH5Hx7kiLF3OslQpjEYHvydl4emJ9SfunHNERPs6rv7HkLd4tjWkuKoDb7q92eXyZ5N29rSbPcYpPFhlqwop0CBswwMb/aPj16GEYQejSk2j+hNQMtNRv34JhQKsfvLGuLZFa+ZogkNc8BZfUPBbm8rDq2qXdr9ErVsEqQk9yMi1pno7HZ7Me0NYsMWKoLwRDBys6OF33iAJwhTBIYCiOW3LSXtlxl8kdoNd0zuSm5yxegSmjzeiT84drY41WLNPZoFBJSLUShNBeOOhoPFhrgCZpvTTbOFKCIMHAOLHxfKlIAOyvC5cY5lmbnnz6It0FE9ip4QTORwdx5WVfeKj8l3oLhgPbsyJ8sVA11ENnta8ISkGkYaJjaan5gYuLOhqnwI+lrbeEK/AnB14S22GIhgOha5ovtUqh9g+Kv/HrVzGVpEgZ9mHKdZTInewX78/W1na5eI7UNQbWqhRkaxInyoE4vrGLm2O1+LCFJTtw4GSUzd5eZV5UpAk0UIh4fYpNozgAuI325YX/bCmbJqokrSesrjo/hwdhTZHL9vtdplvGmGMrE882kQf2BLs5N0z7x5PwBgIAhtCDCqR7Oya5cvmGJd5tyUOeyk+bUE+hxnnW72R62pXencz+Vsc9PGASUwNNbOrciOOpXzQpph2B05wIdGwWPy/OE430cJpzjyec3PbRnthZhfHfX3rKdr1xnI5RC314MWowkCMc4jAdqvlpOVu0ZKg77CQMerlmQf2qLKuFyvC3+m+FELCpMZkeyDsJ9PMElwibOY8rjRx8aIW7DVQG0+THVvyz0SCReyuRPlauPoK+so6V7nUt7yyqJMm7g9XASGOAk+N26fv3qPEyKky1GvUwZUm7Zk8kILNaD7sEolD83wsaKJRQ22IxRIEQaUfqqcMbxmMrDqFb+QtCXml/OCU0V+ZAQ+xBBtZobHC83xWkQ8xu3tHN/s067X/Rg3s9NOi2ZJBAAKq6OURcJEeEkJyDzeUEwnJ0/t8Jzb71/tFGMcuP3Hlg0bvUuMZZzwas/wLnMs5dA7xZFCHQ6tMoim9gmS28UYx1UylDlJVm7puag6836q/ldHEIWmvScX/pOQlDla1bTed01wn2SdRSdhc8OpsrwflnwjKVTPviCJHEUuvlOJ0JM6lyac3VG7nx8rVJeyifYJagCoG7SDmXp2mf5EWaMb8gIHwz4BMG7s7tiHYgPEdhsvXnX1jMEc16CIeIfySBD2HhfPWF8RLW6utkGEzJzjObnNmRBZmXZJvneMITYIBsnCmvsqY6V4y10rjw1W3QkUni83tXCoXESu2j4Ht9cd76h3bklBT+gY9aD6HajPzrYoWuNszsbcipm4ZhaNnKxJWeI4mgxIU0X7J56MnHeCKRH1IZ6Go/CKNm/derWOheGWkjzW+M+xx3Y8j6k2AQRB3/0QA4b9OPtyGVFQrxsTXJkcK8+tX8G8JD8/r6siO/E8iC+5OYyBegrH4uYQW5lBiqL6ANDoUror5iMPPfYLBsSNXGMlp8wm93IPu0VOemNgmrJu6BgxA5IRL92gGEbwgbONn5fXCDJBe2vrxQSJUUPEh7ZAibj/wClycQIF1pFXa1G5GJaPQD0op6PjsYUTMGPhFWkWBHbG7MubbTUEII7lv2Ieab9Glc5M2MGkEVSizf/TFtM2OHfrM7IFAqGpyo1Tgw0FVF/IELN9/0YZMDAdTiPP4byjQOmIzFbb0/SfW2j5iTBwY+W/6T0jP/ei4ePftNxtbHP3PTtxTWWAANoChjY19kXCBXeVxFGYGxsJlFNAqu/5dmLqKTY2CgZsjcLoLtZzBtwJYsPpFkc3kixTubrnzEoTUlShYqFhwobkSfEi/BUrTgNFgHEhHtsz7bknZw/6eTjJJtcu/PwIN/kLUCn5hoNmytbO5RUVZLugSvlaVO1axUh2ZXEmYYHwVUNSbAxif6/pcVzAaU0DfqhsEVnA5ihvMdeFmVVhPRYCGPTCTsdLypkEJ5kFWZUWTkvKVyRdAp3HqGkp9mL+E3DWSFItS9V2OmFrGpYXIJ7N5Ml0AJ/gAyVZwveljw0ppgdQShISyqsc9LwfcB/2i5MQrXg3oTM/CJyET0qeCMPtZMlxrzbp7Ac3TW2SMgoyIPg4qb1zm+d/jHjJwCFGHNMOMznIWVlaE+FzJF8ssA/KBV4nZXEzaZFwMLRugqYkUxwK+kTZEc4XFD3kel5sSOC+V5YJBNmNCXRDzNMOzb56xnPLjcd/KERn8IqPGWXkHniyB1wGJO2jtAyGnwJ3s10NPspzo8CCLpKVlWUC9TpWwbFVUWjFUXXdzTrfEdgpmuUc6yLecMYK7yRnKfXF6wCgjgbNIRHXoSduoGoWtthYKpcuu9hnoeRuHlbbENGP7e51mfA2nQVAuCsriaes0d82MIsZ6x4X7W+2Vh7gJ0h2a8H6JcOba4n6mxcZHDu7VGHPInyyjoTSIg5VBC5bOPXqzmrSjOyDVfXVPy+2rnp1IwUFdVb+Snu8NdnIqff5AXOdDnns7pRzjI41aWTQD6u+cbweeEALL6wot+tAiR4KXpJ4yD0VSDHyIs4+GxN7Xr99iyZzcDwMtqIw4C/4Ia5amEFXVfi7OYOd28YCnM3PLBFlQNxtykbcCPPP5tiPJR9DuNkkDWkK61TDzz7Ivc/E6XT299p6F186lbpB1L0n2yfB2ZOzig70Bh0stAUauersfT9nn2G1LLocIb2p+QGjm+OwPIjzDZXLUPX8bpB0ERA4S5Y92bLb12oaUOAgzaStVxCqc+syEKJST5YtkBt2sNwOMnOerV8OfVhS/JdteenjGzLlvIj12Xdhi0Zl8RJsWtotMeBnfizidm5w5mpG7hOP9nwrUwOVmGGooleBCSHdz4K5kxikrxuEoQl0dkTbKrh3C/uPpFWQxQpPwygk5DXdZWC/Ot2/u7qMiZeFKsXZRJF5Q8YJQHXaLw5olYxXeDcqaXhTTUWu2q6Y57cDxIesW67ymtwMzWjvtqJaFA7LEgzo4NUWnL7nUoWQubx0CiuO3tf9BhcDPXxTXGk/slxAuHIa3s43puf1hnlwE5lZn/cUDx5bQEzKjeB2vY3W/rLkOupqCLfx1aOjZIeBYNI+bnuwc3tne6hXS9VVBk7fMy16aXYIfIOkttZ81MdVXSrnxlQWL5JxH1KL7tS7k6slOrZtQ8cYzfcixYqq4t1XBSF6yaRcJ3ftZsR3b7lEQUqk6sf/1+qVRIJmJWCA72Rx/l1HhAOL9wG4J8IiAKGHKnPENeR2lbyZIzMKHOR5g/ePYwVCTZgNSAvJ8hrxvnzeatpoL1E+oZpJGT6CZp92pPah0S8mZZlRp3I8Wa6Dlarc53zqhwv4M2f15Zg0lDlsTXJROiYDLIRhCtvLCv0caCvRBE4JIJpiZyxxG2ZOPzKWVxB//QMRRsKPEglwEi8wjQgj0ERM4BOBBkKdDG36buuJKBraYQGw/ikziKTSBUCR90EeF1+REo3G2bYpdNPsGuLK0V7x3m2TsMjSxWfdAg9Zt+u2gx9pagl15gRPtERx8qJ1DmmEKT+DbAZ74GEf2RD7HwsuML5ArFGLMv1WR88rr+5XRTanItM37HULimG6XbccgojSOFG44sZ/kHrKJtr32b1a0mRTR4L4PsDyt47YFWfj8yUatTAjzBo9r7ymX5UhXn+kKRSLFj3pFpiWnpXXwTorq0XJVeWitLJkqlNcDN/HN98KKaIo/VWMQ+U8udCZoE4PihqLZ7F/lepofvS7CRo00jNltQgogmZldQ3d8BV8wH0O2/FQs7EXAAWL3gdbfochhbFj248q+HZlnPqHruT4pCid34js5T/O2JTkIrQJpZ9+UUkNjvJlGAAdQ0Th8DGJ2AlFgNWNuTdZum6u6OPwujhYY69cYaTC0KQDXxENPk3hLxd1Hio91NytZKklDUx+fczanUu7TEZTHOePk3AZiQNhM1m2Ef9QK1ujiapmpAJ5iC/81pc+qknJ3jZrv/ogXfVv7VJ3MTYouSSRqhOkwSmGble+JAlhQadhMuKK9K1R6UXy6VadXK+Mcakw8K/eo3B+k3uworgtUB2spZ0v5QVIdS/UviK0yeBwp1YPzles+cMiVKgSTfGG+EXVXf02Z6CEhVn5H7tS4YHeOgGyvCP1aZsoWSR8ZSaghpXmcwKt0uRc43Jhy8mpO7WX5fKBgPI4bnOgzCh0wAaH9u/E3GqieueboSksI5xl0pfZ1FlcRVionyzYmBHRzXdgqIOWLusPbtprSGipAecfomHVXS6E2UV9QFKkkxfrZyG9DW9/EXlxIkV/ov1pqxrWR/lLUJo+mFdXFBPp3R9opt8Py6cZn3IIxjpmclCnICBF/XSygNa+VBH+6R7L9IdoenzeaF8xHyRZwGjHUnd+nCFcxovfpYIDT36jCUcTrR2q4BRhuDE6Iba9tHBGbO0/m2iaG4YaHaIuLtXhXxQSl/prmaw80N2r4Nas05F8ZEoCty67nmS1/ORB+ztMWl8awa1GGi6ieGXRZIGsYqlCL3vINJwkqmUNRSMZDoSUfdM/u2xKk3uCv0avVsmlfnaT0RN+EI5Um92BP0V6ceglc2y1qNCS3ilxq1WGuE1VlPT4smk6ZF1sqpNf+2Ki1UJxVqQ0C+9S9+SljwvQGdXxweB+7Ru6j4S8cidPromLj8/jGrXyapwFa2TmPwJiluqxfgm5/jFmsucAvEn8kFavczWEWvwtwLvw6S9N78eBTjfFEtClTFcHBVANQ0IX7I1OFqyPCM/17SRq/SrOF5TlJ2cGSoF2Ct5QJ7RDjUUCtlloT3C6gwZ6+Sge+FtPaBGsUPoXlCE+GKoNaqZmkoyKKthgHiM25HiNwgm2WCO1sdmCNZrwCmktCffnqfEMmYmSe14wkWKPmW4qcIffrpWOLOSbaIHsBjy4wm4rmgePFn1PaY7s4UyNjVhBkxqFHmiPnmHMrsQwcJxfW0LDnIfd3a3zS5YJjBEuHwSCtMwwJi+xjlt6aGn3Km263/eH4yXyQOtehYz8vNdfkLXlD/+MQdvi2f1HTDV62hK+Ibk4Hb1wQ2isol9S7xHhRBiCdJexVlEcc59cF5zWvm7awrldjhTvyWx0OLybAmT+8AR52yfGLxNt8k7BRMBhJkrg5vEwWxKl036iZkqPXm90x/EyGJ71KgN4iWDjme1Kg36cJm+CZj+xZX6mSCF/c19QCJv0vEPO9bdxc7zhE2c1w3D+7HWWEvW4sMlkbRVvQlBrVEWCVRUU7hlc1yBvGcOgu3zhkckhySIrOz0sLWF+SW2vWh9uleSzHMEp0QtKmqYbpSVhHoU1SzHBUlvelaOtDbfmBow3hbFdNTaB+sY0lj4QnaTk009MVumDs0tL1rhwSoqfF2HSue8mnviRxvIZN8KFR4IrdGnx80trJ6n1AVr6wut5nfpnlJWTnkOcWUol0xOSpU11ROXzwyP2d1wvc16nln0+W1Ju8WRPyO3J7FQfjNPWhqfmBoy/rQgrUViz5BMtOt/iHFV2V/6knG7twSROQwba0qecbvin4cyd3Xu04ls0lSiYn3ohQxCtrY+durazSDq9TMwmrxceRvRHXT3N46hbFkiDU2iqmMgiRtKOvw3QNNJUv1/WUZ0RHek2HKJyfgm7WOhECopXNk3ywagYF+BwNexo3EJ/HQvCUEtFqd2/lg76FRJVoJWp6opZ1KtI5kYxLfJUzcy66vlGG2rJAw3fJIjPeydVapjtgkZwnVMeRxH5xpkpZeEFwW4uRO2yzp+ETcRb5oRXF6mnO4Ipqfvf+0flBGsd4mZjRLDlleShPBw6I4/GWnz3C18XPNFWVBurDLclk7phtlZ+4Gigk1N3ySdUvXstfzWJAY2NNkaokh0a2DF/D6Bh16T+kl9SF5LAHbp6lyb1TSL2MB6d4YbdiglzcvUpsb0sD80V2eE+BC2cISgGQ/SrnPVQbJoHjlCfbRQtW17K9RVpd6TQewguSdUDPZfyu0vRJvSFKHxJyjBmTvcaaXa6JVqa62P3cvG5za2l/KB4DuDertDBr7I5vv4BKgnXA3rotRI/kW7UwQzJyNGaQ+cnu8q/NO5q/bXZXSlsVG7cv7FXHMr9RonbAKOR7p+jKQ0xBrmVoUmIqmBYRXXF059oiHPJxqh08UpGWk6G0cbMVZsrAkxV24WB+81LLQS/eHeY0kmsWANtIj+itapzKqOMS07fOqeabeVRzeyOOM0NaVixvnxe8wPtosiVeCICDEjxL/Ct4ZWTcgTREmmksHnCP8Hs2fxQTh/PmrV5ZHuGXK6Ki+d2Rrem1SRNnUgQ8GCi2uRbssYdBOyapTrZLt8pCgF/2m6S7ps2oSHgVmH8p4z2v3AW9aSqjr4uowEhDciVOlkTfCZgW6XZX0J0rkZ2DbkBxu6q6EkOVgcFWMnVE8EZJL0+uq4kuci3JCb0nmA4SuCAW/x1OUiKYsefYSphNHoSqqPkH11sdnheaPmxZ90oZEJx6BT+LepCkzVCsm0KxRxA6YHzWOlh6mSp3K+dl4TyoFrYPRTVNtP0tJ70uoV8PQMlusvfBsdqIRXaTEQG1BGaUVjuroltT+YzvIbptQOYLTEA/aowjlcUlq61GlJ1aUc7ryDhEnRgaeizKXgmm/ZttaIJtpjKzGKLTFKDLjF3Eaev9pdk5uAXkQexPFcUaJBHpsmqL3hZFm5eZPf3oiG7nulHhAsoXzaJpWZRoNU3yawt/fcKvgRnkABgrUg3mbLhwbPfMdQGnBXt6T9sKnOYM/2SN/eS1JkYzVgcr6ghq1PmPvSi/lkIARNUen+baGj7KmOmv5p1tVYkZRpNqTK9CqG7peKu9BOkuDPcqqaAurL6zfHjj+hSjTEGPjdIW9PKr/n44QHlIQ67vEGfpSyFVa70s2e+DwDzD3kqP6fX7+wNdZBDpjX85gFQtD/mTB6YMX+mNrGB/diOjzK447gGxQIw+miFgRwknsq6MvX11sP2H2Kntb+vb9LMXos5vo4cp9OYV4omwUvmrjxnxyUADmjKTDxqKNjg3HR4D2mSRMBU3TwmIC3e4DSh4GAVX8tTZRhWLPHCBNtTH8ddJVNL79KE1Ld1OV2aDb3FrilHHvx5EoZQnv2FUnkdX6YhrBczGIUgSL6miPD24bNZHwTSFwsfUi2fKQViHk29aJKA96REgfIhl5/MGROD5GWEo9iAYOxgShNAzTj/lUc9cP8Yzdjx5T6Af5r7+SI4OaxjG5me6QvINqpZMqE5bLTj73sCqYq1pPSILEwVG8KdWYid0yFie512UYCJIId7szZlKDCbGGVuuMqhzkmcHTSb+iOEjAJYj5qpQQNh9AaCKKBoTVzUES+1VhUSa4rjucrKhCFmnollCZbSNMc17MAoU4BS4IKtyAtLCNByntO1MoUwS6XP9o0RlE0v5YnnbqvkUja9LHzqwadwmU7zDxYLp/2KhMKyju1tKcGjNp69uqGFDzyZeJ8FnMm6/Yl/ot4VQX7LD8oJzxqffkW2ZFb57gcEmoTB5+kQAwySh0nFGWnpgvwEx+mNhy5SCKRbZgnlKYGccUfA4NDSvxVTtSiaWGjr7l853KDiyA84c5kLgHpaN6koDkJlzhtjYdGU9KCdASO+W8gnXHAHJ3tG/y/HC8eOgxxSiOyAvjDOizqPOTaIRVHTAzdTYit5ZDsc3vSORtwbtZevEMpqFU6wuo1FvcoWUfXGjwxKEx6eO3uzcqdF4AQ/JfjfmR6z5GUdFEE6wvOkDiP6fahXVGwpBvczJtjro2b2MoUdIQp3velhHSoEyyPzpjtd2ywyXfQIdcLPfdCvGBNqFk6Ao/hMeIhEwk0+yO4rf4QfxVF9Zl9GotB4ZM+jP9RJarUHywvWiGFUUe4BGmWhsOrQeUrmJ+adhy10TiJJbFboM9TjImcGLsGlRIRiMemzgWKoiaLJQQGXqJDcyMm3/8ergbd8KcNwelCIgXsooS2x9ZoSQ4ox6M41zOtXp5b72emxWXhK25sAMQXq4SfgyJgaAI0n1BonVO7SzItXHhAYSA8/dSJRZ6aIh4kUPEbzGHCRKb0kpoB8KrxnZAMy6PINvDuNsB4NxzHsICi6pggn+/DZTC8Bl6KJfM4kL1NDHCM7vlwA8KNa/uBwhlc3ZMHSVZMycQpJ6W44PxciY/Y8yHT0lyAX+WzReegxvVc6pHl9AxBUOc8IqYaEcmSCu3vpwG2pWtRlkDHMHbAC5iK2Hyvl9sIHbmH+x5UhcHn7xq+BK3Ov3PBxWOUR5N7/z9t2fH/2yluiu7Mz4ijh21IEl+0L+CltWppQrfP3kb7HRoTWKuuCPJfb1vo/keaLPdzcuRnrVz7x3fzfQbhXvgslVRLkzfk7oKu3yavO82pJdhIZL5LqZIZi0ya/ngIlS+3T0w30+0f5TnINZ1bmBMqFl0FUs1uohUaCzy7R6G+evFEUhPex80A66AVCVcaz1Pp6iOxTlbY9u6tQO/4pTuAkdzYS59Bpt4CgHZAl8p8bzQR6jC1NKGoqiKFxt3bApULjKpZSHx8tvyaj3bgdksQjG8AtJ9AKFeXDhSq6yKlbkTuewOFT6IRAjh8Zs7LibbEgTCR3hqXU6YY5nfxp1uHsco9fRACohGpJLQ9CFCl8XV7iRtFU/njX4cKuqvhI8SZRWIjFlOiIMEX+X6WFN4WB/IvBvBIsynEfcJHGTabJuwHmISpZ2RzN8P3LEJkWbogNNkZO0QF61bSlcXbXtH2Ch3X8oz8K41vu1kyIX6p6fAPKyZ5qD5Sqpm20p2tnsQpjNPPirI1ebc8ZdzAwL/b+hrKqgEpy+96R0DdnbUJ06Ey3QcNN7otGLwncUkfuODGxPI56fJP1KMkOU34ShRSaC5fkvQr45b9F+85QsIeQuLk6poWPL0SiPbMETmgGSZWJYviLaU5IAw0KQ1q+R5byv0YgMWUxq473Xj8ByGnl+wpIw0P1xwuvEXrPqrWXC3V0rGjgNd8JaJxWx4MN1j65xPvhs0o0XTjDeSi/sVQeLtqzBbBBg83gG7pvijSpSL/FPuosdd8QFwucgEaXNnfSWjoD47dNEOY9+pnKl2gxKoSdHHEMRWQwhLEavEo+PYgWWbQHhfTlrq8kTTw1reqIX2+PeWja06LAInVxX85N8fys+b6AkcC/WnjgJfP9fcDhzbJSAxxGS6NmtnwWq0vGBbDFzwU6aMIXAPeZxCZniGpC22JbNFUGuzFEVTxKIRDiy6Q2EsUHifW1631H8WyAaa0TlVNuI+EOsAWkPDeo0UjXdoGT9LuGjCsO0k8u6n/Hwz4lUtpb7urihZjHONKfnLcgg0AcBvRkN4mfhaZJ6dewd3YxEgUOqM8kEs9XSEszRyAwaElGiaSaQkVifNHiqpuhGLRyB6D3HnRQGQ3h18bdz+/pJWEvInE5enaaiEGkdA39TwMcIUPb+hSk7xGx8w3PBU8Ip9IuM7ihNMJuzVFmYnzGdXyZlrCeQcUxbRMZRoTFGD5WD+3u6YhPTKYWzbzOJC/V0CI7cvAS3OiR08RTjst0rpJG2K09ykwsfsp27pSupHSsYmqqbZRCuWLc4U7fRem8UTGXo7NWJnjhWv8GJB5+o65ugLaNrPmFp0VCVj3vb+j9vZ9C3J12OfzKf2ATW8bU/f6fFFjvxapXUIueveYjSXtXkpGLUEreFIaRJIVCP5/kGJ/6CdcVc9oAg1e6QpWMRKpybYHrDuS63jDWvYTx6XgSLdHOTAL9wKTAgvWJ6oQGFLH+ELOAncdJf+qbOzvLHfCTz2ivhPsJWxqJomR/niaendzytjXTxzc4KMUV0c5t7r3GcXHyWZ5j1/cdZpawitmZo/FXvS9YdLExXcUDptC33OX+DZxO4vhoItXQbEHs1j8G3DAPsu4Os6F8BBJc4sggVf4WIqieELmLElV3dlZjqT7jH35DoQnI7ivfmdvv8lEAdSOWGh5DsjLTuWm4409/Xt9JSuFLOHqJli9jKTYCMHx4nV8Ts9ZCrMfijBDxB3Cy+tyf89AKgIO2WEQijQ5H8ZlzGYmaZ2+DR3/c9wn4W+x/7lyO34qBCZ1qRMYfEYU9x6jLLm01yTR+N/3FK6SSu11hB2BFQ36rYtD/VZQF0XPluwjDC5KbD53Do3Pm8+R710quaDXyokdXXSHotucEtzbxCxvDwiD3uxwIgCaKLKfnMEqQmKzJY09XieLxSPVMhZP8LJVITYptxV7FY7ZiMNdwdKEK9xgLHqbij2PJh1kz/oetSMxME1DkLQWoWhqgBYnYFIgd/2IQr2XixxXoyZppfHBxzhBT8SRmcXg3zP9/n9R5XOiCGWfgOZv8lS3KcHIOPYtcGK3kux5mCqM5j9FkMu3MAYUBfHQUBL3vrWKGJ4VFkrPpmeScqAP6p2K9L1d/ZnmcSx1LKqJmkzJCFULd2m2xWZpowEPNATKi8o7iugzAF3f1D36HHy4keke9J6HS2JE0SdceUyEqI9HTY8s0LcbxhnZVzXLnB0jM/OUvtpFKsX+y3BO1l3+qafVjhQoFI5srZDLfCZyw2eUNWQhqElnAKtadaBo6TXg0IFUI2KP9d1yvr9d7owhPSfIJYPKRBasbXiDdBELqLEGR99A3Nk768rRP/ZvNQzI1Lgokzniff3ND4zhBhHepvWdwj1wP/SYtCuIAuKIl/kZQikbjIu/l/FbD4pOQ8pUCB3gzFcAxqPSpy8VLysDCw5BC4oRUu6hZ9cwUiEQz4VojHh2YEtytfRhsDopWFCHE40vVLlGpiIDtwZObzn0p2dsyspnLBPA7BOHeXWfwmOcgp2/PkQzNf3g+X8rW7UqgkpLZWFac2c8cYHRO3IREMsuQBm3PbrtfEuCBgod/0pFkYgzTHKII/eyerIHu39MDfUJMl8iFQPgpPkv2AtdAFy+/sLfw+xLxY9csMDEGSWq4v8LKJFKw47sBLaxhEQYoKi+PDRbAEV9SgEJv+invQCSiMBAUdV1g4//CoDZnCTTQeeOIzHerjpnJuJLCsTI0g4ndKmgi37rEoywp2218B88Uu7Qugc7pInN2kJqgLSCTtuTG0OdWoQ+W5ij1OBJ+NXeYV22LT1WfMluR3V3RXbZeq48RLXlJShNVrl0w2yIuBpNBc0zdwh4SRqAiDdx4AmigR1HaACdDgSTUR7HgPmoY98+WzelsOrfQAV2YE2Sgo/uE/YtkwvY7ZFvvMywpeAuMJtclGbFeymJAz8iLaI3W3huTTFNEGVKxFltEJjvHP0qUo9eVSNRSNWq7fWNlDj2a/wsOx/76iCNV4/4wJPaJaq2K4o/FbppcpqKz/3W5GNEiw0knOzzYQXFkm/FQH8HX1Odp/hriaZQe58/qZ3P6nyLz8yqzQlh5YRnm5N9WydK8xY0pS/DT7VdMyOiPr7xbN6yFoqi5fs0TmPq4PE2MkSEN98hIsgSBEfhI9/+kEK0zynMZhkHjtuy05I+4fRRSx7vaWz1A8eTsw2gVmv68m7iKzCYTL1wS69xSDOoYW8vRPr5YshSQM+zOJOFPdROsOyBVbGNaJ5Vn6s9FCaNY3Lk/9YEXDB1C2V1lKfV2G5e9DLX67OQNGjhOt9Ue/J9TxPzJ4m+pE7bAFJo38xL2REnK6XJtpIapL78Lp8gk+ht2bgB/J5HUQHqn5RVPmsiOOOVPD4RHia+/qcJTmc/YTMoa4UJwr8J8h8l5RadwQpYE0W/JDIKQ1npm0I8gPtPM0fr6B/0R5MdLitEIw09+UXnAPw+ErgypSlah4aJTawAPyMuTo9q/dEbNw6DhOyjq46Ss1hMtQCigaALXlhRXZVWnrg9nGxOm/t1hiFTFPHp61owRd/3S5K/yEwu1AxauP/8JA9ZDWlMg5okdao40Z2LZgm628a8wjPxaw2gBuQmuarygHUPaGgoQw+sktdPj5U3Gonlp5cEGiR93w/kDArnZN0Kf5uJIrgjJFPwNtuTingHfEj/6WnzWIQMjXBXk96Tu3z2JHKGHzxGwJJA44iLmd4m3Q7DiH6axIJ/XFB8m8W2QCOnGi7clkqdSc8hUS7knwXYezDwPY0sI0qAIl0H6NayRzSrgMrFkto3HxGiGqLMY9JCX06nUmQw6P1jckrJiRj/BUHUPfRuV1jkF21y1tvKhR7rScTdppaaypLLU6gee55LAt4VPJx1n4VeLG4nHr/Hh7qny40z8Qe3SGB8fqifyKigBXNdifGAILXX7h50jclrfBtU8+WDji0avFSlM1v7oG7IN1+yvjHh8oRu5U99PtpGqz1REfHjTg/zVs4Z4vLHws5RsIw7AGvm2p++j+GU41JoUoAk2ZXUXlxKsCr02L8qmpvbwe3ZScYgCuVBNq+cIe2DRfSJGyrCwHj4OPmmADCjylGjYSNEJlfsstR6NtfQI+lXGO5R6KHEJa9heIosifoPAsoA1AqL3+4N78RCipjaAxDFZrQwvtAWPTeEHTwueSsQ3wahAUSmWyKJtKPTSaVXus5T6IbC7DvMBVKqMd6j19WNIJUvLxPUpdORxN7BYm3dpmJ8lWb3iYRgsHoHvrxQ0wiIpNCviUutBr5c82csIROrROtNxRMHxvJMynE/Bro8tChc4bRMz7+sLtvbZk2464fA4DhVWAJ14rcHwK+1ZBILGv3yNqRqF+g8wZ2/UXEJy31CBe5ad4b+HYd9e+XrqA8+t2lvkm5eIAK98FLjIyT+phzuOZWIR1zsPweJpErp+kYJVN1qvH0HUP2r5I0GWXUKEk+DT7gh4UeIoJmm7sNCbOJNByPD92UMe5qhp9Yr5/8wvF8nIh5YoHGRXG0dKrcR3UdgEYJSP+tBQc69r9OQHlfEspb4AY5u1J2PfTRnW0LfWhQexxJhxn1hIHNkG7HLxZTrBtpB0MaNHyPdIxVwj/SRXRA2X0NP90+NspgSbeO4YWXkSYoR/5xOFp6gS0aXAX6OE3yJGN/eBinRqiCOj1VZkzvpSSkDDnOD64ChjlCou1dvr5KicxjL0Ah3iqbD2zjW6s2G/JpxJHVowcn20fUbbsxJl9JRB0LjXnJU9q7PypkGMnqwXjtP3bV7ev7pH2aBCZCxQOL409TYHBjBddPi+nY3kpINJudU3b+5evFYdgY5iHbwKKKHH8pAYcdkrr4+YkyDp91kAibx/HAoOvUqehxKTdjq8fDi+IYXUWyhqjAg7k98ZhX8GkF/kzsdwfIm7LAPAOOI0ppAKlLEE/heiwEofn3F6QOudHDGbxlvNCQ0kxpkBnXfOR5B9jEa8WvHfZ9eTH1l03wElbc1YACNg1PW7/GUQy9HmFvh7ArglbaW0a9WhMV9RaAt7QRvg0/C/B2FWXP0cYLHWvAcL9xTSda9RwMkcGBFIA4hq74aW9UR8MmA+dKw/mLwHDoWNr7kjLh7SroVlqte+JlAdGMdyQmConN7weOhaCeRTv5+HXdbweMTReq84rgTZ9r61IEBV2D9J0/qjGTp1fgOsD9dKk++v7uqI034yLcWFvHTbFqiyMzt1y/dW6CLSzf+2oL0ymTCskNfXHx85XirSXO9YtlHUQXptMLgDH/vz5kQgH/rAt8IRRxE+W/3GPxvnqwj4NsrXPxWDPVqy35u1FT0gSjQ/Yo22magZ6taSm39MXWNYDX8TXuXe2xRScIwwrFDV118bDiqBfNzOM2xxR44X82k7pHzZyJDmfU7efRLRXzCZkWqSQVcXAdIyWZE0C56bWVSMb+PrSemC/Niqgvxclkq1jG245sIFaCo7YyySQhQCB/RGBhbnT1VEi5eWgRi8blMnp5aHmI9Go2ayCsQFATml4+z1cj35vCwnmEM6pSSUoaDq9hKzy/CF9w+N4wVxTTcz2bH8zVE5s51pHxRz2iA8hBiIAc1zRqLCT8bmYmaR9ALXOc9HdtrzhfmHUyBSDlLoQfb9v32ftvO9NWU2HKk+nGDIWBBsYP7bJUrQWdWIwn3pgD6ofuV0+Vgv/dy35qTOFwnSdMlfw6Oph3WQpVAdhGd5aP1eO/SpVL9wmySf+Sl4uwdKmqcbrMFJgl9W2EX6V2PxLIJqgUWq/NS9gS5TGDu9xipQRjBAMfvLe06dJR+pbeNaCLdFJ1OSn6ZQUuLf3I24IDpnEIXsVXJMx6d+Kpmi+hGIE3zDw3XeRISAVIsGHN6NovTVFeIlUSQJnrC/VDrBLQQrAQ25M5VIcIGjxVOE0MjQucu+MgDMUYBoDALs8FA+f3IU4f9w6sPURDZcJBFRlG5fspPEYyMG1Hwa8CMdC5KxbDPg9K6cT8+F7muNbhkKgvqQlr9xWAdrVGG4pOuTG6BEYs8H82//+01ItbDN91ZYxExzKoSgW+z91PvwBatpk82jHFs3c1R4EO0o7TvUUtZrS08UN4H9FINPrpGrKXPDfBnovLWjLUQD+Z4gwrBUPgFn/iczcMa2J0z2wEs1zS8Hpw+dbcowzJy+jWELDVgY/+ujT7qQKuxe3xfbEnf9zw+mkRo82yD3akMqNvXkH0sMVKSFG7NADB0ex0K0XoX7fjm0gGEUnG5SbFo7ukBgO+0AVYoi71cCAqwluehkwA4DDhBSSdqCt2VQhODYzwqGAH5Yf3Y3J2joCWFVZltTfgvhlrbjpqi1BUQfG1vl5cUyxJVqXhTsrryOmeLnJHx03/Dz65vVTtCYqJEj8kkXoy5iHPiW8tHzscvUXb//3vD8eam9/+b8rXx5xGWrkK99d+LWmt9PUiIn75G8emXIk401OXXYnmPJSs7Ob30RucaYbnKl5vgWv4j8jKI1J6SmTPq07gSRqi5+YhE44G+D6x5kYRpoHWSZKerJTSmNtlppgK5aA5L3lgKTHR6Byl/pPXJtBCR6gZSlBtIAzLgpYtVdeRiwVTpxdeyS0TtGQOt971lSaQz5FgIOT2lLfhrbTPSCRE6y8BtNlDLZtWJX9aKbu42E4hcRwzabGph6S7bGlG50WXPeH0Egr9bXCN9HUTwWr3DAHoTUXaoMOqchLoTBHbmqEvh3Tw2NWkr1UgBWBZvFYQIwEH2qWM4AcpkkJhNQjRe6YBNoDFCJlwgXTqP7jZvcUoBJqM3HMSRvhi+NQ7p4+A1FGqVuAasK2dSfW5cTaQioxsDaXT6z5iwz9TosdvqAcISRsuPa7S+/HlGUUmp1btHrP5v8JFOWbYkVr8X2wnyXLZ9GISnlT3D26P6x+uF6srwFpeJvF+0Vbr6I/m7EqvnrBDv427FJtLuQxHucJjXG0sBCR6/ao5OHyHXje95NjcvO/Pb1hXF+qFLN7DGx1mR9//tbvYSMX5OHnONhX583LsZxh7k4bSm6edG/7AWJcvQ/nBqfnfH9C/3q7O+fUSdpoV9vTrqBZPc2AwYC7ioR7yJy/KxkEKB8YBC1RPoYKzlSsSTsYWLo3zzBvp7x5zvp9Y4J3PrHIkG+PPGdenrYA56CJuWsa6y+VyWrLxpPmHhcIuyVyxe8AuVb/qZIOkS0gq0vKKJYd3EWLZPKLFlrbjfTzuvd4rObhjiVUoJAI95SkFQAtZwbgASWBQ/BsT9GMrsit/blPxt8jmrzkfgLR3I2Hyk4cod0SpuOxB88krPwSMHOO6RNux49SenONTiSc8yBgyPShTsG7wm9DuvVSe/OncLDAr0SqfmfhwARNnK51KFRT8H+N+N+cQiDV8E8BpvP9wQhC9N9Z5dkzsGCdH5sb7MiprhP409ksJ8yPnyB5oVGCZ/Gk8jE3sp4ez99mwOpHbKMu0g+GxmH7wIfnphO/GaVBnyskLtmPhx8dG9VlIHEpbvxiD3xvvFHT/UZl48ct+x9oHEflff3rt1e/7PA75dhkk14/+J+zMlTMbc198BluP0Ix195vp+HH71Q4Lb2QjapBwutzPpuXRzHu+MMH+0elY8XsIvbcIaLZINXcTc3BF9mdYkdYSfb4SK74FPJU3gVI9yNK2xwx4cs9nxA7r95DC3gmwtShxQ0TJm+5X6WvBUndq8shpT2nb2vR2mYx9ljMwz3scbUUMftIiKIQ5c2vUY3cd8CIjt+i40XOfept9+C5B+j1d2UYaNriICmLUvMF33hYz8ya1SxIqz4o1AZ8YAHMS83JrRnZ7R1T3B3gyGKpaH5FSWQ+9l9tpM2jFvdY21cXwiipsBNI59v0LHK53Meeaw6DBEHpUGKnjFa4y/PWE+xYW3yzEJWnq3ic5mNfeXz+x0B4rJNNGwU0W/39ICg21E4htW/pI5VVsuYvaR3ensblVM8tYpf+sTyOssSu6cE0UgMn/BtHPsoAXQcxAZjIvr9oIwNrLZCBAlJrJf7Sflf8d1AQQwB1LIasySbGpseKBtuzhE8odvWjvDrQ9KdaSN5/NVYW0MEysddvW36ti9Jky4zPE6Oz64rH+CGarcNGFclWcwWWUkqb6Isb7iMskOlMcyWNQq3DCad1MzWbitkzHikaRQQcTB4M6h+LpL+oQ9Q7dUS6Kqn3U3Tq/O4tg01EW7yXTIj4p1X34mhfUd9Vhb92hYaY8kH3p3VVhQx2FxoU/o2kKCTOA2++E6EJfgTwdbRifGe9Y0ObV/5sskG/5aAZ8BAgHTMt5H4jgpb0ruiwaLCKOjrmahR64K6+wc8fFSh+bbiy1B+1nHH3v7cfyLYlM0UkIikDWRP1a/j9ZZ1aPn3wQIVDl/5Y/wohFLKkCXrxo8cbBgEi70sRI0CswtccWkSXEL0iUbcQz90ns/XOpdoxabqLqe3M3/xeJWppmxk4LG9frKnpsscDQLHN3za6QwKGjgSxBEUcHfmZqagHoZ5rLC0PF0Mr5p3lg5LAAtJwR+MwRoaa2T3j6WgvawIKGYr/XDUj/wXyqlRUlnZJ6eUSGe7hZX0aFdsO9O0RZUQLlG7/NvNN1DZfy0NCBwPsJnb7MK5GeqKfelOcxn8tBN3NKPdaALs7/YfcX24BrhJNr7Zo225a3PgqicMWgA4RMgIFn3HI14cXgC8PXs7qQUFlb/dnuW0tulOu+9y0zeZvN61DLHZrNvFpGNxkOWZ8iJ+xyOeH54DvC25re8YvTZyxPg3+6rWcnweHtrE8DZBGcjviByzdghtunrURCwIqHXaBhiBXfNGkXyE9bizqbOIOilHmBRQSiRfzn7c2kvLEZEQx/AzKkLPjiWe6ptVVgdcIrCDvAKYcwgYvTBAIoMwkYjmDZaRK1V8Xyka1nJiNRdocAy3reYjqwJMKBiBHKf74awW2BNm5NgdsRu0binLFAafTIAWdlAGQlBFYeQyGAkaOgoYZjc6Un2HxCgDtEo5wnmIheUn6pc6zs9LJqjaS78U7+Kh3j/QMUiHbp9yzHfzR/TmPSYkiu2xYFHW/SM/mnRkAJH0waxkx3hLe9gYjTwNwB/1dbjhny/l1o78Ms8k+THHTRlbrjMTY13mjZ5owHUZasmNT9OxPKayCume9rxNYuU1lVY5QWEfAGBhnft97P4pny+DFPg5GH1EG4XSJxRrDmwdVRkBH7lhGuPanNNNdIt5fq8JL3jbEYgMp0d2yuz06ShjlQHgQ7zjUIWIR2Zks3zO89oTiWiecT5BhjrPGXCIKzGrkl4fY4hd3868vD1FATMBz53EqjtrS2OTJvCRlKO5Y8p9+ZSzsh3dgAX1G8djnj6Pn3HgSMFdUBexooEzjNaAw3Ay9f9DhLpSk6MgYLxxUPm+EIATsLA5lTVK6xayLtnzJzKdVempcAI4s/CQj9EN/JbhVSHJ4b/TnFzuLh/xgAcjOB+3h7pcgAM9bCfzoXxJCqA5UXxWGWN40wXhOt50vmtPJ8GoGigtWJFxNXPNjxTBWqWG8KzYxXAYFSclDCQIe7gKduDLBD2A34bV8BpfPSRFpGYoKHZcq4MSUzspRSWrsJ7UXa76+cXORG96mAcqa57MqS3lSJMe8dsUcG+zB6AdaPAPy/WzWgD/eXP7hczWv+PlJ0XpJ9frX8oEzqiIs0eYz1X+ad7RmMCKUolcxy2tpaAHp8N20ZCzMR+Lla4NTrNTikYE4klIXcwk7Uj+v6El/UsVv1WxfcJSLKccgt7NttG5FTlIzNMbSyHLYsNNSxT7TEiTRd4gO1FwddIX51fNcTWyOGTKR7y67gqoIwwdqpaJqud4ucMsO8BuFMbwSvT9qYKyCrbYGoIkXpYpAKXc9ugqeIsL75wswZLrcTIc97TKtjaepaQITRtzGeeQM09yQQpcNBAM+YJzhlA6f7JbRWxK+5IHY9InL4/EblAbAPeQ7XdpZA1SpGIaOJ9OUKlEhrWH2R6Lm6Mis5WupKSlmNFYUmvyGmIUZiHFiaamLwWKIdE1iqwyWhmTvqtO/EIU6iibUT7HMvtjdGIE0fU7z/2fgP8Dtk86cAALUMuuTh0/4w48gTfwBX6N3+Mn/PlV6ShWVU71G13nq7HmPQsuXOh/J1g6FAR0gwR9rHArHsWr+BS/wG/wPf7wJukk/ZcG/2q3T1iEwY61oynrXCdtI7RSq0lfBB0qRIpuOAAAAAAAAAAAAAAAAPsAAKDQJYL9AAECBAgQIECAAAECBAgYlHnk9jp0kwa1r7KQLdDSVs1gB3+LKNbq0kNNIEVbOz/1lQ5fD2lQaQ1vCq+ae++1bUYfDCyOTwWoPddeAZE0+aQqUi3RU3Pk7DHPhKVa2C8RVorJWAaXx76zluqfXRG81tMtJj6UfYi13VrDQTd41DwLdLDBCU71ZY+EdFsYseWYpqY5QWVyklslm+JwPxJ+5zm6e6kTC+fvSu5VgTfoSVnQy7hgA85ogkX+SCWGLnzVMZ95W33Ht6EKob+mYLQyGcFm6GqhCdRlNAXfVG9/lyVmxxprI9IyARtHVsLT4GWkbTL+CGDjUbG24TgExSvCQWli7dtXOlgJ31pIEAJG+w27K3PtCewueFmllo1sg/Fc/DEeSxRnd5brrx2usL8dIBGEOysAWDb9gKGf2TE4X9pkdrE5XKUNANcdDGcJtcK4ppehDfKhoIqPXIrGIWOBoMYSvkmp1vldcmk06SWN25i2Vf6STCuojgjpeWzXr/JRcpfvusQXyg9zYBvFHYlUUlvtvRrTtYeBON5hPS4Sbw4hqGa1DmmQT0RaOUDESk2mIxJqgu4YOMAE1jGJwauIFB9BVVSSZ7bJiy+2PpUXx4k2CUlkefUw0MEvKaR18h0/RMdg3DYVlRGhp7BQR5CHrKmx0sQcBoMMCOuwseSHnRYEVUPWX4LWI6I8VcYUlJpKwHq1uuSjU+3tH7Nm3nHlHXDBewbnDNHN17PzLPUF/fxt7rb1YmE+tgInzTFC9AS5Oygsr9c+DAh7yFsKwE9Oa091zd4BwBpCs3Lo6j7QLuAKgyhh1Z3zZ2Y21nn1bqektItWexhlJOipqWO14hHD1YdYrSq+Hex1j8uvliVkuAiC9UYJTJtBwKE/nrwduH2tOWpsWcsA4liWCzyEFYE5cemqGppPNWbMhKG7dZqQ1PRDhg9S7dkOG1ieKWfPZWM17eurXIkksVTrYp0PJQ/w8EqTAkBu5RarFmVBDPur1ZRVQRXEUZeSqQU+BFxpUNa6h6XHMlVjqbtrmuCws7IU7Nhh3iu6BbCBunQGdPF/GinKCd5HjAG7I5BoIAHXdXV9UthaHZMr0wWWnEMua9ahpYcHKFbITi12qoxVUY0U9bMykzI4x7W8+lzRgA0CsbjzcuCFDhisjX69Mq719590FrMqdRfyQq1q2EU3ytuGwToWKNZmau0F+qDreiZiHbwAlL5a32ZxaDjjussHlHrnGB7OH25xDTlV/K1/jpAR4hBXGPu7+zUUiBvIjwO3a6RGbvfbF9Ptgsryxc7dMi2QztLcSrZ24PaRpEpCaBL1ag6gLLevsxZd8uRXtKYQ54/DyF27UV25pnS/BIMXaCuCkhtHPXROeKkYn5JltKLg7OueT/j40kM/+PPKu77wARt+9bv68Fst+y9U8aXv+qVlZp7NuUpW+AIzfIclHg53XHwZHjir0ctUU6G+CDXexK2M4DcB6Let4jlc88yhk2KHPfPh7MNMsymHybB5ziDHdbMOqzNfsrTbzL3qE2zszTHCeVxKHTv7mIdNqCaos5OQXkFzDMo45+kPXvnl3aanLkctDlPgu6EO7+KGQ0Ev/GrZFu7Akh77ep76BBsqc/jtKMOmBPywTrtNBF+m3D/1o8e7NRhwGbcdZVkILAhIAMbX/CsSBQ9zKC237GrbXW6K7Y4cu7P4ka9PULUknt9akam+XnIXMhgod6+XLwctiIwWUFwQbVmwowN9ENiiYmqrijvxEgOGA/4vSoC3cWmlCG0LqFXDJUWk9qh/QMERhZvPKGw9TmHxWbW7c7xecnb+xdp42xknfy2hrrSC1aJETZVYFOfno5Q3PKM6uX2Ay99u/8tSDTvnsIvHYpeCxm/yYBZA6DIwOUQikKlM/12q2GrhWWZVIUGJL4KPc+zuLuJKJCZ3GdN0CNNCjAVqowaX8kujaq5dKtxdjBqAdZrfSOtuMDoTbBoN5F0Az83s9QhqAkslgJ5yB2J+IAdF6C0RMabibZJxrTBlrhEAoZY3CZaWRsTJZEgDk+qo4g3TutHZQm0tylMjiBm0EayrR9hWzBWkiMNK8RRjEdTvT0NgpNNUXdRoO9yByMAoyXhdqMz6RjWEFwBmlcekaol5aSkGKCctCc8RMSZEuA1wCHNwGOPpyPQrxbqJ5EpTYYIirW1V5QXWMmlTCUzrGgK3JMKMdBOTMrQNUo3vLSVbE21NJOhKVTYcgVSXx8eQK3hMjRkcqnRdqPeoaJplVfVFEUHUSKTIuzXEw9AZM6vjmNN9cwGiSZRazPBMd3PJgodaAtK8cPMHkOAwVFEzLYLZptlZoKLVNZk9miN/o+HZTA7XPxC7VVDSZDFxpKdYD09290SgpWRsmQfsJT8+AWkuHZuBOLxM3LpBZsQRErGysg5LUlAV4QzReNLUPXeptlVM3IwoB9RcHWmZzZzMZjbUes0nK07VSaqI1LPUCa9NPVmt9RyBJBULdTIvsjLWwUptTQysM3zYaTF5JIQiH/BKtEfvYUKlVQuvcbEi2JQCP7Pd16GLlHjhXm208qbJrWweA1bMWGaJNEt1RMtcEsMNgYoBUFTT2kUV2OZkTKYlc5PZZNGMmMidrOlaKU6bNGE5cMTSq1zyd8K/LWgQ1jRuEMHaxMqA2ylaCEA7n3xdnivDXdyySJWzsTBpxb1NWMzSp6cc7W7ptabKm+IxwFxCklMihTjHz4OIQvzcgmwddhlYYvSUIple0teEVhRmbaOLWJU0CjWfeb+ViGue5jbHYFmqDhFtPu/2QsBfcNY87AQYDrIGHB2hBhVUnekA48nNQXDDSjNfOFOnKnmYGeysmq6dTEldiUY/d7bsuIRnqjKjdxtiW5JI0xCSj5LUNG0kANpg8gAaXJPDErGRZg0Ec9we1+MBpMFaIhRVl0hubMTXzJkEWapyzVsTRTDJShWGXhqkKc2IJlvf2VUq5Xb3ZKrA3cA9to762G7K+ASn6JJ1U1TZa87q023J9axEDkE0kadGV0lF1xUFs6UER0fN0ozsASNJ3DSgBQSFsq7nB1YtyByZQ8qaAsT0UJDcnO8DV4/py9LU2b2qBbaPqbLBevJew6pAHItLjmP86IMrRwehH8gsxx2eRjMhxYs1t288hGC0pdXZstuVWvIMhdEGsmAuhFRNU1UV7kGMsGHd1Px2N41u+7FFJhiAHCghtt1YMCoa8q1JjuU2G9ShI/gP3G6GWQHqoWbRbxC3Y8ruxmLY5TSSGLeKpD2+8QzqN6vqagAVXhjW6JX5HvmK4oo8ylUQltR8UgktlbYUR66TUUJsmxCNTlvaHGPw0J69xwRJ4b1g8C+c1fPRKwLVyost9hIFozhzqYikWO8pgU2HJfRn3es2dzDEgnBPS78wzEUlwkkMv3ZBg537Anp+H9o7od+99yHSuo7VKJUTotSllvsPUXRuXi/KkkCvRrbGaFt1kWqZpO44uk54w+yMrxQE0Xw/2RY3X2jU3ddvjfcPKLE13B8V2VC+tUefxfWr1hcPEZrgu0GHwrhVWI08Jp8QV6RBQqJiJaNkNmJPN1bWDY+ECnEd0vR9yzKET5Co2LkYswAVChkg4ePGIdwJSzwbvVLnEVHs1lJfYk4eMeddrKRD8PgAkfBu8gsfn3z+6FZlET0q1t4zU6GZsdoRt+5GyHt0gdLbl9jfCf0RMxTR3cfnUamekPZcsl6IbxiuSNssGzpWcipuN40se2XLjsyyZoY+6ZaKrmuLUnPk2YZUfZUyxqkDJPdi8NNqpWnPJ+UkZJXVmNeX+ucKR6YoERjrEV8ogTlj9wPTX1wVRcgYI5aW+3gFenaYMqNT0e8+9fotNH8G+PNnWqRRq7bSaJzMlkkdOKE5ZlbRN6bDtg0SeXa1s2W9zB82Yxfosl3RnVJE+kns+x6UWqtNO8VjIoTypAgQvpkCEkRX9XxUTlJ2XY15c6n/COWsUhAZ23akN0DXwZSMfVG8uYklrJwpWt80TWyam2OMzn5yjgevzJFtBTL+8duMC4Tej67TtKl4FU/CE/Ila/Gh6HBdy5gTeJlrLxm2olle9emKm5leUiajWi2KAlmib362oczsyWPSbYDUfzhPIwZ6LxebtPTs3n3cdakvUZPq/YXOhS52AH9AniGDzSr2oPxwX4XYay1pyXx4ufrqgWxryuz31XypsSC+I7v8lOfVAtsYl8Us8G4ao/PKeEL/hkvWF3T4vmPNKQYt312y2C3t97KITv2mHdQqZLleL5eLSLJ+hGOnpCwBOu0ZNkByX64kHZkJ4aGzTdr1EmiZt/dn2c/mgofDmEP8DPwFZYb8A6rczUd9ecxkGn3vMIIgFcu0h8KLb4XYT4b13uBQ/EBx+b3fzwriMwzDLsjZLaYfdqYTxiecsx9FRxh6TlSO8l6UjfvJ0ahZAroR5W5UT8mk3UqSMpZcDOzZB8LqooTpSpgQ/riBCM9smIHhbJMMXMvVGDo+tMZVj2Mk5og5NK6i/CBd6bMIInIE/HtpIiG8L4gqAxPlwp6qoL43DD9Zbl9tDjUuJKH/jMdNRnxNy3IZvYQsaxa68AkHLt7zX4uOOI6COWkyjotLpov61X6vRu8mo7CSt8n6oF+vp9onCO2kFbVIw8SAVo5dBsgLfi0iSb0f1EpDPNC24nXX5Lqr/oHrBStsNZVnkULdIPtV+Do2galYsQehg6yvSi0NEy8t9zCJIs2uS57savQnYz0fCIy6Llb47+Cgz1oe3fNC1m+UAntjpukJ63zBj3+LjjSNS3Na2V5aWam96tx1Mm00V240J+mynA37ZD6f5XlLv6c4rvREj3XVtOTiYOKsAyT4N1H4vDnFZeiKQGjf6W7RcZ2NP1DzVML2QURVHdbvSPxL17IJHM2Nvbuybk8JHM12VMPwdMfQ5MtiwlTjGuTvaeZwLgr6LQ3D/9frKRc6ZxSV2bzRNKQT9hKw3QkByPVHuU6U3e8zx33TOvfXAJyc9j65+5S1WTP/7/z/WBXS/gXoUODmZ447KvxIoMmQu5aNXzUdvOlJL/sqrLMF0e8if0nNVe73aY1CW2zd6S2C7Y9tvSHKPiBsKPZf9+MOnBTTHwnp7Grd8hhaARN4ufnRTtCeqxTb0ynyZLbVtOaYzHaZR7vCQC5k6BFYPEhoWwSxbGfySPGKrASGjcGqfPST3Z36VvRLfeWTBNY4YJ3hQe9/itUKoPpS4m7s7fOchYSuXI8Q/TW7fF7Bn7wcEfkbap0V/+/hco2J/L/TckAE8LGrV/FF8zcu5/ogp/8/T1jqQVNxsxI9ImTYzlMe+5P55GrTz4cr9zOylvihSUAs9ftCHJzDEUlUnbdCZKDgDtj9oSe5aQE6XH8yps6ZW79cLtrG/7otZB6xTQA+ubenPsYM9zQAg9DHcaoKSPxVBR/lE7A7Dzf/TzzCN5RS/KvnNBGZKlI/6ixRfCOvqxkKjAAurUpJHFpwEB3GUp9PAoXGUN/s5e+ZBDuFJlkcyQcJxYpB+BMOcyXun5dbb9sr0f1j8GA1Gzn2thtxEH56tV9xqDtCHcWxJuDAV1xzWJmPq43CbXq4XiUMg1ZmJ3l2hQ9E1elv8qBkBgoNkSIomFzlERFLOKVoxZYMOBfaP4FHBtTMqRAagQ01JJZR5Crv9Llq5aDIgM6N24AECygTmwVMIP7dwv4FKg5Mrrro/rUK1SpTolHFFJRIo5eVaVGtUCOFYPIfMla99p3dRDeogNOhOKhQ51x+lUTJG9uhsk2ooav/2fZnWafYdlIevkqcc9qZ81m9MtAl55x34fxcP0ahVKhrLmnphkl2UJ7tKo74fybKTde0cluSGLHivJFGp0KV2aoNqoTSgUgNvQQqBnXuckdQYI47CtVr1KTBLjv9SbCEWZI+WptslowoRbNW47SwSGVlY9cmTbtOXUZ0GDKew3QYBlZOQqvttsde+7g8JJmKi6SI2z31TdCtx0QambJke2u3XGISMjlAFFRkNHQsbEjqUEyHMNQUDEw48/xiphneM5livzHcX2Z4Z6N8rx11zBoffPbFfROdd8IrIpUDBHg+++a7I/YqpLZWojwFeh0xzdGBvOtdOu4ECXGQF4oucxCUSLPsHSBnxAoAAA==); }
         </style>
@@ -530,7 +530,7 @@ module DiscourseNarrativeBot
           <clipPath id="clipCircle">
             <circle r="19" cx="19" cy="19"/>
           </clipPath>
-          <image clip-path="url(#clipCircle)" height="38px" width="38px" xlink:href="data:image/png;base64,#{Base64.strict_encode64(URI(avatar_url).open('rb', redirect: true, allow_redirections: :all).read)}"/>
+          <image clip-path="url(#clipCircle)" height="38px" width="38px" #{base64_image_link(avatar_url)}/>
         </g>
         <text transform="matrix(1.0705 0 0 1 544.2073 388.3629)" fill="#020403" font-family="'Tangerine'" font-size="24.9219px">
           #{@discobot_user.username}
@@ -568,7 +568,7 @@ module DiscourseNarrativeBot
 
           <<~URL
           <g transform="translate(#{width / 2 - (size / 2)} #{height})">
-            <image height="#{size}px" width="#{size}px" xlink:href="data:image/png;base64,#{Base64.strict_encode64(logo_uri.open('rb', redirect: true, allow_redirections: :all).read)}"/>
+            <image height="#{size}px" width="#{size}px" #{base64_image_link(logo_uri)}/>
           </g>
           URL
         rescue URI::InvalidURIError
@@ -576,6 +576,20 @@ module DiscourseNarrativeBot
         end
       end
 
+      def base64_image_link(url)
+        if image = fetch_image(url)
+          "xlink:href=\"data:image/png;base64,#{Base64.strict_encode64(image)}\""
+        else
+          ""
+        end
+      end
+
+      def fetch_image(url)
+        URI(url).open('rb', redirect: true, allow_redirections: :all).read
+      rescue OpenURI::HTTPError
+        # Ignore if fetching image returns a non 200 response
+      end
+
       def avatar_url
         UrlHelper.absolute(Discourse.base_uri + @user.avatar_template.gsub('{size}', '250'))
       end
diff --git a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
index f39377d076..7596d335a1 100644
--- a/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
+++ b/plugins/discourse-narrative-bot/lib/discourse_narrative_bot/new_user_narrative.rb
@@ -38,6 +38,7 @@ module DiscourseNarrativeBot
       },
 
       tutorial_emoji: {
+        prerequisite: Proc.new { SiteSetting.enable_emoji },
         next_state: :tutorial_mention,
         next_instructions: Proc.new {
           I18n.t("#{I18N_KEY}.mention.instructions",
@@ -120,7 +121,7 @@ module DiscourseNarrativeBot
 
     def reset_bot(user, post)
       if pm_to_bot?(post)
-        reset_data(user, { topic_id: post.topic_id })
+        reset_data(user, topic_id: post.topic_id)
       else
         reset_data(user)
       end
@@ -153,7 +154,7 @@ module DiscourseNarrativeBot
       PostRevisor.new(post, topic).revise!(
         self.discobot_user,
         { raw: raw },
-        { skip_validations: true, force_new_version: true }
+        skip_validations: true, force_new_version: true
       )
 
       set_state_data(:post_version, post.reload.version || 0)
@@ -184,7 +185,8 @@ module DiscourseNarrativeBot
       opts = {
         title: I18n.t("#{I18N_KEY}.hello.title", title: SiteSetting.title),
         target_usernames: @user.username,
-        archetype: Archetype.private_message
+        archetype: Archetype.private_message,
+        subtype: TopicSubtype.system_message,
       }
 
       if @post &&
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index adc514e29c..79aba1b6ed 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -96,7 +96,7 @@ after_initialize do
           end
 
         respond_to do |format|
-          format.svg { render inline: svg}
+          format.svg { render inline: svg }
         end
       end
     end
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
index f6af336c20..5c2eeb0452 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/advanced_user_narrative_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
   let(:topic) do
     Fabricate(:private_message_topic, first_post: first_post,
-      topic_allowed_users: [
+                                      topic_allowed_users: [
         Fabricate.build(:topic_allowed_user, user: discobot_user),
         Fabricate.build(:topic_allowed_user, user: user),
       ]
@@ -79,15 +79,13 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         new_post = Post.offset(1).last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => topic.id,
-          "state" => "tutorial_edit",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s,
-          "tutorial_edit" => {
+        expect(narrative.get_data(user)).to eq("topic_id" => topic.id,
+                                               "state" => "tutorial_edit",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s,
+                                               "tutorial_edit" => {
             "post_id" => Post.last.id
-          }
-        })
+          })
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to eq(topic.id)
@@ -111,15 +109,13 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
 
         new_post = Post.offset(1).last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => new_post.topic.id,
-          "state" => "tutorial_edit",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s,
-          "tutorial_edit" => {
+        expect(narrative.get_data(user)).to eq("topic_id" => new_post.topic.id,
+                                               "state" => "tutorial_edit",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s,
+                                               "tutorial_edit" => {
             "post_id" => Post.last.id
-          }
-        })
+          })
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to_not eq(topic.id)
@@ -348,7 +344,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
         describe 'when reply contains the skip trigger' do
           it 'should create the right reply' do
             parent_category = Fabricate(:category, name: 'a')
-            category = Fabricate(:category, parent_category: parent_category, name: 'b')
+            _category = Fabricate(:category, parent_category: parent_category, name: 'b')
 
             post.update!(raw: skip_trigger)
             described_class.any_instance.expects(:enqueue_timeout_job).with(user)
@@ -382,7 +378,7 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       describe 'when user recovers a post in the right topic' do
         it 'should create the right reply' do
           parent_category = Fabricate(:category, name: 'a')
-          category = Fabricate(:category, parent_category: parent_category, name: 'b')
+          _category = Fabricate(:category, parent_category: parent_category, name: 'b')
           post
 
           PostDestroyer.new(user, post).destroy
@@ -652,18 +648,16 @@ RSpec.describe DiscourseNarrativeBot::AdvancedUserNarrative do
       end
 
       it 'should create the right reply' do
-        post.update!(raw: "[details=\"This is a test\"]wooohoo[/details]")
+        post.update!(raw: "[details=\"This is a test\"]\nwooohoo\n[/details]")
         narrative.input(:reply, user, post: post)
 
         expect(Post.offset(1).last.raw).to eq(I18n.t(
           'discourse_narrative_bot.advanced_user_narrative.details.reply', base_uri: ''
         ))
 
-        expect(narrative.get_data(user)).to eq({
-          "state" => "end",
-          "topic_id" => topic.id,
-          "track" => described_class.to_s
-        })
+        expect(narrative.get_data(user)).to eq("state" => "end",
+                                               "topic_id" => topic.id,
+                                               "track" => described_class.to_s)
 
         expect(user.badges.where(name: DiscourseNarrativeBot::AdvancedUserNarrative::BADGE_NAME).exists?)
           .to eq(true)
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
index 836a715099..f85c05b070 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/new_user_narrative_spec.rb
@@ -8,7 +8,7 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
   let(:topic) do
     Fabricate(:private_message_topic, first_post: first_post,
-      topic_allowed_users: [
+                                      topic_allowed_users: [
         Fabricate.build(:topic_allowed_user, user: discobot_user),
         Fabricate.build(:topic_allowed_user, user: user),
       ]
@@ -83,12 +83,10 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         new_post = Post.last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => topic.id,
-          "state" => "tutorial_bookmark",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s
-        })
+        expect(narrative.get_data(user)).to eq("topic_id" => topic.id,
+                                               "state" => "tutorial_bookmark",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s)
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to eq(topic.id)
@@ -111,12 +109,10 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
         new_post = Post.last
 
-        expect(narrative.get_data(user)).to eq({
-          "topic_id" => new_post.topic.id,
-          "state" => "tutorial_bookmark",
-          "last_post_id" => new_post.id,
-          "track" => described_class.to_s
-        })
+        expect(narrative.get_data(user)).to eq("topic_id" => new_post.topic.id,
+                                               "state" => "tutorial_bookmark",
+                                               "last_post_id" => new_post.id,
+                                               "track" => described_class.to_s)
 
         expect(new_post.raw).to eq(expected_raw.chomp)
         expect(new_post.topic.id).to_not eq(topic.id)
@@ -302,23 +298,47 @@ describe DiscourseNarrativeBot::NewUserNarrative do
             expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_emoji)
           end
         end
-      end
 
-      it 'should create the right reply' do
-        post.update!(raw: 'https://en.wikipedia.org/wiki/ROT13')
+        describe 'when emoji is disabled' do
+          before do
+            SiteSetting.enable_emoji = false
+          end
 
-        narrative.expects(:enqueue_timeout_job).with(user)
-        narrative.input(:reply, user, post: post)
-        new_post = Post.last
+          it 'should create the right reply' do
+            post.update!(raw: 'https://en.wikipedia.org/wiki/ROT13')
 
-        expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.reply', base_uri: '')}
+            narrative.input(:reply, user, post: post)
+            new_post = Post.last
 
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.emoji.instructions', base_uri: '')}
-        RAW
+            expected_raw = <<~RAW
+              #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.reply', base_uri: '')}
 
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_emoji)
+              #{I18n.t('discourse_narrative_bot.new_user_narrative.mention.instructions',
+                discobot_username: discobot_user.username, base_uri: ''
+              )}
+            RAW
+
+            expect(new_post.raw).to eq(expected_raw.chomp)
+            expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_mention)
+          end
+        end
+
+        it 'should create the right reply' do
+          post.update!(raw: 'https://en.wikipedia.org/wiki/ROT13')
+
+          narrative.expects(:enqueue_timeout_job).with(user)
+          narrative.input(:reply, user, post: post)
+          new_post = Post.last
+
+          expected_raw = <<~RAW
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.onebox.reply', base_uri: '')}
+
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.emoji.instructions', base_uri: '')}
+          RAW
+
+          expect(new_post.raw).to eq(expected_raw.chomp)
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_emoji)
+        end
       end
     end
 
@@ -585,25 +605,25 @@ describe DiscourseNarrativeBot::NewUserNarrative do
             expect(new_post.raw).to include("/forum/images")
           end
         end
-      end
 
-      it 'should create the right reply' do
-        post.update!(
-          raw: '[quote="#{post.user}, post:#{post.post_number}, topic:#{topic.id}"]\n:monkey: :fries:\n[/quote]'
-        )
+        it 'should create the right reply' do
+          post.update!(
+            raw: "[quote=\"#{post.user}, post:#{post.post_number}, topic:#{topic.id}\"]\n:monkey: :fries:\n[/quote]"
+          )
 
-        narrative.expects(:enqueue_timeout_job).with(user)
-        narrative.input(:reply, user, post: post)
-        new_post = Post.last
+          narrative.expects(:enqueue_timeout_job).with(user)
+          narrative.input(:reply, user, post: post)
+          new_post = Post.last
 
-        expected_raw = <<~RAW
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.quoting.reply', base_uri: '')}
+          expected_raw = <<~RAW
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.quoting.reply', base_uri: '')}
 
-          #{I18n.t('discourse_narrative_bot.new_user_narrative.images.instructions', base_uri: '')}
-        RAW
+            #{I18n.t('discourse_narrative_bot.new_user_narrative.images.instructions', base_uri: '')}
+          RAW
 
-        expect(new_post.raw).to eq(expected_raw.chomp)
-        expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_images)
+          expect(new_post.raw).to eq(expected_raw.chomp)
+          expect(narrative.get_data(user)[:state].to_sym).to eq(:tutorial_images)
+        end
       end
     end
 
@@ -898,11 +918,9 @@ describe DiscourseNarrativeBot::NewUserNarrative do
 
           expect(first_post.reload.raw).to eq('Hello world')
 
-          expect(narrative.get_data(user)).to include({
-            "state" => "end",
-            "topic_id" => new_post.topic_id,
-            "track" => described_class.to_s,
-          })
+          expect(narrative.get_data(user)).to include("state" => "end",
+                                                      "topic_id" => new_post.topic_id,
+                                                      "track" => described_class.to_s)
 
           expect(user.badges.where(name: DiscourseNarrativeBot::NewUserNarrative::BADGE_NAME).exists?)
             .to eq(true)
diff --git a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
index 326a7a6ca8..a1d9b2ce8b 100644
--- a/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
+++ b/plugins/discourse-narrative-bot/spec/discourse_narrative_bot/track_selector_spec.rb
@@ -42,7 +42,7 @@ describe DiscourseNarrativeBot::TrackSelector do
 
       let(:topic) do
         Fabricate(:private_message_topic, first_post: first_post,
-          topic_allowed_users: [
+                                          topic_allowed_users: [
             Fabricate.build(:topic_allowed_user, user: discobot_user),
             Fabricate.build(:topic_allowed_user, user: user),
           ]
@@ -466,7 +466,6 @@ describe DiscourseNarrativeBot::TrackSelector do
           expect(new_post.raw).to eq(random_mention_reply)
         end
 
-
         describe 'rate limiting random reply message in public topic' do
           let(:topic) { Fabricate(:topic) }
           let(:other_post) { Fabricate(:post, raw: '@discobot show me something', topic: topic) }
@@ -574,7 +573,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           describe 'when roll dice command is present inside a quote' do
             it 'should ignore the command' do
               user
-              post.update!(raw: '[quote="Donkey, post:6, topic:1"]@discobot roll 2d1[/quote]')
+              post.update!(raw: "[quote=\"Donkey, post:6, topic:1\"]\n@discobot roll 2d1\n[/quote]")
 
               expect { described_class.new(:reply, user, post_id: post.id).select }
                 .to_not change { Post.count }
@@ -611,7 +610,7 @@ describe DiscourseNarrativeBot::TrackSelector do
           describe 'when quote command is present inside a onebox or quote' do
             it 'should ignore the command' do
               user
-              post.update!(raw: '[quote="Donkey, post:6, topic:1"]@discobot quote[/quote]')
+              post.update!(raw: "[quote=\"Donkey, post:6, topic:1\"]\n@discobot quote\n[/quote]")
 
               expect { described_class.new(:reply, user, post_id: post.id).select }
                 .to_not change { Post.count }
diff --git a/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb b/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb
index 78b25666e4..80d44a2aeb 100644
--- a/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb
+++ b/plugins/discourse-nginx-performance-report/app/jobs/scheduled/daily_performance_report.rb
@@ -45,7 +45,6 @@ module Jobs
                            title: I18n.t('performance_report.initial_topic_title'),
                            skip_validations: true)
 
-
       unless post && post.topic_id
         raise StandardError, "Could not create or retrieve performance report topic id"
       end
diff --git a/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb b/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
index 79cac5163a..439b120247 100644
--- a/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
+++ b/plugins/discourse-nginx-performance-report/lib/log_analyzer.rb
@@ -2,7 +2,6 @@ class LogAnalyzer
 
   class LineParser
 
-
     # log_format log_discourse '[$time_local] "$http_host" $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "$sent_http_x_discourse_username"';
 
     attr_accessor :time, :ip_address, :url, :route, :user_agent, :rails_duration, :total_duration,
@@ -69,8 +68,8 @@ class LogAnalyzer
       @aggregate_type = :duration
     end
 
-    def add(id, duration, aggregate=nil)
-      ary = (@data[id] ||= [0,0])
+    def add(id, duration, aggregate = nil)
+      ary = (@data[id] ||= [0, 0])
       ary[0] += duration
       ary[1] += 1
       unless aggregate.nil?
@@ -83,8 +82,8 @@ class LogAnalyzer
       end
     end
 
-    def top(n, aggregator_formatter=nil)
-      @data.sort{|a,b| b[1][0] <=> a[1][0]}.first(n).map do |metric, ary|
+    def top(n, aggregator_formatter = nil)
+      @data.sort { |a, b| b[1][0] <=> a[1][0] }.first(n).map do |metric, ary|
         metric = metric.to_s
         metric = "[empty]" if metric.length == 0
         result = [metric, ary[0], ary[1]]
@@ -93,7 +92,7 @@ class LogAnalyzer
           if aggregator_formatter
             result.push aggregator_formatter.call(ary[2], ary[0], ary[1])
           else
-            result.push ary[2].sort{|a,b| b[1] <=> a[1]}.first(5).map{|k,v|
+            result.push ary[2].sort { |a, b| b[1] <=> a[1] }.first(5).map { |k, v|
             v = "%.2f" % v if Float === v
             "#{k}(#{v})"}.join(" ")
           end
@@ -104,7 +103,7 @@ class LogAnalyzer
     end
   end
 
-  def initialize(filenames, args={})
+  def initialize(filenames, args = {})
     @filenames = filenames
     @ip_to_rails_duration = Aggeregator.new
     @username_to_rails_duration = Aggeregator.new
@@ -148,7 +147,7 @@ class LogAnalyzer
 
         @url_to_rails_duration.add(parsed.url, parsed.rails_duration)
 
-        @status_404_to_count.add(parsed.url,1) if parsed.status == "404"
+        @status_404_to_count.add(parsed.url, 1) if parsed.status == "404"
       end
     end
     self
diff --git a/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb b/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb
index 8550806f87..480beb67eb 100644
--- a/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb
+++ b/plugins/discourse-nginx-performance-report/script/nginx_analyze.rb
@@ -30,7 +30,7 @@ def top(cols, aggregator, count, aggregator_formatter = nil)
 
   col_just = []
 
-  col_widths = map_with_index(cols) do |name,idx|
+  col_widths = map_with_index(cols) do |name, idx|
     max_width = name.length
 
     if cols[idx].respond_to? :align
@@ -46,14 +46,14 @@ def top(cols, aggregator, count, aggregator_formatter = nil)
       row[idx] = row[idx].to_s
       max_width = row[idx].length if row[idx].length > max_width
     end
-    [max_width,80].min
+    [max_width, 80].min
   end
 
-  puts(map_with_index(cols) do |name,idx|
+  puts(map_with_index(cols) do |name, idx|
     name.ljust(col_widths[idx])
   end.join(" "))
 
-  puts(map_with_index(cols) do |name,idx|
+  puts(map_with_index(cols) do |name, idx|
     ("-" * name.length).ljust(col_widths[idx])
   end.join(" "))
 
@@ -102,7 +102,7 @@ end
 puts
 puts "Analyzed: #{analyzer.filenames.join(",")} on #{`hostname`}"
 if limit
-  puts "Limited to #{DateTime.now - (limit.to_f / (60*24.0))} - #{DateTime.now}"
+  puts "Limited to #{DateTime.now - (limit.to_f / (60 * 24.0))} - #{DateTime.now}"
 end
 puts SPACER
 puts "#{analyzer.from_time} - #{analyzer.to_time}"
@@ -121,7 +121,7 @@ puts SPACER
 puts
 puts "Top 100 routes by Server Load"
 puts
-top(["Route", "Duration", "Reqs", Column.new("Mobile", :rjust)], analyzer.route_to_rails_duration, 100, lambda{
+top(["Route", "Duration", "Reqs", Column.new("Mobile", :rjust)], analyzer.route_to_rails_duration, 100, lambda {
   |hash, name, total|
   "#{hash["mobile"] || 0} (#{"%.2f" % (((hash["mobile"] || 0) / (total + 0.0)) * 100)})%"}
 )
diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
index b7b41648e1..1a4ee5060c 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -1,18 +1,8 @@
 /*eslint no-bitwise:0 */
-import { registerOption } from 'pretty-text/pretty-text';
 
 const DATA_PREFIX = "data-poll-";
 const DEFAULT_POLL_NAME = "poll";
 const WHITELISTED_ATTRIBUTES = ["type", "name", "min", "max", "step", "order", "status", "public"];
-const ATTRIBUTES_REGEX = new RegExp("(" + WHITELISTED_ATTRIBUTES.join("|") + ")=['\"]?[^\\s\\]]+['\"]?", "g");
-
-registerOption((siteSettings, opts) => {
-  const currentUser = (opts.getCurrentUser && opts.getCurrentUser(opts.userId)) || opts.currentUser;
-  const staff = currentUser && currentUser.staff;
-
-  opts.features.poll = !!siteSettings.poll_enabled || staff;
-  opts.pollMaximumOptions = siteSettings.poll_maximum_options;
-});
 
 function getHelpText(count, min, max) {
 
@@ -105,14 +95,14 @@ function invalidPoll(state, tag) {
 const rule = {
   tag: 'poll',
 
-  before: function(state, attrs, md, raw){
+  before: function(state, tagInfo, raw){
     let token = state.push('text', '', 0);
     token.content = raw;
-    token.bbcode_attrs = attrs;
+    token.bbcode_attrs = tagInfo.attrs;
     token.bbcode_type = 'poll_open';
   },
 
-  after: function(state, openToken, md, raw) {
+  after: function(state, openToken, raw) {
 
     let items = getListItems(state.tokens, openToken);
     if (!items) {
@@ -123,11 +113,14 @@ const rule = {
 
     // default poll attributes
     const attributes = [["class", "poll"]];
-    attributes.push([DATA_PREFIX + "status", "open"]);
+
+    if (!attrs['status']) {
+      attributes.push([DATA_PREFIX + "status", "open"]);
+    }
 
     WHITELISTED_ATTRIBUTES.forEach(name => {
       if (attrs[name]) {
-        attributes[DATA_PREFIX + name] = attrs[name];
+        attributes.push([DATA_PREFIX + name, attrs[name]]);
       }
     });
 
@@ -136,9 +129,9 @@ const rule = {
     }
 
     // we might need these values later...
-    let min = parseInt(attributes[DATA_PREFIX + "min"], 10);
-    let max = parseInt(attributes[DATA_PREFIX + "max"], 10);
-    let step = parseInt(attributes[DATA_PREFIX + "step"], 10);
+    let min = parseInt(attrs["min"], 10);
+    let max = parseInt(attrs["max"], 10);
+    let step = parseInt(attrs["step"], 10);
 
     let header = [];
 
@@ -157,10 +150,10 @@ const rule = {
     header.push(token);
 
     // generate the options when the type is "number"
-    if (attributes[DATA_PREFIX + "type"] === "number") {
+    if (attrs["type"] === "number") {
       // default values
       if (isNaN(min)) { min = 1; }
-      if (isNaN(max)) { max = md.options.discourse.pollMaximumOptions; }
+      if (isNaN(max)) { max = state.md.options.discourse.pollMaximumOptions; }
       if (isNaN(step)) { step = 1; }
 
       if (items.length > 0) {
@@ -172,7 +165,7 @@ const rule = {
       header.push(token);
 
       for (let o = min; o <= max; o += step) {
-        token = new state.Token('list_item_open', '', 1);
+        token = new state.Token('list_item_open', 'li', 1);
         items.push([token,  String(o)]);
         header.push(token);
 
@@ -180,17 +173,13 @@ const rule = {
         token.content = String(o);
         header.push(token);
 
-        token = new state.Token('list_item_close', '', -1);
+        token = new state.Token('list_item_close', 'li', -1);
         header.push(token);
       }
       token = new state.Token('bullet_item_close', '', -1);
       header.push(token);
     }
 
-    if (items.length < 2) {
-      return invalidPoll(state, raw);
-    }
-
     // flag items so we add hashes
     for (let o = 0; o < items.length; o++) {
       token = items[o][0];
@@ -295,7 +284,7 @@ function newApiInit(helper) {
   });
 
   helper.registerPlugin(md => {
-    md.block.bbcode_ruler.push('poll', rule);
+    md.block.bbcode.ruler.push('poll', rule);
   });
 }
 
@@ -313,160 +302,8 @@ export function setup(helper) {
     'li[data-*]'
   ]);
 
-  if (helper.markdownIt) {
-    newApiInit(helper);
-    return;
-  }
+  newApiInit(helper);
 
-  helper.replaceBlock({
-    start: /\[poll((?:\s+\w+=[^\s\]]+)*)\]([\s\S]*)/igm,
-    stop: /\[\/poll\]/igm,
-
-    emitter(blockContents, matches) {
-      const contents = [];
-
-      // post-process inside block contents
-      if (blockContents.length) {
-        const postProcess = bc => {
-          if (typeof bc === "string" || bc instanceof String) {
-            const processed = this.processInline(String(bc));
-            if (processed.length) {
-              contents.push(["p"].concat(processed));
-            }
-          } else {
-            contents.push(bc);
-          }
-        };
-
-        let b;
-        while ((b = blockContents.shift()) !== undefined) {
-          this.processBlock(b, blockContents).forEach(postProcess);
-        }
-      }
-
-      // default poll attributes
-      const attributes = { "class": "poll" };
-      attributes[DATA_PREFIX + "status"] = "open";
-      attributes[DATA_PREFIX + "name"] = DEFAULT_POLL_NAME;
-
-      // extract poll attributes
-      (matches[1].match(ATTRIBUTES_REGEX) || []).forEach(function(m) {
-        const [ name, value ] = m.split("=");
-        const escaped = helper.escape(value.replace(/["']/g, ""));
-        attributes[DATA_PREFIX + name] = escaped;
-      });
-
-      // we might need these values later...
-      let min = parseInt(attributes[DATA_PREFIX + "min"], 10);
-      let max = parseInt(attributes[DATA_PREFIX + "max"], 10);
-      let step = parseInt(attributes[DATA_PREFIX + "step"], 10);
-
-      // generate the options when the type is "number"
-      if (attributes[DATA_PREFIX + "type"] === "number") {
-        // default values
-        if (isNaN(min)) { min = 1; }
-        if (isNaN(max)) { max = helper.getOptions().pollMaximumOptions; }
-        if (isNaN(step)) { step = 1; }
-        // dynamically generate options
-        contents.push(["bulletlist"]);
-        for (let o = min; o <= max; o += step) {
-          contents[0].push(["listitem", String(o)]);
-        }
-      }
-
-      // make sure there's only 1 child and it's a list with at least 1 option
-      if (contents.length !== 1 || contents[0].length <= 1 || (contents[0][0] !== "numberlist" && contents[0][0] !== "bulletlist")) {
-        return ["div"].concat(contents);
-      }
-
-      // make sure there's only options in the list
-      for (let o=1; o < contents[0].length; o++) {
-        if (contents[0][o][0] !== "listitem") {
-          return ["div"].concat(contents);
-        }
-      }
-
-      // TODO: remove non whitelisted content
-
-      // add option id (hash)
-      for (let o = 1; o < contents[0].length; o++) {
-        const attr = {};
-        // compute md5 hash of the content of the option
-        attr[DATA_PREFIX + "option-id"] = md5(JSON.stringify(contents[0][o].slice(1)));
-        // store options attributes
-        contents[0][o].splice(1, 0, attr);
-      }
-
-      const result = ["div", attributes],
-      poll = ["div"];
-
-      // 1 - POLL CONTAINER
-      const container = ["div", { "class": "poll-container" }].concat(contents);
-      poll.push(container);
-
-      // 2 - POLL INFO
-      const info = ["div", { "class": "poll-info" }];
-
-      // # of voters
-      info.push(["p",
-        ["span", { "class": "info-number" }, "0"],
-        ["span", { "class": "info-text"}, I18n.t("poll.voters", { count: 0 })]
-      ]);
-
-      // multiple help text
-      if (attributes[DATA_PREFIX + "type"] === "multiple") {
-        const optionCount = contents[0].length - 1;
-
-        // default values
-        if (isNaN(min) || min < 1) { min = 1; }
-        if (isNaN(max) || max > optionCount) { max = optionCount; }
-
-        // add some help text
-        let help;
-
-        if (max > 0) {
-          if (min === max) {
-            if (min > 1) {
-              help = I18n.t("poll.multiple.help.x_options", { count: min });
-            }
-          } else if (min > 1) {
-            if (max < optionCount) {
-              help = I18n.t("poll.multiple.help.between_min_and_max_options", { min: min, max: max });
-            } else {
-              help = I18n.t("poll.multiple.help.at_least_min_options", { count: min });
-            }
-          } else if (max <= optionCount) {
-            help = I18n.t("poll.multiple.help.up_to_max_options", { count: max });
-          }
-        }
-
-        if (help) { info.push(["p", help]); }
-      }
-
-      if (attributes[DATA_PREFIX + "public"] === "true") {
-        info.push(["p", I18n.t("poll.public.title")]);
-      }
-
-      poll.push(info);
-
-      // 3 - BUTTONS
-      const buttons = ["div", { "class": "poll-buttons" }];
-
-      // add "cast-votes" button
-      if (attributes[DATA_PREFIX + "type"] === "multiple") {
-        buttons.push(["a", { "class": "button cast-votes", "title": I18n.t("poll.cast-votes.title") }, I18n.t("poll.cast-votes.label")]);
-      }
-
-      // add "toggle-results" button
-      buttons.push(["a", { "class": "button toggle-results", "title": I18n.t("poll.show-results.title") }, I18n.t("poll.show-results.label")]);
-
-      // 4 - MIX IT ALL UP
-      result.push(poll);
-      result.push(buttons);
-
-      return result;
-    }
-  });
 }
 
 /*!
diff --git a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6 b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
index 5bac8d63b8..0f087d2570 100644
--- a/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
+++ b/plugins/poll/assets/javascripts/widgets/discourse-poll.js.es6
@@ -1,6 +1,6 @@
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
-import { iconNode } from 'discourse/helpers/fa-icon-node';
+import { iconNode } from 'discourse-common/lib/icon-library';
 import RawHtml from 'discourse/widgets/raw-html';
 import { ajax } from 'discourse/lib/ajax';
 import evenRound from "discourse/plugins/poll/lib/even-round";
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 7d96f76ebe..d899985143 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -74,6 +74,7 @@ ar:
         insert: أدرج التصويت
         help:
           options_count: أدخل خيارين على الأقل
+          invalid_values: يجب أن تكون القيمة الدّنيا أصغر من القيمة العليا.
         poll_type:
           label: النوع
           regular: اختيار من متعدد
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index e2a9dc4835..67a397d677 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -13,10 +13,17 @@ ja:
       total_votes:
         other: "合計得票数"
       average_rating: "平均評価: <strong>%{average}</strong>."
+      public:
+        title: "投票は公開されています。"
       multiple:
         help:
+          at_least_min_options:
+            other: "少なくとも<strong>%{count}</strong>の選択肢を選んでください"
           up_to_max_options:
             other: "<strong>%{count}</strong>個まで選ぶことができます"
+          x_options:
+            other: "<strong>%{count}</strong>の選択肢を選んでください"
+          between_min_and_max_options: "<strong>%{min}</strong>から<strong>%{max}</strong>の選択肢を選んでください"
       cast-votes:
         title: "投票する"
         label: "投票する"
@@ -34,12 +41,25 @@ ja:
         title: "投票を締め切る"
         label: "投票を締め切る"
         confirm: "この投票を締め切ってもよろしいですか？"
+      error_while_toggling_status: "申し訳ありませんが、この投票のステータスを切り替える際にエラーが発生しました。"
+      error_while_casting_votes: "申し訳ありませんが、投票の際にエラーが発生しました。"
+      error_while_fetching_voters: "申し訳ありませんが、有権者を表示する際にエラーが発生しました。"
       ui_builder:
         title: 投票を作成
+        insert: 投票の挿入
+        help:
+          options_count: 少なくとも2つの選択肢を入力してください
+          invalid_values: 最小値は最大値より小さくなければなりません。
         poll_type:
           label: タイプ
           regular: 一つだけ選択
           multiple: 複数選択
           number: 数字で評価
+        poll_config:
+          max: 最大
+          min: 最小
+          step: 間隔
         poll_public:
           label: 誰が投票したか表示する
+        poll_options:
+          label: 1行ごとに1つの選択肢を入力します
diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml
index fd11a05cd2..a871a56581 100644
--- a/plugins/poll/config/locales/client.pt.yml
+++ b/plugins/poll/config/locales/client.pt.yml
@@ -16,7 +16,7 @@ pt:
         other: "total de votos"
       average_rating: "Classificação média: <strong>%{average}</strong>."
       public:
-        title: "Votos são públicos."
+        title: "Os votos são públicos."
       multiple:
         help:
           at_least_min_options:
@@ -41,23 +41,23 @@ pt:
       open:
         title: "Abrir a sondagem"
         label: "Abrir"
-        confirm: "Tem a certeza que quer abrir esta sondagem?"
+        confirm: "Tem a certeza que deseja abrir esta sondagem?"
       close:
         title: "Fechar a sondagem"
         label: "Fechar"
-        confirm: "Tem a certeza que quer fechar esta sondagem?"
-      error_while_toggling_status: "Pedimos desculpa, ocorreu um erro ao mudar o estado desta sondagem."
-      error_while_casting_votes: "Pedimos desculpa, ocorreu um erro ao submeter os seus votos."
+        confirm: "Tem a certeza que deseja fechar esta sondagem?"
+      error_while_toggling_status: "Desculpe, ocorreu um erro ao alternar o estado desta sondagem."
+      error_while_casting_votes: "Desculpe, ocorreu um erro ao submeter os seus votos."
       error_while_fetching_voters: "Pedimos desculpa, ocorreu um erro ao apresentar os eleitores."
       ui_builder:
         title: Criar Sondagem
         insert: Inserir sondagem
         help:
-          options_count: Indique pelo menos 2 opções
+          options_count: Insira pelo menos 2 opções
         poll_type:
           label: Tipo
           regular: Escolha Única
-          multiple: Multipla escolha
+          multiple: Escolha Múltipla
           number: Cotação numérica
         poll_config:
           max: Máximo
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index 7cb65b2a8a..745f486901 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -9,6 +9,7 @@ ja:
   site_settings:
     poll_enabled: "ユーザーによる投票を許可しますか？"
     poll_maximum_options: "投票で許可されるオプションの最大数。"
+    poll_edit_window_mins: "ポスト作成後に投票を編集できる時間(分)"
   poll:
     multiple_polls_without_name: "名前のない複数の投票があります。一意に投票結果を識別するために、属性'<code>name</code>'を使用します。"
     multiple_polls_with_same_name: "同じ名前: <strong>%{name}</strong> の複数の投票があります。一意に投票結果を識別するために、属性'<code>name</code>'を使用します。"
@@ -23,8 +24,12 @@ ja:
     default_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票に無効なパラメータがあります。"
     named_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票 <strong>%{name}</strong> に無効なパラメータがあります。"
     requires_at_least_1_valid_option: "少なくとも1つの有効なオプションを選択する必要があります。"
+    default_cannot_be_made_public: "得票済みの投票は公開することができません。"
+    named_cannot_be_made_public: "投票 <strong>%{name}</strong> は得票済みのため公開することができません。"
     edit_window_expired:
       cannot_change_polls: "最初の%{minutes}分が経過するまで、投票の追加,  削除, 名前の変更はできません。"
+      op_cannot_edit_options: "最初の%{minutes}分が経過したため投票の選択肢を編集することはできません。投票の選択肢を編集したい場合はモデレータへ連絡してください。"
+      staff_cannot_add_or_remove_options: "最初の%{minutes}分が経過したため投票の選択肢を編集することはできません。このトピックを閉じて代わりに新しいトピックを作成する必要があります。"
     no_polls_associated_with_this_post: "この投稿に関連付けられた投票はありません。"
     no_poll_with_this_name: "この投稿に関連付けられた投票 <strong>%{name}</strong> はありません。"
     post_is_deleted: "削除された投稿を操作する事はできません。"
diff --git a/plugins/poll/config/locales/server.pt.yml b/plugins/poll/config/locales/server.pt.yml
index 8e8708e653..4968a67e16 100644
--- a/plugins/poll/config/locales/server.pt.yml
+++ b/plugins/poll/config/locales/server.pt.yml
@@ -36,7 +36,7 @@ pt:
     no_poll_with_this_name: "Nenhuma sondagem com o nome <strong>%{name}</strong> está associada a esta publicação."
     post_is_deleted: "Não é possível realizar ações em publicações eliminadas."
     topic_must_be_open_to_vote: "O tópico tem que estar aberto para votar."
-    poll_must_be_open_to_vote: "Sondagem tem que estar aberta para votar."
+    poll_must_be_open_to_vote: "A sondagem tem que estar aberta para votar."
     topic_must_be_open_to_toggle_status: "O tópico tem que estar aberto para alternar o estado."
     only_staff_or_op_can_toggle_status: "Apenas um membro da equipa de apoio ou o autor original pode alternar o estado da sondagem."
     email:
diff --git a/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb b/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
index 17e6459e12..33bd122bdf 100644
--- a/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
+++ b/plugins/poll/db/migrate/20151016163051_merge_polls_votes.rb
@@ -5,11 +5,11 @@ class MergePollsVotes < ActiveRecord::Migration
       polls_votes = {}
       PostCustomField.where(post_id: post_id).where("name LIKE 'polls-votes-%'").find_each do |pcf|
         user_id = pcf.name["polls-votes-".size..-1]
-        polls_votes["#{user_id}"] = ::JSON.parse(pcf.value||"{}")
+        polls_votes["#{user_id}"] = ::JSON.parse(pcf.value || "{}")
       end
 
       pcf = PostCustomField.find_or_create_by(name: "polls-votes", post_id: post_id)
-      pcf.value = ::JSON.parse(pcf.value||"{}").merge(polls_votes).to_json
+      pcf.value = ::JSON.parse(pcf.value || "{}").merge(polls_votes).to_json
       pcf.save
     end
   end
diff --git a/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb b/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
index 5ca969c68d..978a41c890 100644
--- a/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
+++ b/plugins/poll/db/migrate/20160321164925_close_polls_in_closed_topics.rb
@@ -2,9 +2,9 @@ class ClosePollsInClosedTopics < ActiveRecord::Migration
 
   def up
     PostCustomField.joins(post: :topic)
-                   .where("post_custom_fields.name = 'polls'")
-                   .where("topics.closed")
-                   .find_each do |pcf|
+      .where("post_custom_fields.name = 'polls'")
+      .where("topics.closed")
+      .find_each do |pcf|
       polls = ::JSON.parse(pcf.value || "{}")
       polls.values.each { |poll| poll["status"] = "closed" }
       pcf.value = polls.to_json
diff --git a/plugins/poll/lib/polls_updater.rb b/plugins/poll/lib/polls_updater.rb
index 696a62eed1..488331041b 100644
--- a/plugins/poll/lib/polls_updater.rb
+++ b/plugins/poll/lib/polls_updater.rb
@@ -79,6 +79,7 @@ module DiscoursePoll
             if previous_option["id"] != option["id"]
               if votes_fields = post.custom_fields[DiscoursePoll::VOTES_CUSTOM_FIELD]
                 votes_fields.each do |key, value|
+                  next unless value[poll_name]
                   index = value[poll_name].index(previous_option["id"])
                   votes_fields[key][poll_name][index] = option["id"] if index
                 end
@@ -100,7 +101,7 @@ module DiscoursePoll
         post.save_custom_fields(true)
 
         # publish the changes
-        MessageBus.publish("/polls/#{post.topic_id}", { post_id: post.id, polls: polls })
+        MessageBus.publish("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
       end
     end
 
diff --git a/plugins/poll/lib/tasks/migrate_old_polls.rake b/plugins/poll/lib/tasks/migrate_old_polls.rake
index 9a551a18a6..d8f2ee4064 100644
--- a/plugins/poll/lib/tasks/migrate_old_polls.rake
+++ b/plugins/poll/lib/tasks/migrate_old_polls.rake
@@ -25,12 +25,11 @@ end
 
 desc "Migrate old polls to new syntax"
 task "poll:migrate_old_polls" => :environment do
-  require "timecop"
   # iterate over all polls
   PluginStoreRow.where(plugin_name: "poll")
-                .where("key LIKE 'poll_options_%'")
-                .pluck(:key)
-                .each do |poll_options_key|
+    .where("key LIKE 'poll_options_%'")
+    .pluck(:key)
+    .each do |poll_options_key|
     # extract the post_id
     post_id = poll_options_key["poll_options_".length..-1].to_i
     # load the post from the db
@@ -39,7 +38,7 @@ task "poll:migrate_old_polls" => :environment do
       # skip if already migrated
       next if post.custom_fields.include?("polls")
       # go back in time
-      Timecop.freeze(post.created_at + 1.minute) do
+      freeze_time(post.created_at + 1.minute) do
         raw = post.raw.gsub(/\n\n([ ]*[-\*\+] )/, "\n\\1") + "\n\n"
         # fix the RAW when needed
         if raw !~ /\[poll\]/
@@ -57,9 +56,9 @@ task "poll:migrate_old_polls" => :environment do
         options = post.custom_fields["polls"]["poll"]["options"]
         # iterate over all votes
         PluginStoreRow.where(plugin_name: "poll")
-                      .where("key LIKE 'poll_vote_#{post_id}_%'")
-                      .pluck(:key, :value)
-                      .each do |poll_vote_key, vote|
+          .where("key LIKE 'poll_vote_#{post_id}_%'")
+          .pluck(:key, :value)
+          .each do |poll_vote_key, vote|
           # extract the user_id
           user_id = poll_vote_key["poll_vote_#{post_id}_%".length..-1].to_i
           # find the selected option
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 3b764043b6..33709ecb0f 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -136,7 +136,7 @@ after_initialize do
 
           post.save_custom_fields(true)
 
-          MessageBus.publish("/polls/#{post.topic_id}", {post_id: post.id, polls: polls })
+          MessageBus.publish("/polls/#{post.topic_id}", post_id: post.id, polls: polls)
 
           polls[poll_name]
         end
@@ -157,13 +157,13 @@ after_initialize do
           # extract attributes
           p.attributes.values.each do |attribute|
             if attribute.name.start_with?(DATA_PREFIX)
-              poll[attribute.name[DATA_PREFIX.length..-1]] = attribute.value
+              poll[attribute.name[DATA_PREFIX.length..-1]] = CGI.escapeHTML(attribute.value || "")
             end
           end
 
           # extract options
           p.css("li[#{DATA_PREFIX}option-id]").each do |o|
-            option_id = o.attributes[DATA_PREFIX + "option-id"].value
+            option_id = o.attributes[DATA_PREFIX + "option-id"].value || ""
             poll["options"] << { "id" => option_id, "html" => o.inner_html, "votes" => 0 }
           end
 
@@ -230,7 +230,7 @@ after_initialize do
           end
 
           next unless option["voter_ids"]
-          user_ids << option["voter_ids"].slice((params[:offset].to_i || 0)  * 25, 25)
+          user_ids << option["voter_ids"].slice((params[:offset].to_i || 0) * 25, 25)
         end
 
         user_ids.flatten!
@@ -260,7 +260,7 @@ after_initialize do
 
         result = []
 
-        users = User.where(id: user_ids).map do |user|
+        User.where(id: user_ids).map do |user|
           result << UserNameSerializer.new(user).serializable_hash
         end
       end
@@ -295,7 +295,7 @@ after_initialize do
     end
   end
 
-  validate(:post, :validate_polls) do |force=nil|
+  validate(:post, :validate_polls) do |force = nil|
     return if !SiteSetting.poll_enabled? && (self.user && !self.user.staff?)
 
     # only care when raw has changed!
@@ -360,9 +360,8 @@ after_initialize do
   # tells the front-end we have a poll for that post
   on(:post_created) do |post|
     next if post.is_first_post? || post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD].blank?
-    MessageBus.publish("/polls/#{post.topic_id}", {
-                         post_id: post.id,
-                         polls: post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD]})
+    MessageBus.publish("/polls/#{post.topic_id}",                          post_id: post.id,
+                                                                           polls: post.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD])
   end
 
   add_to_serializer(:post, :polls, false) do
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index 9e8e019644..02db8bdf93 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -13,7 +13,7 @@ describe ::DiscoursePoll::PollsController do
     it "works" do
       MessageBus.expects(:publish)
 
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
 
       expect(response).to be_success
       json = ::JSON.parse(response.body)
@@ -23,7 +23,7 @@ describe ::DiscoursePoll::PollsController do
     end
 
     it "requires at least 1 valid option" do
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A", "B"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["A", "B"]
 
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
@@ -31,10 +31,10 @@ describe ::DiscoursePoll::PollsController do
     end
 
     it "supports vote changes" do
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       expect(response).to be_success
 
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["e89dec30bbd9bf50fabf6a05b4324edf"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["e89dec30bbd9bf50fabf6a05b4324edf"]
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["poll"]["voters"]).to eq(1)
@@ -44,13 +44,13 @@ describe ::DiscoursePoll::PollsController do
 
     it "works even if topic is closed" do
       topic.update_attribute(:closed, true)
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       expect(response).to be_success
     end
 
     it "ensures topic is not archived" do
       topic.update_attribute(:archived, true)
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["A"]
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.topic_must_be_open_to_vote"))
@@ -58,29 +58,29 @@ describe ::DiscoursePoll::PollsController do
 
     it "ensures post is not trashed" do
       poll.trash!
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["A"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["A"]
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
     end
 
     it "ensures polls are associated with the post" do
-      xhr :put, :vote, { post_id: Fabricate(:post).id, poll_name: "foobar", options: ["A"] }
+      xhr :put, :vote, post_id: Fabricate(:post).id, poll_name: "foobar", options: ["A"]
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.no_polls_associated_with_this_post"))
     end
 
     it "checks the name of the poll" do
-      xhr :put, :vote, { post_id: poll.id, poll_name: "foobar", options: ["A"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "foobar", options: ["A"]
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.no_poll_with_this_name", name: "foobar"))
     end
 
     it "ensures poll is open" do
-      closed_poll = Fabricate(:post, raw: "[poll status=closed]\n- A\n- B\n[/poll]")
-      xhr :put, :vote, { post_id: closed_poll.id, poll_name: "poll", options: ["A"] }
+      closed_poll = create_post(raw: "[poll status=closed]\n- A\n- B\n[/poll]")
+      xhr :put, :vote, post_id: closed_poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.poll_must_be_open_to_vote"))
@@ -88,9 +88,9 @@ describe ::DiscoursePoll::PollsController do
 
     it "doesn't discard anonymous votes when someone votes" do
       default_poll = poll.custom_fields["polls"]["poll"]
-      add_anonymous_votes(poll, default_poll, 17, {"5c24fc1df56d764b550ceae1b9319125" => 11, "e89dec30bbd9bf50fabf6a05b4324edf" => 6})
+      add_anonymous_votes(poll, default_poll, 17, "5c24fc1df56d764b550ceae1b9319125" => 11, "e89dec30bbd9bf50fabf6a05b4324edf" => 6)
 
-      xhr :put, :vote, { post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"] }
+      xhr :put, :vote, post_id: poll.id, poll_name: "poll", options: ["5c24fc1df56d764b550ceae1b9319125"]
       expect(response).to be_success
 
       json = ::JSON.parse(response.body)
@@ -148,7 +148,7 @@ describe ::DiscoursePoll::PollsController do
     it "works for OP" do
       MessageBus.expects(:publish)
 
-      xhr :put, :toggle_status, { post_id: poll.id, poll_name: "poll", status: "closed" }
+      xhr :put, :toggle_status, post_id: poll.id, poll_name: "poll", status: "closed"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["poll"]["status"]).to eq("closed")
@@ -158,7 +158,7 @@ describe ::DiscoursePoll::PollsController do
       log_in(:moderator)
       MessageBus.expects(:publish)
 
-      xhr :put, :toggle_status, { post_id: poll.id, poll_name: "poll", status: "closed" }
+      xhr :put, :toggle_status, post_id: poll.id, poll_name: "poll", status: "closed"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["poll"]["status"]).to eq("closed")
@@ -166,7 +166,7 @@ describe ::DiscoursePoll::PollsController do
 
     it "ensures post is not trashed" do
       poll.trash!
-      xhr :put, :toggle_status, { post_id: poll.id, poll_name: "poll", status: "closed" }
+      xhr :put, :toggle_status, post_id: poll.id, poll_name: "poll", status: "closed"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.post_is_deleted"))
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index d5bf98b157..dd0219f384 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -12,7 +12,7 @@ describe PostsController do
   describe "polls" do
 
     it "works" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll]\n- A\n- B\n[/poll]"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -21,7 +21,7 @@ describe PostsController do
 
     it "works on any post" do
       post = Fabricate(:post)
-      xhr :post, :create, { topic_id: post.topic.id, raw: "[poll]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, topic_id: post.topic.id, raw: "[poll]\n- A\n- B\n[/poll]"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -29,25 +29,25 @@ describe PostsController do
     end
 
     it "should have different options" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- A[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll]\n- A\n- A\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_different_options"))
     end
 
     it "should have at least 2 options" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll]\n- A\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_must_have_at_least_2_options"))
     end
 
     it "should have at most 'SiteSetting.poll_maximum_options' options" do
-      raw = "[poll]"
+      raw = "[poll]\n"
       (SiteSetting.poll_maximum_options + 1).times { |n| raw << "\n- #{n}" }
-      raw << "[/poll]"
+      raw << "\n[/poll]"
 
-      xhr :post, :create, { title: title, raw: raw }
+      xhr :post, :create, title: title, raw: raw
 
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
@@ -55,22 +55,23 @@ describe PostsController do
     end
 
     it "should have valid parameters" do
-      xhr :post, :create, { title: title, raw: "[poll type=multiple min=5]\n- A\n- B[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll type=multiple min=5]\n- A\n- B\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.default_poll_with_multiple_choices_has_invalid_parameters"))
     end
 
     it "prevents self-xss" do
-      xhr :post, :create, { title: title, raw: "[poll name=<script>alert('xss')</script>]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll name=<script>alert('xss')</script>]\n- A\n- B\n[/poll]"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
-      expect(json["polls"]["&lt;script&gt;alert(xss)&lt;/script&gt;"]).to be
+      expect(json["cooked"]).to include("&lt;script&gt;")
+      expect(json["polls"]["&lt;script&gt;alert(&#39;xss&#39;)&lt;/script&gt;"]).to be
     end
 
     it "also works whe there is a link starting with '[poll'" do
-      xhr :post, :create, { title: title, raw: "[Polls are awesome](/foobar)\n[poll]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[Polls are awesome](/foobar)\n[poll]\n- A\n- B\n[/poll]"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -78,7 +79,7 @@ describe PostsController do
     end
 
     it "prevents pollception" do
-      xhr :post, :create, { title: title, raw: "[poll name=1]\n- A\n[poll name=2]\n- B\n- C\n[/poll]\n- D\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll name=1]\n- A\n[poll name=2]\n- B\n- C\n[/poll]\n- D\n[/poll]"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -91,14 +92,14 @@ describe PostsController do
       describe "within the first 5 minutes" do
 
         let(:post_id) do
-          Timecop.freeze(4.minutes.ago) do
-            xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" }
+          freeze_time(4.minutes.ago) do
+            xhr :post, :create, title: title, raw: "[poll]\n- A\n- B\n[/poll]"
             ::JSON.parse(response.body)["id"]
           end
         end
 
         it "can be changed" do
-          xhr :put, :update, { id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" } }
+          xhr :put, :update, id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" }
           expect(response).to be_success
           json = ::JSON.parse(response.body)
           expect(json["post"]["polls"]["poll"]["options"][2]["html"]).to eq("C")
@@ -106,7 +107,7 @@ describe PostsController do
 
         it "resets the votes" do
           DiscoursePoll::Poll.vote(post_id, "poll", ["5c24fc1df56d764b550ceae1b9319125"], user)
-          xhr :put, :update, { id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" } }
+          xhr :put, :update, id: post_id, post: { raw: "[poll]\n- A\n- B\n- C\n[/poll]" }
           expect(response).to be_success
           json = ::JSON.parse(response.body)
           expect(json["post"]["polls_votes"]).to_not be
@@ -116,13 +117,13 @@ describe PostsController do
 
       describe "after the poll edit window has expired" do
 
-        let(:poll) { "[poll]\n- A\n- B[/poll]" }
-        let(:new_option) { "[poll]\n- A\n- C[/poll]" }
-        let(:updated) { "before\n\n[poll]\n- A\n- B[/poll]\n\nafter" }
+        let(:poll) { "[poll]\n- A\n- B\n[/poll]" }
+        let(:new_option) { "[poll]\n- A\n- C\n[/poll]" }
+        let(:updated) { "before\n\n[poll]\n- A\n- B\n[/poll]\n\nafter" }
 
         let(:post_id) do
-          Timecop.freeze(6.minutes.ago) do
-            xhr :post, :create, { title: title, raw: poll }
+          freeze_time(6.minutes.ago) do
+            xhr :post, :create, title: title, raw: poll
             ::JSON.parse(response.body)["id"]
           end
         end
@@ -136,7 +137,7 @@ describe PostsController do
         describe "with no vote" do
 
           it "OP can change the options" do
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            xhr :put, :update, id: post_id, post: { raw: new_option }
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
@@ -144,14 +145,14 @@ describe PostsController do
 
           it "staff can change the options" do
             log_in_user(Fabricate(:moderator))
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            xhr :put, :update, id: post_id, post: { raw: new_option }
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
           end
 
           it "support changes on the post" do
-            xhr :put, :update, { id: post_id, post: { raw: updated } }
+            xhr :put, :update, id: post_id, post: { raw: updated }
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["cooked"]).to match("before")
@@ -166,7 +167,7 @@ describe PostsController do
           end
 
           it "OP cannot change the options" do
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            xhr :put, :update, id: post_id, post: { raw: new_option }
             expect(response).not_to be_success
             json = ::JSON.parse(response.body)
             expect(json["errors"][0]).to eq(I18n.t(
@@ -177,7 +178,7 @@ describe PostsController do
 
           it "staff can change the options and votes are merged" do
             log_in_user(Fabricate(:moderator))
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            xhr :put, :update, id: post_id, post: { raw: new_option }
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["polls"]["poll"]["options"][1]["html"]).to eq("C")
@@ -189,10 +190,10 @@ describe PostsController do
           it "staff can change the options and anonymous votes are merged" do
             post = Post.find_by(id: post_id)
             default_poll = post.custom_fields["polls"]["poll"]
-            add_anonymous_votes(post, default_poll, 7, {"5c24fc1df56d764b550ceae1b9319125" => 7})
+            add_anonymous_votes(post, default_poll, 7, "5c24fc1df56d764b550ceae1b9319125" => 7)
 
             log_in_user(Fabricate(:moderator))
-            xhr :put, :update, { id: post_id, post: { raw: new_option } }
+            xhr :put, :update, id: post_id, post: { raw: new_option }
             expect(response).to be_success
 
             json = ::JSON.parse(response.body)
@@ -203,7 +204,7 @@ describe PostsController do
           end
 
           it "support changes on the post" do
-            xhr :put, :update, { id: post_id, post: { raw: updated } }
+            xhr :put, :update, id: post_id, post: { raw: updated }
             expect(response).to be_success
             json = ::JSON.parse(response.body)
             expect(json["post"]["cooked"]).to match("before")
@@ -220,14 +221,14 @@ describe PostsController do
   describe "named polls" do
 
     it "should have different options" do
-      xhr :post, :create, { title: title, raw: "[poll name=""foo""]\n- A\n- A[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll name=""foo""]\n- A\n- A\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.named_poll_must_have_different_options", name: "foo"))
     end
 
     it "should have at least 2 options" do
-      xhr :post, :create, { title: title, raw: "[poll name='foo']\n- A[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll name='foo']\n- A\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.named_poll_must_have_at_least_2_options", name: "foo"))
@@ -238,7 +239,7 @@ describe PostsController do
   describe "multiple polls" do
 
     it "works" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]"
       expect(response).to be_success
       json = ::JSON.parse(response.body)
       expect(json["cooked"]).to match("data-poll-")
@@ -247,14 +248,14 @@ describe PostsController do
     end
 
     it "should have a name" do
-      xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll]\n- A\n- B\n[/poll]\n[poll]\n- A\n- B\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.multiple_polls_without_name"))
     end
 
     it "should have unique name" do
-      xhr :post, :create, { title: title, raw: "[poll name=foo]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]" }
+      xhr :post, :create, title: title, raw: "[poll name=foo]\n- A\n- B\n[/poll]\n[poll name=foo]\n- A\n- B\n[/poll]"
       expect(response).not_to be_success
       json = ::JSON.parse(response.body)
       expect(json["errors"][0]).to eq(I18n.t("poll.multiple_polls_with_same_name", name: "foo"))
diff --git a/plugins/poll/spec/integration/poll_endpoints_spec.rb b/plugins/poll/spec/integration/poll_endpoints_spec.rb
index d2c5a4caac..67e247e4f2 100644
--- a/plugins/poll/spec/integration/poll_endpoints_spec.rb
+++ b/plugins/poll/spec/integration/poll_endpoints_spec.rb
@@ -13,10 +13,8 @@ describe "DiscoursePoll endpoints" do
         user
       )
 
-      get "/polls/voters.json", {
-        post_id: post.id,
-        poll_name: DiscoursePoll::DEFAULT_POLL_NAME
-      }
+      get "/polls/voters.json",         post_id: post.id,
+                                        poll_name: DiscoursePoll::DEFAULT_POLL_NAME
 
       expect(response.status).to eq(200)
 
@@ -36,11 +34,9 @@ describe "DiscoursePoll endpoints" do
         user
       )
 
-      get "/polls/voters.json", {
-        post_id: post.id,
-        poll_name: DiscoursePoll::DEFAULT_POLL_NAME,
-        option_id: 'e89dec30bbd9bf50fabf6a05b4324edf'
-      }
+      get "/polls/voters.json",         post_id: post.id,
+                                        poll_name: DiscoursePoll::DEFAULT_POLL_NAME,
+                                        option_id: 'e89dec30bbd9bf50fabf6a05b4324edf'
 
       expect(response.status).to eq(200)
 
@@ -57,7 +53,7 @@ describe "DiscoursePoll endpoints" do
 
     describe 'when post_id is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", { poll_name: DiscoursePoll::DEFAULT_POLL_NAME } }
+        expect { get "/polls/voters.json", poll_name: DiscoursePoll::DEFAULT_POLL_NAME }
           .to raise_error(ActionController::ParameterMissing)
       end
     end
@@ -65,17 +61,15 @@ describe "DiscoursePoll endpoints" do
     describe 'when post_id is not valid' do
       it 'should raise the right error' do
         expect do
-          get "/polls/voters.json", {
-            post_id: -1,
-            poll_name: DiscoursePoll::DEFAULT_POLL_NAME
-          }
+          get "/polls/voters.json",             post_id: -1,
+                                                poll_name: DiscoursePoll::DEFAULT_POLL_NAME
         end.to raise_error(Discourse::InvalidParameters, 'post_id is invalid')
       end
     end
 
     describe 'when poll_name is blank' do
       it 'should raise the right error' do
-        expect { get "/polls/voters.json", { post_id: post.id } }
+        expect { get "/polls/voters.json", post_id: post.id }
           .to raise_error(ActionController::ParameterMissing)
       end
     end
@@ -89,7 +83,7 @@ describe "DiscoursePoll endpoints" do
     end
 
     context "number poll" do
-      let(:post) { Fabricate(:post, raw: '[poll type=number min=1 max=20 step=1 public=true][/poll]') }
+      let(:post) { Fabricate(:post, raw: "[poll type=number min=1 max=20 step=1 public=true]\n[/poll]") }
 
       it 'should return the right response' do
         post
@@ -101,10 +95,8 @@ describe "DiscoursePoll endpoints" do
           user
         )
 
-        get "/polls/voters.json", {
-          post_id: post.id,
-          poll_name: DiscoursePoll::DEFAULT_POLL_NAME
-        }
+        get "/polls/voters.json",           post_id: post.id,
+                                            poll_name: DiscoursePoll::DEFAULT_POLL_NAME
 
         expect(response.status).to eq(200)
 
diff --git a/plugins/poll/spec/lib/polls_updater_spec.rb b/plugins/poll/spec/lib/polls_updater_spec.rb
index 3d679d071a..e8a6a0e468 100644
--- a/plugins/poll/spec/lib/polls_updater_spec.rb
+++ b/plugins/poll/spec/lib/polls_updater_spec.rb
@@ -217,6 +217,40 @@ describe DiscoursePoll::PollsUpdater do
       end
     end
 
+    it 'should be able to edit multiple polls with votes' do
+      DiscoursePoll::Poll.vote(
+        post_with_two_polls.id,
+        "poll",
+        [two_polls["poll"]["options"].first["id"]],
+        user
+      )
+
+      raw = <<-RAW.strip_heredoc
+      [poll]
+      * 12
+      * 34
+      [/poll]
+
+      [poll name=test]
+      * 12
+      * 34
+      [/poll]
+      RAW
+
+      different_post = Fabricate(:post, raw: raw)
+      different_polls = DiscoursePoll::PollsValidator.new(different_post).validate_polls
+
+      message = MessageBus.track_publish do
+        described_class.update(post_with_two_polls.reload, different_polls)
+      end.first
+
+      expect(post_with_two_polls.reload.custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD])
+        .to eq(different_polls)
+
+      expect(message.data[:post_id]).to eq(post_with_two_polls.id)
+      expect(message.data[:polls]).to eq(different_polls)
+    end
+
     describe "when poll edit window has expired" do
       let(:poll_edit_window_mins) { 6 }
       let(:another_post) { Fabricate(:post, created_at: Time.zone.now - poll_edit_window_mins.minutes) }
diff --git a/plugins/poll/spec/lib/polls_validator_spec.rb b/plugins/poll/spec/lib/polls_validator_spec.rb
index d5178fe854..a4d6fc27b6 100644
--- a/plugins/poll/spec/lib/polls_validator_spec.rb
+++ b/plugins/poll/spec/lib/polls_validator_spec.rb
@@ -6,7 +6,7 @@ describe ::DiscoursePoll::PollsValidator do
 
   describe "#validate_polls" do
     it "should ensure that polls have unique names" do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       * 2
@@ -24,7 +24,7 @@ describe ::DiscoursePoll::PollsValidator do
         I18n.t("poll.multiple_polls_without_name")
       )
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 2
@@ -44,7 +44,7 @@ describe ::DiscoursePoll::PollsValidator do
     end
 
     it 'should ensure that polls have unique options' do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       * 1
@@ -57,7 +57,7 @@ describe ::DiscoursePoll::PollsValidator do
         I18n.t("poll.default_poll_must_have_different_options")
       )
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 1
@@ -71,9 +71,8 @@ describe ::DiscoursePoll::PollsValidator do
       )
     end
 
-
     it 'should ensure that polls have at least 2 options' do
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       [/poll]
@@ -85,7 +84,7 @@ describe ::DiscoursePoll::PollsValidator do
         I18n.t("poll.default_poll_must_have_at_least_2_options")
       )
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       [/poll]
@@ -101,7 +100,7 @@ describe ::DiscoursePoll::PollsValidator do
     it "should ensure that polls' options do not exceed site settings" do
       SiteSetting.poll_maximum_options = 2
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll]
       * 1
       * 2
@@ -116,7 +115,7 @@ describe ::DiscoursePoll::PollsValidator do
         count: SiteSetting.poll_maximum_options
       ))
 
-      raw = <<-RAW.strip_heredoc
+      raw = <<~RAW
       [poll name=test]
       * 1
       * 2
@@ -134,7 +133,7 @@ describe ::DiscoursePoll::PollsValidator do
 
     describe 'multiple type polls' do
       it "should ensure that min should not be greater than max" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=2 max=1]
         * 1
         * 2
@@ -148,7 +147,7 @@ describe ::DiscoursePoll::PollsValidator do
           I18n.t("poll.default_poll_with_multiple_choices_has_invalid_parameters")
         )
 
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=2 max=1 name=test]
         * 1
         * 2
@@ -164,7 +163,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure max setting is greater than 0" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple max=-2]
         * 1
         * 2
@@ -179,7 +178,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that max settings is smaller or equal to the number of options" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple max=3]
         * 1
         * 2
@@ -194,7 +193,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings is not negative" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=-1]
         * 1
         * 2
@@ -209,7 +208,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings it not equal to zero" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=0]
         * 1
         * 2
@@ -224,7 +223,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings is not equal to the number of options" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=2]
         * 1
         * 2
@@ -239,7 +238,7 @@ describe ::DiscoursePoll::PollsValidator do
       end
 
       it "should ensure that min settings is not greater than the number of options" do
-        raw = <<-RAW.strip_heredoc
+        raw = <<~RAW
         [poll type=multiple min=3]
         * 1
         * 2
diff --git a/plugins/poll/spec/lib/pretty_text_spec.rb b/plugins/poll/spec/lib/pretty_text_spec.rb
index 417a2989f4..85ee2c2a00 100644
--- a/plugins/poll/spec/lib/pretty_text_spec.rb
+++ b/plugins/poll/spec/lib/pretty_text_spec.rb
@@ -7,116 +7,122 @@ describe PrettyText do
     HtmlNormalize.normalize(html)
   end
 
-  context 'markdown it' do
-    before do
-      SiteSetting.enable_experimental_markdown_it = true
-    end
+  it 'supports multi choice polls' do
+    cooked = PrettyText.cook <<~MD
+      [poll type=multiple min=1 max=3 public=true]
+      * option 1
+      * option 2
+      * option 3
+      [/poll]
+    MD
 
-    it 'can properly bake 2 polls' do
-      md = <<~MD
-        this is a test
+    expect(cooked).to include('class="poll"')
+    expect(cooked).to include('data-poll-status="open"')
+    expect(cooked).to include('data-poll-name="poll"')
+    expect(cooked).to include('data-poll-type="multiple"')
+    expect(cooked).to include('data-poll-min="1"')
+    expect(cooked).to include('data-poll-max="3"')
+    expect(cooked).to include('data-poll-public="true"')
+  end
 
-        - i am a list
+  it 'can dynamically generate a poll' do
 
-        [poll]
-        1. test 1
-        2. test 2
-        [/poll]
+    cooked = PrettyText.cook <<~MD
+      [poll type=number min=1 max=20 step=1]
+      [/poll]
+    MD
 
-        [poll name=poll2]
-        1. test 1
-        2. test 2
-        [/poll]
-      MD
+    expect(cooked.scan('<li').length).to eq(20)
+  end
 
-      cooked = PrettyText.cook(md)
-      expect(cooked.scan('class="poll"').length).to eq(2)
-    end
+  it 'can properly bake 2 polls' do
+    md = <<~MD
+      this is a test
 
-    it 'works correctly for new vs old engine with trivial cases' do
-      md = <<~MD
-        [poll]
-        1. test 1
-        2. test 2
-        [/poll]
-      MD
+      - i am a list
 
-      new_engine = n(PrettyText.cook(md))
+      [poll]
+      1. test 1
+      2. test 2
+      [/poll]
 
-      SiteSetting.enable_experimental_markdown_it = false
-      old_engine = n(PrettyText.cook(md))
+      [poll name=poll2]
+      1. test 1
+      2. test 2
+      [/poll]
+    MD
 
-      expect(new_engine).to eq(old_engine)
-    end
+    cooked = PrettyText.cook(md)
+    expect(cooked.scan('class="poll"').length).to eq(2)
+  end
 
-    it 'does not break poll options when going from loose to tight' do
-      md = <<~MD
-        [poll type=multiple]
-        1. test 1 :) <b>test</b>
-        2. test 2
-        [/poll]
-      MD
+  it 'does not break poll options when going from loose to tight' do
+    md = <<~MD
+      [poll type=multiple]
+      1. test 1 :) <b>test</b>
+      2. test 2
+      [/poll]
+    MD
 
-      tight_cooked = PrettyText.cook(md)
+    tight_cooked = PrettyText.cook(md)
 
-      md = <<~MD
-        [poll type=multiple]
+    md = <<~MD
+      [poll type=multiple]
 
-        1. test 1 :) <b>test</b>
+      1. test 1 :) <b>test</b>
 
-        2. test 2
+      2. test 2
 
-        [/poll]
-      MD
+      [/poll]
+    MD
 
-      loose_cooked = PrettyText.cook(md)
+    loose_cooked = PrettyText.cook(md)
 
-      tight_hashes = tight_cooked.scan(/data-poll-option-id=['"]([^'"]+)/)
-      loose_hashes = loose_cooked.scan(/data-poll-option-id=['"]([^'"]+)/)
+    tight_hashes = tight_cooked.scan(/data-poll-option-id=['"]([^'"]+)/)
+    loose_hashes = loose_cooked.scan(/data-poll-option-id=['"]([^'"]+)/)
 
-      expect(tight_hashes).to eq(loose_hashes)
-    end
+    expect(tight_hashes).to eq(loose_hashes)
+  end
 
-    it 'can correctly cook polls' do
-      md = <<~MD
-        [poll type=multiple]
-        1. test 1 :) <b>test</b>
-        2. test 2
-        [/poll]
-      MD
+  it 'can correctly cook polls' do
+    md = <<~MD
+      [poll type=multiple]
+      1. test 1 :) <b>test</b>
+      2. test 2
+      [/poll]
+    MD
 
-      cooked = PrettyText.cook md
+    cooked = PrettyText.cook md
 
-      expected = <<~MD
-        <div class="poll" data-poll-status="open" data-poll-name="poll">
-        <div>
-        <div class="poll-container">
-        <ol>
-        <li data-poll-option-id='b6475cbf6acb8676b20c60582cfc487a'>test 1 <img alt=':slight_smile:' class='emoji' src='/images/emoji/twitter/slight_smile.png?v=5' title=':slight_smile:'> <b>test</b>
-        </li>
-        <li data-poll-option-id='7158af352698eb1443d709818df097d4'>test 2</li>
-        </li>
-        </ol>
-        </div>
-        <div class="poll-info">
-        <p>
-        <span class="info-number">0</span>
-        <span class="info-text">voters</span>
-        </p>
-        <p>
-        Choose up to <strong>2</strong> options</p>
-        </div>
-        </div>
-        <div class="poll-buttons">
-        <a title="Cast your votes">Vote now!</a>
-        <a title="Display the poll results">Show results</a>
-        </div>
-        </div>
-      MD
+    expected = <<~MD
+      <div class="poll" data-poll-status="open" data-poll-name="poll" data-poll-type="multiple">
+      <div>
+      <div class="poll-container">
+      <ol>
+      <li data-poll-option-id='b6475cbf6acb8676b20c60582cfc487a'>test 1 <img alt=':slight_smile:' class='emoji' src='/images/emoji/twitter/slight_smile.png?v=5' title=':slight_smile:'> <b>test</b>
+      </li>
+      <li data-poll-option-id='7158af352698eb1443d709818df097d4'>test 2</li>
+      </li>
+      </ol>
+      </div>
+      <div class="poll-info">
+      <p>
+      <span class="info-number">0</span>
+      <span class="info-text">voters</span>
+      </p>
+      <p>
+      Choose up to <strong>2</strong> options</p>
+      </div>
+      </div>
+      <div class="poll-buttons">
+      <a title="Cast your votes">Vote now!</a>
+      <a title="Display the poll results">Show results</a>
+      </div>
+      </div>
+    MD
 
-      # note, hashes should remain stable even if emoji changes cause text content is hashed
-      expect(n cooked).to eq(n expected)
+    # note, hashes should remain stable even if emoji changes cause text content is hashed
+    expect(n cooked).to eq(n expected)
 
-    end
   end
 end
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 0d646199c7..75035b6651 100644
--- a/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6
+++ b/plugins/poll/test/javascripts/widgets/discourse-poll-option-test.js.es6
@@ -14,7 +14,7 @@ widgetTest('single, not selected', {
   },
 
   test(assert) {
-    assert.ok(find('li .fa-circle-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-circle-o:eq(0)').length === 1);
   }
 });
 
@@ -27,7 +27,7 @@ widgetTest('single, selected', {
   },
 
   test(assert) {
-    assert.ok(find('li .fa-dot-circle-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-dot-circle-o:eq(0)').length === 1);
   }
 });
 
@@ -43,7 +43,7 @@ widgetTest('multi, not selected', {
   },
 
   test(assert) {
-    assert.ok(find('li .fa-square-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-square-o:eq(0)').length === 1);
   }
 });
 
@@ -59,6 +59,6 @@ widgetTest('multi, selected', {
   },
 
   test(assert) {
-    assert.ok(find('li .fa-check-square-o:eq(0)').length === 1);
+    assert.ok(find('li .d-icon-check-square-o:eq(0)').length === 1);
   }
 });
diff --git a/public/403.ar.html b/public/403.ar.html
index 588c339ce9..eb86ac2587 100644
--- a/public/403.ar.html
+++ b/public/403.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>لا يمكنك فعل ذلك (403)</title>
diff --git a/public/403.bs_BA.html b/public/403.bs_BA.html
index 7cc8339617..9fe51f8a19 100644
--- a/public/403.bs_BA.html
+++ b/public/403.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ne možete to učiniti (403)</title>
diff --git a/public/403.cs.html b/public/403.cs.html
index f9d2d1fc6d..47f9f82d4e 100644
--- a/public/403.cs.html
+++ b/public/403.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Tohle nemůžete udělat (403)</title>
diff --git a/public/403.da.html b/public/403.da.html
index 6d7effe313..b91bb8c89c 100644
--- a/public/403.da.html
+++ b/public/403.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Dette kan ikke lade sig gøre (403)</title>
diff --git a/public/403.de.html b/public/403.de.html
index 1b850938db..f83395416a 100644
--- a/public/403.de.html
+++ b/public/403.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Das darfst du nicht (403)</title>
diff --git a/public/403.el.html b/public/403.el.html
index 3a9905a252..949f481c00 100644
--- a/public/403.el.html
+++ b/public/403.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Αυτό δεν επιτρέπετε να το κάνεις (403)</title>
diff --git a/public/403.es.html b/public/403.es.html
index 6a52d5deb5..0dbbdff136 100644
--- a/public/403.es.html
+++ b/public/403.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>No puedes hacer eso (403)</title>
diff --git a/public/403.et.html b/public/403.et.html
index 4e3a373cd7..3f1733c557 100644
--- a/public/403.et.html
+++ b/public/403.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sa ei saa seda teha (403)</title>
diff --git a/public/403.fa_IR.html b/public/403.fa_IR.html
index 4185ca1a21..75372a7faf 100644
--- a/public/403.fa_IR.html
+++ b/public/403.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>نمی‌توانید این کار را بکنید (403)</title>
diff --git a/public/403.fi.html b/public/403.fi.html
index 9f96bb4241..0eb53c7edd 100644
--- a/public/403.fi.html
+++ b/public/403.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Et voi tehdä tuota (403)</title>
diff --git a/public/403.fr.html b/public/403.fr.html
index 171e83c1f5..a0e282d098 100644
--- a/public/403.fr.html
+++ b/public/403.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Vous ne pouvez pas faire ça (403)</title>
diff --git a/public/403.gl.html b/public/403.gl.html
index 4a2ac9508d..ad924ac008 100644
--- a/public/403.gl.html
+++ b/public/403.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Non podes facer iso (403)</title>
diff --git a/public/403.he.html b/public/403.he.html
index 1cffb9ce02..7fe969bb00 100644
--- a/public/403.he.html
+++ b/public/403.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>אין לכם הרשאה (403)</title>
diff --git a/public/403.id.html b/public/403.id.html
index 3f230a9a6f..d810b74675 100644
--- a/public/403.id.html
+++ b/public/403.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Kamu tidak dapat melakukan hal itu (403)</title>
diff --git a/public/403.it.html b/public/403.it.html
index da8e9cba4e..015fe482f0 100644
--- a/public/403.it.html
+++ b/public/403.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Non puoi farlo (403)</title>
diff --git a/public/403.ja.html b/public/403.ja.html
index fef6db38ba..93c1577e00 100644
--- a/public/403.ja.html
+++ b/public/403.ja.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>403エラー</title>
+<title>許可されていません (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,7 +21,7 @@
     <h1>403</h1>
     <p>閲覧することができません。</p>
 
-    <p>お探しのページはアクセスができない状況にあるか、移動または削除された可能性があります。</p>
+    <p>Discourse の 403 ページに置き換えられます。</p>
   </div>
 </body>
 </html>
diff --git a/public/403.ko.html b/public/403.ko.html
index e28a19ef3d..46102ed1ff 100644
--- a/public/403.ko.html
+++ b/public/403.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>권한이 없습니다. (403)</title>
diff --git a/public/403.nb_NO.html b/public/403.nb_NO.html
index 76b6e9a1cf..b11c804fb8 100644
--- a/public/403.nb_NO.html
+++ b/public/403.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Du har ikke tilgang til å gjøre dette (403)</title>
diff --git a/public/403.nl.html b/public/403.nl.html
index 7b03290e9e..362e12559f 100644
--- a/public/403.nl.html
+++ b/public/403.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Deze actie is niet toegestaan (403)</title>
diff --git a/public/403.pl_PL.html b/public/403.pl_PL.html
index ec3366bc51..38b9562f95 100644
--- a/public/403.pl_PL.html
+++ b/public/403.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nie możesz tego zrobić (403)</title>
diff --git a/public/403.pt.html b/public/403.pt.html
index 674df0279a..5d8ac58766 100644
--- a/public/403.pt.html
+++ b/public/403.pt.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Não pode fazer isso (403)</title>
diff --git a/public/403.pt_BR.html b/public/403.pt_BR.html
index 1c00c02a81..5cc571ce71 100644
--- a/public/403.pt_BR.html
+++ b/public/403.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Impossível acessar esta página (403)</title>
diff --git a/public/403.ro.html b/public/403.ro.html
index 0ad295eb83..8b72c15824 100644
--- a/public/403.ro.html
+++ b/public/403.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nu poți face asta (403)</title>
diff --git a/public/403.ru.html b/public/403.ru.html
index d87d9d27c9..c7cec3760d 100644
--- a/public/403.ru.html
+++ b/public/403.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Действите запрещено (403)</title>
diff --git a/public/403.sk.html b/public/403.sk.html
index eca5973106..9cce25b9c6 100644
--- a/public/403.sk.html
+++ b/public/403.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Na toto nemáte oprávnenie (403)</title>
diff --git a/public/403.sq.html b/public/403.sq.html
index ded7ddc6be..c745b66b48 100644
--- a/public/403.sq.html
+++ b/public/403.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nuk mund ta bëni atë (403)</title>
diff --git a/public/403.sv.html b/public/403.sv.html
index e042091983..3ff6f89b95 100644
--- a/public/403.sv.html
+++ b/public/403.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sådär kan du inte göra (403)</title>
diff --git a/public/403.te.html b/public/403.te.html
index 80659a1515..1433ddde18 100644
--- a/public/403.te.html
+++ b/public/403.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>మీరది చేయలేరు(403)</title>
diff --git a/public/403.tr_TR.html b/public/403.tr_TR.html
index c0f1dd3ea7..0cae7c6731 100644
--- a/public/403.tr_TR.html
+++ b/public/403.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Bunu yapamazsınız (403)</title>
diff --git a/public/403.uk.html b/public/403.uk.html
index 035dae104f..8e0e7d4481 100644
--- a/public/403.uk.html
+++ b/public/403.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Заборонено (HTTP-403)</title>
diff --git a/public/403.ur.html b/public/403.ur.html
index 268f0bac3f..0b66a595ad 100644
--- a/public/403.ur.html
+++ b/public/403.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>اپ ایسا نہیں کر سکتے (403)</title>
diff --git a/public/403.vi.html b/public/403.vi.html
index 20f3770528..7ddb46110b 100644
--- a/public/403.vi.html
+++ b/public/403.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title> Bạn không thể làm được điều đó (403)</title>
diff --git a/public/403.zh_CN.html b/public/403.zh_CN.html
index 6d7098c5ca..0887f9e31c 100644
--- a/public/403.zh_CN.html
+++ b/public/403.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>你不可以这样做 (403)</title>
diff --git a/public/403.zh_TW.html b/public/403.zh_TW.html
index 833ba11085..e7353129d0 100644
--- a/public/403.zh_TW.html
+++ b/public/403.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>拒絕執行 (403)</title>
diff --git a/public/422.ar.html b/public/422.ar.html
index a32a46698e..66aa046af6 100644
--- a/public/422.ar.html
+++ b/public/422.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>رُفض التغيير الذي طلبته (422)</title>
diff --git a/public/422.bs_BA.html b/public/422.bs_BA.html
index 91cb7d2bba..634e59250d 100644
--- a/public/422.bs_BA.html
+++ b/public/422.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Promjena koju ste htjeli je odbijena (422)</title>
diff --git a/public/422.cs.html b/public/422.cs.html
index ae0439e5a1..f0b019acbf 100644
--- a/public/422.cs.html
+++ b/public/422.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Změna, kterou jste chtěl(a), byl(a) odmítnuta (422)</title>
diff --git a/public/422.da.html b/public/422.da.html
index 35363c5a15..34f06f1ffb 100644
--- a/public/422.da.html
+++ b/public/422.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Den ændring du ville lave er blevet afvist (422)</title>
diff --git a/public/422.de.html b/public/422.de.html
index 1a4e41d7f6..e602466125 100644
--- a/public/422.de.html
+++ b/public/422.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Die gewünschte Änderung wurde abgelehnt (422)</title>
diff --git a/public/422.el.html b/public/422.el.html
index f8ffc181d3..f6e6d33c5d 100644
--- a/public/422.el.html
+++ b/public/422.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Η αλλαγή που ζήτησες απορρίφθηκε (422)</title>
diff --git a/public/422.es.html b/public/422.es.html
index 54024459dc..973befb9e8 100644
--- a/public/422.es.html
+++ b/public/422.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>El cambio que querías ha sido rechazado (422)</title>
diff --git a/public/422.et.html b/public/422.et.html
index 2f776f1ab1..f7e5dff884 100644
--- a/public/422.et.html
+++ b/public/422.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Muudatust, mida soovisid, ei kiidetud heaks (422)</title>
diff --git a/public/422.fa_IR.html b/public/422.fa_IR.html
index b08b4263a5..d92f363684 100644
--- a/public/422.fa_IR.html
+++ b/public/422.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>تغییری که خواستید، رد شد (422)</title>
diff --git a/public/422.fi.html b/public/422.fi.html
index 68ccf75bf2..1fff8ce6a7 100644
--- a/public/422.fi.html
+++ b/public/422.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Haluamasi muutospyyntö hylättiin (422)</title>
diff --git a/public/422.fr.html b/public/422.fr.html
index c99663709c..ce04617abd 100644
--- a/public/422.fr.html
+++ b/public/422.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>La modification demandée a été rejetée (422)</title>
diff --git a/public/422.gl.html b/public/422.gl.html
index 98d3a1b87c..fb07b51643 100644
--- a/public/422.gl.html
+++ b/public/422.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Rexeitouse o cambio pretendido (422)</title>
diff --git a/public/422.he.html b/public/422.he.html
index e8b1f51729..594e603566 100644
--- a/public/422.he.html
+++ b/public/422.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>השינוי שביקשתם נדחה (422)</title>
diff --git a/public/422.id.html b/public/422.id.html
index 4affddff5d..91eb8b7434 100644
--- a/public/422.id.html
+++ b/public/422.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Perubahan yang kamu inginkan telah ditolak (422)</title>
diff --git a/public/422.it.html b/public/422.it.html
index 632fb1f52e..1d016d0ba9 100644
--- a/public/422.it.html
+++ b/public/422.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Modifica rifiutata (422)</title>
diff --git a/public/422.ja.html b/public/422.ja.html
index 9577b35e1d..2ceed7730b 100644
--- a/public/422.ja.html
+++ b/public/422.ja.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>422エラー</title>
+<title>変更要求は拒否されました (422)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -18,8 +19,8 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>閲覧することができません。</h1>
-    <p>処理できないエンティティがあります。</p>
+    <h1>変更要求は拒否されました。</h1>
+    <p>おそらくアクセス権のないものを変更しようとしています。</p>
   </div>
 </body>
 </html>
diff --git a/public/422.ko.html b/public/422.ko.html
index a75eace8dd..2bb626b5c7 100644
--- a/public/422.ko.html
+++ b/public/422.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>변경이 거부되었습니다. (422)</title>
diff --git a/public/422.nb_NO.html b/public/422.nb_NO.html
index acdcb6b08b..47675f0d0d 100644
--- a/public/422.nb_NO.html
+++ b/public/422.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Endringen du ønsket, ble avvist (422)</title>
diff --git a/public/422.nl.html b/public/422.nl.html
index d654bc4c9e..f31faffbfd 100644
--- a/public/422.nl.html
+++ b/public/422.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>De geplande wijziging is geweigerd (422)</title>
diff --git a/public/422.pl_PL.html b/public/422.pl_PL.html
index 7cd0bb82b3..18e970242d 100644
--- a/public/422.pl_PL.html
+++ b/public/422.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Zażądana przez Ciebie zmiana została odrzucona (422)</title>
diff --git a/public/422.pt.html b/public/422.pt.html
index 2e64ef6607..240dd474de 100644
--- a/public/422.pt.html
+++ b/public/422.pt.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>A alteração que solicitou foi rejeitada (422)</title>
diff --git a/public/422.pt_BR.html b/public/422.pt_BR.html
index b4a30f58ca..50ca78177d 100644
--- a/public/422.pt_BR.html
+++ b/public/422.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>A alteração que você solicitou foi rejeitada (422)</title>
diff --git a/public/422.ro.html b/public/422.ro.html
index 9aad3b0826..d366a7e069 100644
--- a/public/422.ro.html
+++ b/public/422.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Schimbarea dorită a fost respinsă (422)</title>
diff --git a/public/422.ru.html b/public/422.ru.html
index 81caed8e08..3b7e73203a 100644
--- a/public/422.ru.html
+++ b/public/422.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ваш запрос отклонен (HTTP-422)</title>
diff --git a/public/422.sk.html b/public/422.sk.html
index 3cde526192..5d8bb671f6 100644
--- a/public/422.sk.html
+++ b/public/422.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Požadovaná zmena bola zamietnutá (422)</title>
diff --git a/public/422.sq.html b/public/422.sq.html
index b4b02c2229..9bd8fcc783 100644
--- a/public/422.sq.html
+++ b/public/422.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ndryshimet që donit të bënit u refuzuan (422)</title>
diff --git a/public/422.sv.html b/public/422.sv.html
index 2068200259..f8f3e9bcc5 100644
--- a/public/422.sv.html
+++ b/public/422.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Förändringen du ville göra nekades (422)</title>
diff --git a/public/422.te.html b/public/422.te.html
index 55437eb36a..f47f8bc607 100644
--- a/public/422.te.html
+++ b/public/422.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>మీరు చేయాలనుకున్న మార్పు తిరస్కారమైంది (422)</title>
diff --git a/public/422.tr_TR.html b/public/422.tr_TR.html
index 23af24fbfc..0c3101fa1e 100644
--- a/public/422.tr_TR.html
+++ b/public/422.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>İstediğiniz değişiklik reddedildi (422)</title>
diff --git a/public/422.uk.html b/public/422.uk.html
index 42ab0b789a..b5a1052fd5 100644
--- a/public/422.uk.html
+++ b/public/422.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Зміни, які Ви намагалися внести, було відхилено (422)</title>
diff --git a/public/422.ur.html b/public/422.ur.html
index 9827ed711d..8d561cf8e9 100644
--- a/public/422.ur.html
+++ b/public/422.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>جو تبدیلی آپ چاہتے تھے اس کو مسترد کر دیا گیا (422)</title>
diff --git a/public/422.vi.html b/public/422.vi.html
index 082a63b385..c6904f029a 100644
--- a/public/422.vi.html
+++ b/public/422.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Thay đổi bạn muốn thực hiện đã bị từ chối (422)</title>
diff --git a/public/422.zh_CN.html b/public/422.zh_CN.html
index 44c14545c0..c270e0f711 100644
--- a/public/422.zh_CN.html
+++ b/public/422.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>你的更改操作被拒绝  (422)</title>
diff --git a/public/422.zh_TW.html b/public/422.zh_TW.html
index a3d9f4a41e..4a400f129d 100644
--- a/public/422.zh_TW.html
+++ b/public/422.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>改動請求被拒 (422)</title>
diff --git a/public/500.ar.html b/public/500.ar.html
index 72323ee844..afa677a391 100644
--- a/public/500.ar.html
+++ b/public/500.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>آخ - الخطأ 500</title>
diff --git a/public/500.bs_BA.html b/public/500.bs_BA.html
index e7ef753acc..b938bd5459 100644
--- a/public/500.bs_BA.html
+++ b/public/500.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Greška 500</title>
diff --git a/public/500.cs.html b/public/500.cs.html
index 4e68ddedcb..388a0c4d57 100644
--- a/public/500.cs.html
+++ b/public/500.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Jejda – chyba 500</title>
diff --git a/public/500.da.html b/public/500.da.html
index 2eb2158fe6..f272d4d890 100644
--- a/public/500.da.html
+++ b/public/500.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hovsa - Fejl 500</title>
diff --git a/public/500.de.html b/public/500.de.html
index 5fc3b344d5..32f1d6086a 100644
--- a/public/500.de.html
+++ b/public/500.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hoppla - Fehler 500</title>
diff --git a/public/500.el.html b/public/500.el.html
index 216aaf6d26..9363ac2651 100644
--- a/public/500.el.html
+++ b/public/500.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ωχ - Σφάλμα 500</title>
diff --git a/public/500.es.html b/public/500.es.html
index be623a4db2..42977501a4 100644
--- a/public/500.es.html
+++ b/public/500.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>¡Ups! - Error 500</title>
diff --git a/public/500.et.html b/public/500.et.html
index f3c3090070..46401b6a63 100644
--- a/public/500.et.html
+++ b/public/500.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oh sa - viga 500</title>
diff --git a/public/500.fa_IR.html b/public/500.fa_IR.html
index 7ec5303935..4d442d0ac3 100644
--- a/public/500.fa_IR.html
+++ b/public/500.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title> اوه - خطای 500</title>
diff --git a/public/500.fi.html b/public/500.fi.html
index d28e89d771..d43e9cfe41 100644
--- a/public/500.fi.html
+++ b/public/500.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hupsista - Virhe 500</title>
diff --git a/public/500.fr.html b/public/500.fr.html
index 1102b61f24..95d425863c 100644
--- a/public/500.fr.html
+++ b/public/500.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oups - Erreur 500</title>
diff --git a/public/500.gl.html b/public/500.gl.html
index d4708e7b8b..e279e7fa15 100644
--- a/public/500.gl.html
+++ b/public/500.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Vaites - Erro 500</title>
diff --git a/public/500.he.html b/public/500.he.html
index 1567e62665..ffec6877b7 100644
--- a/public/500.he.html
+++ b/public/500.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>אופס – שגיאה 500</title>
diff --git a/public/500.id.html b/public/500.id.html
index ae5ca30393..b30066fea3 100644
--- a/public/500.id.html
+++ b/public/500.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ups - Error 500</title>
diff --git a/public/500.it.html b/public/500.it.html
index ff28f1e545..3b941a72f4 100644
--- a/public/500.it.html
+++ b/public/500.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Errore 500</title>
diff --git a/public/500.ja.html b/public/500.ja.html
index 472d2055b4..b96f465303 100644
--- a/public/500.ja.html
+++ b/public/500.ja.html
@@ -1,11 +1,12 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>500エラー</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>500</h1>
-    <p>予期しないエラーが発生しました。</p>
+    <h1>おっとっと</h1>
+    <p>予期しない問題が発生しました。 ご不便をおかけして申し訳ございません。</p>
     <p>エラーについての詳細情報は記録されました。自動通知を受け取りました。確認致します。</p>
     <p>これ以上のアクションは必要ありません。ただし、問題が解決されない場合は問題が起こる手順を含めてサイトのフィードバックカテゴリなどに投稿することで詳細情報を提供することができます。</p>
 </body>
diff --git a/public/500.ko.html b/public/500.ko.html
index 430f9511e2..09e822c863 100644
--- a/public/500.ko.html
+++ b/public/500.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>죄송합니다 - 오류가 발생했습니다.  (500)</title>
diff --git a/public/500.nb_NO.html b/public/500.nb_NO.html
index 2aa31d97ca..56e2c70bdb 100644
--- a/public/500.nb_NO.html
+++ b/public/500.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oisann - Feil 500</title>
diff --git a/public/500.nl.html b/public/500.nl.html
index 7a092cd2a1..833c38a2f5 100644
--- a/public/500.nl.html
+++ b/public/500.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oeps - Fout 500</title>
diff --git a/public/500.pl_PL.html b/public/500.pl_PL.html
index 248ff1f2d9..d326953788 100644
--- a/public/500.pl_PL.html
+++ b/public/500.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ups - Błąd 500</title>
diff --git a/public/500.pt.html b/public/500.pt.html
index c49a3a46da..277f7a8747 100644
--- a/public/500.pt.html
+++ b/public/500.pt.html
@@ -1,12 +1,13 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>Oops - Erro 500</title>
+<title>Ups - Erro 500</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>Oops</h1>
     <p>O software que sustenta este fórum de discussão encontrou um problema inesperado. Pedimos desculpa pelo inconveniente.</p>
-    <p>Informações detalhadas sobre o erro foram registadas, e uma notificação automática foi gerada. Iremos verificar estes registos.</p>
+    <p>A informação detalhada sobre o erro foi registada, e foi gerada uma notificação automática. Nós iremos verificar o mesmo.</p>
     <p>Nenhuma ação adicional é necessária. No entanto, se a condição de erro persistir, pode fornecer detalhes adicionais, incluindo as etapas para reproduzir o erro, publicando um tópico de discussão na categoria de retorno do sítio.</p>
 </body>
 </html>
diff --git a/public/500.pt_BR.html b/public/500.pt_BR.html
index 78cf1befa3..5d45a35c2a 100644
--- a/public/500.pt_BR.html
+++ b/public/500.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Erro 500</title>
diff --git a/public/500.ro.html b/public/500.ro.html
index c315c0d8cd..e599e95bec 100644
--- a/public/500.ro.html
+++ b/public/500.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Cod de eroare 500</title>
diff --git a/public/500.ru.html b/public/500.ru.html
index 0e07ea39c4..f7df6ca8ad 100644
--- a/public/500.ru.html
+++ b/public/500.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ой! Ошибка 500</title>
diff --git a/public/500.sk.html b/public/500.sk.html
index 6faefa3186..88e8784564 100644
--- a/public/500.sk.html
+++ b/public/500.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - Chyba 500</title>
diff --git a/public/500.sq.html b/public/500.sq.html
index 107042f194..2270f3c6e7 100644
--- a/public/500.sq.html
+++ b/public/500.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ndjesë - Gabim 500</title>
diff --git a/public/500.sv.html b/public/500.sv.html
index d84e556cda..e9de29fe0a 100644
--- a/public/500.sv.html
+++ b/public/500.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hoppsan - Error 500</title>
diff --git a/public/500.te.html b/public/500.te.html
index 45c48b9628..2a9452fb32 100644
--- a/public/500.te.html
+++ b/public/500.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>అయ్యో - దోషం 500</title>
diff --git a/public/500.tr_TR.html b/public/500.tr_TR.html
index de7139bb87..c54c765d59 100644
--- a/public/500.tr_TR.html
+++ b/public/500.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Hay Aksi - Hata 500</title>
diff --git a/public/500.uk.html b/public/500.uk.html
index b7627c80b6..2adf723c18 100644
--- a/public/500.uk.html
+++ b/public/500.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Йой - Помилка 500</title>
diff --git a/public/500.ur.html b/public/500.ur.html
index af41c9343d..b0feeda7b8 100644
--- a/public/500.ur.html
+++ b/public/500.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>افوہ - تکنیکی خرابی 500</title>
diff --git a/public/500.vi.html b/public/500.vi.html
index 9f4adf6470..d02ad1a8f2 100644
--- a/public/500.vi.html
+++ b/public/500.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ôi - Lỗi 500</title>
diff --git a/public/500.zh_CN.html b/public/500.zh_CN.html
index a35da74f24..70b5d50c99 100644
--- a/public/500.zh_CN.html
+++ b/public/500.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>啊哦 - 错误 500</title>
diff --git a/public/500.zh_TW.html b/public/500.zh_TW.html
index b42094bb25..05278ed934 100644
--- a/public/500.zh_TW.html
+++ b/public/500.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Oops - 錯誤 500</title>
diff --git a/public/503.ar.html b/public/503.ar.html
index f9c1f9e500..cf1b50101c 100644
--- a/public/503.ar.html
+++ b/public/503.ar.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>الموقع تحت الصيانة - Discourse.org</title>
diff --git a/public/503.bs_BA.html b/public/503.bs_BA.html
index 75eaee4fd4..1463fa0452 100644
--- a/public/503.bs_BA.html
+++ b/public/503.bs_BA.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>U toku je održavanje web stranice -Discourse.org</title>
diff --git a/public/503.cs.html b/public/503.cs.html
index 45db98e397..f6cc1bd934 100644
--- a/public/503.cs.html
+++ b/public/503.cs.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Probíhá údržba</title>
diff --git a/public/503.da.html b/public/503.da.html
index ab8909472a..18710fead3 100644
--- a/public/503.da.html
+++ b/public/503.da.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Forummet er under vedligeholdelse.</title>
diff --git a/public/503.de.html b/public/503.de.html
index c84b57cdd3..c5f3ae8faa 100644
--- a/public/503.de.html
+++ b/public/503.de.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Website wird gerade gewartet - Discourse.org</title>
diff --git a/public/503.el.html b/public/503.el.html
index c87180b824..829d209a86 100644
--- a/public/503.el.html
+++ b/public/503.el.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Ο ιστότοπος βρίσκεται σε κατάσταση συντήρησης - Discourse.org</title>
diff --git a/public/503.es.html b/public/503.es.html
index 5b7b6f53af..135ec37faf 100644
--- a/public/503.es.html
+++ b/public/503.es.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>El sitio está en labores de mantenimiento - Discourse.org</title>
diff --git a/public/503.et.html b/public/503.et.html
index 8be6c19759..f84d3b877c 100644
--- a/public/503.et.html
+++ b/public/503.et.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Teostame hooldustöid - Discourse.org</title>
diff --git a/public/503.fa_IR.html b/public/503.fa_IR.html
index 6d14e0c683..1e5038aee7 100644
--- a/public/503.fa_IR.html
+++ b/public/503.fa_IR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>سایت در دست تعمیر و نگهداری است - Discourse.org</title>
diff --git a/public/503.fi.html b/public/503.fi.html
index 837a81a8b4..8667dc5145 100644
--- a/public/503.fi.html
+++ b/public/503.fi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sivustolle suoritetaan ylläpitotoimia  - Discourse.org</title>
diff --git a/public/503.fr.html b/public/503.fr.html
index 6a14566b77..d57807f37a 100644
--- a/public/503.fr.html
+++ b/public/503.fr.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Le site en cours de maintenance - Discourse.org</title>
diff --git a/public/503.gl.html b/public/503.gl.html
index 7ffae6239a..ad9ff5cb92 100644
--- a/public/503.gl.html
+++ b/public/503.gl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Este sitio está en mantemento - Discourse.org</title>
diff --git a/public/503.he.html b/public/503.he.html
index 19b94063d6..2ea706e5dd 100644
--- a/public/503.he.html
+++ b/public/503.he.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>פעילות תחזוקה מתבצעת כרגע באתר – Discourse.org</title>
diff --git a/public/503.id.html b/public/503.id.html
index c18fe1824a..8f85d98176 100644
--- a/public/503.id.html
+++ b/public/503.id.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Situs Sedang Berada Dalam Pemeliharaan - Discourse.org</title>
diff --git a/public/503.it.html b/public/503.it.html
index 030669b160..812e700cb0 100644
--- a/public/503.it.html
+++ b/public/503.it.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Manutenzione in corso - Discourse.org</title>
diff --git a/public/503.ja.html b/public/503.ja.html
index 14d415adb3..ca5f0a2d4a 100644
--- a/public/503.ja.html
+++ b/public/503.ja.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>メンテナンス中</title>
@@ -5,7 +6,7 @@
 </head>
 <body>
     <h1>サイトメンテナンス中です。</h1>
-    <p><span id="when-to-check-back">後ほど</span>、もう一度ご確認ください。</p>
+    <p><span id="when-to-check-back">暫く経ってから</span>、もう一度ご確認ください。</p>
     <p id="apology">不便をお掛けして申し訳ありません。</p>
 </body>
 </html>
diff --git a/public/503.ko.html b/public/503.ko.html
index 02e8d4b652..2c21dc87be 100644
--- a/public/503.ko.html
+++ b/public/503.ko.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>사이트가 현재 점검 중입니다.</title>
diff --git a/public/503.nb_NO.html b/public/503.nb_NO.html
index 80ebfe2b00..3a3a3935a9 100644
--- a/public/503.nb_NO.html
+++ b/public/503.nb_NO.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Nettstedet gjennomgår vedlikehold - Discourse.org</title>
diff --git a/public/503.nl.html b/public/503.nl.html
index 1953a6a250..7baac2eb27 100644
--- a/public/503.nl.html
+++ b/public/503.nl.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Er wordt aan de website gewerkt - Discourse.org</title>
diff --git a/public/503.pl_PL.html b/public/503.pl_PL.html
index 64453803e8..61ccbf6242 100644
--- a/public/503.pl_PL.html
+++ b/public/503.pl_PL.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Przerwa techniczna - Discourse.org</title>
diff --git a/public/503.pt.html b/public/503.pt.html
index 18f73d1d3d..aff933211b 100644
--- a/public/503.pt.html
+++ b/public/503.pt.html
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
 <html>
 <head>
-<title>O sítio está em Manutenção</title>
+<title>O site está em Manutenção - Discourse.org</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
diff --git a/public/503.pt_BR.html b/public/503.pt_BR.html
index 1cea17bebc..11996adbb5 100644
--- a/public/503.pt_BR.html
+++ b/public/503.pt_BR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Site Está em Manutenção - Discourse.org</title>
diff --git a/public/503.ro.html b/public/503.ro.html
index 834b98ba9a..fd4e4a268a 100644
--- a/public/503.ro.html
+++ b/public/503.ro.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Site-ul este în revizie - Discourse.org</title>
diff --git a/public/503.ru.html b/public/503.ru.html
index ce60ba0a85..7b89873d26 100644
--- a/public/503.ru.html
+++ b/public/503.ru.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Технические работы на сайте</title>
diff --git a/public/503.sk.html b/public/503.sk.html
index eae9f09226..33e4096764 100644
--- a/public/503.sk.html
+++ b/public/503.sk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Na stránke sa práve vykonáva údržba.</title>
diff --git a/public/503.sq.html b/public/503.sq.html
index f62f49bbb0..508de2e330 100644
--- a/public/503.sq.html
+++ b/public/503.sq.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Faqja është në Në Mirëmbajtje - Discourse.org.</title>
diff --git a/public/503.sv.html b/public/503.sv.html
index c6d4cd6004..55fedeaa88 100644
--- a/public/503.sv.html
+++ b/public/503.sv.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Sidan genomgår underhåll - Discourse.org</title>
diff --git a/public/503.te.html b/public/503.te.html
index 57aaa206c4..80cc500214 100644
--- a/public/503.te.html
+++ b/public/503.te.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>డిస్కోర్స్ డాట్ ఆర్గ్ సైటు నిర్వహణలో ఉంది.</title>
diff --git a/public/503.tr_TR.html b/public/503.tr_TR.html
index a8e4090cb7..8f7c065b60 100644
--- a/public/503.tr_TR.html
+++ b/public/503.tr_TR.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Site Bakım Modunda - Discourse.org</title>
diff --git a/public/503.uk.html b/public/503.uk.html
index 7cc315548c..2acc668de2 100644
--- a/public/503.uk.html
+++ b/public/503.uk.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Технічні роботи - Discourse.org</title>
diff --git a/public/503.ur.html b/public/503.ur.html
index c6b8726fc9..d088924c01 100644
--- a/public/503.ur.html
+++ b/public/503.ur.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>ویب سائٹ کی محافظت ہو رہی ہے - Discourse.org</title>
diff --git a/public/503.vi.html b/public/503.vi.html
index 0216e90242..5f19115b54 100644
--- a/public/503.vi.html
+++ b/public/503.vi.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>Trang đang được bảo trì</title>
diff --git a/public/503.zh_CN.html b/public/503.zh_CN.html
index 87cf9bce6b..9bb0fbfc31 100644
--- a/public/503.zh_CN.html
+++ b/public/503.zh_CN.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>站点正在维护中 - Discourse.org</title>
diff --git a/public/503.zh_TW.html b/public/503.zh_TW.html
index fd4f64ee7d..4636f7b60c 100644
--- a/public/503.zh_TW.html
+++ b/public/503.zh_TW.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
 <title>網站維護中 - Discourse.org</title>
diff --git a/public/images/emoji/emoji_one/+1.png b/public/images/emoji/emoji_one/+1.png
index 76e9adb153..fdbf5f8213 100644
Binary files a/public/images/emoji/emoji_one/+1.png and b/public/images/emoji/emoji_one/+1.png differ
diff --git a/public/images/emoji/emoji_one/+1/2.png b/public/images/emoji/emoji_one/+1/2.png
index 411f6e0da8..8d6845de63 100644
Binary files a/public/images/emoji/emoji_one/+1/2.png and b/public/images/emoji/emoji_one/+1/2.png differ
diff --git a/public/images/emoji/emoji_one/+1/3.png b/public/images/emoji/emoji_one/+1/3.png
index 2b6cb70447..361ee4e1c9 100644
Binary files a/public/images/emoji/emoji_one/+1/3.png and b/public/images/emoji/emoji_one/+1/3.png differ
diff --git a/public/images/emoji/emoji_one/+1/4.png b/public/images/emoji/emoji_one/+1/4.png
index 385abbf4de..29b08bf2fa 100644
Binary files a/public/images/emoji/emoji_one/+1/4.png and b/public/images/emoji/emoji_one/+1/4.png differ
diff --git a/public/images/emoji/emoji_one/+1/5.png b/public/images/emoji/emoji_one/+1/5.png
index 36bca309c9..7ed0ca9bf9 100644
Binary files a/public/images/emoji/emoji_one/+1/5.png and b/public/images/emoji/emoji_one/+1/5.png differ
diff --git a/public/images/emoji/emoji_one/+1/6.png b/public/images/emoji/emoji_one/+1/6.png
index 2d9460c949..56210de91e 100644
Binary files a/public/images/emoji/emoji_one/+1/6.png and b/public/images/emoji/emoji_one/+1/6.png differ
diff --git a/public/images/emoji/emoji_one/-1.png b/public/images/emoji/emoji_one/-1.png
index 609e825618..3feb01c56c 100644
Binary files a/public/images/emoji/emoji_one/-1.png and b/public/images/emoji/emoji_one/-1.png differ
diff --git a/public/images/emoji/emoji_one/-1/2.png b/public/images/emoji/emoji_one/-1/2.png
index 322c518f75..0803889326 100644
Binary files a/public/images/emoji/emoji_one/-1/2.png and b/public/images/emoji/emoji_one/-1/2.png differ
diff --git a/public/images/emoji/emoji_one/-1/3.png b/public/images/emoji/emoji_one/-1/3.png
index 0c7a4ca2ce..91fbda2d09 100644
Binary files a/public/images/emoji/emoji_one/-1/3.png and b/public/images/emoji/emoji_one/-1/3.png differ
diff --git a/public/images/emoji/emoji_one/-1/4.png b/public/images/emoji/emoji_one/-1/4.png
index 9734764304..bba84d3f7e 100644
Binary files a/public/images/emoji/emoji_one/-1/4.png and b/public/images/emoji/emoji_one/-1/4.png differ
diff --git a/public/images/emoji/emoji_one/-1/5.png b/public/images/emoji/emoji_one/-1/5.png
index 39e2360bf9..e660885f03 100644
Binary files a/public/images/emoji/emoji_one/-1/5.png and b/public/images/emoji/emoji_one/-1/5.png differ
diff --git a/public/images/emoji/emoji_one/-1/6.png b/public/images/emoji/emoji_one/-1/6.png
index cb21abb2dc..0647aeda56 100644
Binary files a/public/images/emoji/emoji_one/-1/6.png and b/public/images/emoji/emoji_one/-1/6.png differ
diff --git a/public/images/emoji/emoji_one/adult.png b/public/images/emoji/emoji_one/adult.png
index 53a5eb2ccb..5c93775783 100644
Binary files a/public/images/emoji/emoji_one/adult.png and b/public/images/emoji/emoji_one/adult.png differ
diff --git a/public/images/emoji/emoji_one/adult/2.png b/public/images/emoji/emoji_one/adult/2.png
index 8f30fc9e38..eb7e3ae046 100644
Binary files a/public/images/emoji/emoji_one/adult/2.png and b/public/images/emoji/emoji_one/adult/2.png differ
diff --git a/public/images/emoji/emoji_one/adult/3.png b/public/images/emoji/emoji_one/adult/3.png
index 36a4e57d1f..895267d4ff 100644
Binary files a/public/images/emoji/emoji_one/adult/3.png and b/public/images/emoji/emoji_one/adult/3.png differ
diff --git a/public/images/emoji/emoji_one/adult/4.png b/public/images/emoji/emoji_one/adult/4.png
index 77c57605e9..7d44e111c8 100644
Binary files a/public/images/emoji/emoji_one/adult/4.png and b/public/images/emoji/emoji_one/adult/4.png differ
diff --git a/public/images/emoji/emoji_one/adult/5.png b/public/images/emoji/emoji_one/adult/5.png
index 58bcd6a2fc..f006f3b48c 100644
Binary files a/public/images/emoji/emoji_one/adult/5.png and b/public/images/emoji/emoji_one/adult/5.png differ
diff --git a/public/images/emoji/emoji_one/adult/6.png b/public/images/emoji/emoji_one/adult/6.png
index 3bc6b5a57a..41751f211a 100644
Binary files a/public/images/emoji/emoji_one/adult/6.png and b/public/images/emoji/emoji_one/adult/6.png differ
diff --git a/public/images/emoji/emoji_one/aerial_tramway.png b/public/images/emoji/emoji_one/aerial_tramway.png
index 2ef335b50c..f5ad1fedb9 100644
Binary files a/public/images/emoji/emoji_one/aerial_tramway.png and b/public/images/emoji/emoji_one/aerial_tramway.png differ
diff --git a/public/images/emoji/emoji_one/ambulance.png b/public/images/emoji/emoji_one/ambulance.png
index 11d6555609..9b0ebdce02 100644
Binary files a/public/images/emoji/emoji_one/ambulance.png and b/public/images/emoji/emoji_one/ambulance.png differ
diff --git a/public/images/emoji/emoji_one/angel.png b/public/images/emoji/emoji_one/angel.png
index 4248a99235..1f43ea7a63 100644
Binary files a/public/images/emoji/emoji_one/angel.png and b/public/images/emoji/emoji_one/angel.png differ
diff --git a/public/images/emoji/emoji_one/angel/2.png b/public/images/emoji/emoji_one/angel/2.png
index 7733acacb3..6a827186e7 100644
Binary files a/public/images/emoji/emoji_one/angel/2.png and b/public/images/emoji/emoji_one/angel/2.png differ
diff --git a/public/images/emoji/emoji_one/angel/3.png b/public/images/emoji/emoji_one/angel/3.png
index 798d0c66c9..fb2aec6732 100644
Binary files a/public/images/emoji/emoji_one/angel/3.png and b/public/images/emoji/emoji_one/angel/3.png differ
diff --git a/public/images/emoji/emoji_one/angel/4.png b/public/images/emoji/emoji_one/angel/4.png
index fa79792b43..c9539c948a 100644
Binary files a/public/images/emoji/emoji_one/angel/4.png and b/public/images/emoji/emoji_one/angel/4.png differ
diff --git a/public/images/emoji/emoji_one/angel/5.png b/public/images/emoji/emoji_one/angel/5.png
index 485c20b6c0..04e60609d7 100644
Binary files a/public/images/emoji/emoji_one/angel/5.png and b/public/images/emoji/emoji_one/angel/5.png differ
diff --git a/public/images/emoji/emoji_one/angel/6.png b/public/images/emoji/emoji_one/angel/6.png
index 51954e4578..28b5101dda 100644
Binary files a/public/images/emoji/emoji_one/angel/6.png and b/public/images/emoji/emoji_one/angel/6.png differ
diff --git a/public/images/emoji/emoji_one/anguished.png b/public/images/emoji/emoji_one/anguished.png
index 653818fef5..e8c2e90a68 100644
Binary files a/public/images/emoji/emoji_one/anguished.png and b/public/images/emoji/emoji_one/anguished.png differ
diff --git a/public/images/emoji/emoji_one/articulated_lorry.png b/public/images/emoji/emoji_one/articulated_lorry.png
index 20c40488f1..ed3c648ec0 100644
Binary files a/public/images/emoji/emoji_one/articulated_lorry.png and b/public/images/emoji/emoji_one/articulated_lorry.png differ
diff --git a/public/images/emoji/emoji_one/astonished.png b/public/images/emoji/emoji_one/astonished.png
index ddb5e1bfe6..45fead0aa7 100644
Binary files a/public/images/emoji/emoji_one/astonished.png and b/public/images/emoji/emoji_one/astonished.png differ
diff --git a/public/images/emoji/emoji_one/automobile.png b/public/images/emoji/emoji_one/automobile.png
index a5f65e3832..5755dee2a7 100644
Binary files a/public/images/emoji/emoji_one/automobile.png and b/public/images/emoji/emoji_one/automobile.png differ
diff --git a/public/images/emoji/emoji_one/baby.png b/public/images/emoji/emoji_one/baby.png
index f2ec524f21..c1ed53010e 100644
Binary files a/public/images/emoji/emoji_one/baby.png and b/public/images/emoji/emoji_one/baby.png differ
diff --git a/public/images/emoji/emoji_one/baby/2.png b/public/images/emoji/emoji_one/baby/2.png
index 0d30fd1ad9..152e2dda06 100644
Binary files a/public/images/emoji/emoji_one/baby/2.png and b/public/images/emoji/emoji_one/baby/2.png differ
diff --git a/public/images/emoji/emoji_one/baby/3.png b/public/images/emoji/emoji_one/baby/3.png
index b8cee0e210..284b2d0472 100644
Binary files a/public/images/emoji/emoji_one/baby/3.png and b/public/images/emoji/emoji_one/baby/3.png differ
diff --git a/public/images/emoji/emoji_one/baby/4.png b/public/images/emoji/emoji_one/baby/4.png
index 43dc76221b..b425ddfb6d 100644
Binary files a/public/images/emoji/emoji_one/baby/4.png and b/public/images/emoji/emoji_one/baby/4.png differ
diff --git a/public/images/emoji/emoji_one/baby/5.png b/public/images/emoji/emoji_one/baby/5.png
index 05f72b7b7a..e308fff508 100644
Binary files a/public/images/emoji/emoji_one/baby/5.png and b/public/images/emoji/emoji_one/baby/5.png differ
diff --git a/public/images/emoji/emoji_one/baby/6.png b/public/images/emoji/emoji_one/baby/6.png
index 724c079047..112a2fe784 100644
Binary files a/public/images/emoji/emoji_one/baby/6.png and b/public/images/emoji/emoji_one/baby/6.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man.png b/public/images/emoji/emoji_one/basketball_man.png
index a6904abac9..bc5aa6b3ea 100644
Binary files a/public/images/emoji/emoji_one/basketball_man.png and b/public/images/emoji/emoji_one/basketball_man.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/2.png b/public/images/emoji/emoji_one/basketball_man/2.png
index 9c1bee41ce..572fa0925f 100644
Binary files a/public/images/emoji/emoji_one/basketball_man/2.png and b/public/images/emoji/emoji_one/basketball_man/2.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/3.png b/public/images/emoji/emoji_one/basketball_man/3.png
index 275d1edd9b..203a5bbd82 100644
Binary files a/public/images/emoji/emoji_one/basketball_man/3.png and b/public/images/emoji/emoji_one/basketball_man/3.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/4.png b/public/images/emoji/emoji_one/basketball_man/4.png
index 7eb313163d..303b43c832 100644
Binary files a/public/images/emoji/emoji_one/basketball_man/4.png and b/public/images/emoji/emoji_one/basketball_man/4.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/5.png b/public/images/emoji/emoji_one/basketball_man/5.png
index fb9dc3936f..ebfd7ae793 100644
Binary files a/public/images/emoji/emoji_one/basketball_man/5.png and b/public/images/emoji/emoji_one/basketball_man/5.png differ
diff --git a/public/images/emoji/emoji_one/basketball_man/6.png b/public/images/emoji/emoji_one/basketball_man/6.png
index 6636a5024f..94d75c809b 100644
Binary files a/public/images/emoji/emoji_one/basketball_man/6.png and b/public/images/emoji/emoji_one/basketball_man/6.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player.png b/public/images/emoji/emoji_one/basketball_player.png
index a6904abac9..bc5aa6b3ea 100644
Binary files a/public/images/emoji/emoji_one/basketball_player.png and b/public/images/emoji/emoji_one/basketball_player.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/2.png b/public/images/emoji/emoji_one/basketball_player/2.png
index 9c1bee41ce..572fa0925f 100644
Binary files a/public/images/emoji/emoji_one/basketball_player/2.png and b/public/images/emoji/emoji_one/basketball_player/2.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/3.png b/public/images/emoji/emoji_one/basketball_player/3.png
index 275d1edd9b..203a5bbd82 100644
Binary files a/public/images/emoji/emoji_one/basketball_player/3.png and b/public/images/emoji/emoji_one/basketball_player/3.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/4.png b/public/images/emoji/emoji_one/basketball_player/4.png
index 7eb313163d..303b43c832 100644
Binary files a/public/images/emoji/emoji_one/basketball_player/4.png and b/public/images/emoji/emoji_one/basketball_player/4.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/5.png b/public/images/emoji/emoji_one/basketball_player/5.png
index fb9dc3936f..ebfd7ae793 100644
Binary files a/public/images/emoji/emoji_one/basketball_player/5.png and b/public/images/emoji/emoji_one/basketball_player/5.png differ
diff --git a/public/images/emoji/emoji_one/basketball_player/6.png b/public/images/emoji/emoji_one/basketball_player/6.png
index 6636a5024f..94d75c809b 100644
Binary files a/public/images/emoji/emoji_one/basketball_player/6.png and b/public/images/emoji/emoji_one/basketball_player/6.png differ
diff --git a/public/images/emoji/emoji_one/basketball_woman.png b/public/images/emoji/emoji_one/basketball_woman.png
index 0678a603ff..14e7d5fac3 100644
Binary files a/public/images/emoji/emoji_one/basketball_woman.png and b/public/images/emoji/emoji_one/basketball_woman.png differ
diff --git a/public/images/emoji/emoji_one/bat.png b/public/images/emoji/emoji_one/bat.png
index ba364f336e..65700dfe85 100644
Binary files a/public/images/emoji/emoji_one/bat.png and b/public/images/emoji/emoji_one/bat.png differ
diff --git a/public/images/emoji/emoji_one/bath.png b/public/images/emoji/emoji_one/bath.png
index 91ab14afe9..eb2677b402 100644
Binary files a/public/images/emoji/emoji_one/bath.png and b/public/images/emoji/emoji_one/bath.png differ
diff --git a/public/images/emoji/emoji_one/bath/2.png b/public/images/emoji/emoji_one/bath/2.png
index ce03295c2a..b90231fb06 100644
Binary files a/public/images/emoji/emoji_one/bath/2.png and b/public/images/emoji/emoji_one/bath/2.png differ
diff --git a/public/images/emoji/emoji_one/bath/3.png b/public/images/emoji/emoji_one/bath/3.png
index 830dd9c4d9..e59ac64180 100644
Binary files a/public/images/emoji/emoji_one/bath/3.png and b/public/images/emoji/emoji_one/bath/3.png differ
diff --git a/public/images/emoji/emoji_one/bath/4.png b/public/images/emoji/emoji_one/bath/4.png
index a0363bc2a0..2fdae451e2 100644
Binary files a/public/images/emoji/emoji_one/bath/4.png and b/public/images/emoji/emoji_one/bath/4.png differ
diff --git a/public/images/emoji/emoji_one/bath/5.png b/public/images/emoji/emoji_one/bath/5.png
index 17f1291f13..32ad4e75a2 100644
Binary files a/public/images/emoji/emoji_one/bath/5.png and b/public/images/emoji/emoji_one/bath/5.png differ
diff --git a/public/images/emoji/emoji_one/bath/6.png b/public/images/emoji/emoji_one/bath/6.png
index 9a9f7d1d1c..4cf359f1cb 100644
Binary files a/public/images/emoji/emoji_one/bath/6.png and b/public/images/emoji/emoji_one/bath/6.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person.png b/public/images/emoji/emoji_one/bearded_person.png
index ed22a6cb38..c58d43b952 100644
Binary files a/public/images/emoji/emoji_one/bearded_person.png and b/public/images/emoji/emoji_one/bearded_person.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/2.png b/public/images/emoji/emoji_one/bearded_person/2.png
index 4a2fdeb304..b3681462d7 100644
Binary files a/public/images/emoji/emoji_one/bearded_person/2.png and b/public/images/emoji/emoji_one/bearded_person/2.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/3.png b/public/images/emoji/emoji_one/bearded_person/3.png
index b1f6e168d7..119b89edfc 100644
Binary files a/public/images/emoji/emoji_one/bearded_person/3.png and b/public/images/emoji/emoji_one/bearded_person/3.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/4.png b/public/images/emoji/emoji_one/bearded_person/4.png
index f75b75a74e..42faf6bc41 100644
Binary files a/public/images/emoji/emoji_one/bearded_person/4.png and b/public/images/emoji/emoji_one/bearded_person/4.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/5.png b/public/images/emoji/emoji_one/bearded_person/5.png
index a9665b318a..e203c8963f 100644
Binary files a/public/images/emoji/emoji_one/bearded_person/5.png and b/public/images/emoji/emoji_one/bearded_person/5.png differ
diff --git a/public/images/emoji/emoji_one/bearded_person/6.png b/public/images/emoji/emoji_one/bearded_person/6.png
index a42b3caf88..954f548788 100644
Binary files a/public/images/emoji/emoji_one/bearded_person/6.png and b/public/images/emoji/emoji_one/bearded_person/6.png differ
diff --git a/public/images/emoji/emoji_one/beetle.png b/public/images/emoji/emoji_one/beetle.png
index 499e98e35b..68bca322d7 100644
Binary files a/public/images/emoji/emoji_one/beetle.png and b/public/images/emoji/emoji_one/beetle.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist.png b/public/images/emoji/emoji_one/bicyclist.png
index feb6048cd4..a74712953c 100644
Binary files a/public/images/emoji/emoji_one/bicyclist.png and b/public/images/emoji/emoji_one/bicyclist.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/2.png b/public/images/emoji/emoji_one/bicyclist/2.png
index 4fa4e81854..fd03ab59aa 100644
Binary files a/public/images/emoji/emoji_one/bicyclist/2.png and b/public/images/emoji/emoji_one/bicyclist/2.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/3.png b/public/images/emoji/emoji_one/bicyclist/3.png
index 295a4648cf..3083595254 100644
Binary files a/public/images/emoji/emoji_one/bicyclist/3.png and b/public/images/emoji/emoji_one/bicyclist/3.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/4.png b/public/images/emoji/emoji_one/bicyclist/4.png
index dc90355376..16139833d0 100644
Binary files a/public/images/emoji/emoji_one/bicyclist/4.png and b/public/images/emoji/emoji_one/bicyclist/4.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/5.png b/public/images/emoji/emoji_one/bicyclist/5.png
index f9d93a8923..5068892c34 100644
Binary files a/public/images/emoji/emoji_one/bicyclist/5.png and b/public/images/emoji/emoji_one/bicyclist/5.png differ
diff --git a/public/images/emoji/emoji_one/bicyclist/6.png b/public/images/emoji/emoji_one/bicyclist/6.png
index ca8ab4280f..89741e494e 100644
Binary files a/public/images/emoji/emoji_one/bicyclist/6.png and b/public/images/emoji/emoji_one/bicyclist/6.png differ
diff --git a/public/images/emoji/emoji_one/biking_man.png b/public/images/emoji/emoji_one/biking_man.png
index feb6048cd4..a74712953c 100644
Binary files a/public/images/emoji/emoji_one/biking_man.png and b/public/images/emoji/emoji_one/biking_man.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/2.png b/public/images/emoji/emoji_one/biking_man/2.png
index 4fa4e81854..fd03ab59aa 100644
Binary files a/public/images/emoji/emoji_one/biking_man/2.png and b/public/images/emoji/emoji_one/biking_man/2.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/3.png b/public/images/emoji/emoji_one/biking_man/3.png
index 295a4648cf..3083595254 100644
Binary files a/public/images/emoji/emoji_one/biking_man/3.png and b/public/images/emoji/emoji_one/biking_man/3.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/4.png b/public/images/emoji/emoji_one/biking_man/4.png
index dc90355376..16139833d0 100644
Binary files a/public/images/emoji/emoji_one/biking_man/4.png and b/public/images/emoji/emoji_one/biking_man/4.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/5.png b/public/images/emoji/emoji_one/biking_man/5.png
index f9d93a8923..5068892c34 100644
Binary files a/public/images/emoji/emoji_one/biking_man/5.png and b/public/images/emoji/emoji_one/biking_man/5.png differ
diff --git a/public/images/emoji/emoji_one/biking_man/6.png b/public/images/emoji/emoji_one/biking_man/6.png
index ca8ab4280f..89741e494e 100644
Binary files a/public/images/emoji/emoji_one/biking_man/6.png and b/public/images/emoji/emoji_one/biking_man/6.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman.png b/public/images/emoji/emoji_one/biking_woman.png
index 3e6311734d..98ae3976e0 100644
Binary files a/public/images/emoji/emoji_one/biking_woman.png and b/public/images/emoji/emoji_one/biking_woman.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/2.png b/public/images/emoji/emoji_one/biking_woman/2.png
index 42037a81c0..aa9745273b 100644
Binary files a/public/images/emoji/emoji_one/biking_woman/2.png and b/public/images/emoji/emoji_one/biking_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/3.png b/public/images/emoji/emoji_one/biking_woman/3.png
index 055393dd1c..bd3942ca18 100644
Binary files a/public/images/emoji/emoji_one/biking_woman/3.png and b/public/images/emoji/emoji_one/biking_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/4.png b/public/images/emoji/emoji_one/biking_woman/4.png
index 4bfc8b0ed9..7c2ccd98ec 100644
Binary files a/public/images/emoji/emoji_one/biking_woman/4.png and b/public/images/emoji/emoji_one/biking_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/5.png b/public/images/emoji/emoji_one/biking_woman/5.png
index b19804b8c0..dfaf405a70 100644
Binary files a/public/images/emoji/emoji_one/biking_woman/5.png and b/public/images/emoji/emoji_one/biking_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/biking_woman/6.png b/public/images/emoji/emoji_one/biking_woman/6.png
index 0fa241f856..66d259efd5 100644
Binary files a/public/images/emoji/emoji_one/biking_woman/6.png and b/public/images/emoji/emoji_one/biking_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/billed_cap.png b/public/images/emoji/emoji_one/billed_cap.png
index 5cc92e307e..53a46ea33e 100644
Binary files a/public/images/emoji/emoji_one/billed_cap.png and b/public/images/emoji/emoji_one/billed_cap.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man.png b/public/images/emoji/emoji_one/blonde_man.png
index b7e300ea9c..1dfbe295e6 100644
Binary files a/public/images/emoji/emoji_one/blonde_man.png and b/public/images/emoji/emoji_one/blonde_man.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/2.png b/public/images/emoji/emoji_one/blonde_man/2.png
index afe0242f7a..775250def1 100644
Binary files a/public/images/emoji/emoji_one/blonde_man/2.png and b/public/images/emoji/emoji_one/blonde_man/2.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/3.png b/public/images/emoji/emoji_one/blonde_man/3.png
index 39dff27938..5720c58ea9 100644
Binary files a/public/images/emoji/emoji_one/blonde_man/3.png and b/public/images/emoji/emoji_one/blonde_man/3.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/4.png b/public/images/emoji/emoji_one/blonde_man/4.png
index 02da4b5d72..8d74699a83 100644
Binary files a/public/images/emoji/emoji_one/blonde_man/4.png and b/public/images/emoji/emoji_one/blonde_man/4.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/5.png b/public/images/emoji/emoji_one/blonde_man/5.png
index e207ddaa26..adf7d3113f 100644
Binary files a/public/images/emoji/emoji_one/blonde_man/5.png and b/public/images/emoji/emoji_one/blonde_man/5.png differ
diff --git a/public/images/emoji/emoji_one/blonde_man/6.png b/public/images/emoji/emoji_one/blonde_man/6.png
index cb09defa9f..31a2d833c5 100644
Binary files a/public/images/emoji/emoji_one/blonde_man/6.png and b/public/images/emoji/emoji_one/blonde_man/6.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman.png b/public/images/emoji/emoji_one/blonde_woman.png
index 1d536ac1c2..b5b81f4588 100644
Binary files a/public/images/emoji/emoji_one/blonde_woman.png and b/public/images/emoji/emoji_one/blonde_woman.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/2.png b/public/images/emoji/emoji_one/blonde_woman/2.png
index 0e55204bb5..4996f778cf 100644
Binary files a/public/images/emoji/emoji_one/blonde_woman/2.png and b/public/images/emoji/emoji_one/blonde_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/3.png b/public/images/emoji/emoji_one/blonde_woman/3.png
index 031dd59854..5a1ef459f8 100644
Binary files a/public/images/emoji/emoji_one/blonde_woman/3.png and b/public/images/emoji/emoji_one/blonde_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/4.png b/public/images/emoji/emoji_one/blonde_woman/4.png
index 1cfc38d177..9cc66bc521 100644
Binary files a/public/images/emoji/emoji_one/blonde_woman/4.png and b/public/images/emoji/emoji_one/blonde_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/5.png b/public/images/emoji/emoji_one/blonde_woman/5.png
index 5917cb562d..8a9c369fa8 100644
Binary files a/public/images/emoji/emoji_one/blonde_woman/5.png and b/public/images/emoji/emoji_one/blonde_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/blonde_woman/6.png b/public/images/emoji/emoji_one/blonde_woman/6.png
index aad07c5065..658432d235 100644
Binary files a/public/images/emoji/emoji_one/blonde_woman/6.png and b/public/images/emoji/emoji_one/blonde_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/blue_car.png b/public/images/emoji/emoji_one/blue_car.png
index 4baeb467f5..40ef01ffa3 100644
Binary files a/public/images/emoji/emoji_one/blue_car.png and b/public/images/emoji/emoji_one/blue_car.png differ
diff --git a/public/images/emoji/emoji_one/bow.png b/public/images/emoji/emoji_one/bow.png
index b76022d3f3..43f0bdeda9 100644
Binary files a/public/images/emoji/emoji_one/bow.png and b/public/images/emoji/emoji_one/bow.png differ
diff --git a/public/images/emoji/emoji_one/bow/2.png b/public/images/emoji/emoji_one/bow/2.png
index f6d22d5fa2..4e327ec473 100644
Binary files a/public/images/emoji/emoji_one/bow/2.png and b/public/images/emoji/emoji_one/bow/2.png differ
diff --git a/public/images/emoji/emoji_one/bow/3.png b/public/images/emoji/emoji_one/bow/3.png
index f7d2ebec17..5905d065ba 100644
Binary files a/public/images/emoji/emoji_one/bow/3.png and b/public/images/emoji/emoji_one/bow/3.png differ
diff --git a/public/images/emoji/emoji_one/bow/4.png b/public/images/emoji/emoji_one/bow/4.png
index 509c8f7752..702ea34a5a 100644
Binary files a/public/images/emoji/emoji_one/bow/4.png and b/public/images/emoji/emoji_one/bow/4.png differ
diff --git a/public/images/emoji/emoji_one/bow/5.png b/public/images/emoji/emoji_one/bow/5.png
index 88f208ca89..1f0a3822d0 100644
Binary files a/public/images/emoji/emoji_one/bow/5.png and b/public/images/emoji/emoji_one/bow/5.png differ
diff --git a/public/images/emoji/emoji_one/bow/6.png b/public/images/emoji/emoji_one/bow/6.png
index e0a57ab040..4a499131f2 100644
Binary files a/public/images/emoji/emoji_one/bow/6.png and b/public/images/emoji/emoji_one/bow/6.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man.png b/public/images/emoji/emoji_one/bowing_man.png
index b76022d3f3..43f0bdeda9 100644
Binary files a/public/images/emoji/emoji_one/bowing_man.png and b/public/images/emoji/emoji_one/bowing_man.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/2.png b/public/images/emoji/emoji_one/bowing_man/2.png
index f6d22d5fa2..4e327ec473 100644
Binary files a/public/images/emoji/emoji_one/bowing_man/2.png and b/public/images/emoji/emoji_one/bowing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/3.png b/public/images/emoji/emoji_one/bowing_man/3.png
index f7d2ebec17..5905d065ba 100644
Binary files a/public/images/emoji/emoji_one/bowing_man/3.png and b/public/images/emoji/emoji_one/bowing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/4.png b/public/images/emoji/emoji_one/bowing_man/4.png
index 509c8f7752..702ea34a5a 100644
Binary files a/public/images/emoji/emoji_one/bowing_man/4.png and b/public/images/emoji/emoji_one/bowing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/5.png b/public/images/emoji/emoji_one/bowing_man/5.png
index 88f208ca89..1f0a3822d0 100644
Binary files a/public/images/emoji/emoji_one/bowing_man/5.png and b/public/images/emoji/emoji_one/bowing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/bowing_man/6.png b/public/images/emoji/emoji_one/bowing_man/6.png
index e0a57ab040..4a499131f2 100644
Binary files a/public/images/emoji/emoji_one/bowing_man/6.png and b/public/images/emoji/emoji_one/bowing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman.png b/public/images/emoji/emoji_one/bowing_woman.png
index e7b7afb18b..49fdc5dc4b 100644
Binary files a/public/images/emoji/emoji_one/bowing_woman.png and b/public/images/emoji/emoji_one/bowing_woman.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/2.png b/public/images/emoji/emoji_one/bowing_woman/2.png
index d71680cf40..a36dab29fc 100644
Binary files a/public/images/emoji/emoji_one/bowing_woman/2.png and b/public/images/emoji/emoji_one/bowing_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/3.png b/public/images/emoji/emoji_one/bowing_woman/3.png
index 6b776c893b..59039d11aa 100644
Binary files a/public/images/emoji/emoji_one/bowing_woman/3.png and b/public/images/emoji/emoji_one/bowing_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/4.png b/public/images/emoji/emoji_one/bowing_woman/4.png
index 53ff772fa4..9719185cd4 100644
Binary files a/public/images/emoji/emoji_one/bowing_woman/4.png and b/public/images/emoji/emoji_one/bowing_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/5.png b/public/images/emoji/emoji_one/bowing_woman/5.png
index ce18aa7caf..07bdd9eff2 100644
Binary files a/public/images/emoji/emoji_one/bowing_woman/5.png and b/public/images/emoji/emoji_one/bowing_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/bowing_woman/6.png b/public/images/emoji/emoji_one/bowing_woman/6.png
index fade8369bc..73d3215040 100644
Binary files a/public/images/emoji/emoji_one/bowing_woman/6.png and b/public/images/emoji/emoji_one/bowing_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/bowl_with_spoon.png b/public/images/emoji/emoji_one/bowl_with_spoon.png
index b0d88a73b9..9f0f2bd41b 100644
Binary files a/public/images/emoji/emoji_one/bowl_with_spoon.png and b/public/images/emoji/emoji_one/bowl_with_spoon.png differ
diff --git a/public/images/emoji/emoji_one/boy.png b/public/images/emoji/emoji_one/boy.png
index eb0ca9ef7e..2b18d266e4 100644
Binary files a/public/images/emoji/emoji_one/boy.png and b/public/images/emoji/emoji_one/boy.png differ
diff --git a/public/images/emoji/emoji_one/boy/2.png b/public/images/emoji/emoji_one/boy/2.png
index c87f96db0e..0c5cd81fb8 100644
Binary files a/public/images/emoji/emoji_one/boy/2.png and b/public/images/emoji/emoji_one/boy/2.png differ
diff --git a/public/images/emoji/emoji_one/boy/3.png b/public/images/emoji/emoji_one/boy/3.png
index 974e9d9976..a5d70fd217 100644
Binary files a/public/images/emoji/emoji_one/boy/3.png and b/public/images/emoji/emoji_one/boy/3.png differ
diff --git a/public/images/emoji/emoji_one/boy/4.png b/public/images/emoji/emoji_one/boy/4.png
index 2388146fb2..690825a07c 100644
Binary files a/public/images/emoji/emoji_one/boy/4.png and b/public/images/emoji/emoji_one/boy/4.png differ
diff --git a/public/images/emoji/emoji_one/boy/5.png b/public/images/emoji/emoji_one/boy/5.png
index 9095729338..2bc62f9d2d 100644
Binary files a/public/images/emoji/emoji_one/boy/5.png and b/public/images/emoji/emoji_one/boy/5.png differ
diff --git a/public/images/emoji/emoji_one/boy/6.png b/public/images/emoji/emoji_one/boy/6.png
index a0438161a9..82c12f0b8f 100644
Binary files a/public/images/emoji/emoji_one/boy/6.png and b/public/images/emoji/emoji_one/boy/6.png differ
diff --git a/public/images/emoji/emoji_one/brain.png b/public/images/emoji/emoji_one/brain.png
index c8e889faec..eabbf1630c 100644
Binary files a/public/images/emoji/emoji_one/brain.png and b/public/images/emoji/emoji_one/brain.png differ
diff --git a/public/images/emoji/emoji_one/bread.png b/public/images/emoji/emoji_one/bread.png
index e79d2841f8..ff0c2707b6 100644
Binary files a/public/images/emoji/emoji_one/bread.png and b/public/images/emoji/emoji_one/bread.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding.png b/public/images/emoji/emoji_one/breast_feeding.png
index 22b935f80b..60e15e3ae3 100644
Binary files a/public/images/emoji/emoji_one/breast_feeding.png and b/public/images/emoji/emoji_one/breast_feeding.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/2.png b/public/images/emoji/emoji_one/breast_feeding/2.png
new file mode 100644
index 0000000000..65df960b70
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/2.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/3.png b/public/images/emoji/emoji_one/breast_feeding/3.png
new file mode 100644
index 0000000000..20ecfe2978
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/3.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/4.png b/public/images/emoji/emoji_one/breast_feeding/4.png
new file mode 100644
index 0000000000..b2341d8aae
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/4.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/5.png b/public/images/emoji/emoji_one/breast_feeding/5.png
new file mode 100644
index 0000000000..8e3a8eb70f
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/5.png differ
diff --git a/public/images/emoji/emoji_one/breast_feeding/6.png b/public/images/emoji/emoji_one/breast_feeding/6.png
new file mode 100644
index 0000000000..842d627356
Binary files /dev/null and b/public/images/emoji/emoji_one/breast_feeding/6.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil.png b/public/images/emoji/emoji_one/bride_with_veil.png
index 266ea22000..05ca64cd91 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil.png and b/public/images/emoji/emoji_one/bride_with_veil.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/2.png b/public/images/emoji/emoji_one/bride_with_veil/2.png
index 2bbccd37ce..f345807c51 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil/2.png and b/public/images/emoji/emoji_one/bride_with_veil/2.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/3.png b/public/images/emoji/emoji_one/bride_with_veil/3.png
index d6d86151ec..fd9cffe983 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil/3.png and b/public/images/emoji/emoji_one/bride_with_veil/3.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/4.png b/public/images/emoji/emoji_one/bride_with_veil/4.png
index bfc2d74c39..17a8e36f7f 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil/4.png and b/public/images/emoji/emoji_one/bride_with_veil/4.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/5.png b/public/images/emoji/emoji_one/bride_with_veil/5.png
index 085b7ffd7a..e3fbb25250 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil/5.png and b/public/images/emoji/emoji_one/bride_with_veil/5.png differ
diff --git a/public/images/emoji/emoji_one/bride_with_veil/6.png b/public/images/emoji/emoji_one/bride_with_veil/6.png
index e650ad355d..f5c03d37da 100644
Binary files a/public/images/emoji/emoji_one/bride_with_veil/6.png and b/public/images/emoji/emoji_one/bride_with_veil/6.png differ
diff --git a/public/images/emoji/emoji_one/broccoli.png b/public/images/emoji/emoji_one/broccoli.png
index 74f1b2a7de..bfb8d83b42 100644
Binary files a/public/images/emoji/emoji_one/broccoli.png and b/public/images/emoji/emoji_one/broccoli.png differ
diff --git a/public/images/emoji/emoji_one/bus.png b/public/images/emoji/emoji_one/bus.png
index 8cad8a67ff..d04ab7c29b 100644
Binary files a/public/images/emoji/emoji_one/bus.png and b/public/images/emoji/emoji_one/bus.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating.png b/public/images/emoji/emoji_one/business_suit_levitating.png
index f25e14fd06..b880f689b9 100644
Binary files a/public/images/emoji/emoji_one/business_suit_levitating.png and b/public/images/emoji/emoji_one/business_suit_levitating.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/2.png b/public/images/emoji/emoji_one/business_suit_levitating/2.png
index c8af4516a2..20ca989182 100644
Binary files a/public/images/emoji/emoji_one/business_suit_levitating/2.png and b/public/images/emoji/emoji_one/business_suit_levitating/2.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/3.png b/public/images/emoji/emoji_one/business_suit_levitating/3.png
index ed5fde06d4..4c3c6694bf 100644
Binary files a/public/images/emoji/emoji_one/business_suit_levitating/3.png and b/public/images/emoji/emoji_one/business_suit_levitating/3.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/4.png b/public/images/emoji/emoji_one/business_suit_levitating/4.png
index 631c51d4e6..cc1ec83794 100644
Binary files a/public/images/emoji/emoji_one/business_suit_levitating/4.png and b/public/images/emoji/emoji_one/business_suit_levitating/4.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/5.png b/public/images/emoji/emoji_one/business_suit_levitating/5.png
index 5bbb08cab4..f76955c717 100644
Binary files a/public/images/emoji/emoji_one/business_suit_levitating/5.png and b/public/images/emoji/emoji_one/business_suit_levitating/5.png differ
diff --git a/public/images/emoji/emoji_one/business_suit_levitating/6.png b/public/images/emoji/emoji_one/business_suit_levitating/6.png
index 84fd92bd35..c129851655 100644
Binary files a/public/images/emoji/emoji_one/business_suit_levitating/6.png and b/public/images/emoji/emoji_one/business_suit_levitating/6.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/2.png b/public/images/emoji/emoji_one/call_me_hand/2.png
index 35ac0f5bae..bb3cc68419 100644
Binary files a/public/images/emoji/emoji_one/call_me_hand/2.png and b/public/images/emoji/emoji_one/call_me_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/3.png b/public/images/emoji/emoji_one/call_me_hand/3.png
index a9e5e03937..1b8f8eb16e 100644
Binary files a/public/images/emoji/emoji_one/call_me_hand/3.png and b/public/images/emoji/emoji_one/call_me_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/4.png b/public/images/emoji/emoji_one/call_me_hand/4.png
index 9be8eeff9c..14aa1d58b8 100644
Binary files a/public/images/emoji/emoji_one/call_me_hand/4.png and b/public/images/emoji/emoji_one/call_me_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/5.png b/public/images/emoji/emoji_one/call_me_hand/5.png
index eea7d6a9ed..1713274126 100644
Binary files a/public/images/emoji/emoji_one/call_me_hand/5.png and b/public/images/emoji/emoji_one/call_me_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/call_me_hand/6.png b/public/images/emoji/emoji_one/call_me_hand/6.png
index 4ccd08ca8f..e8ae0d27a4 100644
Binary files a/public/images/emoji/emoji_one/call_me_hand/6.png and b/public/images/emoji/emoji_one/call_me_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/canned_food.png b/public/images/emoji/emoji_one/canned_food.png
index 2e5976e9d2..a477d8e27b 100644
Binary files a/public/images/emoji/emoji_one/canned_food.png and b/public/images/emoji/emoji_one/canned_food.png differ
diff --git a/public/images/emoji/emoji_one/car.png b/public/images/emoji/emoji_one/car.png
index a5f65e3832..5755dee2a7 100644
Binary files a/public/images/emoji/emoji_one/car.png and b/public/images/emoji/emoji_one/car.png differ
diff --git a/public/images/emoji/emoji_one/chestnut.png b/public/images/emoji/emoji_one/chestnut.png
index 2bf74e110d..da815b4bf7 100644
Binary files a/public/images/emoji/emoji_one/chestnut.png and b/public/images/emoji/emoji_one/chestnut.png differ
diff --git a/public/images/emoji/emoji_one/child.png b/public/images/emoji/emoji_one/child.png
index 33e50494a3..6e2e876a6b 100644
Binary files a/public/images/emoji/emoji_one/child.png and b/public/images/emoji/emoji_one/child.png differ
diff --git a/public/images/emoji/emoji_one/child/2.png b/public/images/emoji/emoji_one/child/2.png
index 7a0e4f1cb7..6b35a5dc9c 100644
Binary files a/public/images/emoji/emoji_one/child/2.png and b/public/images/emoji/emoji_one/child/2.png differ
diff --git a/public/images/emoji/emoji_one/child/3.png b/public/images/emoji/emoji_one/child/3.png
index 81a69110e9..6165ba3398 100644
Binary files a/public/images/emoji/emoji_one/child/3.png and b/public/images/emoji/emoji_one/child/3.png differ
diff --git a/public/images/emoji/emoji_one/child/4.png b/public/images/emoji/emoji_one/child/4.png
index b5c64c9cc8..e7d334c1af 100644
Binary files a/public/images/emoji/emoji_one/child/4.png and b/public/images/emoji/emoji_one/child/4.png differ
diff --git a/public/images/emoji/emoji_one/child/5.png b/public/images/emoji/emoji_one/child/5.png
index 0763a8bd94..3a570cee8a 100644
Binary files a/public/images/emoji/emoji_one/child/5.png and b/public/images/emoji/emoji_one/child/5.png differ
diff --git a/public/images/emoji/emoji_one/child/6.png b/public/images/emoji/emoji_one/child/6.png
index 3ed705b902..fbdd6a03e6 100644
Binary files a/public/images/emoji/emoji_one/child/6.png and b/public/images/emoji/emoji_one/child/6.png differ
diff --git a/public/images/emoji/emoji_one/chipmunk.png b/public/images/emoji/emoji_one/chipmunk.png
index a959f55dbe..83541f8f50 100644
Binary files a/public/images/emoji/emoji_one/chipmunk.png and b/public/images/emoji/emoji_one/chipmunk.png differ
diff --git a/public/images/emoji/emoji_one/chocolate_bar.png b/public/images/emoji/emoji_one/chocolate_bar.png
index 92b21045da..e6e14fedb8 100644
Binary files a/public/images/emoji/emoji_one/chocolate_bar.png and b/public/images/emoji/emoji_one/chocolate_bar.png differ
diff --git a/public/images/emoji/emoji_one/chopsticks.png b/public/images/emoji/emoji_one/chopsticks.png
index 3bcd601a3f..5b80933a3a 100644
Binary files a/public/images/emoji/emoji_one/chopsticks.png and b/public/images/emoji/emoji_one/chopsticks.png differ
diff --git a/public/images/emoji/emoji_one/clap/2.png b/public/images/emoji/emoji_one/clap/2.png
index c5e73e6d39..38b6a707d7 100644
Binary files a/public/images/emoji/emoji_one/clap/2.png and b/public/images/emoji/emoji_one/clap/2.png differ
diff --git a/public/images/emoji/emoji_one/clap/3.png b/public/images/emoji/emoji_one/clap/3.png
index fbe9680295..a3568f864f 100644
Binary files a/public/images/emoji/emoji_one/clap/3.png and b/public/images/emoji/emoji_one/clap/3.png differ
diff --git a/public/images/emoji/emoji_one/clap/4.png b/public/images/emoji/emoji_one/clap/4.png
index 46056c30c0..ca1a86bae2 100644
Binary files a/public/images/emoji/emoji_one/clap/4.png and b/public/images/emoji/emoji_one/clap/4.png differ
diff --git a/public/images/emoji/emoji_one/clap/5.png b/public/images/emoji/emoji_one/clap/5.png
index 23404f8b0c..407f2f65e7 100644
Binary files a/public/images/emoji/emoji_one/clap/5.png and b/public/images/emoji/emoji_one/clap/5.png differ
diff --git a/public/images/emoji/emoji_one/clap/6.png b/public/images/emoji/emoji_one/clap/6.png
index 259db111c6..703f211b1e 100644
Binary files a/public/images/emoji/emoji_one/clap/6.png and b/public/images/emoji/emoji_one/clap/6.png differ
diff --git a/public/images/emoji/emoji_one/clapper.png b/public/images/emoji/emoji_one/clapper.png
index f2b3f78a57..4b2b43d6d7 100644
Binary files a/public/images/emoji/emoji_one/clapper.png and b/public/images/emoji/emoji_one/clapper.png differ
diff --git a/public/images/emoji/emoji_one/coat.png b/public/images/emoji/emoji_one/coat.png
index c409f9f4c4..dd93e9fbe5 100644
Binary files a/public/images/emoji/emoji_one/coat.png and b/public/images/emoji/emoji_one/coat.png differ
diff --git a/public/images/emoji/emoji_one/coconut.png b/public/images/emoji/emoji_one/coconut.png
index e76b533149..332601f31e 100644
Binary files a/public/images/emoji/emoji_one/coconut.png and b/public/images/emoji/emoji_one/coconut.png differ
diff --git a/public/images/emoji/emoji_one/cold_sweat.png b/public/images/emoji/emoji_one/cold_sweat.png
index b6a51008fe..81b918de6e 100644
Binary files a/public/images/emoji/emoji_one/cold_sweat.png and b/public/images/emoji/emoji_one/cold_sweat.png differ
diff --git a/public/images/emoji/emoji_one/confounded.png b/public/images/emoji/emoji_one/confounded.png
index 9f57374a99..b4d759476f 100644
Binary files a/public/images/emoji/emoji_one/confounded.png and b/public/images/emoji/emoji_one/confounded.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker.png b/public/images/emoji/emoji_one/construction_worker.png
index 0b464f0625..f3550fb038 100644
Binary files a/public/images/emoji/emoji_one/construction_worker.png and b/public/images/emoji/emoji_one/construction_worker.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/2.png b/public/images/emoji/emoji_one/construction_worker/2.png
index e6903c1f1e..6bc1aabe02 100644
Binary files a/public/images/emoji/emoji_one/construction_worker/2.png and b/public/images/emoji/emoji_one/construction_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/3.png b/public/images/emoji/emoji_one/construction_worker/3.png
index 3f4d0241f8..f24e0421aa 100644
Binary files a/public/images/emoji/emoji_one/construction_worker/3.png and b/public/images/emoji/emoji_one/construction_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/4.png b/public/images/emoji/emoji_one/construction_worker/4.png
index acbe3b8cb5..fb6d38e646 100644
Binary files a/public/images/emoji/emoji_one/construction_worker/4.png and b/public/images/emoji/emoji_one/construction_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/5.png b/public/images/emoji/emoji_one/construction_worker/5.png
index 4da35b048a..9d9c7c04e9 100644
Binary files a/public/images/emoji/emoji_one/construction_worker/5.png and b/public/images/emoji/emoji_one/construction_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker/6.png b/public/images/emoji/emoji_one/construction_worker/6.png
index 367b28ae4b..9401983b70 100644
Binary files a/public/images/emoji/emoji_one/construction_worker/6.png and b/public/images/emoji/emoji_one/construction_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man.png b/public/images/emoji/emoji_one/construction_worker_man.png
index 0b464f0625..f3550fb038 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_man.png and b/public/images/emoji/emoji_one/construction_worker_man.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/2.png b/public/images/emoji/emoji_one/construction_worker_man/2.png
index e6903c1f1e..6bc1aabe02 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_man/2.png and b/public/images/emoji/emoji_one/construction_worker_man/2.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/3.png b/public/images/emoji/emoji_one/construction_worker_man/3.png
index 3f4d0241f8..f24e0421aa 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_man/3.png and b/public/images/emoji/emoji_one/construction_worker_man/3.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/4.png b/public/images/emoji/emoji_one/construction_worker_man/4.png
index acbe3b8cb5..fb6d38e646 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_man/4.png and b/public/images/emoji/emoji_one/construction_worker_man/4.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/5.png b/public/images/emoji/emoji_one/construction_worker_man/5.png
index 4da35b048a..9d9c7c04e9 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_man/5.png and b/public/images/emoji/emoji_one/construction_worker_man/5.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_man/6.png b/public/images/emoji/emoji_one/construction_worker_man/6.png
index 367b28ae4b..9401983b70 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_man/6.png and b/public/images/emoji/emoji_one/construction_worker_man/6.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman.png b/public/images/emoji/emoji_one/construction_worker_woman.png
index 8db867b438..47199f11ff 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_woman.png and b/public/images/emoji/emoji_one/construction_worker_woman.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/2.png b/public/images/emoji/emoji_one/construction_worker_woman/2.png
index bb290a4825..2c0501f240 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_woman/2.png and b/public/images/emoji/emoji_one/construction_worker_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/3.png b/public/images/emoji/emoji_one/construction_worker_woman/3.png
index 12aa0b45dd..dd2eff582d 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_woman/3.png and b/public/images/emoji/emoji_one/construction_worker_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/4.png b/public/images/emoji/emoji_one/construction_worker_woman/4.png
index 18fce71a77..92ad84d196 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_woman/4.png and b/public/images/emoji/emoji_one/construction_worker_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/5.png b/public/images/emoji/emoji_one/construction_worker_woman/5.png
index d610198eab..7324735095 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_woman/5.png and b/public/images/emoji/emoji_one/construction_worker_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/construction_worker_woman/6.png b/public/images/emoji/emoji_one/construction_worker_woman/6.png
index fa57fb7f3e..b6600c7373 100644
Binary files a/public/images/emoji/emoji_one/construction_worker_woman/6.png and b/public/images/emoji/emoji_one/construction_worker_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/cookie.png b/public/images/emoji/emoji_one/cookie.png
index 6d168d3b19..5ddfd7e8b0 100644
Binary files a/public/images/emoji/emoji_one/cookie.png and b/public/images/emoji/emoji_one/cookie.png differ
diff --git a/public/images/emoji/emoji_one/cop.png b/public/images/emoji/emoji_one/cop.png
index d6cf91384e..ad6742c9c0 100644
Binary files a/public/images/emoji/emoji_one/cop.png and b/public/images/emoji/emoji_one/cop.png differ
diff --git a/public/images/emoji/emoji_one/cop/2.png b/public/images/emoji/emoji_one/cop/2.png
index 0b83eee330..a1373eaf8f 100644
Binary files a/public/images/emoji/emoji_one/cop/2.png and b/public/images/emoji/emoji_one/cop/2.png differ
diff --git a/public/images/emoji/emoji_one/cop/3.png b/public/images/emoji/emoji_one/cop/3.png
index 5b8dedac12..167a0412b0 100644
Binary files a/public/images/emoji/emoji_one/cop/3.png and b/public/images/emoji/emoji_one/cop/3.png differ
diff --git a/public/images/emoji/emoji_one/cop/4.png b/public/images/emoji/emoji_one/cop/4.png
index f6cccf50a5..4292f33eef 100644
Binary files a/public/images/emoji/emoji_one/cop/4.png and b/public/images/emoji/emoji_one/cop/4.png differ
diff --git a/public/images/emoji/emoji_one/cop/5.png b/public/images/emoji/emoji_one/cop/5.png
index ae3b2d81e6..49e49d38dd 100644
Binary files a/public/images/emoji/emoji_one/cop/5.png and b/public/images/emoji/emoji_one/cop/5.png differ
diff --git a/public/images/emoji/emoji_one/cop/6.png b/public/images/emoji/emoji_one/cop/6.png
index 6d74f9bd25..772e55693f 100644
Binary files a/public/images/emoji/emoji_one/cop/6.png and b/public/images/emoji/emoji_one/cop/6.png differ
diff --git a/public/images/emoji/emoji_one/couple.png b/public/images/emoji/emoji_one/couple.png
index b664d1ca4b..bd1907dfa0 100644
Binary files a/public/images/emoji/emoji_one/couple.png and b/public/images/emoji/emoji_one/couple.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart.png b/public/images/emoji/emoji_one/couple_with_heart.png
index f4d1ce0c37..50d8998355 100644
Binary files a/public/images/emoji/emoji_one/couple_with_heart.png and b/public/images/emoji/emoji_one/couple_with_heart.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart_man_man.png b/public/images/emoji/emoji_one/couple_with_heart_man_man.png
index c8b688db39..4b69d0f920 100644
Binary files a/public/images/emoji/emoji_one/couple_with_heart_man_man.png and b/public/images/emoji/emoji_one/couple_with_heart_man_man.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart_woman_man.png b/public/images/emoji/emoji_one/couple_with_heart_woman_man.png
index f4d1ce0c37..50d8998355 100644
Binary files a/public/images/emoji/emoji_one/couple_with_heart_woman_man.png and b/public/images/emoji/emoji_one/couple_with_heart_woman_man.png differ
diff --git a/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png b/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png
index 8f47f828f3..e7c428cf4c 100644
Binary files a/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png and b/public/images/emoji/emoji_one/couple_with_heart_woman_woman.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss.png b/public/images/emoji/emoji_one/couplekiss.png
index dae18ed1db..d10715713c 100644
Binary files a/public/images/emoji/emoji_one/couplekiss.png and b/public/images/emoji/emoji_one/couplekiss.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss_man_man.png b/public/images/emoji/emoji_one/couplekiss_man_man.png
index 851abf3341..ad67a6194b 100644
Binary files a/public/images/emoji/emoji_one/couplekiss_man_man.png and b/public/images/emoji/emoji_one/couplekiss_man_man.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss_man_woman.png b/public/images/emoji/emoji_one/couplekiss_man_woman.png
index dae18ed1db..d10715713c 100644
Binary files a/public/images/emoji/emoji_one/couplekiss_man_woman.png and b/public/images/emoji/emoji_one/couplekiss_man_woman.png differ
diff --git a/public/images/emoji/emoji_one/couplekiss_woman_woman.png b/public/images/emoji/emoji_one/couplekiss_woman_woman.png
index ca34f3376b..86772728e7 100644
Binary files a/public/images/emoji/emoji_one/couplekiss_woman_woman.png and b/public/images/emoji/emoji_one/couplekiss_woman_woman.png differ
diff --git a/public/images/emoji/emoji_one/cowboy_hat_face.png b/public/images/emoji/emoji_one/cowboy_hat_face.png
index 389ac97c45..c8bfd71aa2 100644
Binary files a/public/images/emoji/emoji_one/cowboy_hat_face.png and b/public/images/emoji/emoji_one/cowboy_hat_face.png differ
diff --git a/public/images/emoji/emoji_one/crazy_face.png b/public/images/emoji/emoji_one/crazy_face.png
index 0aaa1cf765..8098a0f910 100644
Binary files a/public/images/emoji/emoji_one/crazy_face.png and b/public/images/emoji/emoji_one/crazy_face.png differ
diff --git a/public/images/emoji/emoji_one/cricket.png b/public/images/emoji/emoji_one/cricket.png
index 293f5d891d..8195229642 100644
Binary files a/public/images/emoji/emoji_one/cricket.png and b/public/images/emoji/emoji_one/cricket.png differ
diff --git a/public/images/emoji/emoji_one/crocodile.png b/public/images/emoji/emoji_one/crocodile.png
index 10a920d0e3..4b5918bf7d 100644
Binary files a/public/images/emoji/emoji_one/crocodile.png and b/public/images/emoji/emoji_one/crocodile.png differ
diff --git a/public/images/emoji/emoji_one/croissant.png b/public/images/emoji/emoji_one/croissant.png
index f9ba6cdba5..b0dcb10620 100644
Binary files a/public/images/emoji/emoji_one/croissant.png and b/public/images/emoji/emoji_one/croissant.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/2.png b/public/images/emoji/emoji_one/crossed_fingers/2.png
index 9e9e1666dc..473b7ba4fe 100644
Binary files a/public/images/emoji/emoji_one/crossed_fingers/2.png and b/public/images/emoji/emoji_one/crossed_fingers/2.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/3.png b/public/images/emoji/emoji_one/crossed_fingers/3.png
index f7caf65800..7567205d6a 100644
Binary files a/public/images/emoji/emoji_one/crossed_fingers/3.png and b/public/images/emoji/emoji_one/crossed_fingers/3.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/4.png b/public/images/emoji/emoji_one/crossed_fingers/4.png
index 22e97a6723..250c150960 100644
Binary files a/public/images/emoji/emoji_one/crossed_fingers/4.png and b/public/images/emoji/emoji_one/crossed_fingers/4.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/5.png b/public/images/emoji/emoji_one/crossed_fingers/5.png
index f847d3d9b3..1961892b4c 100644
Binary files a/public/images/emoji/emoji_one/crossed_fingers/5.png and b/public/images/emoji/emoji_one/crossed_fingers/5.png differ
diff --git a/public/images/emoji/emoji_one/crossed_fingers/6.png b/public/images/emoji/emoji_one/crossed_fingers/6.png
index e9bf6498ad..698b0e3ec3 100644
Binary files a/public/images/emoji/emoji_one/crossed_fingers/6.png and b/public/images/emoji/emoji_one/crossed_fingers/6.png differ
diff --git a/public/images/emoji/emoji_one/cry.png b/public/images/emoji/emoji_one/cry.png
index b865f00cd0..93bc582ff7 100644
Binary files a/public/images/emoji/emoji_one/cry.png and b/public/images/emoji/emoji_one/cry.png differ
diff --git a/public/images/emoji/emoji_one/cup_with_straw.png b/public/images/emoji/emoji_one/cup_with_straw.png
index 4b2f313f9b..b4188d416c 100644
Binary files a/public/images/emoji/emoji_one/cup_with_straw.png and b/public/images/emoji/emoji_one/cup_with_straw.png differ
diff --git a/public/images/emoji/emoji_one/curling_stone.png b/public/images/emoji/emoji_one/curling_stone.png
index 7e8795ae18..22bf4336c9 100644
Binary files a/public/images/emoji/emoji_one/curling_stone.png and b/public/images/emoji/emoji_one/curling_stone.png differ
diff --git a/public/images/emoji/emoji_one/cut_of_meat.png b/public/images/emoji/emoji_one/cut_of_meat.png
index 57fe5d182e..8412c03d81 100644
Binary files a/public/images/emoji/emoji_one/cut_of_meat.png and b/public/images/emoji/emoji_one/cut_of_meat.png differ
diff --git a/public/images/emoji/emoji_one/dancer.png b/public/images/emoji/emoji_one/dancer.png
index fbfed2500a..74616bab2b 100644
Binary files a/public/images/emoji/emoji_one/dancer.png and b/public/images/emoji/emoji_one/dancer.png differ
diff --git a/public/images/emoji/emoji_one/dancer/2.png b/public/images/emoji/emoji_one/dancer/2.png
index 0670be7294..196ebd7966 100644
Binary files a/public/images/emoji/emoji_one/dancer/2.png and b/public/images/emoji/emoji_one/dancer/2.png differ
diff --git a/public/images/emoji/emoji_one/dancer/3.png b/public/images/emoji/emoji_one/dancer/3.png
index a57bc146cc..05d15b2959 100644
Binary files a/public/images/emoji/emoji_one/dancer/3.png and b/public/images/emoji/emoji_one/dancer/3.png differ
diff --git a/public/images/emoji/emoji_one/dancer/4.png b/public/images/emoji/emoji_one/dancer/4.png
index 05d419e7e2..81fcac87f6 100644
Binary files a/public/images/emoji/emoji_one/dancer/4.png and b/public/images/emoji/emoji_one/dancer/4.png differ
diff --git a/public/images/emoji/emoji_one/dancer/5.png b/public/images/emoji/emoji_one/dancer/5.png
index f3daf87704..ec9bff7a8a 100644
Binary files a/public/images/emoji/emoji_one/dancer/5.png and b/public/images/emoji/emoji_one/dancer/5.png differ
diff --git a/public/images/emoji/emoji_one/dancer/6.png b/public/images/emoji/emoji_one/dancer/6.png
index 73ebeafcd1..4848587a5f 100644
Binary files a/public/images/emoji/emoji_one/dancer/6.png and b/public/images/emoji/emoji_one/dancer/6.png differ
diff --git a/public/images/emoji/emoji_one/dancers.png b/public/images/emoji/emoji_one/dancers.png
index 2ec8588575..023ea9ec4c 100644
Binary files a/public/images/emoji/emoji_one/dancers.png and b/public/images/emoji/emoji_one/dancers.png differ
diff --git a/public/images/emoji/emoji_one/dancing_men.png b/public/images/emoji/emoji_one/dancing_men.png
index 3d42f55004..bc3f24c692 100644
Binary files a/public/images/emoji/emoji_one/dancing_men.png and b/public/images/emoji/emoji_one/dancing_men.png differ
diff --git a/public/images/emoji/emoji_one/dancing_women.png b/public/images/emoji/emoji_one/dancing_women.png
index 2ec8588575..023ea9ec4c 100644
Binary files a/public/images/emoji/emoji_one/dancing_women.png and b/public/images/emoji/emoji_one/dancing_women.png differ
diff --git a/public/images/emoji/emoji_one/dark_sunglasses.png b/public/images/emoji/emoji_one/dark_sunglasses.png
index 295f83c364..7eb1ae31c2 100644
Binary files a/public/images/emoji/emoji_one/dark_sunglasses.png and b/public/images/emoji/emoji_one/dark_sunglasses.png differ
diff --git a/public/images/emoji/emoji_one/disappointed.png b/public/images/emoji/emoji_one/disappointed.png
index 5d5d8cfbc9..a75e90c776 100644
Binary files a/public/images/emoji/emoji_one/disappointed.png and b/public/images/emoji/emoji_one/disappointed.png differ
diff --git a/public/images/emoji/emoji_one/disappointed_relieved.png b/public/images/emoji/emoji_one/disappointed_relieved.png
index e21683c159..e3ee8bda8a 100644
Binary files a/public/images/emoji/emoji_one/disappointed_relieved.png and b/public/images/emoji/emoji_one/disappointed_relieved.png differ
diff --git a/public/images/emoji/emoji_one/drooling_face.png b/public/images/emoji/emoji_one/drooling_face.png
index 8e07532e79..d8ad735662 100644
Binary files a/public/images/emoji/emoji_one/drooling_face.png and b/public/images/emoji/emoji_one/drooling_face.png differ
diff --git a/public/images/emoji/emoji_one/dumpling.png b/public/images/emoji/emoji_one/dumpling.png
index 45150c00d5..95d1d4c4e9 100644
Binary files a/public/images/emoji/emoji_one/dumpling.png and b/public/images/emoji/emoji_one/dumpling.png differ
diff --git a/public/images/emoji/emoji_one/ear/2.png b/public/images/emoji/emoji_one/ear/2.png
index 3d6b2b7178..928c3543a7 100644
Binary files a/public/images/emoji/emoji_one/ear/2.png and b/public/images/emoji/emoji_one/ear/2.png differ
diff --git a/public/images/emoji/emoji_one/ear/3.png b/public/images/emoji/emoji_one/ear/3.png
index 2634e607a6..db1584488f 100644
Binary files a/public/images/emoji/emoji_one/ear/3.png and b/public/images/emoji/emoji_one/ear/3.png differ
diff --git a/public/images/emoji/emoji_one/ear/4.png b/public/images/emoji/emoji_one/ear/4.png
index 7a7f3dea19..0582c2c236 100644
Binary files a/public/images/emoji/emoji_one/ear/4.png and b/public/images/emoji/emoji_one/ear/4.png differ
diff --git a/public/images/emoji/emoji_one/ear/5.png b/public/images/emoji/emoji_one/ear/5.png
index 59fbe52053..f71be88d0d 100644
Binary files a/public/images/emoji/emoji_one/ear/5.png and b/public/images/emoji/emoji_one/ear/5.png differ
diff --git a/public/images/emoji/emoji_one/ear/6.png b/public/images/emoji/emoji_one/ear/6.png
index 26401ce434..e611b2e06e 100644
Binary files a/public/images/emoji/emoji_one/ear/6.png and b/public/images/emoji/emoji_one/ear/6.png differ
diff --git a/public/images/emoji/emoji_one/eggplant.png b/public/images/emoji/emoji_one/eggplant.png
index e733c5d366..0fc6bf8252 100644
Binary files a/public/images/emoji/emoji_one/eggplant.png and b/public/images/emoji/emoji_one/eggplant.png differ
diff --git a/public/images/emoji/emoji_one/elf.png b/public/images/emoji/emoji_one/elf.png
index f8b6dd873e..b7e9ede465 100644
Binary files a/public/images/emoji/emoji_one/elf.png and b/public/images/emoji/emoji_one/elf.png differ
diff --git a/public/images/emoji/emoji_one/elf/2.png b/public/images/emoji/emoji_one/elf/2.png
index 15984024f2..c5eb705be1 100644
Binary files a/public/images/emoji/emoji_one/elf/2.png and b/public/images/emoji/emoji_one/elf/2.png differ
diff --git a/public/images/emoji/emoji_one/elf/3.png b/public/images/emoji/emoji_one/elf/3.png
index 4689243a17..89fc04491c 100644
Binary files a/public/images/emoji/emoji_one/elf/3.png and b/public/images/emoji/emoji_one/elf/3.png differ
diff --git a/public/images/emoji/emoji_one/elf/4.png b/public/images/emoji/emoji_one/elf/4.png
index 861cbf808c..e95e3b03ea 100644
Binary files a/public/images/emoji/emoji_one/elf/4.png and b/public/images/emoji/emoji_one/elf/4.png differ
diff --git a/public/images/emoji/emoji_one/elf/5.png b/public/images/emoji/emoji_one/elf/5.png
index 5074876010..68b6c22551 100644
Binary files a/public/images/emoji/emoji_one/elf/5.png and b/public/images/emoji/emoji_one/elf/5.png differ
diff --git a/public/images/emoji/emoji_one/elf/6.png b/public/images/emoji/emoji_one/elf/6.png
index 505c908b18..244c6b574b 100644
Binary files a/public/images/emoji/emoji_one/elf/6.png and b/public/images/emoji/emoji_one/elf/6.png differ
diff --git a/public/images/emoji/emoji_one/exploding_head.png b/public/images/emoji/emoji_one/exploding_head.png
index af1108c31e..9945d0b0f5 100644
Binary files a/public/images/emoji/emoji_one/exploding_head.png and b/public/images/emoji/emoji_one/exploding_head.png differ
diff --git a/public/images/emoji/emoji_one/expressionless.png b/public/images/emoji/emoji_one/expressionless.png
index bc436e20d4..acb8900446 100644
Binary files a/public/images/emoji/emoji_one/expressionless.png and b/public/images/emoji/emoji_one/expressionless.png differ
diff --git a/public/images/emoji/emoji_one/eyeglasses.png b/public/images/emoji/emoji_one/eyeglasses.png
index ae4484bc66..ab0d01d3c4 100644
Binary files a/public/images/emoji/emoji_one/eyeglasses.png and b/public/images/emoji/emoji_one/eyeglasses.png differ
diff --git a/public/images/emoji/emoji_one/eyes.png b/public/images/emoji/emoji_one/eyes.png
index 95e53d50b4..b5dc2d0f25 100644
Binary files a/public/images/emoji/emoji_one/eyes.png and b/public/images/emoji/emoji_one/eyes.png differ
diff --git a/public/images/emoji/emoji_one/face_vomiting.png b/public/images/emoji/emoji_one/face_vomiting.png
index a79017a1eb..60b8fb4bab 100644
Binary files a/public/images/emoji/emoji_one/face_vomiting.png and b/public/images/emoji/emoji_one/face_vomiting.png differ
diff --git a/public/images/emoji/emoji_one/face_with_hand_over_mouth.png b/public/images/emoji/emoji_one/face_with_hand_over_mouth.png
index aed8f62e0b..9848625592 100644
Binary files a/public/images/emoji/emoji_one/face_with_hand_over_mouth.png and b/public/images/emoji/emoji_one/face_with_hand_over_mouth.png differ
diff --git a/public/images/emoji/emoji_one/face_with_head_bandage.png b/public/images/emoji/emoji_one/face_with_head_bandage.png
index ed6dc56acc..36cfc0d6e6 100644
Binary files a/public/images/emoji/emoji_one/face_with_head_bandage.png and b/public/images/emoji/emoji_one/face_with_head_bandage.png differ
diff --git a/public/images/emoji/emoji_one/face_with_monocle.png b/public/images/emoji/emoji_one/face_with_monocle.png
index c6fbb4481d..a28a9dd741 100644
Binary files a/public/images/emoji/emoji_one/face_with_monocle.png and b/public/images/emoji/emoji_one/face_with_monocle.png differ
diff --git a/public/images/emoji/emoji_one/face_with_raised_eyebrow.png b/public/images/emoji/emoji_one/face_with_raised_eyebrow.png
index 4a5d139f5c..1cdbcf410f 100644
Binary files a/public/images/emoji/emoji_one/face_with_raised_eyebrow.png and b/public/images/emoji/emoji_one/face_with_raised_eyebrow.png differ
diff --git a/public/images/emoji/emoji_one/face_with_rolling_eyes.png b/public/images/emoji/emoji_one/face_with_rolling_eyes.png
index dc4f8c1385..e6fa5b3d7b 100644
Binary files a/public/images/emoji/emoji_one/face_with_rolling_eyes.png and b/public/images/emoji/emoji_one/face_with_rolling_eyes.png differ
diff --git a/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png b/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png
index 84bb9ec9c5..af49373833 100644
Binary files a/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png and b/public/images/emoji/emoji_one/face_with_symbols_over_mouth.png differ
diff --git a/public/images/emoji/emoji_one/face_with_thermometer.png b/public/images/emoji/emoji_one/face_with_thermometer.png
index abfed8eb56..9ba627bbaf 100644
Binary files a/public/images/emoji/emoji_one/face_with_thermometer.png and b/public/images/emoji/emoji_one/face_with_thermometer.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/2.png b/public/images/emoji/emoji_one/facepunch/2.png
index ba746c9f2e..42f2b3cbdf 100644
Binary files a/public/images/emoji/emoji_one/facepunch/2.png and b/public/images/emoji/emoji_one/facepunch/2.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/3.png b/public/images/emoji/emoji_one/facepunch/3.png
index 35ecc381dc..8171539a60 100644
Binary files a/public/images/emoji/emoji_one/facepunch/3.png and b/public/images/emoji/emoji_one/facepunch/3.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/4.png b/public/images/emoji/emoji_one/facepunch/4.png
index d90a941782..c8aa4ef7a6 100644
Binary files a/public/images/emoji/emoji_one/facepunch/4.png and b/public/images/emoji/emoji_one/facepunch/4.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/5.png b/public/images/emoji/emoji_one/facepunch/5.png
index 1331fa3b8a..048cb8c26c 100644
Binary files a/public/images/emoji/emoji_one/facepunch/5.png and b/public/images/emoji/emoji_one/facepunch/5.png differ
diff --git a/public/images/emoji/emoji_one/facepunch/6.png b/public/images/emoji/emoji_one/facepunch/6.png
index 6e7920e71a..13a376407e 100644
Binary files a/public/images/emoji/emoji_one/facepunch/6.png and b/public/images/emoji/emoji_one/facepunch/6.png differ
diff --git a/public/images/emoji/emoji_one/fairy.png b/public/images/emoji/emoji_one/fairy.png
index 429938294b..555344dd2b 100644
Binary files a/public/images/emoji/emoji_one/fairy.png and b/public/images/emoji/emoji_one/fairy.png differ
diff --git a/public/images/emoji/emoji_one/fairy/2.png b/public/images/emoji/emoji_one/fairy/2.png
index 91e1de4e5d..38c49baead 100644
Binary files a/public/images/emoji/emoji_one/fairy/2.png and b/public/images/emoji/emoji_one/fairy/2.png differ
diff --git a/public/images/emoji/emoji_one/fairy/3.png b/public/images/emoji/emoji_one/fairy/3.png
index 42821806e9..bd64845e16 100644
Binary files a/public/images/emoji/emoji_one/fairy/3.png and b/public/images/emoji/emoji_one/fairy/3.png differ
diff --git a/public/images/emoji/emoji_one/fairy/4.png b/public/images/emoji/emoji_one/fairy/4.png
index 9e8d3adb89..ffd07f760b 100644
Binary files a/public/images/emoji/emoji_one/fairy/4.png and b/public/images/emoji/emoji_one/fairy/4.png differ
diff --git a/public/images/emoji/emoji_one/fairy/5.png b/public/images/emoji/emoji_one/fairy/5.png
index 88d190e392..73e4fe3352 100644
Binary files a/public/images/emoji/emoji_one/fairy/5.png and b/public/images/emoji/emoji_one/fairy/5.png differ
diff --git a/public/images/emoji/emoji_one/fairy/6.png b/public/images/emoji/emoji_one/fairy/6.png
index e6ab8ade74..40cc6731e3 100644
Binary files a/public/images/emoji/emoji_one/fairy/6.png and b/public/images/emoji/emoji_one/fairy/6.png differ
diff --git a/public/images/emoji/emoji_one/family.png b/public/images/emoji/emoji_one/family.png
index 7e4df9c267..de58298e2b 100644
Binary files a/public/images/emoji/emoji_one/family.png and b/public/images/emoji/emoji_one/family.png differ
diff --git a/public/images/emoji/emoji_one/family_man_boy.png b/public/images/emoji/emoji_one/family_man_boy.png
index 66f7ac3aac..8c23cb623c 100644
Binary files a/public/images/emoji/emoji_one/family_man_boy.png and b/public/images/emoji/emoji_one/family_man_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_boy_boy.png b/public/images/emoji/emoji_one/family_man_boy_boy.png
index f12c281441..8d5b32dc80 100644
Binary files a/public/images/emoji/emoji_one/family_man_boy_boy.png and b/public/images/emoji/emoji_one/family_man_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_girl.png b/public/images/emoji/emoji_one/family_man_girl.png
index 9735917ea7..d3cb82a6db 100644
Binary files a/public/images/emoji/emoji_one/family_man_girl.png and b/public/images/emoji/emoji_one/family_man_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_girl_boy.png b/public/images/emoji/emoji_one/family_man_girl_boy.png
index b903807083..1622bdc524 100644
Binary files a/public/images/emoji/emoji_one/family_man_girl_boy.png and b/public/images/emoji/emoji_one/family_man_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_girl_girl.png b/public/images/emoji/emoji_one/family_man_girl_girl.png
index ad722bb5ab..807256a6a4 100644
Binary files a/public/images/emoji/emoji_one/family_man_girl_girl.png and b/public/images/emoji/emoji_one/family_man_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_boy.png b/public/images/emoji/emoji_one/family_man_man_boy.png
index 55becf1393..1528b583fc 100644
Binary files a/public/images/emoji/emoji_one/family_man_man_boy.png and b/public/images/emoji/emoji_one/family_man_man_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_boy_boy.png b/public/images/emoji/emoji_one/family_man_man_boy_boy.png
index 06e8d4ef62..33a00c62c1 100644
Binary files a/public/images/emoji/emoji_one/family_man_man_boy_boy.png and b/public/images/emoji/emoji_one/family_man_man_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_girl.png b/public/images/emoji/emoji_one/family_man_man_girl.png
index 2b51b71d73..9c7883366c 100644
Binary files a/public/images/emoji/emoji_one/family_man_man_girl.png and b/public/images/emoji/emoji_one/family_man_man_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_girl_boy.png b/public/images/emoji/emoji_one/family_man_man_girl_boy.png
index 54681513bd..40ae2584f4 100644
Binary files a/public/images/emoji/emoji_one/family_man_man_girl_boy.png and b/public/images/emoji/emoji_one/family_man_man_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_man_girl_girl.png b/public/images/emoji/emoji_one/family_man_man_girl_girl.png
index 523a8f9b8e..b275d7879f 100644
Binary files a/public/images/emoji/emoji_one/family_man_man_girl_girl.png and b/public/images/emoji/emoji_one/family_man_man_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_boy.png b/public/images/emoji/emoji_one/family_man_woman_boy.png
index bc47302bce..2e166c5677 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_boy.png and b/public/images/emoji/emoji_one/family_man_woman_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_boy_boy.png b/public/images/emoji/emoji_one/family_man_woman_boy_boy.png
index ec9043c65f..ddc50a0f01 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_boy_boy.png and b/public/images/emoji/emoji_one/family_man_woman_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_boys.png b/public/images/emoji/emoji_one/family_man_woman_boys.png
index ec9043c65f..ddc50a0f01 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_boys.png and b/public/images/emoji/emoji_one/family_man_woman_boys.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girl.png b/public/images/emoji/emoji_one/family_man_woman_girl.png
index d5b1b16d55..f51fe0fb85 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girl.png and b/public/images/emoji/emoji_one/family_man_woman_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girl_boy.png b/public/images/emoji/emoji_one/family_man_woman_girl_boy.png
index 7e4df9c267..de58298e2b 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girl_boy.png and b/public/images/emoji/emoji_one/family_man_woman_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girl_girl.png b/public/images/emoji/emoji_one/family_man_woman_girl_girl.png
index c22c23d631..b973ad0a81 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girl_girl.png and b/public/images/emoji/emoji_one/family_man_woman_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_man_woman_girls.png b/public/images/emoji/emoji_one/family_man_woman_girls.png
index c22c23d631..b973ad0a81 100644
Binary files a/public/images/emoji/emoji_one/family_man_woman_girls.png and b/public/images/emoji/emoji_one/family_man_woman_girls.png differ
diff --git a/public/images/emoji/emoji_one/family_men_boy.png b/public/images/emoji/emoji_one/family_men_boy.png
index 55becf1393..1528b583fc 100644
Binary files a/public/images/emoji/emoji_one/family_men_boy.png and b/public/images/emoji/emoji_one/family_men_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_men_boys.png b/public/images/emoji/emoji_one/family_men_boys.png
index 06e8d4ef62..33a00c62c1 100644
Binary files a/public/images/emoji/emoji_one/family_men_boys.png and b/public/images/emoji/emoji_one/family_men_boys.png differ
diff --git a/public/images/emoji/emoji_one/family_men_girl.png b/public/images/emoji/emoji_one/family_men_girl.png
index 2b51b71d73..9c7883366c 100644
Binary files a/public/images/emoji/emoji_one/family_men_girl.png and b/public/images/emoji/emoji_one/family_men_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_men_girl_boy.png b/public/images/emoji/emoji_one/family_men_girl_boy.png
index 54681513bd..40ae2584f4 100644
Binary files a/public/images/emoji/emoji_one/family_men_girl_boy.png and b/public/images/emoji/emoji_one/family_men_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_men_girls.png b/public/images/emoji/emoji_one/family_men_girls.png
index 523a8f9b8e..b275d7879f 100644
Binary files a/public/images/emoji/emoji_one/family_men_girls.png and b/public/images/emoji/emoji_one/family_men_girls.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_boy.png b/public/images/emoji/emoji_one/family_woman_boy.png
index 3ab3cda659..88436d821c 100644
Binary files a/public/images/emoji/emoji_one/family_woman_boy.png and b/public/images/emoji/emoji_one/family_woman_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_boy_boy.png b/public/images/emoji/emoji_one/family_woman_boy_boy.png
index 3014086f5c..c9c8b46280 100644
Binary files a/public/images/emoji/emoji_one/family_woman_boy_boy.png and b/public/images/emoji/emoji_one/family_woman_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_girl.png b/public/images/emoji/emoji_one/family_woman_girl.png
index 6649e32dbf..4bd576975a 100644
Binary files a/public/images/emoji/emoji_one/family_woman_girl.png and b/public/images/emoji/emoji_one/family_woman_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_girl_boy.png b/public/images/emoji/emoji_one/family_woman_girl_boy.png
index 5e87ee2537..413121663b 100644
Binary files a/public/images/emoji/emoji_one/family_woman_girl_boy.png and b/public/images/emoji/emoji_one/family_woman_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_girl_girl.png b/public/images/emoji/emoji_one/family_woman_girl_girl.png
index 5cd65ec3bc..8f030ada0a 100644
Binary files a/public/images/emoji/emoji_one/family_woman_girl_girl.png and b/public/images/emoji/emoji_one/family_woman_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_boy.png b/public/images/emoji/emoji_one/family_woman_woman_boy.png
index c921369fc7..e251dfbb51 100644
Binary files a/public/images/emoji/emoji_one/family_woman_woman_boy.png and b/public/images/emoji/emoji_one/family_woman_woman_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png b/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png
index 1f0e7494c2..6e8eb012af 100644
Binary files a/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png and b/public/images/emoji/emoji_one/family_woman_woman_boy_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_girl.png b/public/images/emoji/emoji_one/family_woman_woman_girl.png
index 1008bd3daf..630af52ac5 100644
Binary files a/public/images/emoji/emoji_one/family_woman_woman_girl.png and b/public/images/emoji/emoji_one/family_woman_woman_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png b/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png
index a49fbfef8a..618e396fa2 100644
Binary files a/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png and b/public/images/emoji/emoji_one/family_woman_woman_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png b/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png
index eae0863938..972f7de7ed 100644
Binary files a/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png and b/public/images/emoji/emoji_one/family_woman_woman_girl_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_women_boy.png b/public/images/emoji/emoji_one/family_women_boy.png
index c921369fc7..e251dfbb51 100644
Binary files a/public/images/emoji/emoji_one/family_women_boy.png and b/public/images/emoji/emoji_one/family_women_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_women_boys.png b/public/images/emoji/emoji_one/family_women_boys.png
index 1f0e7494c2..6e8eb012af 100644
Binary files a/public/images/emoji/emoji_one/family_women_boys.png and b/public/images/emoji/emoji_one/family_women_boys.png differ
diff --git a/public/images/emoji/emoji_one/family_women_girl.png b/public/images/emoji/emoji_one/family_women_girl.png
index 1008bd3daf..630af52ac5 100644
Binary files a/public/images/emoji/emoji_one/family_women_girl.png and b/public/images/emoji/emoji_one/family_women_girl.png differ
diff --git a/public/images/emoji/emoji_one/family_women_girl_boy.png b/public/images/emoji/emoji_one/family_women_girl_boy.png
index a49fbfef8a..618e396fa2 100644
Binary files a/public/images/emoji/emoji_one/family_women_girl_boy.png and b/public/images/emoji/emoji_one/family_women_girl_boy.png differ
diff --git a/public/images/emoji/emoji_one/family_women_girls.png b/public/images/emoji/emoji_one/family_women_girls.png
index eae0863938..972f7de7ed 100644
Binary files a/public/images/emoji/emoji_one/family_women_girls.png and b/public/images/emoji/emoji_one/family_women_girls.png differ
diff --git a/public/images/emoji/emoji_one/fearful.png b/public/images/emoji/emoji_one/fearful.png
index 83bd3a25b1..bef07aa0ce 100644
Binary files a/public/images/emoji/emoji_one/fearful.png and b/public/images/emoji/emoji_one/fearful.png differ
diff --git a/public/images/emoji/emoji_one/female_couple_with_heart.png b/public/images/emoji/emoji_one/female_couple_with_heart.png
index 8f47f828f3..e7c428cf4c 100644
Binary files a/public/images/emoji/emoji_one/female_couple_with_heart.png and b/public/images/emoji/emoji_one/female_couple_with_heart.png differ
diff --git a/public/images/emoji/emoji_one/female_couplekiss.png b/public/images/emoji/emoji_one/female_couplekiss.png
index ca34f3376b..86772728e7 100644
Binary files a/public/images/emoji/emoji_one/female_couplekiss.png and b/public/images/emoji/emoji_one/female_couplekiss.png differ
diff --git a/public/images/emoji/emoji_one/female_detective.png b/public/images/emoji/emoji_one/female_detective.png
index c6aa2d216e..7c2824abf4 100644
Binary files a/public/images/emoji/emoji_one/female_detective.png and b/public/images/emoji/emoji_one/female_detective.png differ
diff --git a/public/images/emoji/emoji_one/fire_engine.png b/public/images/emoji/emoji_one/fire_engine.png
index c5f9478071..84717fc41c 100644
Binary files a/public/images/emoji/emoji_one/fire_engine.png and b/public/images/emoji/emoji_one/fire_engine.png differ
diff --git a/public/images/emoji/emoji_one/fist/2.png b/public/images/emoji/emoji_one/fist/2.png
index be5c67e4ab..9bf22d7237 100644
Binary files a/public/images/emoji/emoji_one/fist/2.png and b/public/images/emoji/emoji_one/fist/2.png differ
diff --git a/public/images/emoji/emoji_one/fist/3.png b/public/images/emoji/emoji_one/fist/3.png
index da6c11fe6a..32064fbc16 100644
Binary files a/public/images/emoji/emoji_one/fist/3.png and b/public/images/emoji/emoji_one/fist/3.png differ
diff --git a/public/images/emoji/emoji_one/fist/4.png b/public/images/emoji/emoji_one/fist/4.png
index 756db48214..dc9642f7d7 100644
Binary files a/public/images/emoji/emoji_one/fist/4.png and b/public/images/emoji/emoji_one/fist/4.png differ
diff --git a/public/images/emoji/emoji_one/fist/5.png b/public/images/emoji/emoji_one/fist/5.png
index ab598946b5..351ad23d85 100644
Binary files a/public/images/emoji/emoji_one/fist/5.png and b/public/images/emoji/emoji_one/fist/5.png differ
diff --git a/public/images/emoji/emoji_one/fist/6.png b/public/images/emoji/emoji_one/fist/6.png
index a3fa057393..4aa443d262 100644
Binary files a/public/images/emoji/emoji_one/fist/6.png and b/public/images/emoji/emoji_one/fist/6.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/2.png b/public/images/emoji/emoji_one/fist_left/2.png
index 105a75e3f2..4751c12a20 100644
Binary files a/public/images/emoji/emoji_one/fist_left/2.png and b/public/images/emoji/emoji_one/fist_left/2.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/3.png b/public/images/emoji/emoji_one/fist_left/3.png
index a6c68fe3f1..1590412783 100644
Binary files a/public/images/emoji/emoji_one/fist_left/3.png and b/public/images/emoji/emoji_one/fist_left/3.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/4.png b/public/images/emoji/emoji_one/fist_left/4.png
index abe07f06fd..84f985a5a5 100644
Binary files a/public/images/emoji/emoji_one/fist_left/4.png and b/public/images/emoji/emoji_one/fist_left/4.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/5.png b/public/images/emoji/emoji_one/fist_left/5.png
index 38dd5eff0f..11d9b52ccb 100644
Binary files a/public/images/emoji/emoji_one/fist_left/5.png and b/public/images/emoji/emoji_one/fist_left/5.png differ
diff --git a/public/images/emoji/emoji_one/fist_left/6.png b/public/images/emoji/emoji_one/fist_left/6.png
index a75572cb23..70c5114eea 100644
Binary files a/public/images/emoji/emoji_one/fist_left/6.png and b/public/images/emoji/emoji_one/fist_left/6.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/2.png b/public/images/emoji/emoji_one/fist_right/2.png
index 425f98ea6e..068c6b74e1 100644
Binary files a/public/images/emoji/emoji_one/fist_right/2.png and b/public/images/emoji/emoji_one/fist_right/2.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/3.png b/public/images/emoji/emoji_one/fist_right/3.png
index 428c8a710d..73a55f81a0 100644
Binary files a/public/images/emoji/emoji_one/fist_right/3.png and b/public/images/emoji/emoji_one/fist_right/3.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/4.png b/public/images/emoji/emoji_one/fist_right/4.png
index 2b4c8706e9..f1339d60f5 100644
Binary files a/public/images/emoji/emoji_one/fist_right/4.png and b/public/images/emoji/emoji_one/fist_right/4.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/5.png b/public/images/emoji/emoji_one/fist_right/5.png
index b3c868e9a3..2dc89ccd7e 100644
Binary files a/public/images/emoji/emoji_one/fist_right/5.png and b/public/images/emoji/emoji_one/fist_right/5.png differ
diff --git a/public/images/emoji/emoji_one/fist_right/6.png b/public/images/emoji/emoji_one/fist_right/6.png
index 76bc2cae3b..db57af813f 100644
Binary files a/public/images/emoji/emoji_one/fist_right/6.png and b/public/images/emoji/emoji_one/fist_right/6.png differ
diff --git a/public/images/emoji/emoji_one/flushed.png b/public/images/emoji/emoji_one/flushed.png
index 807a19dc88..17a0a7244b 100644
Binary files a/public/images/emoji/emoji_one/flushed.png and b/public/images/emoji/emoji_one/flushed.png differ
diff --git a/public/images/emoji/emoji_one/flying_saucer.png b/public/images/emoji/emoji_one/flying_saucer.png
index 23b8c3444d..d64c528e55 100644
Binary files a/public/images/emoji/emoji_one/flying_saucer.png and b/public/images/emoji/emoji_one/flying_saucer.png differ
diff --git a/public/images/emoji/emoji_one/fortune_cookie.png b/public/images/emoji/emoji_one/fortune_cookie.png
index 8f3b3cbcf7..728c4d4431 100644
Binary files a/public/images/emoji/emoji_one/fortune_cookie.png and b/public/images/emoji/emoji_one/fortune_cookie.png differ
diff --git a/public/images/emoji/emoji_one/fountain.png b/public/images/emoji/emoji_one/fountain.png
index bd6f509682..589a355b8c 100644
Binary files a/public/images/emoji/emoji_one/fountain.png and b/public/images/emoji/emoji_one/fountain.png differ
diff --git a/public/images/emoji/emoji_one/frame_photo.png b/public/images/emoji/emoji_one/frame_photo.png
index 0ad6a812a2..6515739454 100644
Binary files a/public/images/emoji/emoji_one/frame_photo.png and b/public/images/emoji/emoji_one/frame_photo.png differ
diff --git a/public/images/emoji/emoji_one/frame_with_picture.png b/public/images/emoji/emoji_one/frame_with_picture.png
index 0ad6a812a2..6515739454 100644
Binary files a/public/images/emoji/emoji_one/frame_with_picture.png and b/public/images/emoji/emoji_one/frame_with_picture.png differ
diff --git a/public/images/emoji/emoji_one/framed_picture.png b/public/images/emoji/emoji_one/framed_picture.png
index 0ad6a812a2..6515739454 100644
Binary files a/public/images/emoji/emoji_one/framed_picture.png and b/public/images/emoji/emoji_one/framed_picture.png differ
diff --git a/public/images/emoji/emoji_one/frowning.png b/public/images/emoji/emoji_one/frowning.png
index 59aa47f301..81aab04959 100644
Binary files a/public/images/emoji/emoji_one/frowning.png and b/public/images/emoji/emoji_one/frowning.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man.png b/public/images/emoji/emoji_one/frowning_man.png
index 3bbbadec60..885eded8fd 100644
Binary files a/public/images/emoji/emoji_one/frowning_man.png and b/public/images/emoji/emoji_one/frowning_man.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/2.png b/public/images/emoji/emoji_one/frowning_man/2.png
index 90ca627703..ea31fa278d 100644
Binary files a/public/images/emoji/emoji_one/frowning_man/2.png and b/public/images/emoji/emoji_one/frowning_man/2.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/3.png b/public/images/emoji/emoji_one/frowning_man/3.png
index 4577d02251..4db889b850 100644
Binary files a/public/images/emoji/emoji_one/frowning_man/3.png and b/public/images/emoji/emoji_one/frowning_man/3.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/4.png b/public/images/emoji/emoji_one/frowning_man/4.png
index c019d515e0..b3e7fb57a6 100644
Binary files a/public/images/emoji/emoji_one/frowning_man/4.png and b/public/images/emoji/emoji_one/frowning_man/4.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/5.png b/public/images/emoji/emoji_one/frowning_man/5.png
index 0e166d4a42..cfb35662e4 100644
Binary files a/public/images/emoji/emoji_one/frowning_man/5.png and b/public/images/emoji/emoji_one/frowning_man/5.png differ
diff --git a/public/images/emoji/emoji_one/frowning_man/6.png b/public/images/emoji/emoji_one/frowning_man/6.png
index d01eefacee..ae75f23099 100644
Binary files a/public/images/emoji/emoji_one/frowning_man/6.png and b/public/images/emoji/emoji_one/frowning_man/6.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman.png b/public/images/emoji/emoji_one/frowning_woman.png
index a1af9eaf91..15945278a4 100644
Binary files a/public/images/emoji/emoji_one/frowning_woman.png and b/public/images/emoji/emoji_one/frowning_woman.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/2.png b/public/images/emoji/emoji_one/frowning_woman/2.png
index ce5ee0f036..45d4fbfa64 100644
Binary files a/public/images/emoji/emoji_one/frowning_woman/2.png and b/public/images/emoji/emoji_one/frowning_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/3.png b/public/images/emoji/emoji_one/frowning_woman/3.png
index f2017acecf..a162630c94 100644
Binary files a/public/images/emoji/emoji_one/frowning_woman/3.png and b/public/images/emoji/emoji_one/frowning_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/4.png b/public/images/emoji/emoji_one/frowning_woman/4.png
index 9fca177e9d..ee475d8400 100644
Binary files a/public/images/emoji/emoji_one/frowning_woman/4.png and b/public/images/emoji/emoji_one/frowning_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/5.png b/public/images/emoji/emoji_one/frowning_woman/5.png
index 8bb8d943af..97c21442ba 100644
Binary files a/public/images/emoji/emoji_one/frowning_woman/5.png and b/public/images/emoji/emoji_one/frowning_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/frowning_woman/6.png b/public/images/emoji/emoji_one/frowning_woman/6.png
index 5d30d35d42..2c5a39db98 100644
Binary files a/public/images/emoji/emoji_one/frowning_woman/6.png and b/public/images/emoji/emoji_one/frowning_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/fu/2.png b/public/images/emoji/emoji_one/fu/2.png
index 37ac478031..6d4d00f77c 100644
Binary files a/public/images/emoji/emoji_one/fu/2.png and b/public/images/emoji/emoji_one/fu/2.png differ
diff --git a/public/images/emoji/emoji_one/fu/3.png b/public/images/emoji/emoji_one/fu/3.png
index 69fbed14d2..37bc135b96 100644
Binary files a/public/images/emoji/emoji_one/fu/3.png and b/public/images/emoji/emoji_one/fu/3.png differ
diff --git a/public/images/emoji/emoji_one/fu/4.png b/public/images/emoji/emoji_one/fu/4.png
index c1134aea0f..2b3abdbf9a 100644
Binary files a/public/images/emoji/emoji_one/fu/4.png and b/public/images/emoji/emoji_one/fu/4.png differ
diff --git a/public/images/emoji/emoji_one/fu/5.png b/public/images/emoji/emoji_one/fu/5.png
index 371ee90cf9..12c2de3a50 100644
Binary files a/public/images/emoji/emoji_one/fu/5.png and b/public/images/emoji/emoji_one/fu/5.png differ
diff --git a/public/images/emoji/emoji_one/fu/6.png b/public/images/emoji/emoji_one/fu/6.png
index db57dfd098..d3a0b3f62a 100644
Binary files a/public/images/emoji/emoji_one/fu/6.png and b/public/images/emoji/emoji_one/fu/6.png differ
diff --git a/public/images/emoji/emoji_one/genie.png b/public/images/emoji/emoji_one/genie.png
index f0eddcc91a..c0f55e5fca 100644
Binary files a/public/images/emoji/emoji_one/genie.png and b/public/images/emoji/emoji_one/genie.png differ
diff --git a/public/images/emoji/emoji_one/giraffe.png b/public/images/emoji/emoji_one/giraffe.png
index 4db1a06ce4..0a28664013 100644
Binary files a/public/images/emoji/emoji_one/giraffe.png and b/public/images/emoji/emoji_one/giraffe.png differ
diff --git a/public/images/emoji/emoji_one/girl.png b/public/images/emoji/emoji_one/girl.png
index 9deb44f2df..28dd184909 100644
Binary files a/public/images/emoji/emoji_one/girl.png and b/public/images/emoji/emoji_one/girl.png differ
diff --git a/public/images/emoji/emoji_one/girl/2.png b/public/images/emoji/emoji_one/girl/2.png
index c305c1c572..6862a669fe 100644
Binary files a/public/images/emoji/emoji_one/girl/2.png and b/public/images/emoji/emoji_one/girl/2.png differ
diff --git a/public/images/emoji/emoji_one/girl/3.png b/public/images/emoji/emoji_one/girl/3.png
index e6bf63cee3..18e997e465 100644
Binary files a/public/images/emoji/emoji_one/girl/3.png and b/public/images/emoji/emoji_one/girl/3.png differ
diff --git a/public/images/emoji/emoji_one/girl/4.png b/public/images/emoji/emoji_one/girl/4.png
index 3063e88cf8..be6c1bf1d3 100644
Binary files a/public/images/emoji/emoji_one/girl/4.png and b/public/images/emoji/emoji_one/girl/4.png differ
diff --git a/public/images/emoji/emoji_one/girl/5.png b/public/images/emoji/emoji_one/girl/5.png
index 189a0ebc95..eb885b9f86 100644
Binary files a/public/images/emoji/emoji_one/girl/5.png and b/public/images/emoji/emoji_one/girl/5.png differ
diff --git a/public/images/emoji/emoji_one/girl/6.png b/public/images/emoji/emoji_one/girl/6.png
index 5774ab8435..7d2abdfb58 100644
Binary files a/public/images/emoji/emoji_one/girl/6.png and b/public/images/emoji/emoji_one/girl/6.png differ
diff --git a/public/images/emoji/emoji_one/gloves.png b/public/images/emoji/emoji_one/gloves.png
index 1a11dd2c56..ddf2bd80e3 100644
Binary files a/public/images/emoji/emoji_one/gloves.png and b/public/images/emoji/emoji_one/gloves.png differ
diff --git a/public/images/emoji/emoji_one/golfer.png b/public/images/emoji/emoji_one/golfer.png
index d4c43cbf88..be4ac637d3 100644
Binary files a/public/images/emoji/emoji_one/golfer.png and b/public/images/emoji/emoji_one/golfer.png differ
diff --git a/public/images/emoji/emoji_one/golfer/2.png b/public/images/emoji/emoji_one/golfer/2.png
index cc24e381fe..6a7e379bd1 100644
Binary files a/public/images/emoji/emoji_one/golfer/2.png and b/public/images/emoji/emoji_one/golfer/2.png differ
diff --git a/public/images/emoji/emoji_one/golfer/3.png b/public/images/emoji/emoji_one/golfer/3.png
index 4a26b7fc23..44146d6084 100644
Binary files a/public/images/emoji/emoji_one/golfer/3.png and b/public/images/emoji/emoji_one/golfer/3.png differ
diff --git a/public/images/emoji/emoji_one/golfer/4.png b/public/images/emoji/emoji_one/golfer/4.png
index f92e91f8dd..320b0f2f4b 100644
Binary files a/public/images/emoji/emoji_one/golfer/4.png and b/public/images/emoji/emoji_one/golfer/4.png differ
diff --git a/public/images/emoji/emoji_one/golfer/5.png b/public/images/emoji/emoji_one/golfer/5.png
index 7dab5eabba..ef6ab47d3d 100644
Binary files a/public/images/emoji/emoji_one/golfer/5.png and b/public/images/emoji/emoji_one/golfer/5.png differ
diff --git a/public/images/emoji/emoji_one/golfer/6.png b/public/images/emoji/emoji_one/golfer/6.png
index 54188ddddb..d9bf32f398 100644
Binary files a/public/images/emoji/emoji_one/golfer/6.png and b/public/images/emoji/emoji_one/golfer/6.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man.png b/public/images/emoji/emoji_one/golfing_man.png
index d4c43cbf88..be4ac637d3 100644
Binary files a/public/images/emoji/emoji_one/golfing_man.png and b/public/images/emoji/emoji_one/golfing_man.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/2.png b/public/images/emoji/emoji_one/golfing_man/2.png
index cc24e381fe..6a7e379bd1 100644
Binary files a/public/images/emoji/emoji_one/golfing_man/2.png and b/public/images/emoji/emoji_one/golfing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/3.png b/public/images/emoji/emoji_one/golfing_man/3.png
index 4a26b7fc23..44146d6084 100644
Binary files a/public/images/emoji/emoji_one/golfing_man/3.png and b/public/images/emoji/emoji_one/golfing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/4.png b/public/images/emoji/emoji_one/golfing_man/4.png
index f92e91f8dd..320b0f2f4b 100644
Binary files a/public/images/emoji/emoji_one/golfing_man/4.png and b/public/images/emoji/emoji_one/golfing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/5.png b/public/images/emoji/emoji_one/golfing_man/5.png
index 7dab5eabba..ef6ab47d3d 100644
Binary files a/public/images/emoji/emoji_one/golfing_man/5.png and b/public/images/emoji/emoji_one/golfing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/golfing_man/6.png b/public/images/emoji/emoji_one/golfing_man/6.png
index 54188ddddb..d9bf32f398 100644
Binary files a/public/images/emoji/emoji_one/golfing_man/6.png and b/public/images/emoji/emoji_one/golfing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/golfing_woman.png b/public/images/emoji/emoji_one/golfing_woman.png
index f77e9038b4..5490d5a7e6 100644
Binary files a/public/images/emoji/emoji_one/golfing_woman.png and b/public/images/emoji/emoji_one/golfing_woman.png differ
diff --git a/public/images/emoji/emoji_one/grandma.png b/public/images/emoji/emoji_one/grandma.png
index ef0d803bae..2ec3cbecff 100644
Binary files a/public/images/emoji/emoji_one/grandma.png and b/public/images/emoji/emoji_one/grandma.png differ
diff --git a/public/images/emoji/emoji_one/grandma/2.png b/public/images/emoji/emoji_one/grandma/2.png
index 78028f179f..cbbfc13132 100644
Binary files a/public/images/emoji/emoji_one/grandma/2.png and b/public/images/emoji/emoji_one/grandma/2.png differ
diff --git a/public/images/emoji/emoji_one/grandma/3.png b/public/images/emoji/emoji_one/grandma/3.png
index e12b43f089..4d0c325f09 100644
Binary files a/public/images/emoji/emoji_one/grandma/3.png and b/public/images/emoji/emoji_one/grandma/3.png differ
diff --git a/public/images/emoji/emoji_one/grandma/4.png b/public/images/emoji/emoji_one/grandma/4.png
index 7d5882174c..287a4d0de1 100644
Binary files a/public/images/emoji/emoji_one/grandma/4.png and b/public/images/emoji/emoji_one/grandma/4.png differ
diff --git a/public/images/emoji/emoji_one/grandma/5.png b/public/images/emoji/emoji_one/grandma/5.png
index fdc2609bdb..8cda00960c 100644
Binary files a/public/images/emoji/emoji_one/grandma/5.png and b/public/images/emoji/emoji_one/grandma/5.png differ
diff --git a/public/images/emoji/emoji_one/grandma/6.png b/public/images/emoji/emoji_one/grandma/6.png
index a9b8dc3fa1..00a5201716 100644
Binary files a/public/images/emoji/emoji_one/grandma/6.png and b/public/images/emoji/emoji_one/grandma/6.png differ
diff --git a/public/images/emoji/emoji_one/green_salad.png b/public/images/emoji/emoji_one/green_salad.png
index 34daefa85b..e2dfc7bd75 100644
Binary files a/public/images/emoji/emoji_one/green_salad.png and b/public/images/emoji/emoji_one/green_salad.png differ
diff --git a/public/images/emoji/emoji_one/grimacing.png b/public/images/emoji/emoji_one/grimacing.png
index 3ce0a4e8a4..afb9111ea3 100644
Binary files a/public/images/emoji/emoji_one/grimacing.png and b/public/images/emoji/emoji_one/grimacing.png differ
diff --git a/public/images/emoji/emoji_one/guardsman.png b/public/images/emoji/emoji_one/guardsman.png
index be981bfeda..599615fd99 100644
Binary files a/public/images/emoji/emoji_one/guardsman.png and b/public/images/emoji/emoji_one/guardsman.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/2.png b/public/images/emoji/emoji_one/guardsman/2.png
index f6c3cfc868..55702df544 100644
Binary files a/public/images/emoji/emoji_one/guardsman/2.png and b/public/images/emoji/emoji_one/guardsman/2.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/3.png b/public/images/emoji/emoji_one/guardsman/3.png
index 719a40ca67..c25292e69c 100644
Binary files a/public/images/emoji/emoji_one/guardsman/3.png and b/public/images/emoji/emoji_one/guardsman/3.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/4.png b/public/images/emoji/emoji_one/guardsman/4.png
index 2e853da32e..709591a792 100644
Binary files a/public/images/emoji/emoji_one/guardsman/4.png and b/public/images/emoji/emoji_one/guardsman/4.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/5.png b/public/images/emoji/emoji_one/guardsman/5.png
index 4512abdde2..385c38d04e 100644
Binary files a/public/images/emoji/emoji_one/guardsman/5.png and b/public/images/emoji/emoji_one/guardsman/5.png differ
diff --git a/public/images/emoji/emoji_one/guardsman/6.png b/public/images/emoji/emoji_one/guardsman/6.png
index 4eb541d1ff..c583999ddd 100644
Binary files a/public/images/emoji/emoji_one/guardsman/6.png and b/public/images/emoji/emoji_one/guardsman/6.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman.png b/public/images/emoji/emoji_one/guardswoman.png
index 3d0acf013f..eac3b57f1f 100644
Binary files a/public/images/emoji/emoji_one/guardswoman.png and b/public/images/emoji/emoji_one/guardswoman.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/2.png b/public/images/emoji/emoji_one/guardswoman/2.png
index 5539a1f22f..2fa6d6b994 100644
Binary files a/public/images/emoji/emoji_one/guardswoman/2.png and b/public/images/emoji/emoji_one/guardswoman/2.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/3.png b/public/images/emoji/emoji_one/guardswoman/3.png
index 96203685f0..923676cb5e 100644
Binary files a/public/images/emoji/emoji_one/guardswoman/3.png and b/public/images/emoji/emoji_one/guardswoman/3.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/4.png b/public/images/emoji/emoji_one/guardswoman/4.png
index e60736a4ef..df3c993ef4 100644
Binary files a/public/images/emoji/emoji_one/guardswoman/4.png and b/public/images/emoji/emoji_one/guardswoman/4.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/5.png b/public/images/emoji/emoji_one/guardswoman/5.png
index 6d74a2b71b..e469588248 100644
Binary files a/public/images/emoji/emoji_one/guardswoman/5.png and b/public/images/emoji/emoji_one/guardswoman/5.png differ
diff --git a/public/images/emoji/emoji_one/guardswoman/6.png b/public/images/emoji/emoji_one/guardswoman/6.png
index c57159a307..1fb44a6038 100644
Binary files a/public/images/emoji/emoji_one/guardswoman/6.png and b/public/images/emoji/emoji_one/guardswoman/6.png differ
diff --git a/public/images/emoji/emoji_one/haircut.png b/public/images/emoji/emoji_one/haircut.png
index 13604ef04f..01ed8634e7 100644
Binary files a/public/images/emoji/emoji_one/haircut.png and b/public/images/emoji/emoji_one/haircut.png differ
diff --git a/public/images/emoji/emoji_one/haircut/2.png b/public/images/emoji/emoji_one/haircut/2.png
index d6d54e613b..6a06636b26 100644
Binary files a/public/images/emoji/emoji_one/haircut/2.png and b/public/images/emoji/emoji_one/haircut/2.png differ
diff --git a/public/images/emoji/emoji_one/haircut/3.png b/public/images/emoji/emoji_one/haircut/3.png
index 2050b9a4c3..2bbc47bb7e 100644
Binary files a/public/images/emoji/emoji_one/haircut/3.png and b/public/images/emoji/emoji_one/haircut/3.png differ
diff --git a/public/images/emoji/emoji_one/haircut/4.png b/public/images/emoji/emoji_one/haircut/4.png
index 66d44eaa6d..030b4145fa 100644
Binary files a/public/images/emoji/emoji_one/haircut/4.png and b/public/images/emoji/emoji_one/haircut/4.png differ
diff --git a/public/images/emoji/emoji_one/haircut/5.png b/public/images/emoji/emoji_one/haircut/5.png
index e201d5f97b..77587c4962 100644
Binary files a/public/images/emoji/emoji_one/haircut/5.png and b/public/images/emoji/emoji_one/haircut/5.png differ
diff --git a/public/images/emoji/emoji_one/haircut/6.png b/public/images/emoji/emoji_one/haircut/6.png
index 39c44ef473..021541666d 100644
Binary files a/public/images/emoji/emoji_one/haircut/6.png and b/public/images/emoji/emoji_one/haircut/6.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man.png b/public/images/emoji/emoji_one/haircut_man.png
index 24ad625cdc..d4c6fc5364 100644
Binary files a/public/images/emoji/emoji_one/haircut_man.png and b/public/images/emoji/emoji_one/haircut_man.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/2.png b/public/images/emoji/emoji_one/haircut_man/2.png
index 692a251d5c..5f03fe9d20 100644
Binary files a/public/images/emoji/emoji_one/haircut_man/2.png and b/public/images/emoji/emoji_one/haircut_man/2.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/3.png b/public/images/emoji/emoji_one/haircut_man/3.png
index ac9210ac3d..9adb849bdd 100644
Binary files a/public/images/emoji/emoji_one/haircut_man/3.png and b/public/images/emoji/emoji_one/haircut_man/3.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/4.png b/public/images/emoji/emoji_one/haircut_man/4.png
index 2566a19ee8..9e4b455927 100644
Binary files a/public/images/emoji/emoji_one/haircut_man/4.png and b/public/images/emoji/emoji_one/haircut_man/4.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/5.png b/public/images/emoji/emoji_one/haircut_man/5.png
index 9ea58646d6..bcd905bfd1 100644
Binary files a/public/images/emoji/emoji_one/haircut_man/5.png and b/public/images/emoji/emoji_one/haircut_man/5.png differ
diff --git a/public/images/emoji/emoji_one/haircut_man/6.png b/public/images/emoji/emoji_one/haircut_man/6.png
index 27b2356ff9..c690b0464c 100644
Binary files a/public/images/emoji/emoji_one/haircut_man/6.png and b/public/images/emoji/emoji_one/haircut_man/6.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman.png b/public/images/emoji/emoji_one/haircut_woman.png
index 13604ef04f..01ed8634e7 100644
Binary files a/public/images/emoji/emoji_one/haircut_woman.png and b/public/images/emoji/emoji_one/haircut_woman.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/2.png b/public/images/emoji/emoji_one/haircut_woman/2.png
index d6d54e613b..6a06636b26 100644
Binary files a/public/images/emoji/emoji_one/haircut_woman/2.png and b/public/images/emoji/emoji_one/haircut_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/3.png b/public/images/emoji/emoji_one/haircut_woman/3.png
index 2050b9a4c3..2bbc47bb7e 100644
Binary files a/public/images/emoji/emoji_one/haircut_woman/3.png and b/public/images/emoji/emoji_one/haircut_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/4.png b/public/images/emoji/emoji_one/haircut_woman/4.png
index 66d44eaa6d..030b4145fa 100644
Binary files a/public/images/emoji/emoji_one/haircut_woman/4.png and b/public/images/emoji/emoji_one/haircut_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/5.png b/public/images/emoji/emoji_one/haircut_woman/5.png
index e201d5f97b..77587c4962 100644
Binary files a/public/images/emoji/emoji_one/haircut_woman/5.png and b/public/images/emoji/emoji_one/haircut_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/haircut_woman/6.png b/public/images/emoji/emoji_one/haircut_woman/6.png
index 39c44ef473..021541666d 100644
Binary files a/public/images/emoji/emoji_one/haircut_woman/6.png and b/public/images/emoji/emoji_one/haircut_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/hamburger.png b/public/images/emoji/emoji_one/hamburger.png
index 4ca595e1a2..ddc1965fe9 100644
Binary files a/public/images/emoji/emoji_one/hamburger.png and b/public/images/emoji/emoji_one/hamburger.png differ
diff --git a/public/images/emoji/emoji_one/hand/2.png b/public/images/emoji/emoji_one/hand/2.png
index 9f4b42f571..8484849fec 100644
Binary files a/public/images/emoji/emoji_one/hand/2.png and b/public/images/emoji/emoji_one/hand/2.png differ
diff --git a/public/images/emoji/emoji_one/hand/3.png b/public/images/emoji/emoji_one/hand/3.png
index 49df4165bb..4469d89931 100644
Binary files a/public/images/emoji/emoji_one/hand/3.png and b/public/images/emoji/emoji_one/hand/3.png differ
diff --git a/public/images/emoji/emoji_one/hand/4.png b/public/images/emoji/emoji_one/hand/4.png
index 0de00d135e..aa00db9402 100644
Binary files a/public/images/emoji/emoji_one/hand/4.png and b/public/images/emoji/emoji_one/hand/4.png differ
diff --git a/public/images/emoji/emoji_one/hand/5.png b/public/images/emoji/emoji_one/hand/5.png
index 13d1da4f67..a79f3fc150 100644
Binary files a/public/images/emoji/emoji_one/hand/5.png and b/public/images/emoji/emoji_one/hand/5.png differ
diff --git a/public/images/emoji/emoji_one/hand/6.png b/public/images/emoji/emoji_one/hand/6.png
index 27d2a626e4..d0135a6614 100644
Binary files a/public/images/emoji/emoji_one/hand/6.png and b/public/images/emoji/emoji_one/hand/6.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/2.png b/public/images/emoji/emoji_one/hand_splayed/2.png
index d360cea9ed..373f6150be 100644
Binary files a/public/images/emoji/emoji_one/hand_splayed/2.png and b/public/images/emoji/emoji_one/hand_splayed/2.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/3.png b/public/images/emoji/emoji_one/hand_splayed/3.png
index c889c464ba..413cdd2b96 100644
Binary files a/public/images/emoji/emoji_one/hand_splayed/3.png and b/public/images/emoji/emoji_one/hand_splayed/3.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/4.png b/public/images/emoji/emoji_one/hand_splayed/4.png
index fa9654e786..c44bd59f71 100644
Binary files a/public/images/emoji/emoji_one/hand_splayed/4.png and b/public/images/emoji/emoji_one/hand_splayed/4.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/5.png b/public/images/emoji/emoji_one/hand_splayed/5.png
index 243d1cc157..87ef3aa7ad 100644
Binary files a/public/images/emoji/emoji_one/hand_splayed/5.png and b/public/images/emoji/emoji_one/hand_splayed/5.png differ
diff --git a/public/images/emoji/emoji_one/hand_splayed/6.png b/public/images/emoji/emoji_one/hand_splayed/6.png
index 255937df93..387d9c89c9 100644
Binary files a/public/images/emoji/emoji_one/hand_splayed/6.png and b/public/images/emoji/emoji_one/hand_splayed/6.png differ
diff --git a/public/images/emoji/emoji_one/head_bandage.png b/public/images/emoji/emoji_one/head_bandage.png
index ed6dc56acc..36cfc0d6e6 100644
Binary files a/public/images/emoji/emoji_one/head_bandage.png and b/public/images/emoji/emoji_one/head_bandage.png differ
diff --git a/public/images/emoji/emoji_one/heart_eyes_cat.png b/public/images/emoji/emoji_one/heart_eyes_cat.png
index 732977cc36..31e788d272 100644
Binary files a/public/images/emoji/emoji_one/heart_eyes_cat.png and b/public/images/emoji/emoji_one/heart_eyes_cat.png differ
diff --git a/public/images/emoji/emoji_one/hedgehog.png b/public/images/emoji/emoji_one/hedgehog.png
index 9b978b3540..3b32a704b9 100644
Binary files a/public/images/emoji/emoji_one/hedgehog.png and b/public/images/emoji/emoji_one/hedgehog.png differ
diff --git a/public/images/emoji/emoji_one/helicopter.png b/public/images/emoji/emoji_one/helicopter.png
index 7f2aee8820..bd31b31f16 100644
Binary files a/public/images/emoji/emoji_one/helicopter.png and b/public/images/emoji/emoji_one/helicopter.png differ
diff --git a/public/images/emoji/emoji_one/honey_pot.png b/public/images/emoji/emoji_one/honey_pot.png
index f6c4ad460b..4b6e695e66 100644
Binary files a/public/images/emoji/emoji_one/honey_pot.png and b/public/images/emoji/emoji_one/honey_pot.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing.png b/public/images/emoji/emoji_one/horse_racing.png
index f9e9eb5017..0c1d8d0ae4 100644
Binary files a/public/images/emoji/emoji_one/horse_racing.png and b/public/images/emoji/emoji_one/horse_racing.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/2.png b/public/images/emoji/emoji_one/horse_racing/2.png
index a9ad5fa065..dbceeeb2e3 100644
Binary files a/public/images/emoji/emoji_one/horse_racing/2.png and b/public/images/emoji/emoji_one/horse_racing/2.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/3.png b/public/images/emoji/emoji_one/horse_racing/3.png
index 2dcfa730b9..96fd5fd7f1 100644
Binary files a/public/images/emoji/emoji_one/horse_racing/3.png and b/public/images/emoji/emoji_one/horse_racing/3.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/4.png b/public/images/emoji/emoji_one/horse_racing/4.png
index 3d4d12bd28..e26e0a19bb 100644
Binary files a/public/images/emoji/emoji_one/horse_racing/4.png and b/public/images/emoji/emoji_one/horse_racing/4.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/5.png b/public/images/emoji/emoji_one/horse_racing/5.png
index bb33885627..8fd2d6b63e 100644
Binary files a/public/images/emoji/emoji_one/horse_racing/5.png and b/public/images/emoji/emoji_one/horse_racing/5.png differ
diff --git a/public/images/emoji/emoji_one/horse_racing/6.png b/public/images/emoji/emoji_one/horse_racing/6.png
index ccbd586d39..991f19cf86 100644
Binary files a/public/images/emoji/emoji_one/horse_racing/6.png and b/public/images/emoji/emoji_one/horse_racing/6.png differ
diff --git a/public/images/emoji/emoji_one/hot_pepper.png b/public/images/emoji/emoji_one/hot_pepper.png
index 58421228e3..e6f6a70287 100644
Binary files a/public/images/emoji/emoji_one/hot_pepper.png and b/public/images/emoji/emoji_one/hot_pepper.png differ
diff --git a/public/images/emoji/emoji_one/hugging.png b/public/images/emoji/emoji_one/hugging.png
index 126b51a8f3..13f6c1cea0 100644
Binary files a/public/images/emoji/emoji_one/hugging.png and b/public/images/emoji/emoji_one/hugging.png differ
diff --git a/public/images/emoji/emoji_one/hugging_face.png b/public/images/emoji/emoji_one/hugging_face.png
index 126b51a8f3..13f6c1cea0 100644
Binary files a/public/images/emoji/emoji_one/hugging_face.png and b/public/images/emoji/emoji_one/hugging_face.png differ
diff --git a/public/images/emoji/emoji_one/hugs.png b/public/images/emoji/emoji_one/hugs.png
index 126b51a8f3..13f6c1cea0 100644
Binary files a/public/images/emoji/emoji_one/hugs.png and b/public/images/emoji/emoji_one/hugs.png differ
diff --git a/public/images/emoji/emoji_one/hushed.png b/public/images/emoji/emoji_one/hushed.png
index 13c71f47fc..88297a79bf 100644
Binary files a/public/images/emoji/emoji_one/hushed.png and b/public/images/emoji/emoji_one/hushed.png differ
diff --git a/public/images/emoji/emoji_one/ice_skate.png b/public/images/emoji/emoji_one/ice_skate.png
index b42483a959..f813abd7d5 100644
Binary files a/public/images/emoji/emoji_one/ice_skate.png and b/public/images/emoji/emoji_one/ice_skate.png differ
diff --git a/public/images/emoji/emoji_one/imp.png b/public/images/emoji/emoji_one/imp.png
index 2f5a892143..5bbe29f84c 100644
Binary files a/public/images/emoji/emoji_one/imp.png and b/public/images/emoji/emoji_one/imp.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person.png b/public/images/emoji/emoji_one/information_desk_person.png
index 919dff8d5b..97f8256ad4 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person.png and b/public/images/emoji/emoji_one/information_desk_person.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/2.png b/public/images/emoji/emoji_one/information_desk_person/2.png
index c5ac40f6d7..4e2ffc47e9 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person/2.png and b/public/images/emoji/emoji_one/information_desk_person/2.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/3.png b/public/images/emoji/emoji_one/information_desk_person/3.png
index 40d67b2e4e..5796ae4861 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person/3.png and b/public/images/emoji/emoji_one/information_desk_person/3.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/4.png b/public/images/emoji/emoji_one/information_desk_person/4.png
index 28e222afc0..b61d746b06 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person/4.png and b/public/images/emoji/emoji_one/information_desk_person/4.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/5.png b/public/images/emoji/emoji_one/information_desk_person/5.png
index cf2033c7d9..5da96c0d6f 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person/5.png and b/public/images/emoji/emoji_one/information_desk_person/5.png differ
diff --git a/public/images/emoji/emoji_one/information_desk_person/6.png b/public/images/emoji/emoji_one/information_desk_person/6.png
index 2284126f87..9e580ed02e 100644
Binary files a/public/images/emoji/emoji_one/information_desk_person/6.png and b/public/images/emoji/emoji_one/information_desk_person/6.png differ
diff --git a/public/images/emoji/emoji_one/innocent.png b/public/images/emoji/emoji_one/innocent.png
index 720506dbd8..d563bf8990 100644
Binary files a/public/images/emoji/emoji_one/innocent.png and b/public/images/emoji/emoji_one/innocent.png differ
diff --git a/public/images/emoji/emoji_one/joy.png b/public/images/emoji/emoji_one/joy.png
index bb973cad4c..38bf2a6cfa 100644
Binary files a/public/images/emoji/emoji_one/joy.png and b/public/images/emoji/emoji_one/joy.png differ
diff --git a/public/images/emoji/emoji_one/kissing.png b/public/images/emoji/emoji_one/kissing.png
index 7b879ae8fb..4b13317053 100644
Binary files a/public/images/emoji/emoji_one/kissing.png and b/public/images/emoji/emoji_one/kissing.png differ
diff --git a/public/images/emoji/emoji_one/kissing_cat.png b/public/images/emoji/emoji_one/kissing_cat.png
index 995ca2d82d..8dcdffd9c5 100644
Binary files a/public/images/emoji/emoji_one/kissing_cat.png and b/public/images/emoji/emoji_one/kissing_cat.png differ
diff --git a/public/images/emoji/emoji_one/kissing_closed_eyes.png b/public/images/emoji/emoji_one/kissing_closed_eyes.png
index 148a00480e..4e6074694f 100644
Binary files a/public/images/emoji/emoji_one/kissing_closed_eyes.png and b/public/images/emoji/emoji_one/kissing_closed_eyes.png differ
diff --git a/public/images/emoji/emoji_one/kissing_heart.png b/public/images/emoji/emoji_one/kissing_heart.png
index ad47847096..074e0660f2 100644
Binary files a/public/images/emoji/emoji_one/kissing_heart.png and b/public/images/emoji/emoji_one/kissing_heart.png differ
diff --git a/public/images/emoji/emoji_one/laughing.png b/public/images/emoji/emoji_one/laughing.png
index ffa2477caa..42b85c1c98 100644
Binary files a/public/images/emoji/emoji_one/laughing.png and b/public/images/emoji/emoji_one/laughing.png differ
diff --git a/public/images/emoji/emoji_one/levitate.png b/public/images/emoji/emoji_one/levitate.png
index f25e14fd06..b880f689b9 100644
Binary files a/public/images/emoji/emoji_one/levitate.png and b/public/images/emoji/emoji_one/levitate.png differ
diff --git a/public/images/emoji/emoji_one/levitate/2.png b/public/images/emoji/emoji_one/levitate/2.png
index c8af4516a2..20ca989182 100644
Binary files a/public/images/emoji/emoji_one/levitate/2.png and b/public/images/emoji/emoji_one/levitate/2.png differ
diff --git a/public/images/emoji/emoji_one/levitate/3.png b/public/images/emoji/emoji_one/levitate/3.png
index ed5fde06d4..4c3c6694bf 100644
Binary files a/public/images/emoji/emoji_one/levitate/3.png and b/public/images/emoji/emoji_one/levitate/3.png differ
diff --git a/public/images/emoji/emoji_one/levitate/4.png b/public/images/emoji/emoji_one/levitate/4.png
index 631c51d4e6..cc1ec83794 100644
Binary files a/public/images/emoji/emoji_one/levitate/4.png and b/public/images/emoji/emoji_one/levitate/4.png differ
diff --git a/public/images/emoji/emoji_one/levitate/5.png b/public/images/emoji/emoji_one/levitate/5.png
index 5bbb08cab4..f76955c717 100644
Binary files a/public/images/emoji/emoji_one/levitate/5.png and b/public/images/emoji/emoji_one/levitate/5.png differ
diff --git a/public/images/emoji/emoji_one/levitate/6.png b/public/images/emoji/emoji_one/levitate/6.png
index 84fd92bd35..c129851655 100644
Binary files a/public/images/emoji/emoji_one/levitate/6.png and b/public/images/emoji/emoji_one/levitate/6.png differ
diff --git a/public/images/emoji/emoji_one/lifter.png b/public/images/emoji/emoji_one/lifter.png
index e559b73ffe..b7cb2b519a 100644
Binary files a/public/images/emoji/emoji_one/lifter.png and b/public/images/emoji/emoji_one/lifter.png differ
diff --git a/public/images/emoji/emoji_one/lifter/2.png b/public/images/emoji/emoji_one/lifter/2.png
index a31a1aab29..61086831f9 100644
Binary files a/public/images/emoji/emoji_one/lifter/2.png and b/public/images/emoji/emoji_one/lifter/2.png differ
diff --git a/public/images/emoji/emoji_one/lifter/3.png b/public/images/emoji/emoji_one/lifter/3.png
index 45ebbc67df..4471efca72 100644
Binary files a/public/images/emoji/emoji_one/lifter/3.png and b/public/images/emoji/emoji_one/lifter/3.png differ
diff --git a/public/images/emoji/emoji_one/lifter/4.png b/public/images/emoji/emoji_one/lifter/4.png
index c5d5f63edc..48bc828d30 100644
Binary files a/public/images/emoji/emoji_one/lifter/4.png and b/public/images/emoji/emoji_one/lifter/4.png differ
diff --git a/public/images/emoji/emoji_one/lifter/5.png b/public/images/emoji/emoji_one/lifter/5.png
index eeb1fa21c7..3818123af8 100644
Binary files a/public/images/emoji/emoji_one/lifter/5.png and b/public/images/emoji/emoji_one/lifter/5.png differ
diff --git a/public/images/emoji/emoji_one/lifter/6.png b/public/images/emoji/emoji_one/lifter/6.png
index a3308e8869..b6daa47178 100644
Binary files a/public/images/emoji/emoji_one/lifter/6.png and b/public/images/emoji/emoji_one/lifter/6.png differ
diff --git a/public/images/emoji/emoji_one/light_rail.png b/public/images/emoji/emoji_one/light_rail.png
index 6ce065de71..2651803dcb 100644
Binary files a/public/images/emoji/emoji_one/light_rail.png and b/public/images/emoji/emoji_one/light_rail.png differ
diff --git a/public/images/emoji/emoji_one/lips.png b/public/images/emoji/emoji_one/lips.png
index b4c1e3f78a..65a5722bd5 100644
Binary files a/public/images/emoji/emoji_one/lips.png and b/public/images/emoji/emoji_one/lips.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture.png b/public/images/emoji/emoji_one/love_you_gesture.png
index 14ef7c72b2..007ab2ea57 100644
Binary files a/public/images/emoji/emoji_one/love_you_gesture.png and b/public/images/emoji/emoji_one/love_you_gesture.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/2.png b/public/images/emoji/emoji_one/love_you_gesture/2.png
index b70217e894..edd0271d90 100644
Binary files a/public/images/emoji/emoji_one/love_you_gesture/2.png and b/public/images/emoji/emoji_one/love_you_gesture/2.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/3.png b/public/images/emoji/emoji_one/love_you_gesture/3.png
index aa984ea926..677eeff1c1 100644
Binary files a/public/images/emoji/emoji_one/love_you_gesture/3.png and b/public/images/emoji/emoji_one/love_you_gesture/3.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/4.png b/public/images/emoji/emoji_one/love_you_gesture/4.png
index 5decb0e800..9901ffe74e 100644
Binary files a/public/images/emoji/emoji_one/love_you_gesture/4.png and b/public/images/emoji/emoji_one/love_you_gesture/4.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/5.png b/public/images/emoji/emoji_one/love_you_gesture/5.png
index e0bb218cc0..7d5009e13f 100644
Binary files a/public/images/emoji/emoji_one/love_you_gesture/5.png and b/public/images/emoji/emoji_one/love_you_gesture/5.png differ
diff --git a/public/images/emoji/emoji_one/love_you_gesture/6.png b/public/images/emoji/emoji_one/love_you_gesture/6.png
index bb51bde8bb..0e771bf61c 100644
Binary files a/public/images/emoji/emoji_one/love_you_gesture/6.png and b/public/images/emoji/emoji_one/love_you_gesture/6.png differ
diff --git a/public/images/emoji/emoji_one/lying_face.png b/public/images/emoji/emoji_one/lying_face.png
index 4dab78b5c2..2086acbc2b 100644
Binary files a/public/images/emoji/emoji_one/lying_face.png and b/public/images/emoji/emoji_one/lying_face.png differ
diff --git a/public/images/emoji/emoji_one/mage.png b/public/images/emoji/emoji_one/mage.png
index 71c1b13f92..703f32aee7 100644
Binary files a/public/images/emoji/emoji_one/mage.png and b/public/images/emoji/emoji_one/mage.png differ
diff --git a/public/images/emoji/emoji_one/mage/2.png b/public/images/emoji/emoji_one/mage/2.png
index 823f6843fa..886173ec97 100644
Binary files a/public/images/emoji/emoji_one/mage/2.png and b/public/images/emoji/emoji_one/mage/2.png differ
diff --git a/public/images/emoji/emoji_one/mage/3.png b/public/images/emoji/emoji_one/mage/3.png
index c2ff6622a0..5f1ec8faad 100644
Binary files a/public/images/emoji/emoji_one/mage/3.png and b/public/images/emoji/emoji_one/mage/3.png differ
diff --git a/public/images/emoji/emoji_one/mage/4.png b/public/images/emoji/emoji_one/mage/4.png
index 76d0a52e37..7664ec51ec 100644
Binary files a/public/images/emoji/emoji_one/mage/4.png and b/public/images/emoji/emoji_one/mage/4.png differ
diff --git a/public/images/emoji/emoji_one/mage/5.png b/public/images/emoji/emoji_one/mage/5.png
index ddb5de5580..d791d4eb11 100644
Binary files a/public/images/emoji/emoji_one/mage/5.png and b/public/images/emoji/emoji_one/mage/5.png differ
diff --git a/public/images/emoji/emoji_one/mage/6.png b/public/images/emoji/emoji_one/mage/6.png
index 302dd62dfb..d3a31e9de8 100644
Binary files a/public/images/emoji/emoji_one/mage/6.png and b/public/images/emoji/emoji_one/mage/6.png differ
diff --git a/public/images/emoji/emoji_one/male_couple_with_heart.png b/public/images/emoji/emoji_one/male_couple_with_heart.png
index c8b688db39..4b69d0f920 100644
Binary files a/public/images/emoji/emoji_one/male_couple_with_heart.png and b/public/images/emoji/emoji_one/male_couple_with_heart.png differ
diff --git a/public/images/emoji/emoji_one/male_couplekiss.png b/public/images/emoji/emoji_one/male_couplekiss.png
index 851abf3341..ad67a6194b 100644
Binary files a/public/images/emoji/emoji_one/male_couplekiss.png and b/public/images/emoji/emoji_one/male_couplekiss.png differ
diff --git a/public/images/emoji/emoji_one/male_detective.png b/public/images/emoji/emoji_one/male_detective.png
index dda052dfbb..8d0cfe50b6 100644
Binary files a/public/images/emoji/emoji_one/male_detective.png and b/public/images/emoji/emoji_one/male_detective.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/2.png b/public/images/emoji/emoji_one/male_detective/2.png
index 22f8a4fa1b..248be42171 100644
Binary files a/public/images/emoji/emoji_one/male_detective/2.png and b/public/images/emoji/emoji_one/male_detective/2.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/3.png b/public/images/emoji/emoji_one/male_detective/3.png
index 028d6d8e16..620aadaf24 100644
Binary files a/public/images/emoji/emoji_one/male_detective/3.png and b/public/images/emoji/emoji_one/male_detective/3.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/4.png b/public/images/emoji/emoji_one/male_detective/4.png
index 467e372e51..d6ed01d7e1 100644
Binary files a/public/images/emoji/emoji_one/male_detective/4.png and b/public/images/emoji/emoji_one/male_detective/4.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/5.png b/public/images/emoji/emoji_one/male_detective/5.png
index 69c952c3b7..6d06155f7e 100644
Binary files a/public/images/emoji/emoji_one/male_detective/5.png and b/public/images/emoji/emoji_one/male_detective/5.png differ
diff --git a/public/images/emoji/emoji_one/male_detective/6.png b/public/images/emoji/emoji_one/male_detective/6.png
index 3caf1bcfc8..890777db04 100644
Binary files a/public/images/emoji/emoji_one/male_detective/6.png and b/public/images/emoji/emoji_one/male_detective/6.png differ
diff --git a/public/images/emoji/emoji_one/man.png b/public/images/emoji/emoji_one/man.png
index abcdfbb5bf..31a7a88460 100644
Binary files a/public/images/emoji/emoji_one/man.png and b/public/images/emoji/emoji_one/man.png differ
diff --git a/public/images/emoji/emoji_one/man/2.png b/public/images/emoji/emoji_one/man/2.png
index 96662e6bc3..ca803d13aa 100644
Binary files a/public/images/emoji/emoji_one/man/2.png and b/public/images/emoji/emoji_one/man/2.png differ
diff --git a/public/images/emoji/emoji_one/man/3.png b/public/images/emoji/emoji_one/man/3.png
index afcd96c710..c27072ac83 100644
Binary files a/public/images/emoji/emoji_one/man/3.png and b/public/images/emoji/emoji_one/man/3.png differ
diff --git a/public/images/emoji/emoji_one/man/4.png b/public/images/emoji/emoji_one/man/4.png
index 084b945111..e6fb47fc5a 100644
Binary files a/public/images/emoji/emoji_one/man/4.png and b/public/images/emoji/emoji_one/man/4.png differ
diff --git a/public/images/emoji/emoji_one/man/5.png b/public/images/emoji/emoji_one/man/5.png
index 6f00c116b3..8fbd8c1201 100644
Binary files a/public/images/emoji/emoji_one/man/5.png and b/public/images/emoji/emoji_one/man/5.png differ
diff --git a/public/images/emoji/emoji_one/man/6.png b/public/images/emoji/emoji_one/man/6.png
index 22a5732e1c..ea9ff5a377 100644
Binary files a/public/images/emoji/emoji_one/man/6.png and b/public/images/emoji/emoji_one/man/6.png differ
diff --git a/public/images/emoji/emoji_one/man_artist.png b/public/images/emoji/emoji_one/man_artist.png
index c82d9e99ba..9fe74a23eb 100644
Binary files a/public/images/emoji/emoji_one/man_artist.png and b/public/images/emoji/emoji_one/man_artist.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/2.png b/public/images/emoji/emoji_one/man_artist/2.png
index fa80701bae..0ef32d13de 100644
Binary files a/public/images/emoji/emoji_one/man_artist/2.png and b/public/images/emoji/emoji_one/man_artist/2.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/3.png b/public/images/emoji/emoji_one/man_artist/3.png
index 906d6fbb14..cb57383562 100644
Binary files a/public/images/emoji/emoji_one/man_artist/3.png and b/public/images/emoji/emoji_one/man_artist/3.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/4.png b/public/images/emoji/emoji_one/man_artist/4.png
index 76bb436757..16798bed95 100644
Binary files a/public/images/emoji/emoji_one/man_artist/4.png and b/public/images/emoji/emoji_one/man_artist/4.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/5.png b/public/images/emoji/emoji_one/man_artist/5.png
index b90d71e450..c41cedefe9 100644
Binary files a/public/images/emoji/emoji_one/man_artist/5.png and b/public/images/emoji/emoji_one/man_artist/5.png differ
diff --git a/public/images/emoji/emoji_one/man_artist/6.png b/public/images/emoji/emoji_one/man_artist/6.png
index b9ad3f698d..d17211c3eb 100644
Binary files a/public/images/emoji/emoji_one/man_artist/6.png and b/public/images/emoji/emoji_one/man_artist/6.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut.png b/public/images/emoji/emoji_one/man_astronaut.png
index 89e1f5e805..6db91a0984 100644
Binary files a/public/images/emoji/emoji_one/man_astronaut.png and b/public/images/emoji/emoji_one/man_astronaut.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/2.png b/public/images/emoji/emoji_one/man_astronaut/2.png
index 036bf3c705..798c0166f4 100644
Binary files a/public/images/emoji/emoji_one/man_astronaut/2.png and b/public/images/emoji/emoji_one/man_astronaut/2.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/3.png b/public/images/emoji/emoji_one/man_astronaut/3.png
index e9b71d73be..bd65d6b5ed 100644
Binary files a/public/images/emoji/emoji_one/man_astronaut/3.png and b/public/images/emoji/emoji_one/man_astronaut/3.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/4.png b/public/images/emoji/emoji_one/man_astronaut/4.png
index 201716ac4d..6ebe8cb15b 100644
Binary files a/public/images/emoji/emoji_one/man_astronaut/4.png and b/public/images/emoji/emoji_one/man_astronaut/4.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/5.png b/public/images/emoji/emoji_one/man_astronaut/5.png
index 3c6708c9ce..31a9f7e4ad 100644
Binary files a/public/images/emoji/emoji_one/man_astronaut/5.png and b/public/images/emoji/emoji_one/man_astronaut/5.png differ
diff --git a/public/images/emoji/emoji_one/man_astronaut/6.png b/public/images/emoji/emoji_one/man_astronaut/6.png
index 71f36fb80c..621f8d5f78 100644
Binary files a/public/images/emoji/emoji_one/man_astronaut/6.png and b/public/images/emoji/emoji_one/man_astronaut/6.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling.png b/public/images/emoji/emoji_one/man_cartwheeling.png
index 9cbb502df6..4caeb4352b 100644
Binary files a/public/images/emoji/emoji_one/man_cartwheeling.png and b/public/images/emoji/emoji_one/man_cartwheeling.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/2.png b/public/images/emoji/emoji_one/man_cartwheeling/2.png
index 2ee4ced431..0be82acac8 100644
Binary files a/public/images/emoji/emoji_one/man_cartwheeling/2.png and b/public/images/emoji/emoji_one/man_cartwheeling/2.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/3.png b/public/images/emoji/emoji_one/man_cartwheeling/3.png
index b3b82f3ed0..27cbd1aea8 100644
Binary files a/public/images/emoji/emoji_one/man_cartwheeling/3.png and b/public/images/emoji/emoji_one/man_cartwheeling/3.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/4.png b/public/images/emoji/emoji_one/man_cartwheeling/4.png
index cd5b5f7db7..7178f6cee0 100644
Binary files a/public/images/emoji/emoji_one/man_cartwheeling/4.png and b/public/images/emoji/emoji_one/man_cartwheeling/4.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/5.png b/public/images/emoji/emoji_one/man_cartwheeling/5.png
index 7f13cb8d09..4d915f2409 100644
Binary files a/public/images/emoji/emoji_one/man_cartwheeling/5.png and b/public/images/emoji/emoji_one/man_cartwheeling/5.png differ
diff --git a/public/images/emoji/emoji_one/man_cartwheeling/6.png b/public/images/emoji/emoji_one/man_cartwheeling/6.png
index 6a5aea5612..cd33cf5fbc 100644
Binary files a/public/images/emoji/emoji_one/man_cartwheeling/6.png and b/public/images/emoji/emoji_one/man_cartwheeling/6.png differ
diff --git a/public/images/emoji/emoji_one/man_cook.png b/public/images/emoji/emoji_one/man_cook.png
index 335d8b5f21..5485416daf 100644
Binary files a/public/images/emoji/emoji_one/man_cook.png and b/public/images/emoji/emoji_one/man_cook.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/2.png b/public/images/emoji/emoji_one/man_cook/2.png
index 46fd1f6dcd..a7a9a64872 100644
Binary files a/public/images/emoji/emoji_one/man_cook/2.png and b/public/images/emoji/emoji_one/man_cook/2.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/3.png b/public/images/emoji/emoji_one/man_cook/3.png
index 3a552dbbbc..b05e0cb88a 100644
Binary files a/public/images/emoji/emoji_one/man_cook/3.png and b/public/images/emoji/emoji_one/man_cook/3.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/4.png b/public/images/emoji/emoji_one/man_cook/4.png
index 5c8dfe5240..b2d94d736b 100644
Binary files a/public/images/emoji/emoji_one/man_cook/4.png and b/public/images/emoji/emoji_one/man_cook/4.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/5.png b/public/images/emoji/emoji_one/man_cook/5.png
index 2b1fc6cb7d..89a9f1403d 100644
Binary files a/public/images/emoji/emoji_one/man_cook/5.png and b/public/images/emoji/emoji_one/man_cook/5.png differ
diff --git a/public/images/emoji/emoji_one/man_cook/6.png b/public/images/emoji/emoji_one/man_cook/6.png
index afbbb0ee16..01ed27b473 100644
Binary files a/public/images/emoji/emoji_one/man_cook/6.png and b/public/images/emoji/emoji_one/man_cook/6.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing.png b/public/images/emoji/emoji_one/man_dancing.png
index 87ad16029e..175e16641e 100644
Binary files a/public/images/emoji/emoji_one/man_dancing.png and b/public/images/emoji/emoji_one/man_dancing.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/2.png b/public/images/emoji/emoji_one/man_dancing/2.png
index 9c666b8759..284f54a87f 100644
Binary files a/public/images/emoji/emoji_one/man_dancing/2.png and b/public/images/emoji/emoji_one/man_dancing/2.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/3.png b/public/images/emoji/emoji_one/man_dancing/3.png
index 55ed8888ac..a7da239bf9 100644
Binary files a/public/images/emoji/emoji_one/man_dancing/3.png and b/public/images/emoji/emoji_one/man_dancing/3.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/4.png b/public/images/emoji/emoji_one/man_dancing/4.png
index 3f590db81b..a8acf35bf9 100644
Binary files a/public/images/emoji/emoji_one/man_dancing/4.png and b/public/images/emoji/emoji_one/man_dancing/4.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/5.png b/public/images/emoji/emoji_one/man_dancing/5.png
index cf516c730d..096e316cec 100644
Binary files a/public/images/emoji/emoji_one/man_dancing/5.png and b/public/images/emoji/emoji_one/man_dancing/5.png differ
diff --git a/public/images/emoji/emoji_one/man_dancing/6.png b/public/images/emoji/emoji_one/man_dancing/6.png
index 2d0880aace..f9513c441f 100644
Binary files a/public/images/emoji/emoji_one/man_dancing/6.png and b/public/images/emoji/emoji_one/man_dancing/6.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming.png b/public/images/emoji/emoji_one/man_facepalming.png
index 1fd9b1e63e..73bcbacd41 100644
Binary files a/public/images/emoji/emoji_one/man_facepalming.png and b/public/images/emoji/emoji_one/man_facepalming.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/2.png b/public/images/emoji/emoji_one/man_facepalming/2.png
index 9da5b3cb87..f4eafb555c 100644
Binary files a/public/images/emoji/emoji_one/man_facepalming/2.png and b/public/images/emoji/emoji_one/man_facepalming/2.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/3.png b/public/images/emoji/emoji_one/man_facepalming/3.png
index eef8155983..b5d656e11a 100644
Binary files a/public/images/emoji/emoji_one/man_facepalming/3.png and b/public/images/emoji/emoji_one/man_facepalming/3.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/4.png b/public/images/emoji/emoji_one/man_facepalming/4.png
index 4ceed5477a..751c68c260 100644
Binary files a/public/images/emoji/emoji_one/man_facepalming/4.png and b/public/images/emoji/emoji_one/man_facepalming/4.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/5.png b/public/images/emoji/emoji_one/man_facepalming/5.png
index 2607a2f2c2..68ea3546d2 100644
Binary files a/public/images/emoji/emoji_one/man_facepalming/5.png and b/public/images/emoji/emoji_one/man_facepalming/5.png differ
diff --git a/public/images/emoji/emoji_one/man_facepalming/6.png b/public/images/emoji/emoji_one/man_facepalming/6.png
index f2c9a7f81d..de901b3758 100644
Binary files a/public/images/emoji/emoji_one/man_facepalming/6.png and b/public/images/emoji/emoji_one/man_facepalming/6.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker.png b/public/images/emoji/emoji_one/man_factory_worker.png
index d3c083a93a..b5faf12a06 100644
Binary files a/public/images/emoji/emoji_one/man_factory_worker.png and b/public/images/emoji/emoji_one/man_factory_worker.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/2.png b/public/images/emoji/emoji_one/man_factory_worker/2.png
index 1edb3ab417..bb4891ab86 100644
Binary files a/public/images/emoji/emoji_one/man_factory_worker/2.png and b/public/images/emoji/emoji_one/man_factory_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/3.png b/public/images/emoji/emoji_one/man_factory_worker/3.png
index 9500d63176..99fabdb827 100644
Binary files a/public/images/emoji/emoji_one/man_factory_worker/3.png and b/public/images/emoji/emoji_one/man_factory_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/4.png b/public/images/emoji/emoji_one/man_factory_worker/4.png
index 70c32c37b6..8dbc6953ba 100644
Binary files a/public/images/emoji/emoji_one/man_factory_worker/4.png and b/public/images/emoji/emoji_one/man_factory_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/5.png b/public/images/emoji/emoji_one/man_factory_worker/5.png
index 00272c5336..a8549f277f 100644
Binary files a/public/images/emoji/emoji_one/man_factory_worker/5.png and b/public/images/emoji/emoji_one/man_factory_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/man_factory_worker/6.png b/public/images/emoji/emoji_one/man_factory_worker/6.png
index 6b15a2bdea..8d99881753 100644
Binary files a/public/images/emoji/emoji_one/man_factory_worker/6.png and b/public/images/emoji/emoji_one/man_factory_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer.png b/public/images/emoji/emoji_one/man_farmer.png
index 9cb2fbfbcb..860f1c1377 100644
Binary files a/public/images/emoji/emoji_one/man_farmer.png and b/public/images/emoji/emoji_one/man_farmer.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/2.png b/public/images/emoji/emoji_one/man_farmer/2.png
index 19e67034d1..14461632a7 100644
Binary files a/public/images/emoji/emoji_one/man_farmer/2.png and b/public/images/emoji/emoji_one/man_farmer/2.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/3.png b/public/images/emoji/emoji_one/man_farmer/3.png
index 4ccf7c153f..696e158c62 100644
Binary files a/public/images/emoji/emoji_one/man_farmer/3.png and b/public/images/emoji/emoji_one/man_farmer/3.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/4.png b/public/images/emoji/emoji_one/man_farmer/4.png
index 73732ab4ae..2ccab6e595 100644
Binary files a/public/images/emoji/emoji_one/man_farmer/4.png and b/public/images/emoji/emoji_one/man_farmer/4.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/5.png b/public/images/emoji/emoji_one/man_farmer/5.png
index 1ef4e92800..04c80514cd 100644
Binary files a/public/images/emoji/emoji_one/man_farmer/5.png and b/public/images/emoji/emoji_one/man_farmer/5.png differ
diff --git a/public/images/emoji/emoji_one/man_farmer/6.png b/public/images/emoji/emoji_one/man_farmer/6.png
index 58afdbe531..f9f5968f5d 100644
Binary files a/public/images/emoji/emoji_one/man_farmer/6.png and b/public/images/emoji/emoji_one/man_farmer/6.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter.png b/public/images/emoji/emoji_one/man_firefighter.png
index d875623c94..0071d3a048 100644
Binary files a/public/images/emoji/emoji_one/man_firefighter.png and b/public/images/emoji/emoji_one/man_firefighter.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/2.png b/public/images/emoji/emoji_one/man_firefighter/2.png
index 1b89440e51..def9befadc 100644
Binary files a/public/images/emoji/emoji_one/man_firefighter/2.png and b/public/images/emoji/emoji_one/man_firefighter/2.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/3.png b/public/images/emoji/emoji_one/man_firefighter/3.png
index 16ed4ef12f..a87cd27c42 100644
Binary files a/public/images/emoji/emoji_one/man_firefighter/3.png and b/public/images/emoji/emoji_one/man_firefighter/3.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/4.png b/public/images/emoji/emoji_one/man_firefighter/4.png
index fd93c503cc..1ef10190af 100644
Binary files a/public/images/emoji/emoji_one/man_firefighter/4.png and b/public/images/emoji/emoji_one/man_firefighter/4.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/5.png b/public/images/emoji/emoji_one/man_firefighter/5.png
index e64fcc0e54..13a64c444e 100644
Binary files a/public/images/emoji/emoji_one/man_firefighter/5.png and b/public/images/emoji/emoji_one/man_firefighter/5.png differ
diff --git a/public/images/emoji/emoji_one/man_firefighter/6.png b/public/images/emoji/emoji_one/man_firefighter/6.png
index a5890f727b..cf8b84d095 100644
Binary files a/public/images/emoji/emoji_one/man_firefighter/6.png and b/public/images/emoji/emoji_one/man_firefighter/6.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker.png b/public/images/emoji/emoji_one/man_health_worker.png
index 7c6ff94006..992d51555f 100644
Binary files a/public/images/emoji/emoji_one/man_health_worker.png and b/public/images/emoji/emoji_one/man_health_worker.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/2.png b/public/images/emoji/emoji_one/man_health_worker/2.png
index 39fa46098d..d11dc967c7 100644
Binary files a/public/images/emoji/emoji_one/man_health_worker/2.png and b/public/images/emoji/emoji_one/man_health_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/3.png b/public/images/emoji/emoji_one/man_health_worker/3.png
index 8a57747931..39a81bb114 100644
Binary files a/public/images/emoji/emoji_one/man_health_worker/3.png and b/public/images/emoji/emoji_one/man_health_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/4.png b/public/images/emoji/emoji_one/man_health_worker/4.png
index 7bb737ae92..a04b2d1601 100644
Binary files a/public/images/emoji/emoji_one/man_health_worker/4.png and b/public/images/emoji/emoji_one/man_health_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/5.png b/public/images/emoji/emoji_one/man_health_worker/5.png
index face3063d6..0a6979d6b6 100644
Binary files a/public/images/emoji/emoji_one/man_health_worker/5.png and b/public/images/emoji/emoji_one/man_health_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/man_health_worker/6.png b/public/images/emoji/emoji_one/man_health_worker/6.png
index cfd9b80a52..8a62b2bbc9 100644
Binary files a/public/images/emoji/emoji_one/man_health_worker/6.png and b/public/images/emoji/emoji_one/man_health_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating.png
index f25e14fd06..b880f689b9 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png
index c8af4516a2..20ca989182 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/2.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png
index ed5fde06d4..4c3c6694bf 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/3.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png
index 631c51d4e6..cc1ec83794 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/4.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png
index 5bbb08cab4..f76955c717 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/5.png differ
diff --git a/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png b/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png
index 84fd92bd35..c129851655 100644
Binary files a/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png and b/public/images/emoji/emoji_one/man_in_business_suit_levitating/6.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo.png b/public/images/emoji/emoji_one/man_in_tuxedo.png
index 6b754543e1..e09a2d4850 100644
Binary files a/public/images/emoji/emoji_one/man_in_tuxedo.png and b/public/images/emoji/emoji_one/man_in_tuxedo.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/2.png b/public/images/emoji/emoji_one/man_in_tuxedo/2.png
index f0f5d5b66b..332af37781 100644
Binary files a/public/images/emoji/emoji_one/man_in_tuxedo/2.png and b/public/images/emoji/emoji_one/man_in_tuxedo/2.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/3.png b/public/images/emoji/emoji_one/man_in_tuxedo/3.png
index 970c9b2395..33a7172c52 100644
Binary files a/public/images/emoji/emoji_one/man_in_tuxedo/3.png and b/public/images/emoji/emoji_one/man_in_tuxedo/3.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/4.png b/public/images/emoji/emoji_one/man_in_tuxedo/4.png
index 9625588690..a6ea08854b 100644
Binary files a/public/images/emoji/emoji_one/man_in_tuxedo/4.png and b/public/images/emoji/emoji_one/man_in_tuxedo/4.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/5.png b/public/images/emoji/emoji_one/man_in_tuxedo/5.png
index 573cfb4018..ca56aae928 100644
Binary files a/public/images/emoji/emoji_one/man_in_tuxedo/5.png and b/public/images/emoji/emoji_one/man_in_tuxedo/5.png differ
diff --git a/public/images/emoji/emoji_one/man_in_tuxedo/6.png b/public/images/emoji/emoji_one/man_in_tuxedo/6.png
index 10c76308e2..e44e5fcc5c 100644
Binary files a/public/images/emoji/emoji_one/man_in_tuxedo/6.png and b/public/images/emoji/emoji_one/man_in_tuxedo/6.png differ
diff --git a/public/images/emoji/emoji_one/man_judge.png b/public/images/emoji/emoji_one/man_judge.png
index 420e5f557f..5bab800d40 100644
Binary files a/public/images/emoji/emoji_one/man_judge.png and b/public/images/emoji/emoji_one/man_judge.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/2.png b/public/images/emoji/emoji_one/man_judge/2.png
index 453b958de5..b07f3ccdd3 100644
Binary files a/public/images/emoji/emoji_one/man_judge/2.png and b/public/images/emoji/emoji_one/man_judge/2.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/3.png b/public/images/emoji/emoji_one/man_judge/3.png
index 1501db4f66..08e064168a 100644
Binary files a/public/images/emoji/emoji_one/man_judge/3.png and b/public/images/emoji/emoji_one/man_judge/3.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/4.png b/public/images/emoji/emoji_one/man_judge/4.png
index c3efb5cc91..a8e41b4d29 100644
Binary files a/public/images/emoji/emoji_one/man_judge/4.png and b/public/images/emoji/emoji_one/man_judge/4.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/5.png b/public/images/emoji/emoji_one/man_judge/5.png
index f6ca93becc..69e8f0bd76 100644
Binary files a/public/images/emoji/emoji_one/man_judge/5.png and b/public/images/emoji/emoji_one/man_judge/5.png differ
diff --git a/public/images/emoji/emoji_one/man_judge/6.png b/public/images/emoji/emoji_one/man_judge/6.png
index 7cd49a4f4c..bbdc7ffe48 100644
Binary files a/public/images/emoji/emoji_one/man_judge/6.png and b/public/images/emoji/emoji_one/man_judge/6.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling.png b/public/images/emoji/emoji_one/man_juggling.png
index f805f92f06..53dccdba44 100644
Binary files a/public/images/emoji/emoji_one/man_juggling.png and b/public/images/emoji/emoji_one/man_juggling.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/2.png b/public/images/emoji/emoji_one/man_juggling/2.png
index 5c4baaddee..33451db507 100644
Binary files a/public/images/emoji/emoji_one/man_juggling/2.png and b/public/images/emoji/emoji_one/man_juggling/2.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/3.png b/public/images/emoji/emoji_one/man_juggling/3.png
index f4eb5d751f..150224b4c5 100644
Binary files a/public/images/emoji/emoji_one/man_juggling/3.png and b/public/images/emoji/emoji_one/man_juggling/3.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/4.png b/public/images/emoji/emoji_one/man_juggling/4.png
index 2b13f5da36..233f5e6fb3 100644
Binary files a/public/images/emoji/emoji_one/man_juggling/4.png and b/public/images/emoji/emoji_one/man_juggling/4.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/5.png b/public/images/emoji/emoji_one/man_juggling/5.png
index 1489fb086b..858d6d027a 100644
Binary files a/public/images/emoji/emoji_one/man_juggling/5.png and b/public/images/emoji/emoji_one/man_juggling/5.png differ
diff --git a/public/images/emoji/emoji_one/man_juggling/6.png b/public/images/emoji/emoji_one/man_juggling/6.png
index f5728b8992..0d0197ab92 100644
Binary files a/public/images/emoji/emoji_one/man_juggling/6.png and b/public/images/emoji/emoji_one/man_juggling/6.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic.png b/public/images/emoji/emoji_one/man_mechanic.png
index 1c9be382e3..d91f2086d3 100644
Binary files a/public/images/emoji/emoji_one/man_mechanic.png and b/public/images/emoji/emoji_one/man_mechanic.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/2.png b/public/images/emoji/emoji_one/man_mechanic/2.png
index ede2f4b680..55b452aa49 100644
Binary files a/public/images/emoji/emoji_one/man_mechanic/2.png and b/public/images/emoji/emoji_one/man_mechanic/2.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/3.png b/public/images/emoji/emoji_one/man_mechanic/3.png
index a7e1cbc46b..44dd62d8bd 100644
Binary files a/public/images/emoji/emoji_one/man_mechanic/3.png and b/public/images/emoji/emoji_one/man_mechanic/3.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/4.png b/public/images/emoji/emoji_one/man_mechanic/4.png
index 5162e05bff..6abac278c2 100644
Binary files a/public/images/emoji/emoji_one/man_mechanic/4.png and b/public/images/emoji/emoji_one/man_mechanic/4.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/5.png b/public/images/emoji/emoji_one/man_mechanic/5.png
index 3cab0f1a32..f3b4dcf8e4 100644
Binary files a/public/images/emoji/emoji_one/man_mechanic/5.png and b/public/images/emoji/emoji_one/man_mechanic/5.png differ
diff --git a/public/images/emoji/emoji_one/man_mechanic/6.png b/public/images/emoji/emoji_one/man_mechanic/6.png
index 6480465f24..717ec8233a 100644
Binary files a/public/images/emoji/emoji_one/man_mechanic/6.png and b/public/images/emoji/emoji_one/man_mechanic/6.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker.png b/public/images/emoji/emoji_one/man_office_worker.png
index ff2e1d512c..9f229b9dd5 100644
Binary files a/public/images/emoji/emoji_one/man_office_worker.png and b/public/images/emoji/emoji_one/man_office_worker.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/2.png b/public/images/emoji/emoji_one/man_office_worker/2.png
index fdcd97b1f5..1a23240241 100644
Binary files a/public/images/emoji/emoji_one/man_office_worker/2.png and b/public/images/emoji/emoji_one/man_office_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/3.png b/public/images/emoji/emoji_one/man_office_worker/3.png
index 4973ca5492..fdd019dffc 100644
Binary files a/public/images/emoji/emoji_one/man_office_worker/3.png and b/public/images/emoji/emoji_one/man_office_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/4.png b/public/images/emoji/emoji_one/man_office_worker/4.png
index d040f49ea2..79c2f242e7 100644
Binary files a/public/images/emoji/emoji_one/man_office_worker/4.png and b/public/images/emoji/emoji_one/man_office_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/5.png b/public/images/emoji/emoji_one/man_office_worker/5.png
index 99766ff9d8..34387a1c9b 100644
Binary files a/public/images/emoji/emoji_one/man_office_worker/5.png and b/public/images/emoji/emoji_one/man_office_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/man_office_worker/6.png b/public/images/emoji/emoji_one/man_office_worker/6.png
index 38dc9a1394..9f6685360a 100644
Binary files a/public/images/emoji/emoji_one/man_office_worker/6.png and b/public/images/emoji/emoji_one/man_office_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot.png b/public/images/emoji/emoji_one/man_pilot.png
index b9cf3af516..b06ea0112a 100644
Binary files a/public/images/emoji/emoji_one/man_pilot.png and b/public/images/emoji/emoji_one/man_pilot.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/2.png b/public/images/emoji/emoji_one/man_pilot/2.png
index 5828b6cbb4..264674fbc3 100644
Binary files a/public/images/emoji/emoji_one/man_pilot/2.png and b/public/images/emoji/emoji_one/man_pilot/2.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/3.png b/public/images/emoji/emoji_one/man_pilot/3.png
index 92affa0b59..9942d5a2b9 100644
Binary files a/public/images/emoji/emoji_one/man_pilot/3.png and b/public/images/emoji/emoji_one/man_pilot/3.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/4.png b/public/images/emoji/emoji_one/man_pilot/4.png
index 59434b8f6b..de44ad6a2b 100644
Binary files a/public/images/emoji/emoji_one/man_pilot/4.png and b/public/images/emoji/emoji_one/man_pilot/4.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/5.png b/public/images/emoji/emoji_one/man_pilot/5.png
index 7ef55e6a0f..a43f5608e9 100644
Binary files a/public/images/emoji/emoji_one/man_pilot/5.png and b/public/images/emoji/emoji_one/man_pilot/5.png differ
diff --git a/public/images/emoji/emoji_one/man_pilot/6.png b/public/images/emoji/emoji_one/man_pilot/6.png
index 6a9bb6326d..1a7bc2d4a7 100644
Binary files a/public/images/emoji/emoji_one/man_pilot/6.png and b/public/images/emoji/emoji_one/man_pilot/6.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball.png b/public/images/emoji/emoji_one/man_playing_handball.png
index f601cd91dc..4567ae6722 100644
Binary files a/public/images/emoji/emoji_one/man_playing_handball.png and b/public/images/emoji/emoji_one/man_playing_handball.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/2.png b/public/images/emoji/emoji_one/man_playing_handball/2.png
index 98609b1378..51005b6e82 100644
Binary files a/public/images/emoji/emoji_one/man_playing_handball/2.png and b/public/images/emoji/emoji_one/man_playing_handball/2.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/3.png b/public/images/emoji/emoji_one/man_playing_handball/3.png
index e656a0a953..f5d65f9da0 100644
Binary files a/public/images/emoji/emoji_one/man_playing_handball/3.png and b/public/images/emoji/emoji_one/man_playing_handball/3.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/4.png b/public/images/emoji/emoji_one/man_playing_handball/4.png
index c450007bcd..340af47454 100644
Binary files a/public/images/emoji/emoji_one/man_playing_handball/4.png and b/public/images/emoji/emoji_one/man_playing_handball/4.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/5.png b/public/images/emoji/emoji_one/man_playing_handball/5.png
index 01e5663bcb..20a3fee4bb 100644
Binary files a/public/images/emoji/emoji_one/man_playing_handball/5.png and b/public/images/emoji/emoji_one/man_playing_handball/5.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_handball/6.png b/public/images/emoji/emoji_one/man_playing_handball/6.png
index 1836ebfc31..12cca91ae1 100644
Binary files a/public/images/emoji/emoji_one/man_playing_handball/6.png and b/public/images/emoji/emoji_one/man_playing_handball/6.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo.png b/public/images/emoji/emoji_one/man_playing_water_polo.png
index d7167ec5b2..78c2ce464b 100644
Binary files a/public/images/emoji/emoji_one/man_playing_water_polo.png and b/public/images/emoji/emoji_one/man_playing_water_polo.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/2.png b/public/images/emoji/emoji_one/man_playing_water_polo/2.png
index 4dcd8f371b..fb4329d396 100644
Binary files a/public/images/emoji/emoji_one/man_playing_water_polo/2.png and b/public/images/emoji/emoji_one/man_playing_water_polo/2.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/3.png b/public/images/emoji/emoji_one/man_playing_water_polo/3.png
index a99323fe8d..73c9c1b805 100644
Binary files a/public/images/emoji/emoji_one/man_playing_water_polo/3.png and b/public/images/emoji/emoji_one/man_playing_water_polo/3.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/4.png b/public/images/emoji/emoji_one/man_playing_water_polo/4.png
index d79863e4c2..8f9163ae98 100644
Binary files a/public/images/emoji/emoji_one/man_playing_water_polo/4.png and b/public/images/emoji/emoji_one/man_playing_water_polo/4.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/5.png b/public/images/emoji/emoji_one/man_playing_water_polo/5.png
index ea75d7e910..fab5ded877 100644
Binary files a/public/images/emoji/emoji_one/man_playing_water_polo/5.png and b/public/images/emoji/emoji_one/man_playing_water_polo/5.png differ
diff --git a/public/images/emoji/emoji_one/man_playing_water_polo/6.png b/public/images/emoji/emoji_one/man_playing_water_polo/6.png
index f597e75c4c..0d917ac951 100644
Binary files a/public/images/emoji/emoji_one/man_playing_water_polo/6.png and b/public/images/emoji/emoji_one/man_playing_water_polo/6.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist.png b/public/images/emoji/emoji_one/man_scientist.png
index 4f92ec5abb..1d412d6d40 100644
Binary files a/public/images/emoji/emoji_one/man_scientist.png and b/public/images/emoji/emoji_one/man_scientist.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/2.png b/public/images/emoji/emoji_one/man_scientist/2.png
index ee0c38afe7..99930cc163 100644
Binary files a/public/images/emoji/emoji_one/man_scientist/2.png and b/public/images/emoji/emoji_one/man_scientist/2.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/3.png b/public/images/emoji/emoji_one/man_scientist/3.png
index 3b0003351a..eceef6632d 100644
Binary files a/public/images/emoji/emoji_one/man_scientist/3.png and b/public/images/emoji/emoji_one/man_scientist/3.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/4.png b/public/images/emoji/emoji_one/man_scientist/4.png
index 6d88377310..25578dce04 100644
Binary files a/public/images/emoji/emoji_one/man_scientist/4.png and b/public/images/emoji/emoji_one/man_scientist/4.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/5.png b/public/images/emoji/emoji_one/man_scientist/5.png
index fe5f8b6449..8eb3414a9f 100644
Binary files a/public/images/emoji/emoji_one/man_scientist/5.png and b/public/images/emoji/emoji_one/man_scientist/5.png differ
diff --git a/public/images/emoji/emoji_one/man_scientist/6.png b/public/images/emoji/emoji_one/man_scientist/6.png
index 4624f47916..6f1d005307 100644
Binary files a/public/images/emoji/emoji_one/man_scientist/6.png and b/public/images/emoji/emoji_one/man_scientist/6.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging.png b/public/images/emoji/emoji_one/man_shrugging.png
index e5e27fbaf6..7f1d6bdb87 100644
Binary files a/public/images/emoji/emoji_one/man_shrugging.png and b/public/images/emoji/emoji_one/man_shrugging.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/2.png b/public/images/emoji/emoji_one/man_shrugging/2.png
index c272bf4542..c82c1e0f15 100644
Binary files a/public/images/emoji/emoji_one/man_shrugging/2.png and b/public/images/emoji/emoji_one/man_shrugging/2.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/3.png b/public/images/emoji/emoji_one/man_shrugging/3.png
index a1bf809d21..89b98c654f 100644
Binary files a/public/images/emoji/emoji_one/man_shrugging/3.png and b/public/images/emoji/emoji_one/man_shrugging/3.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/4.png b/public/images/emoji/emoji_one/man_shrugging/4.png
index 5c45d8f136..3983c33584 100644
Binary files a/public/images/emoji/emoji_one/man_shrugging/4.png and b/public/images/emoji/emoji_one/man_shrugging/4.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/5.png b/public/images/emoji/emoji_one/man_shrugging/5.png
index 41b3733d4f..bb2383cf70 100644
Binary files a/public/images/emoji/emoji_one/man_shrugging/5.png and b/public/images/emoji/emoji_one/man_shrugging/5.png differ
diff --git a/public/images/emoji/emoji_one/man_shrugging/6.png b/public/images/emoji/emoji_one/man_shrugging/6.png
index 17fd228434..ef0ae6ce80 100644
Binary files a/public/images/emoji/emoji_one/man_shrugging/6.png and b/public/images/emoji/emoji_one/man_shrugging/6.png differ
diff --git a/public/images/emoji/emoji_one/man_singer.png b/public/images/emoji/emoji_one/man_singer.png
index 33d678d274..7f025355c3 100644
Binary files a/public/images/emoji/emoji_one/man_singer.png and b/public/images/emoji/emoji_one/man_singer.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/2.png b/public/images/emoji/emoji_one/man_singer/2.png
index 4f88fddb22..391a01ebe5 100644
Binary files a/public/images/emoji/emoji_one/man_singer/2.png and b/public/images/emoji/emoji_one/man_singer/2.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/3.png b/public/images/emoji/emoji_one/man_singer/3.png
index 0a60b03573..e8feaf7e5c 100644
Binary files a/public/images/emoji/emoji_one/man_singer/3.png and b/public/images/emoji/emoji_one/man_singer/3.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/4.png b/public/images/emoji/emoji_one/man_singer/4.png
index bde6c56f6b..0a21632cbf 100644
Binary files a/public/images/emoji/emoji_one/man_singer/4.png and b/public/images/emoji/emoji_one/man_singer/4.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/5.png b/public/images/emoji/emoji_one/man_singer/5.png
index 8754a2ec35..81475e7b2a 100644
Binary files a/public/images/emoji/emoji_one/man_singer/5.png and b/public/images/emoji/emoji_one/man_singer/5.png differ
diff --git a/public/images/emoji/emoji_one/man_singer/6.png b/public/images/emoji/emoji_one/man_singer/6.png
index 4ef64cdd34..dfca41862f 100644
Binary files a/public/images/emoji/emoji_one/man_singer/6.png and b/public/images/emoji/emoji_one/man_singer/6.png differ
diff --git a/public/images/emoji/emoji_one/man_student.png b/public/images/emoji/emoji_one/man_student.png
index 7f8b601840..f315b0ee96 100644
Binary files a/public/images/emoji/emoji_one/man_student.png and b/public/images/emoji/emoji_one/man_student.png differ
diff --git a/public/images/emoji/emoji_one/man_student/2.png b/public/images/emoji/emoji_one/man_student/2.png
index af41fdaa11..1ffa1c9d28 100644
Binary files a/public/images/emoji/emoji_one/man_student/2.png and b/public/images/emoji/emoji_one/man_student/2.png differ
diff --git a/public/images/emoji/emoji_one/man_student/3.png b/public/images/emoji/emoji_one/man_student/3.png
index 0b2ec4fb61..9c1bbfae91 100644
Binary files a/public/images/emoji/emoji_one/man_student/3.png and b/public/images/emoji/emoji_one/man_student/3.png differ
diff --git a/public/images/emoji/emoji_one/man_student/4.png b/public/images/emoji/emoji_one/man_student/4.png
index 5ddbe0fd84..57da497ac6 100644
Binary files a/public/images/emoji/emoji_one/man_student/4.png and b/public/images/emoji/emoji_one/man_student/4.png differ
diff --git a/public/images/emoji/emoji_one/man_student/5.png b/public/images/emoji/emoji_one/man_student/5.png
index aced934658..401b5480ae 100644
Binary files a/public/images/emoji/emoji_one/man_student/5.png and b/public/images/emoji/emoji_one/man_student/5.png differ
diff --git a/public/images/emoji/emoji_one/man_student/6.png b/public/images/emoji/emoji_one/man_student/6.png
index a95159c072..39301f07d9 100644
Binary files a/public/images/emoji/emoji_one/man_student/6.png and b/public/images/emoji/emoji_one/man_student/6.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher.png b/public/images/emoji/emoji_one/man_teacher.png
index c46732784e..c4e350ab97 100644
Binary files a/public/images/emoji/emoji_one/man_teacher.png and b/public/images/emoji/emoji_one/man_teacher.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/2.png b/public/images/emoji/emoji_one/man_teacher/2.png
index dfa4bd606a..c4d5a75238 100644
Binary files a/public/images/emoji/emoji_one/man_teacher/2.png and b/public/images/emoji/emoji_one/man_teacher/2.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/3.png b/public/images/emoji/emoji_one/man_teacher/3.png
index 08470c3799..f28c46ca87 100644
Binary files a/public/images/emoji/emoji_one/man_teacher/3.png and b/public/images/emoji/emoji_one/man_teacher/3.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/4.png b/public/images/emoji/emoji_one/man_teacher/4.png
index 9ff218b002..beb13aff88 100644
Binary files a/public/images/emoji/emoji_one/man_teacher/4.png and b/public/images/emoji/emoji_one/man_teacher/4.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/5.png b/public/images/emoji/emoji_one/man_teacher/5.png
index 2c124f5a41..c9537d5f18 100644
Binary files a/public/images/emoji/emoji_one/man_teacher/5.png and b/public/images/emoji/emoji_one/man_teacher/5.png differ
diff --git a/public/images/emoji/emoji_one/man_teacher/6.png b/public/images/emoji/emoji_one/man_teacher/6.png
index b25f4ae19c..a9f420da3e 100644
Binary files a/public/images/emoji/emoji_one/man_teacher/6.png and b/public/images/emoji/emoji_one/man_teacher/6.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist.png b/public/images/emoji/emoji_one/man_technologist.png
index e371bfbc51..0d2f933338 100644
Binary files a/public/images/emoji/emoji_one/man_technologist.png and b/public/images/emoji/emoji_one/man_technologist.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/2.png b/public/images/emoji/emoji_one/man_technologist/2.png
index 7b701e8f4d..982e4682ec 100644
Binary files a/public/images/emoji/emoji_one/man_technologist/2.png and b/public/images/emoji/emoji_one/man_technologist/2.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/3.png b/public/images/emoji/emoji_one/man_technologist/3.png
index 4b76f79626..331eb0c6d9 100644
Binary files a/public/images/emoji/emoji_one/man_technologist/3.png and b/public/images/emoji/emoji_one/man_technologist/3.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/4.png b/public/images/emoji/emoji_one/man_technologist/4.png
index 92381c99d1..0cd626faa3 100644
Binary files a/public/images/emoji/emoji_one/man_technologist/4.png and b/public/images/emoji/emoji_one/man_technologist/4.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/5.png b/public/images/emoji/emoji_one/man_technologist/5.png
index e86b665f29..a76c9543d1 100644
Binary files a/public/images/emoji/emoji_one/man_technologist/5.png and b/public/images/emoji/emoji_one/man_technologist/5.png differ
diff --git a/public/images/emoji/emoji_one/man_technologist/6.png b/public/images/emoji/emoji_one/man_technologist/6.png
index 6493a958a2..9eee8ad824 100644
Binary files a/public/images/emoji/emoji_one/man_technologist/6.png and b/public/images/emoji/emoji_one/man_technologist/6.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao.png
index a98751ba50..a353498e0e 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png
index 57861e5538..d0a030989b 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/2.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png
index 55c6a76172..d4a284fc97 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/3.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png
index 3ed67d24ea..a673157b96 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/4.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png
index 4940d7f81b..23e11db97a 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/5.png differ
diff --git a/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png b/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png
index 5767e39717..6f83cf7b70 100644
Binary files a/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png and b/public/images/emoji/emoji_one/man_with_gua_pi_mao/6.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban.png b/public/images/emoji/emoji_one/man_with_turban.png
index f68b73d520..945f700dba 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban.png and b/public/images/emoji/emoji_one/man_with_turban.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/2.png b/public/images/emoji/emoji_one/man_with_turban/2.png
index e47844dd5a..844059d903 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban/2.png and b/public/images/emoji/emoji_one/man_with_turban/2.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/3.png b/public/images/emoji/emoji_one/man_with_turban/3.png
index 72f636b0f9..6f2d33162a 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban/3.png and b/public/images/emoji/emoji_one/man_with_turban/3.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/4.png b/public/images/emoji/emoji_one/man_with_turban/4.png
index 96a3733f4f..77136cd601 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban/4.png and b/public/images/emoji/emoji_one/man_with_turban/4.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/5.png b/public/images/emoji/emoji_one/man_with_turban/5.png
index dca15965c8..e22afc06c1 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban/5.png and b/public/images/emoji/emoji_one/man_with_turban/5.png differ
diff --git a/public/images/emoji/emoji_one/man_with_turban/6.png b/public/images/emoji/emoji_one/man_with_turban/6.png
index 5a4f11ed8e..3929c0f3f8 100644
Binary files a/public/images/emoji/emoji_one/man_with_turban/6.png and b/public/images/emoji/emoji_one/man_with_turban/6.png differ
diff --git a/public/images/emoji/emoji_one/mask.png b/public/images/emoji/emoji_one/mask.png
index 84de8c9579..36daabc318 100644
Binary files a/public/images/emoji/emoji_one/mask.png and b/public/images/emoji/emoji_one/mask.png differ
diff --git a/public/images/emoji/emoji_one/massage.png b/public/images/emoji/emoji_one/massage.png
index bc6176bb8e..9847b62f10 100644
Binary files a/public/images/emoji/emoji_one/massage.png and b/public/images/emoji/emoji_one/massage.png differ
diff --git a/public/images/emoji/emoji_one/massage/2.png b/public/images/emoji/emoji_one/massage/2.png
index 1f91b9ebac..d0e9119631 100644
Binary files a/public/images/emoji/emoji_one/massage/2.png and b/public/images/emoji/emoji_one/massage/2.png differ
diff --git a/public/images/emoji/emoji_one/massage/3.png b/public/images/emoji/emoji_one/massage/3.png
index b5d0c9d676..4a6f674e47 100644
Binary files a/public/images/emoji/emoji_one/massage/3.png and b/public/images/emoji/emoji_one/massage/3.png differ
diff --git a/public/images/emoji/emoji_one/massage/4.png b/public/images/emoji/emoji_one/massage/4.png
index 861a00f549..718959c3bb 100644
Binary files a/public/images/emoji/emoji_one/massage/4.png and b/public/images/emoji/emoji_one/massage/4.png differ
diff --git a/public/images/emoji/emoji_one/massage/5.png b/public/images/emoji/emoji_one/massage/5.png
index df5f8d6607..422dd9a61e 100644
Binary files a/public/images/emoji/emoji_one/massage/5.png and b/public/images/emoji/emoji_one/massage/5.png differ
diff --git a/public/images/emoji/emoji_one/massage/6.png b/public/images/emoji/emoji_one/massage/6.png
index 7419cfaa35..cd82c5f9ae 100644
Binary files a/public/images/emoji/emoji_one/massage/6.png and b/public/images/emoji/emoji_one/massage/6.png differ
diff --git a/public/images/emoji/emoji_one/massage_man.png b/public/images/emoji/emoji_one/massage_man.png
index 68d3f71634..4bba2ec395 100644
Binary files a/public/images/emoji/emoji_one/massage_man.png and b/public/images/emoji/emoji_one/massage_man.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/2.png b/public/images/emoji/emoji_one/massage_man/2.png
index d5ad39832a..8040caeac0 100644
Binary files a/public/images/emoji/emoji_one/massage_man/2.png and b/public/images/emoji/emoji_one/massage_man/2.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/3.png b/public/images/emoji/emoji_one/massage_man/3.png
index d8557c701e..671fbcf916 100644
Binary files a/public/images/emoji/emoji_one/massage_man/3.png and b/public/images/emoji/emoji_one/massage_man/3.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/4.png b/public/images/emoji/emoji_one/massage_man/4.png
index e7c12dd8c7..4111e66b82 100644
Binary files a/public/images/emoji/emoji_one/massage_man/4.png and b/public/images/emoji/emoji_one/massage_man/4.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/5.png b/public/images/emoji/emoji_one/massage_man/5.png
index 70c44ccb05..53e60ebf4f 100644
Binary files a/public/images/emoji/emoji_one/massage_man/5.png and b/public/images/emoji/emoji_one/massage_man/5.png differ
diff --git a/public/images/emoji/emoji_one/massage_man/6.png b/public/images/emoji/emoji_one/massage_man/6.png
index bd1020497d..c88327dca6 100644
Binary files a/public/images/emoji/emoji_one/massage_man/6.png and b/public/images/emoji/emoji_one/massage_man/6.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman.png b/public/images/emoji/emoji_one/massage_woman.png
index bc6176bb8e..9847b62f10 100644
Binary files a/public/images/emoji/emoji_one/massage_woman.png and b/public/images/emoji/emoji_one/massage_woman.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/2.png b/public/images/emoji/emoji_one/massage_woman/2.png
index 1f91b9ebac..d0e9119631 100644
Binary files a/public/images/emoji/emoji_one/massage_woman/2.png and b/public/images/emoji/emoji_one/massage_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/3.png b/public/images/emoji/emoji_one/massage_woman/3.png
index b5d0c9d676..4a6f674e47 100644
Binary files a/public/images/emoji/emoji_one/massage_woman/3.png and b/public/images/emoji/emoji_one/massage_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/4.png b/public/images/emoji/emoji_one/massage_woman/4.png
index 861a00f549..718959c3bb 100644
Binary files a/public/images/emoji/emoji_one/massage_woman/4.png and b/public/images/emoji/emoji_one/massage_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/5.png b/public/images/emoji/emoji_one/massage_woman/5.png
index df5f8d6607..422dd9a61e 100644
Binary files a/public/images/emoji/emoji_one/massage_woman/5.png and b/public/images/emoji/emoji_one/massage_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/massage_woman/6.png b/public/images/emoji/emoji_one/massage_woman/6.png
index 7419cfaa35..cd82c5f9ae 100644
Binary files a/public/images/emoji/emoji_one/massage_woman/6.png and b/public/images/emoji/emoji_one/massage_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/men_wrestling.png b/public/images/emoji/emoji_one/men_wrestling.png
index a4fc02f4df..842ddc1b1c 100644
Binary files a/public/images/emoji/emoji_one/men_wrestling.png and b/public/images/emoji/emoji_one/men_wrestling.png differ
diff --git a/public/images/emoji/emoji_one/merperson.png b/public/images/emoji/emoji_one/merperson.png
index 8bb7f4f887..785b587fec 100644
Binary files a/public/images/emoji/emoji_one/merperson.png and b/public/images/emoji/emoji_one/merperson.png differ
diff --git a/public/images/emoji/emoji_one/merperson/2.png b/public/images/emoji/emoji_one/merperson/2.png
new file mode 100644
index 0000000000..e9619aa522
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/2.png differ
diff --git a/public/images/emoji/emoji_one/merperson/3.png b/public/images/emoji/emoji_one/merperson/3.png
new file mode 100644
index 0000000000..0c4dc9e5e0
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/3.png differ
diff --git a/public/images/emoji/emoji_one/merperson/4.png b/public/images/emoji/emoji_one/merperson/4.png
new file mode 100644
index 0000000000..f14097564f
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/4.png differ
diff --git a/public/images/emoji/emoji_one/merperson/5.png b/public/images/emoji/emoji_one/merperson/5.png
new file mode 100644
index 0000000000..7b79d56316
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/5.png differ
diff --git a/public/images/emoji/emoji_one/merperson/6.png b/public/images/emoji/emoji_one/merperson/6.png
new file mode 100644
index 0000000000..cd862603d2
Binary files /dev/null and b/public/images/emoji/emoji_one/merperson/6.png differ
diff --git a/public/images/emoji/emoji_one/metal/2.png b/public/images/emoji/emoji_one/metal/2.png
index 58823b056c..e67d5a5079 100644
Binary files a/public/images/emoji/emoji_one/metal/2.png and b/public/images/emoji/emoji_one/metal/2.png differ
diff --git a/public/images/emoji/emoji_one/metal/3.png b/public/images/emoji/emoji_one/metal/3.png
index 7649f660d6..7a62d35c6d 100644
Binary files a/public/images/emoji/emoji_one/metal/3.png and b/public/images/emoji/emoji_one/metal/3.png differ
diff --git a/public/images/emoji/emoji_one/metal/4.png b/public/images/emoji/emoji_one/metal/4.png
index 587ce13ef0..947ca5b1bd 100644
Binary files a/public/images/emoji/emoji_one/metal/4.png and b/public/images/emoji/emoji_one/metal/4.png differ
diff --git a/public/images/emoji/emoji_one/metal/5.png b/public/images/emoji/emoji_one/metal/5.png
index 6f5a7f9a1a..9eb041cbfc 100644
Binary files a/public/images/emoji/emoji_one/metal/5.png and b/public/images/emoji/emoji_one/metal/5.png differ
diff --git a/public/images/emoji/emoji_one/metal/6.png b/public/images/emoji/emoji_one/metal/6.png
index 90670b6792..f670879ac8 100644
Binary files a/public/images/emoji/emoji_one/metal/6.png and b/public/images/emoji/emoji_one/metal/6.png differ
diff --git a/public/images/emoji/emoji_one/metro.png b/public/images/emoji/emoji_one/metro.png
index 997ab04c9c..2e814e076e 100644
Binary files a/public/images/emoji/emoji_one/metro.png and b/public/images/emoji/emoji_one/metro.png differ
diff --git a/public/images/emoji/emoji_one/microphone.png b/public/images/emoji/emoji_one/microphone.png
index 25c6a41f23..5655cbed37 100644
Binary files a/public/images/emoji/emoji_one/microphone.png and b/public/images/emoji/emoji_one/microphone.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/2.png b/public/images/emoji/emoji_one/middle_finger/2.png
index 37ac478031..6d4d00f77c 100644
Binary files a/public/images/emoji/emoji_one/middle_finger/2.png and b/public/images/emoji/emoji_one/middle_finger/2.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/3.png b/public/images/emoji/emoji_one/middle_finger/3.png
index 69fbed14d2..37bc135b96 100644
Binary files a/public/images/emoji/emoji_one/middle_finger/3.png and b/public/images/emoji/emoji_one/middle_finger/3.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/4.png b/public/images/emoji/emoji_one/middle_finger/4.png
index c1134aea0f..2b3abdbf9a 100644
Binary files a/public/images/emoji/emoji_one/middle_finger/4.png and b/public/images/emoji/emoji_one/middle_finger/4.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/5.png b/public/images/emoji/emoji_one/middle_finger/5.png
index 371ee90cf9..12c2de3a50 100644
Binary files a/public/images/emoji/emoji_one/middle_finger/5.png and b/public/images/emoji/emoji_one/middle_finger/5.png differ
diff --git a/public/images/emoji/emoji_one/middle_finger/6.png b/public/images/emoji/emoji_one/middle_finger/6.png
index db57dfd098..d3a0b3f62a 100644
Binary files a/public/images/emoji/emoji_one/middle_finger/6.png and b/public/images/emoji/emoji_one/middle_finger/6.png differ
diff --git a/public/images/emoji/emoji_one/minibus.png b/public/images/emoji/emoji_one/minibus.png
index 94424442b3..2e75d35fab 100644
Binary files a/public/images/emoji/emoji_one/minibus.png and b/public/images/emoji/emoji_one/minibus.png differ
diff --git a/public/images/emoji/emoji_one/money_mouth.png b/public/images/emoji/emoji_one/money_mouth.png
index 364ee6dbcb..6ced1590e6 100644
Binary files a/public/images/emoji/emoji_one/money_mouth.png and b/public/images/emoji/emoji_one/money_mouth.png differ
diff --git a/public/images/emoji/emoji_one/money_mouth_face.png b/public/images/emoji/emoji_one/money_mouth_face.png
index 364ee6dbcb..6ced1590e6 100644
Binary files a/public/images/emoji/emoji_one/money_mouth_face.png and b/public/images/emoji/emoji_one/money_mouth_face.png differ
diff --git a/public/images/emoji/emoji_one/monorail.png b/public/images/emoji/emoji_one/monorail.png
index e081bf9cb8..ccb79a0954 100644
Binary files a/public/images/emoji/emoji_one/monorail.png and b/public/images/emoji/emoji_one/monorail.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist.png b/public/images/emoji/emoji_one/mountain_bicyclist.png
index 7966eeba38..af6a404310 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist.png and b/public/images/emoji/emoji_one/mountain_bicyclist.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/2.png b/public/images/emoji/emoji_one/mountain_bicyclist/2.png
index 03e88fba5e..5b83ed9ab9 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist/2.png and b/public/images/emoji/emoji_one/mountain_bicyclist/2.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/3.png b/public/images/emoji/emoji_one/mountain_bicyclist/3.png
index 4505087a27..aeb0961472 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist/3.png and b/public/images/emoji/emoji_one/mountain_bicyclist/3.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/4.png b/public/images/emoji/emoji_one/mountain_bicyclist/4.png
index ab88eaeeeb..17fba414cf 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist/4.png and b/public/images/emoji/emoji_one/mountain_bicyclist/4.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/5.png b/public/images/emoji/emoji_one/mountain_bicyclist/5.png
index 8fc9f8ee14..86063f518b 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist/5.png and b/public/images/emoji/emoji_one/mountain_bicyclist/5.png differ
diff --git a/public/images/emoji/emoji_one/mountain_bicyclist/6.png b/public/images/emoji/emoji_one/mountain_bicyclist/6.png
index 52c8ad73d4..fa29ccd48e 100644
Binary files a/public/images/emoji/emoji_one/mountain_bicyclist/6.png and b/public/images/emoji/emoji_one/mountain_bicyclist/6.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man.png b/public/images/emoji/emoji_one/mountain_biking_man.png
index 7966eeba38..af6a404310 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_man.png and b/public/images/emoji/emoji_one/mountain_biking_man.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/2.png b/public/images/emoji/emoji_one/mountain_biking_man/2.png
index 03e88fba5e..5b83ed9ab9 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_man/2.png and b/public/images/emoji/emoji_one/mountain_biking_man/2.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/3.png b/public/images/emoji/emoji_one/mountain_biking_man/3.png
index 4505087a27..aeb0961472 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_man/3.png and b/public/images/emoji/emoji_one/mountain_biking_man/3.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/4.png b/public/images/emoji/emoji_one/mountain_biking_man/4.png
index ab88eaeeeb..17fba414cf 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_man/4.png and b/public/images/emoji/emoji_one/mountain_biking_man/4.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/5.png b/public/images/emoji/emoji_one/mountain_biking_man/5.png
index 8fc9f8ee14..86063f518b 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_man/5.png and b/public/images/emoji/emoji_one/mountain_biking_man/5.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_man/6.png b/public/images/emoji/emoji_one/mountain_biking_man/6.png
index 52c8ad73d4..fa29ccd48e 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_man/6.png and b/public/images/emoji/emoji_one/mountain_biking_man/6.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman.png b/public/images/emoji/emoji_one/mountain_biking_woman.png
index 9f370d9ae5..f1b2303d63 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_woman.png and b/public/images/emoji/emoji_one/mountain_biking_woman.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/2.png b/public/images/emoji/emoji_one/mountain_biking_woman/2.png
index 568cc09171..cc5eff2627 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_woman/2.png and b/public/images/emoji/emoji_one/mountain_biking_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/3.png b/public/images/emoji/emoji_one/mountain_biking_woman/3.png
index 64eeccd1b5..9b8a3d5173 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_woman/3.png and b/public/images/emoji/emoji_one/mountain_biking_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/4.png b/public/images/emoji/emoji_one/mountain_biking_woman/4.png
index 87ece4d70c..d70cdd187f 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_woman/4.png and b/public/images/emoji/emoji_one/mountain_biking_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/5.png b/public/images/emoji/emoji_one/mountain_biking_woman/5.png
index 83ccad20ac..f815944b68 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_woman/5.png and b/public/images/emoji/emoji_one/mountain_biking_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/mountain_biking_woman/6.png b/public/images/emoji/emoji_one/mountain_biking_woman/6.png
index 4b0753fa20..b6200c484f 100644
Binary files a/public/images/emoji/emoji_one/mountain_biking_woman/6.png and b/public/images/emoji/emoji_one/mountain_biking_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/mountain_cableway.png b/public/images/emoji/emoji_one/mountain_cableway.png
index a517207caf..5e9c152600 100644
Binary files a/public/images/emoji/emoji_one/mountain_cableway.png and b/public/images/emoji/emoji_one/mountain_cableway.png differ
diff --git a/public/images/emoji/emoji_one/mountain_railway.png b/public/images/emoji/emoji_one/mountain_railway.png
index dd42e9d447..c1d638c38f 100644
Binary files a/public/images/emoji/emoji_one/mountain_railway.png and b/public/images/emoji/emoji_one/mountain_railway.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus.png b/public/images/emoji/emoji_one/mrs_claus.png
index 0bfa9b2289..359bc47bb8 100644
Binary files a/public/images/emoji/emoji_one/mrs_claus.png and b/public/images/emoji/emoji_one/mrs_claus.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/2.png b/public/images/emoji/emoji_one/mrs_claus/2.png
index 016b9b201f..9b693ecc22 100644
Binary files a/public/images/emoji/emoji_one/mrs_claus/2.png and b/public/images/emoji/emoji_one/mrs_claus/2.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/3.png b/public/images/emoji/emoji_one/mrs_claus/3.png
index b62fbe5fe2..33246bf258 100644
Binary files a/public/images/emoji/emoji_one/mrs_claus/3.png and b/public/images/emoji/emoji_one/mrs_claus/3.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/4.png b/public/images/emoji/emoji_one/mrs_claus/4.png
index bda101150e..8e6d449ac7 100644
Binary files a/public/images/emoji/emoji_one/mrs_claus/4.png and b/public/images/emoji/emoji_one/mrs_claus/4.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/5.png b/public/images/emoji/emoji_one/mrs_claus/5.png
index 5fac5f0e0b..31ef37007e 100644
Binary files a/public/images/emoji/emoji_one/mrs_claus/5.png and b/public/images/emoji/emoji_one/mrs_claus/5.png differ
diff --git a/public/images/emoji/emoji_one/mrs_claus/6.png b/public/images/emoji/emoji_one/mrs_claus/6.png
index 0f37b0cfd2..7b35e725bc 100644
Binary files a/public/images/emoji/emoji_one/mrs_claus/6.png and b/public/images/emoji/emoji_one/mrs_claus/6.png differ
diff --git a/public/images/emoji/emoji_one/muscle/2.png b/public/images/emoji/emoji_one/muscle/2.png
index ad23c83c70..d9b6ca91a8 100644
Binary files a/public/images/emoji/emoji_one/muscle/2.png and b/public/images/emoji/emoji_one/muscle/2.png differ
diff --git a/public/images/emoji/emoji_one/muscle/3.png b/public/images/emoji/emoji_one/muscle/3.png
index cea5d32403..c82638adc0 100644
Binary files a/public/images/emoji/emoji_one/muscle/3.png and b/public/images/emoji/emoji_one/muscle/3.png differ
diff --git a/public/images/emoji/emoji_one/muscle/4.png b/public/images/emoji/emoji_one/muscle/4.png
index 551a9a8b83..387755c0d4 100644
Binary files a/public/images/emoji/emoji_one/muscle/4.png and b/public/images/emoji/emoji_one/muscle/4.png differ
diff --git a/public/images/emoji/emoji_one/muscle/5.png b/public/images/emoji/emoji_one/muscle/5.png
index 2ac7a5f392..a22958b595 100644
Binary files a/public/images/emoji/emoji_one/muscle/5.png and b/public/images/emoji/emoji_one/muscle/5.png differ
diff --git a/public/images/emoji/emoji_one/muscle/6.png b/public/images/emoji/emoji_one/muscle/6.png
index d73cee216e..60d56c1803 100644
Binary files a/public/images/emoji/emoji_one/muscle/6.png and b/public/images/emoji/emoji_one/muscle/6.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/2.png b/public/images/emoji/emoji_one/nail_care/2.png
index e923209845..86e57118d9 100644
Binary files a/public/images/emoji/emoji_one/nail_care/2.png and b/public/images/emoji/emoji_one/nail_care/2.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/3.png b/public/images/emoji/emoji_one/nail_care/3.png
index be20f9cb05..5c25f16c9c 100644
Binary files a/public/images/emoji/emoji_one/nail_care/3.png and b/public/images/emoji/emoji_one/nail_care/3.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/4.png b/public/images/emoji/emoji_one/nail_care/4.png
index 849c511bd1..6701798116 100644
Binary files a/public/images/emoji/emoji_one/nail_care/4.png and b/public/images/emoji/emoji_one/nail_care/4.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/5.png b/public/images/emoji/emoji_one/nail_care/5.png
index 99d9dcec6d..405950c16b 100644
Binary files a/public/images/emoji/emoji_one/nail_care/5.png and b/public/images/emoji/emoji_one/nail_care/5.png differ
diff --git a/public/images/emoji/emoji_one/nail_care/6.png b/public/images/emoji/emoji_one/nail_care/6.png
index f676aaca29..be57e95299 100644
Binary files a/public/images/emoji/emoji_one/nail_care/6.png and b/public/images/emoji/emoji_one/nail_care/6.png differ
diff --git a/public/images/emoji/emoji_one/nauseated_face.png b/public/images/emoji/emoji_one/nauseated_face.png
index 5daeea636d..9e76d92ce6 100644
Binary files a/public/images/emoji/emoji_one/nauseated_face.png and b/public/images/emoji/emoji_one/nauseated_face.png differ
diff --git a/public/images/emoji/emoji_one/nerd.png b/public/images/emoji/emoji_one/nerd.png
index c17e121530..da39afd16c 100644
Binary files a/public/images/emoji/emoji_one/nerd.png and b/public/images/emoji/emoji_one/nerd.png differ
diff --git a/public/images/emoji/emoji_one/nerd_face.png b/public/images/emoji/emoji_one/nerd_face.png
index c17e121530..da39afd16c 100644
Binary files a/public/images/emoji/emoji_one/nerd_face.png and b/public/images/emoji/emoji_one/nerd_face.png differ
diff --git a/public/images/emoji/emoji_one/neutral_face.png b/public/images/emoji/emoji_one/neutral_face.png
index 678d22e786..d0970fa6f5 100644
Binary files a/public/images/emoji/emoji_one/neutral_face.png and b/public/images/emoji/emoji_one/neutral_face.png differ
diff --git a/public/images/emoji/emoji_one/no_good.png b/public/images/emoji/emoji_one/no_good.png
index 3a23f470d6..9526207d0e 100644
Binary files a/public/images/emoji/emoji_one/no_good.png and b/public/images/emoji/emoji_one/no_good.png differ
diff --git a/public/images/emoji/emoji_one/no_good/2.png b/public/images/emoji/emoji_one/no_good/2.png
index 127af7cad7..7715d22900 100644
Binary files a/public/images/emoji/emoji_one/no_good/2.png and b/public/images/emoji/emoji_one/no_good/2.png differ
diff --git a/public/images/emoji/emoji_one/no_good/3.png b/public/images/emoji/emoji_one/no_good/3.png
index 90e84f442d..059277896e 100644
Binary files a/public/images/emoji/emoji_one/no_good/3.png and b/public/images/emoji/emoji_one/no_good/3.png differ
diff --git a/public/images/emoji/emoji_one/no_good/4.png b/public/images/emoji/emoji_one/no_good/4.png
index e8dc6e8882..d9108260ed 100644
Binary files a/public/images/emoji/emoji_one/no_good/4.png and b/public/images/emoji/emoji_one/no_good/4.png differ
diff --git a/public/images/emoji/emoji_one/no_good/5.png b/public/images/emoji/emoji_one/no_good/5.png
index 3cbb6fcf0e..e4f62c49a9 100644
Binary files a/public/images/emoji/emoji_one/no_good/5.png and b/public/images/emoji/emoji_one/no_good/5.png differ
diff --git a/public/images/emoji/emoji_one/no_good/6.png b/public/images/emoji/emoji_one/no_good/6.png
index 0b2954a0c6..7bf14fd611 100644
Binary files a/public/images/emoji/emoji_one/no_good/6.png and b/public/images/emoji/emoji_one/no_good/6.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man.png b/public/images/emoji/emoji_one/no_good_man.png
index c875ae4a2d..6fbcf7e45b 100644
Binary files a/public/images/emoji/emoji_one/no_good_man.png and b/public/images/emoji/emoji_one/no_good_man.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/2.png b/public/images/emoji/emoji_one/no_good_man/2.png
index ecc62da49c..2da1c9c434 100644
Binary files a/public/images/emoji/emoji_one/no_good_man/2.png and b/public/images/emoji/emoji_one/no_good_man/2.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/3.png b/public/images/emoji/emoji_one/no_good_man/3.png
index 0f80353ea3..d5ab6b70ab 100644
Binary files a/public/images/emoji/emoji_one/no_good_man/3.png and b/public/images/emoji/emoji_one/no_good_man/3.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/4.png b/public/images/emoji/emoji_one/no_good_man/4.png
index bdc4c7da13..a51775e9ad 100644
Binary files a/public/images/emoji/emoji_one/no_good_man/4.png and b/public/images/emoji/emoji_one/no_good_man/4.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/5.png b/public/images/emoji/emoji_one/no_good_man/5.png
index 1c3daecf36..2aa6983643 100644
Binary files a/public/images/emoji/emoji_one/no_good_man/5.png and b/public/images/emoji/emoji_one/no_good_man/5.png differ
diff --git a/public/images/emoji/emoji_one/no_good_man/6.png b/public/images/emoji/emoji_one/no_good_man/6.png
index 20502fbaed..6fbee0fc44 100644
Binary files a/public/images/emoji/emoji_one/no_good_man/6.png and b/public/images/emoji/emoji_one/no_good_man/6.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman.png b/public/images/emoji/emoji_one/no_good_woman.png
index 3a23f470d6..9526207d0e 100644
Binary files a/public/images/emoji/emoji_one/no_good_woman.png and b/public/images/emoji/emoji_one/no_good_woman.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/2.png b/public/images/emoji/emoji_one/no_good_woman/2.png
index 127af7cad7..7715d22900 100644
Binary files a/public/images/emoji/emoji_one/no_good_woman/2.png and b/public/images/emoji/emoji_one/no_good_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/3.png b/public/images/emoji/emoji_one/no_good_woman/3.png
index 90e84f442d..059277896e 100644
Binary files a/public/images/emoji/emoji_one/no_good_woman/3.png and b/public/images/emoji/emoji_one/no_good_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/4.png b/public/images/emoji/emoji_one/no_good_woman/4.png
index e8dc6e8882..d9108260ed 100644
Binary files a/public/images/emoji/emoji_one/no_good_woman/4.png and b/public/images/emoji/emoji_one/no_good_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/5.png b/public/images/emoji/emoji_one/no_good_woman/5.png
index 3cbb6fcf0e..e4f62c49a9 100644
Binary files a/public/images/emoji/emoji_one/no_good_woman/5.png and b/public/images/emoji/emoji_one/no_good_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/no_good_woman/6.png b/public/images/emoji/emoji_one/no_good_woman/6.png
index 0b2954a0c6..7bf14fd611 100644
Binary files a/public/images/emoji/emoji_one/no_good_woman/6.png and b/public/images/emoji/emoji_one/no_good_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/nose/2.png b/public/images/emoji/emoji_one/nose/2.png
index 3a7140471a..594c3749f8 100644
Binary files a/public/images/emoji/emoji_one/nose/2.png and b/public/images/emoji/emoji_one/nose/2.png differ
diff --git a/public/images/emoji/emoji_one/nose/3.png b/public/images/emoji/emoji_one/nose/3.png
index 7c3d483c52..b8fdc6475c 100644
Binary files a/public/images/emoji/emoji_one/nose/3.png and b/public/images/emoji/emoji_one/nose/3.png differ
diff --git a/public/images/emoji/emoji_one/nose/4.png b/public/images/emoji/emoji_one/nose/4.png
index 7ba3f95a23..0ff983229c 100644
Binary files a/public/images/emoji/emoji_one/nose/4.png and b/public/images/emoji/emoji_one/nose/4.png differ
diff --git a/public/images/emoji/emoji_one/nose/5.png b/public/images/emoji/emoji_one/nose/5.png
index d7fc311f57..579822b610 100644
Binary files a/public/images/emoji/emoji_one/nose/5.png and b/public/images/emoji/emoji_one/nose/5.png differ
diff --git a/public/images/emoji/emoji_one/nose/6.png b/public/images/emoji/emoji_one/nose/6.png
index c0b5ed0644..efc3d926aa 100644
Binary files a/public/images/emoji/emoji_one/nose/6.png and b/public/images/emoji/emoji_one/nose/6.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/2.png b/public/images/emoji/emoji_one/ok_hand/2.png
index 3e42cc0a07..4d96379444 100644
Binary files a/public/images/emoji/emoji_one/ok_hand/2.png and b/public/images/emoji/emoji_one/ok_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/3.png b/public/images/emoji/emoji_one/ok_hand/3.png
index 4348ebf5c1..a35aad0aae 100644
Binary files a/public/images/emoji/emoji_one/ok_hand/3.png and b/public/images/emoji/emoji_one/ok_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/4.png b/public/images/emoji/emoji_one/ok_hand/4.png
index 031dde8ddd..77867ccc8e 100644
Binary files a/public/images/emoji/emoji_one/ok_hand/4.png and b/public/images/emoji/emoji_one/ok_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/5.png b/public/images/emoji/emoji_one/ok_hand/5.png
index 09d6bc18ff..eafe6aaf98 100644
Binary files a/public/images/emoji/emoji_one/ok_hand/5.png and b/public/images/emoji/emoji_one/ok_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/ok_hand/6.png b/public/images/emoji/emoji_one/ok_hand/6.png
index 3d2ef92e86..d2498a5ec5 100644
Binary files a/public/images/emoji/emoji_one/ok_hand/6.png and b/public/images/emoji/emoji_one/ok_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/ok_man.png b/public/images/emoji/emoji_one/ok_man.png
index 2ea10db866..5b65c87562 100644
Binary files a/public/images/emoji/emoji_one/ok_man.png and b/public/images/emoji/emoji_one/ok_man.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/2.png b/public/images/emoji/emoji_one/ok_man/2.png
index dc21a39e4a..b327322e7a 100644
Binary files a/public/images/emoji/emoji_one/ok_man/2.png and b/public/images/emoji/emoji_one/ok_man/2.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/3.png b/public/images/emoji/emoji_one/ok_man/3.png
index f9099ef5bd..e9220ff076 100644
Binary files a/public/images/emoji/emoji_one/ok_man/3.png and b/public/images/emoji/emoji_one/ok_man/3.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/4.png b/public/images/emoji/emoji_one/ok_man/4.png
index 716c85c6b5..39d5fb63d4 100644
Binary files a/public/images/emoji/emoji_one/ok_man/4.png and b/public/images/emoji/emoji_one/ok_man/4.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/5.png b/public/images/emoji/emoji_one/ok_man/5.png
index 1b266778a1..2014874e3a 100644
Binary files a/public/images/emoji/emoji_one/ok_man/5.png and b/public/images/emoji/emoji_one/ok_man/5.png differ
diff --git a/public/images/emoji/emoji_one/ok_man/6.png b/public/images/emoji/emoji_one/ok_man/6.png
index 7368625766..9bd5b16f2e 100644
Binary files a/public/images/emoji/emoji_one/ok_man/6.png and b/public/images/emoji/emoji_one/ok_man/6.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman.png b/public/images/emoji/emoji_one/ok_woman.png
index 7f85ec7859..c9127aa346 100644
Binary files a/public/images/emoji/emoji_one/ok_woman.png and b/public/images/emoji/emoji_one/ok_woman.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/2.png b/public/images/emoji/emoji_one/ok_woman/2.png
index fe1e9991f5..fb044fa443 100644
Binary files a/public/images/emoji/emoji_one/ok_woman/2.png and b/public/images/emoji/emoji_one/ok_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/3.png b/public/images/emoji/emoji_one/ok_woman/3.png
index 4a0aa4a2d7..0cdf717264 100644
Binary files a/public/images/emoji/emoji_one/ok_woman/3.png and b/public/images/emoji/emoji_one/ok_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/4.png b/public/images/emoji/emoji_one/ok_woman/4.png
index 67bf1fa2bb..d2a4df276f 100644
Binary files a/public/images/emoji/emoji_one/ok_woman/4.png and b/public/images/emoji/emoji_one/ok_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/5.png b/public/images/emoji/emoji_one/ok_woman/5.png
index 2f64f65149..b5b517667e 100644
Binary files a/public/images/emoji/emoji_one/ok_woman/5.png and b/public/images/emoji/emoji_one/ok_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/ok_woman/6.png b/public/images/emoji/emoji_one/ok_woman/6.png
index e79ae5d5ac..9e6718ce1c 100644
Binary files a/public/images/emoji/emoji_one/ok_woman/6.png and b/public/images/emoji/emoji_one/ok_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/older_adult.png b/public/images/emoji/emoji_one/older_adult.png
index 8796829b87..0faf0d0481 100644
Binary files a/public/images/emoji/emoji_one/older_adult.png and b/public/images/emoji/emoji_one/older_adult.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/2.png b/public/images/emoji/emoji_one/older_adult/2.png
index b36f41960e..3d1ff662b0 100644
Binary files a/public/images/emoji/emoji_one/older_adult/2.png and b/public/images/emoji/emoji_one/older_adult/2.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/3.png b/public/images/emoji/emoji_one/older_adult/3.png
index dc1441fea5..18cc2a1195 100644
Binary files a/public/images/emoji/emoji_one/older_adult/3.png and b/public/images/emoji/emoji_one/older_adult/3.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/4.png b/public/images/emoji/emoji_one/older_adult/4.png
index abc19e06c7..6533f0f567 100644
Binary files a/public/images/emoji/emoji_one/older_adult/4.png and b/public/images/emoji/emoji_one/older_adult/4.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/5.png b/public/images/emoji/emoji_one/older_adult/5.png
index c90549f681..02729ab0e0 100644
Binary files a/public/images/emoji/emoji_one/older_adult/5.png and b/public/images/emoji/emoji_one/older_adult/5.png differ
diff --git a/public/images/emoji/emoji_one/older_adult/6.png b/public/images/emoji/emoji_one/older_adult/6.png
index 5152c9c1a3..78badf8a41 100644
Binary files a/public/images/emoji/emoji_one/older_adult/6.png and b/public/images/emoji/emoji_one/older_adult/6.png differ
diff --git a/public/images/emoji/emoji_one/older_man.png b/public/images/emoji/emoji_one/older_man.png
index 509ee79a9e..03423fcdb7 100644
Binary files a/public/images/emoji/emoji_one/older_man.png and b/public/images/emoji/emoji_one/older_man.png differ
diff --git a/public/images/emoji/emoji_one/older_man/2.png b/public/images/emoji/emoji_one/older_man/2.png
index f98ec1d04d..f245d63322 100644
Binary files a/public/images/emoji/emoji_one/older_man/2.png and b/public/images/emoji/emoji_one/older_man/2.png differ
diff --git a/public/images/emoji/emoji_one/older_man/3.png b/public/images/emoji/emoji_one/older_man/3.png
index ce66ed2b8e..70146de661 100644
Binary files a/public/images/emoji/emoji_one/older_man/3.png and b/public/images/emoji/emoji_one/older_man/3.png differ
diff --git a/public/images/emoji/emoji_one/older_man/4.png b/public/images/emoji/emoji_one/older_man/4.png
index d3a008785c..9a716f53ad 100644
Binary files a/public/images/emoji/emoji_one/older_man/4.png and b/public/images/emoji/emoji_one/older_man/4.png differ
diff --git a/public/images/emoji/emoji_one/older_man/5.png b/public/images/emoji/emoji_one/older_man/5.png
index aa4f4230cf..bb162526e0 100644
Binary files a/public/images/emoji/emoji_one/older_man/5.png and b/public/images/emoji/emoji_one/older_man/5.png differ
diff --git a/public/images/emoji/emoji_one/older_man/6.png b/public/images/emoji/emoji_one/older_man/6.png
index 12903f8100..e856ce7acc 100644
Binary files a/public/images/emoji/emoji_one/older_man/6.png and b/public/images/emoji/emoji_one/older_man/6.png differ
diff --git a/public/images/emoji/emoji_one/older_woman.png b/public/images/emoji/emoji_one/older_woman.png
index ef0d803bae..2ec3cbecff 100644
Binary files a/public/images/emoji/emoji_one/older_woman.png and b/public/images/emoji/emoji_one/older_woman.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/2.png b/public/images/emoji/emoji_one/older_woman/2.png
index 78028f179f..cbbfc13132 100644
Binary files a/public/images/emoji/emoji_one/older_woman/2.png and b/public/images/emoji/emoji_one/older_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/3.png b/public/images/emoji/emoji_one/older_woman/3.png
index e12b43f089..4d0c325f09 100644
Binary files a/public/images/emoji/emoji_one/older_woman/3.png and b/public/images/emoji/emoji_one/older_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/4.png b/public/images/emoji/emoji_one/older_woman/4.png
index 7d5882174c..287a4d0de1 100644
Binary files a/public/images/emoji/emoji_one/older_woman/4.png and b/public/images/emoji/emoji_one/older_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/5.png b/public/images/emoji/emoji_one/older_woman/5.png
index fdc2609bdb..8cda00960c 100644
Binary files a/public/images/emoji/emoji_one/older_woman/5.png and b/public/images/emoji/emoji_one/older_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/older_woman/6.png b/public/images/emoji/emoji_one/older_woman/6.png
index a9b8dc3fa1..00a5201716 100644
Binary files a/public/images/emoji/emoji_one/older_woman/6.png and b/public/images/emoji/emoji_one/older_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_automobile.png b/public/images/emoji/emoji_one/oncoming_automobile.png
index a5f65e3832..5755dee2a7 100644
Binary files a/public/images/emoji/emoji_one/oncoming_automobile.png and b/public/images/emoji/emoji_one/oncoming_automobile.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_bus.png b/public/images/emoji/emoji_one/oncoming_bus.png
index 582d961cc9..f564779d49 100644
Binary files a/public/images/emoji/emoji_one/oncoming_bus.png and b/public/images/emoji/emoji_one/oncoming_bus.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_police_car.png b/public/images/emoji/emoji_one/oncoming_police_car.png
index 1866a25fa8..e57bd9af84 100644
Binary files a/public/images/emoji/emoji_one/oncoming_police_car.png and b/public/images/emoji/emoji_one/oncoming_police_car.png differ
diff --git a/public/images/emoji/emoji_one/oncoming_taxi.png b/public/images/emoji/emoji_one/oncoming_taxi.png
index 36907a54be..93c8ec02a4 100644
Binary files a/public/images/emoji/emoji_one/oncoming_taxi.png and b/public/images/emoji/emoji_one/oncoming_taxi.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/2.png b/public/images/emoji/emoji_one/open_hands/2.png
index 345b06c23f..eb4cb57330 100644
Binary files a/public/images/emoji/emoji_one/open_hands/2.png and b/public/images/emoji/emoji_one/open_hands/2.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/3.png b/public/images/emoji/emoji_one/open_hands/3.png
index 3e82135ac4..e34055a06c 100644
Binary files a/public/images/emoji/emoji_one/open_hands/3.png and b/public/images/emoji/emoji_one/open_hands/3.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/4.png b/public/images/emoji/emoji_one/open_hands/4.png
index 1238b01769..b89d128ad9 100644
Binary files a/public/images/emoji/emoji_one/open_hands/4.png and b/public/images/emoji/emoji_one/open_hands/4.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/5.png b/public/images/emoji/emoji_one/open_hands/5.png
index 6da54d7f51..d286a3f9db 100644
Binary files a/public/images/emoji/emoji_one/open_hands/5.png and b/public/images/emoji/emoji_one/open_hands/5.png differ
diff --git a/public/images/emoji/emoji_one/open_hands/6.png b/public/images/emoji/emoji_one/open_hands/6.png
index 93b7a9f3d3..4cac8ef2f2 100644
Binary files a/public/images/emoji/emoji_one/open_hands/6.png and b/public/images/emoji/emoji_one/open_hands/6.png differ
diff --git a/public/images/emoji/emoji_one/orange_heart.png b/public/images/emoji/emoji_one/orange_heart.png
index f217c930a7..b7a2b8fc27 100644
Binary files a/public/images/emoji/emoji_one/orange_heart.png and b/public/images/emoji/emoji_one/orange_heart.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together.png b/public/images/emoji/emoji_one/palms_up_together.png
index fb66ba11c4..15e0667ae7 100644
Binary files a/public/images/emoji/emoji_one/palms_up_together.png and b/public/images/emoji/emoji_one/palms_up_together.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/2.png b/public/images/emoji/emoji_one/palms_up_together/2.png
index 6d9b2fc8cc..85b6622b5d 100644
Binary files a/public/images/emoji/emoji_one/palms_up_together/2.png and b/public/images/emoji/emoji_one/palms_up_together/2.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/3.png b/public/images/emoji/emoji_one/palms_up_together/3.png
index c5d52f5c7a..0648189e06 100644
Binary files a/public/images/emoji/emoji_one/palms_up_together/3.png and b/public/images/emoji/emoji_one/palms_up_together/3.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/4.png b/public/images/emoji/emoji_one/palms_up_together/4.png
index 3d4288d10d..2b0bd1cd2a 100644
Binary files a/public/images/emoji/emoji_one/palms_up_together/4.png and b/public/images/emoji/emoji_one/palms_up_together/4.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/5.png b/public/images/emoji/emoji_one/palms_up_together/5.png
index 6ff36c07cb..6d7fdb021c 100644
Binary files a/public/images/emoji/emoji_one/palms_up_together/5.png and b/public/images/emoji/emoji_one/palms_up_together/5.png differ
diff --git a/public/images/emoji/emoji_one/palms_up_together/6.png b/public/images/emoji/emoji_one/palms_up_together/6.png
index c25d42927d..2fd1e06e2e 100644
Binary files a/public/images/emoji/emoji_one/palms_up_together/6.png and b/public/images/emoji/emoji_one/palms_up_together/6.png differ
diff --git a/public/images/emoji/emoji_one/pancakes.png b/public/images/emoji/emoji_one/pancakes.png
index 73d2253fe5..36e1dda8ef 100644
Binary files a/public/images/emoji/emoji_one/pancakes.png and b/public/images/emoji/emoji_one/pancakes.png differ
diff --git a/public/images/emoji/emoji_one/paw_prints.png b/public/images/emoji/emoji_one/paw_prints.png
index 37710a6f88..311f3d4d6b 100644
Binary files a/public/images/emoji/emoji_one/paw_prints.png and b/public/images/emoji/emoji_one/paw_prints.png differ
diff --git a/public/images/emoji/emoji_one/peach.png b/public/images/emoji/emoji_one/peach.png
index 03680ece2a..0692539b3c 100644
Binary files a/public/images/emoji/emoji_one/peach.png and b/public/images/emoji/emoji_one/peach.png differ
diff --git a/public/images/emoji/emoji_one/peanuts.png b/public/images/emoji/emoji_one/peanuts.png
index cfbdab9aec..9c1c5b0558 100644
Binary files a/public/images/emoji/emoji_one/peanuts.png and b/public/images/emoji/emoji_one/peanuts.png differ
diff --git a/public/images/emoji/emoji_one/pensive.png b/public/images/emoji/emoji_one/pensive.png
index e7bcd154b6..a1998cb27d 100644
Binary files a/public/images/emoji/emoji_one/pensive.png and b/public/images/emoji/emoji_one/pensive.png differ
diff --git a/public/images/emoji/emoji_one/persevere.png b/public/images/emoji/emoji_one/persevere.png
index 53038c443f..6868a838d1 100644
Binary files a/public/images/emoji/emoji_one/persevere.png and b/public/images/emoji/emoji_one/persevere.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing.png b/public/images/emoji/emoji_one/person_climbing.png
index 202a814c71..5f602e7921 100644
Binary files a/public/images/emoji/emoji_one/person_climbing.png and b/public/images/emoji/emoji_one/person_climbing.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/2.png b/public/images/emoji/emoji_one/person_climbing/2.png
new file mode 100644
index 0000000000..4215248b4d
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/2.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/3.png b/public/images/emoji/emoji_one/person_climbing/3.png
new file mode 100644
index 0000000000..778bb5eea5
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/3.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/4.png b/public/images/emoji/emoji_one/person_climbing/4.png
new file mode 100644
index 0000000000..f88dcf1a0e
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/4.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/5.png b/public/images/emoji/emoji_one/person_climbing/5.png
new file mode 100644
index 0000000000..67ddf47872
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/5.png differ
diff --git a/public/images/emoji/emoji_one/person_climbing/6.png b/public/images/emoji/emoji_one/person_climbing/6.png
new file mode 100644
index 0000000000..fcd36f345a
Binary files /dev/null and b/public/images/emoji/emoji_one/person_climbing/6.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning.png b/public/images/emoji/emoji_one/person_frowning.png
index a1af9eaf91..15945278a4 100644
Binary files a/public/images/emoji/emoji_one/person_frowning.png and b/public/images/emoji/emoji_one/person_frowning.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/2.png b/public/images/emoji/emoji_one/person_frowning/2.png
index ce5ee0f036..45d4fbfa64 100644
Binary files a/public/images/emoji/emoji_one/person_frowning/2.png and b/public/images/emoji/emoji_one/person_frowning/2.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/3.png b/public/images/emoji/emoji_one/person_frowning/3.png
index f2017acecf..a162630c94 100644
Binary files a/public/images/emoji/emoji_one/person_frowning/3.png and b/public/images/emoji/emoji_one/person_frowning/3.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/4.png b/public/images/emoji/emoji_one/person_frowning/4.png
index 9fca177e9d..ee475d8400 100644
Binary files a/public/images/emoji/emoji_one/person_frowning/4.png and b/public/images/emoji/emoji_one/person_frowning/4.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/5.png b/public/images/emoji/emoji_one/person_frowning/5.png
index 8bb8d943af..97c21442ba 100644
Binary files a/public/images/emoji/emoji_one/person_frowning/5.png and b/public/images/emoji/emoji_one/person_frowning/5.png differ
diff --git a/public/images/emoji/emoji_one/person_frowning/6.png b/public/images/emoji/emoji_one/person_frowning/6.png
index 5d30d35d42..2c5a39db98 100644
Binary files a/public/images/emoji/emoji_one/person_frowning/6.png and b/public/images/emoji/emoji_one/person_frowning/6.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position.png b/public/images/emoji/emoji_one/person_in_lotus_position.png
index e9404fd525..85b467093b 100644
Binary files a/public/images/emoji/emoji_one/person_in_lotus_position.png and b/public/images/emoji/emoji_one/person_in_lotus_position.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/2.png b/public/images/emoji/emoji_one/person_in_lotus_position/2.png
index 8817578cf0..339d2cd515 100644
Binary files a/public/images/emoji/emoji_one/person_in_lotus_position/2.png and b/public/images/emoji/emoji_one/person_in_lotus_position/2.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/3.png b/public/images/emoji/emoji_one/person_in_lotus_position/3.png
index 0e9bf46e0b..33cdf4d89d 100644
Binary files a/public/images/emoji/emoji_one/person_in_lotus_position/3.png and b/public/images/emoji/emoji_one/person_in_lotus_position/3.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/4.png b/public/images/emoji/emoji_one/person_in_lotus_position/4.png
index 918e3d435a..50fcaa6ee3 100644
Binary files a/public/images/emoji/emoji_one/person_in_lotus_position/4.png and b/public/images/emoji/emoji_one/person_in_lotus_position/4.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/5.png b/public/images/emoji/emoji_one/person_in_lotus_position/5.png
index 0c01143530..be94a8bc33 100644
Binary files a/public/images/emoji/emoji_one/person_in_lotus_position/5.png and b/public/images/emoji/emoji_one/person_in_lotus_position/5.png differ
diff --git a/public/images/emoji/emoji_one/person_in_lotus_position/6.png b/public/images/emoji/emoji_one/person_in_lotus_position/6.png
index fed226dac2..35c5fba885 100644
Binary files a/public/images/emoji/emoji_one/person_in_lotus_position/6.png and b/public/images/emoji/emoji_one/person_in_lotus_position/6.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room.png b/public/images/emoji/emoji_one/person_in_steamy_room.png
index 65a0790d92..c83e9d0c9a 100644
Binary files a/public/images/emoji/emoji_one/person_in_steamy_room.png and b/public/images/emoji/emoji_one/person_in_steamy_room.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/2.png b/public/images/emoji/emoji_one/person_in_steamy_room/2.png
index 7260df1d15..3f4fce712d 100644
Binary files a/public/images/emoji/emoji_one/person_in_steamy_room/2.png and b/public/images/emoji/emoji_one/person_in_steamy_room/2.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/3.png b/public/images/emoji/emoji_one/person_in_steamy_room/3.png
index d14580a3db..d95e31e3a3 100644
Binary files a/public/images/emoji/emoji_one/person_in_steamy_room/3.png and b/public/images/emoji/emoji_one/person_in_steamy_room/3.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/4.png b/public/images/emoji/emoji_one/person_in_steamy_room/4.png
index 9313ab2116..573911f259 100644
Binary files a/public/images/emoji/emoji_one/person_in_steamy_room/4.png and b/public/images/emoji/emoji_one/person_in_steamy_room/4.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/5.png b/public/images/emoji/emoji_one/person_in_steamy_room/5.png
index f432b554b3..0ded387a6c 100644
Binary files a/public/images/emoji/emoji_one/person_in_steamy_room/5.png and b/public/images/emoji/emoji_one/person_in_steamy_room/5.png differ
diff --git a/public/images/emoji/emoji_one/person_in_steamy_room/6.png b/public/images/emoji/emoji_one/person_in_steamy_room/6.png
index dc7087e028..381e454934 100644
Binary files a/public/images/emoji/emoji_one/person_in_steamy_room/6.png and b/public/images/emoji/emoji_one/person_in_steamy_room/6.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball.png b/public/images/emoji/emoji_one/person_with_ball.png
index a6904abac9..bc5aa6b3ea 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball.png and b/public/images/emoji/emoji_one/person_with_ball.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/2.png b/public/images/emoji/emoji_one/person_with_ball/2.png
index 9c1bee41ce..572fa0925f 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball/2.png and b/public/images/emoji/emoji_one/person_with_ball/2.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/3.png b/public/images/emoji/emoji_one/person_with_ball/3.png
index 275d1edd9b..203a5bbd82 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball/3.png and b/public/images/emoji/emoji_one/person_with_ball/3.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/4.png b/public/images/emoji/emoji_one/person_with_ball/4.png
index 7eb313163d..303b43c832 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball/4.png and b/public/images/emoji/emoji_one/person_with_ball/4.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/5.png b/public/images/emoji/emoji_one/person_with_ball/5.png
index fb9dc3936f..ebfd7ae793 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball/5.png and b/public/images/emoji/emoji_one/person_with_ball/5.png differ
diff --git a/public/images/emoji/emoji_one/person_with_ball/6.png b/public/images/emoji/emoji_one/person_with_ball/6.png
index 6636a5024f..94d75c809b 100644
Binary files a/public/images/emoji/emoji_one/person_with_ball/6.png and b/public/images/emoji/emoji_one/person_with_ball/6.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair.png b/public/images/emoji/emoji_one/person_with_blond_hair.png
index b7e300ea9c..1dfbe295e6 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair.png and b/public/images/emoji/emoji_one/person_with_blond_hair.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/2.png b/public/images/emoji/emoji_one/person_with_blond_hair/2.png
index afe0242f7a..775250def1 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair/2.png and b/public/images/emoji/emoji_one/person_with_blond_hair/2.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/3.png b/public/images/emoji/emoji_one/person_with_blond_hair/3.png
index 39dff27938..5720c58ea9 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair/3.png and b/public/images/emoji/emoji_one/person_with_blond_hair/3.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/4.png b/public/images/emoji/emoji_one/person_with_blond_hair/4.png
index 02da4b5d72..8d74699a83 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair/4.png and b/public/images/emoji/emoji_one/person_with_blond_hair/4.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/5.png b/public/images/emoji/emoji_one/person_with_blond_hair/5.png
index e207ddaa26..adf7d3113f 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair/5.png and b/public/images/emoji/emoji_one/person_with_blond_hair/5.png differ
diff --git a/public/images/emoji/emoji_one/person_with_blond_hair/6.png b/public/images/emoji/emoji_one/person_with_blond_hair/6.png
index cb09defa9f..31a2d833c5 100644
Binary files a/public/images/emoji/emoji_one/person_with_blond_hair/6.png and b/public/images/emoji/emoji_one/person_with_blond_hair/6.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face.png b/public/images/emoji/emoji_one/person_with_pouting_face.png
index 72c13f1532..c843d97f68 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face.png and b/public/images/emoji/emoji_one/person_with_pouting_face.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/2.png b/public/images/emoji/emoji_one/person_with_pouting_face/2.png
index dae7de1890..78eda48aa8 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face/2.png and b/public/images/emoji/emoji_one/person_with_pouting_face/2.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/3.png b/public/images/emoji/emoji_one/person_with_pouting_face/3.png
index 341d3e80ce..563bf2a626 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face/3.png and b/public/images/emoji/emoji_one/person_with_pouting_face/3.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/4.png b/public/images/emoji/emoji_one/person_with_pouting_face/4.png
index 1847d9f981..ed72191eb2 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face/4.png and b/public/images/emoji/emoji_one/person_with_pouting_face/4.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/5.png b/public/images/emoji/emoji_one/person_with_pouting_face/5.png
index 5a5df7acd7..8ad4c80223 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face/5.png and b/public/images/emoji/emoji_one/person_with_pouting_face/5.png differ
diff --git a/public/images/emoji/emoji_one/person_with_pouting_face/6.png b/public/images/emoji/emoji_one/person_with_pouting_face/6.png
index 393544addf..6981738f3e 100644
Binary files a/public/images/emoji/emoji_one/person_with_pouting_face/6.png and b/public/images/emoji/emoji_one/person_with_pouting_face/6.png differ
diff --git a/public/images/emoji/emoji_one/phone.png b/public/images/emoji/emoji_one/phone.png
index 41071e5804..e40b890329 100644
Binary files a/public/images/emoji/emoji_one/phone.png and b/public/images/emoji/emoji_one/phone.png differ
diff --git a/public/images/emoji/emoji_one/pie.png b/public/images/emoji/emoji_one/pie.png
index e73a1a2ed9..ba1646daf1 100644
Binary files a/public/images/emoji/emoji_one/pie.png and b/public/images/emoji/emoji_one/pie.png differ
diff --git a/public/images/emoji/emoji_one/point_down/2.png b/public/images/emoji/emoji_one/point_down/2.png
index 96fb4bb64b..d3c688ba81 100644
Binary files a/public/images/emoji/emoji_one/point_down/2.png and b/public/images/emoji/emoji_one/point_down/2.png differ
diff --git a/public/images/emoji/emoji_one/point_down/3.png b/public/images/emoji/emoji_one/point_down/3.png
index a59bc6fefd..d8c0bae4eb 100644
Binary files a/public/images/emoji/emoji_one/point_down/3.png and b/public/images/emoji/emoji_one/point_down/3.png differ
diff --git a/public/images/emoji/emoji_one/point_down/4.png b/public/images/emoji/emoji_one/point_down/4.png
index 333b5248ba..da88c69234 100644
Binary files a/public/images/emoji/emoji_one/point_down/4.png and b/public/images/emoji/emoji_one/point_down/4.png differ
diff --git a/public/images/emoji/emoji_one/point_down/5.png b/public/images/emoji/emoji_one/point_down/5.png
index 7ee088592d..afa8064a05 100644
Binary files a/public/images/emoji/emoji_one/point_down/5.png and b/public/images/emoji/emoji_one/point_down/5.png differ
diff --git a/public/images/emoji/emoji_one/point_down/6.png b/public/images/emoji/emoji_one/point_down/6.png
index d9934267db..163a4b0dcf 100644
Binary files a/public/images/emoji/emoji_one/point_down/6.png and b/public/images/emoji/emoji_one/point_down/6.png differ
diff --git a/public/images/emoji/emoji_one/point_left/2.png b/public/images/emoji/emoji_one/point_left/2.png
index 0a8efd8002..5a8e36c91a 100644
Binary files a/public/images/emoji/emoji_one/point_left/2.png and b/public/images/emoji/emoji_one/point_left/2.png differ
diff --git a/public/images/emoji/emoji_one/point_left/3.png b/public/images/emoji/emoji_one/point_left/3.png
index aaaa6a2ab4..b81564c587 100644
Binary files a/public/images/emoji/emoji_one/point_left/3.png and b/public/images/emoji/emoji_one/point_left/3.png differ
diff --git a/public/images/emoji/emoji_one/point_left/4.png b/public/images/emoji/emoji_one/point_left/4.png
index 1e47d41509..a5110e6d2e 100644
Binary files a/public/images/emoji/emoji_one/point_left/4.png and b/public/images/emoji/emoji_one/point_left/4.png differ
diff --git a/public/images/emoji/emoji_one/point_left/5.png b/public/images/emoji/emoji_one/point_left/5.png
index a86834bb47..4955393e91 100644
Binary files a/public/images/emoji/emoji_one/point_left/5.png and b/public/images/emoji/emoji_one/point_left/5.png differ
diff --git a/public/images/emoji/emoji_one/point_left/6.png b/public/images/emoji/emoji_one/point_left/6.png
index 8f35b049dd..a887cde42d 100644
Binary files a/public/images/emoji/emoji_one/point_left/6.png and b/public/images/emoji/emoji_one/point_left/6.png differ
diff --git a/public/images/emoji/emoji_one/point_right/2.png b/public/images/emoji/emoji_one/point_right/2.png
index 8da5fac950..206752435c 100644
Binary files a/public/images/emoji/emoji_one/point_right/2.png and b/public/images/emoji/emoji_one/point_right/2.png differ
diff --git a/public/images/emoji/emoji_one/point_right/3.png b/public/images/emoji/emoji_one/point_right/3.png
index 487b670a73..177137155d 100644
Binary files a/public/images/emoji/emoji_one/point_right/3.png and b/public/images/emoji/emoji_one/point_right/3.png differ
diff --git a/public/images/emoji/emoji_one/point_right/4.png b/public/images/emoji/emoji_one/point_right/4.png
index ee87509e0b..e6d909ef81 100644
Binary files a/public/images/emoji/emoji_one/point_right/4.png and b/public/images/emoji/emoji_one/point_right/4.png differ
diff --git a/public/images/emoji/emoji_one/point_right/5.png b/public/images/emoji/emoji_one/point_right/5.png
index 7764f18805..81e3218e43 100644
Binary files a/public/images/emoji/emoji_one/point_right/5.png and b/public/images/emoji/emoji_one/point_right/5.png differ
diff --git a/public/images/emoji/emoji_one/point_right/6.png b/public/images/emoji/emoji_one/point_right/6.png
index 67f96ff9d0..4832388346 100644
Binary files a/public/images/emoji/emoji_one/point_right/6.png and b/public/images/emoji/emoji_one/point_right/6.png differ
diff --git a/public/images/emoji/emoji_one/point_up/2.png b/public/images/emoji/emoji_one/point_up/2.png
index a058a4da96..d5206e547d 100644
Binary files a/public/images/emoji/emoji_one/point_up/2.png and b/public/images/emoji/emoji_one/point_up/2.png differ
diff --git a/public/images/emoji/emoji_one/point_up/3.png b/public/images/emoji/emoji_one/point_up/3.png
index be32c0b3ce..58a19cc569 100644
Binary files a/public/images/emoji/emoji_one/point_up/3.png and b/public/images/emoji/emoji_one/point_up/3.png differ
diff --git a/public/images/emoji/emoji_one/point_up/4.png b/public/images/emoji/emoji_one/point_up/4.png
index ac76d48a9b..687a8375cf 100644
Binary files a/public/images/emoji/emoji_one/point_up/4.png and b/public/images/emoji/emoji_one/point_up/4.png differ
diff --git a/public/images/emoji/emoji_one/point_up/5.png b/public/images/emoji/emoji_one/point_up/5.png
index 616bb44aba..5b574e1b03 100644
Binary files a/public/images/emoji/emoji_one/point_up/5.png and b/public/images/emoji/emoji_one/point_up/5.png differ
diff --git a/public/images/emoji/emoji_one/point_up/6.png b/public/images/emoji/emoji_one/point_up/6.png
index c4ca8311bf..344d0ac6cb 100644
Binary files a/public/images/emoji/emoji_one/point_up/6.png and b/public/images/emoji/emoji_one/point_up/6.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/2.png b/public/images/emoji/emoji_one/point_up_2/2.png
index b3fe16db21..1348d5b262 100644
Binary files a/public/images/emoji/emoji_one/point_up_2/2.png and b/public/images/emoji/emoji_one/point_up_2/2.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/3.png b/public/images/emoji/emoji_one/point_up_2/3.png
index 694ba78e72..c6cc1b2920 100644
Binary files a/public/images/emoji/emoji_one/point_up_2/3.png and b/public/images/emoji/emoji_one/point_up_2/3.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/4.png b/public/images/emoji/emoji_one/point_up_2/4.png
index a8e7406727..92bf676d58 100644
Binary files a/public/images/emoji/emoji_one/point_up_2/4.png and b/public/images/emoji/emoji_one/point_up_2/4.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/5.png b/public/images/emoji/emoji_one/point_up_2/5.png
index 6814fe7d07..2605af4c6e 100644
Binary files a/public/images/emoji/emoji_one/point_up_2/5.png and b/public/images/emoji/emoji_one/point_up_2/5.png differ
diff --git a/public/images/emoji/emoji_one/point_up_2/6.png b/public/images/emoji/emoji_one/point_up_2/6.png
index ab59bd66aa..93df6e6a33 100644
Binary files a/public/images/emoji/emoji_one/point_up_2/6.png and b/public/images/emoji/emoji_one/point_up_2/6.png differ
diff --git a/public/images/emoji/emoji_one/police_car.png b/public/images/emoji/emoji_one/police_car.png
index 12b42ef1db..258951b4e4 100644
Binary files a/public/images/emoji/emoji_one/police_car.png and b/public/images/emoji/emoji_one/police_car.png differ
diff --git a/public/images/emoji/emoji_one/policeman.png b/public/images/emoji/emoji_one/policeman.png
index d6cf91384e..ad6742c9c0 100644
Binary files a/public/images/emoji/emoji_one/policeman.png and b/public/images/emoji/emoji_one/policeman.png differ
diff --git a/public/images/emoji/emoji_one/policeman/2.png b/public/images/emoji/emoji_one/policeman/2.png
index 0b83eee330..a1373eaf8f 100644
Binary files a/public/images/emoji/emoji_one/policeman/2.png and b/public/images/emoji/emoji_one/policeman/2.png differ
diff --git a/public/images/emoji/emoji_one/policeman/3.png b/public/images/emoji/emoji_one/policeman/3.png
index 5b8dedac12..167a0412b0 100644
Binary files a/public/images/emoji/emoji_one/policeman/3.png and b/public/images/emoji/emoji_one/policeman/3.png differ
diff --git a/public/images/emoji/emoji_one/policeman/4.png b/public/images/emoji/emoji_one/policeman/4.png
index f6cccf50a5..4292f33eef 100644
Binary files a/public/images/emoji/emoji_one/policeman/4.png and b/public/images/emoji/emoji_one/policeman/4.png differ
diff --git a/public/images/emoji/emoji_one/policeman/5.png b/public/images/emoji/emoji_one/policeman/5.png
index ae3b2d81e6..49e49d38dd 100644
Binary files a/public/images/emoji/emoji_one/policeman/5.png and b/public/images/emoji/emoji_one/policeman/5.png differ
diff --git a/public/images/emoji/emoji_one/policeman/6.png b/public/images/emoji/emoji_one/policeman/6.png
index 6d74f9bd25..772e55693f 100644
Binary files a/public/images/emoji/emoji_one/policeman/6.png and b/public/images/emoji/emoji_one/policeman/6.png differ
diff --git a/public/images/emoji/emoji_one/policewoman.png b/public/images/emoji/emoji_one/policewoman.png
index afcc80b7aa..e947e47150 100644
Binary files a/public/images/emoji/emoji_one/policewoman.png and b/public/images/emoji/emoji_one/policewoman.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/2.png b/public/images/emoji/emoji_one/policewoman/2.png
index b40a2ebfa4..522ee6694f 100644
Binary files a/public/images/emoji/emoji_one/policewoman/2.png and b/public/images/emoji/emoji_one/policewoman/2.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/3.png b/public/images/emoji/emoji_one/policewoman/3.png
index df1a0123ba..df32872ada 100644
Binary files a/public/images/emoji/emoji_one/policewoman/3.png and b/public/images/emoji/emoji_one/policewoman/3.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/4.png b/public/images/emoji/emoji_one/policewoman/4.png
index 1c38500508..2a699adb77 100644
Binary files a/public/images/emoji/emoji_one/policewoman/4.png and b/public/images/emoji/emoji_one/policewoman/4.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/5.png b/public/images/emoji/emoji_one/policewoman/5.png
index aa9d8e25c6..593907cb50 100644
Binary files a/public/images/emoji/emoji_one/policewoman/5.png and b/public/images/emoji/emoji_one/policewoman/5.png differ
diff --git a/public/images/emoji/emoji_one/policewoman/6.png b/public/images/emoji/emoji_one/policewoman/6.png
index 8a79e5bb92..ac7cca6290 100644
Binary files a/public/images/emoji/emoji_one/policewoman/6.png and b/public/images/emoji/emoji_one/policewoman/6.png differ
diff --git a/public/images/emoji/emoji_one/popcorn.png b/public/images/emoji/emoji_one/popcorn.png
index b6015b545a..a5f4d3c7f5 100644
Binary files a/public/images/emoji/emoji_one/popcorn.png and b/public/images/emoji/emoji_one/popcorn.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man.png b/public/images/emoji/emoji_one/pouting_man.png
index 000fdf8d58..02442baee2 100644
Binary files a/public/images/emoji/emoji_one/pouting_man.png and b/public/images/emoji/emoji_one/pouting_man.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/2.png b/public/images/emoji/emoji_one/pouting_man/2.png
index eeb90e0691..74aa020461 100644
Binary files a/public/images/emoji/emoji_one/pouting_man/2.png and b/public/images/emoji/emoji_one/pouting_man/2.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/3.png b/public/images/emoji/emoji_one/pouting_man/3.png
index 0189ff9faf..cd4b032196 100644
Binary files a/public/images/emoji/emoji_one/pouting_man/3.png and b/public/images/emoji/emoji_one/pouting_man/3.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/4.png b/public/images/emoji/emoji_one/pouting_man/4.png
index 1e1fff1794..81b215e075 100644
Binary files a/public/images/emoji/emoji_one/pouting_man/4.png and b/public/images/emoji/emoji_one/pouting_man/4.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/5.png b/public/images/emoji/emoji_one/pouting_man/5.png
index 9250b873e9..49a8019871 100644
Binary files a/public/images/emoji/emoji_one/pouting_man/5.png and b/public/images/emoji/emoji_one/pouting_man/5.png differ
diff --git a/public/images/emoji/emoji_one/pouting_man/6.png b/public/images/emoji/emoji_one/pouting_man/6.png
index 715052ff4d..9ac5e2c664 100644
Binary files a/public/images/emoji/emoji_one/pouting_man/6.png and b/public/images/emoji/emoji_one/pouting_man/6.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman.png b/public/images/emoji/emoji_one/pouting_woman.png
index 72c13f1532..c843d97f68 100644
Binary files a/public/images/emoji/emoji_one/pouting_woman.png and b/public/images/emoji/emoji_one/pouting_woman.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/2.png b/public/images/emoji/emoji_one/pouting_woman/2.png
index dae7de1890..78eda48aa8 100644
Binary files a/public/images/emoji/emoji_one/pouting_woman/2.png and b/public/images/emoji/emoji_one/pouting_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/3.png b/public/images/emoji/emoji_one/pouting_woman/3.png
index 341d3e80ce..563bf2a626 100644
Binary files a/public/images/emoji/emoji_one/pouting_woman/3.png and b/public/images/emoji/emoji_one/pouting_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/4.png b/public/images/emoji/emoji_one/pouting_woman/4.png
index 1847d9f981..ed72191eb2 100644
Binary files a/public/images/emoji/emoji_one/pouting_woman/4.png and b/public/images/emoji/emoji_one/pouting_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/5.png b/public/images/emoji/emoji_one/pouting_woman/5.png
index 5a5df7acd7..8ad4c80223 100644
Binary files a/public/images/emoji/emoji_one/pouting_woman/5.png and b/public/images/emoji/emoji_one/pouting_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/pouting_woman/6.png b/public/images/emoji/emoji_one/pouting_woman/6.png
index 393544addf..6981738f3e 100644
Binary files a/public/images/emoji/emoji_one/pouting_woman/6.png and b/public/images/emoji/emoji_one/pouting_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/pray/2.png b/public/images/emoji/emoji_one/pray/2.png
index 8875cc01c7..a2d310c724 100644
Binary files a/public/images/emoji/emoji_one/pray/2.png and b/public/images/emoji/emoji_one/pray/2.png differ
diff --git a/public/images/emoji/emoji_one/pray/3.png b/public/images/emoji/emoji_one/pray/3.png
index bc82bf06dc..bb2e715770 100644
Binary files a/public/images/emoji/emoji_one/pray/3.png and b/public/images/emoji/emoji_one/pray/3.png differ
diff --git a/public/images/emoji/emoji_one/pray/4.png b/public/images/emoji/emoji_one/pray/4.png
index d5fdb30a81..a2706ce2e2 100644
Binary files a/public/images/emoji/emoji_one/pray/4.png and b/public/images/emoji/emoji_one/pray/4.png differ
diff --git a/public/images/emoji/emoji_one/pray/5.png b/public/images/emoji/emoji_one/pray/5.png
index ce8568ef64..d6be32bf47 100644
Binary files a/public/images/emoji/emoji_one/pray/5.png and b/public/images/emoji/emoji_one/pray/5.png differ
diff --git a/public/images/emoji/emoji_one/pray/6.png b/public/images/emoji/emoji_one/pray/6.png
index 117117a5d0..3b34141b59 100644
Binary files a/public/images/emoji/emoji_one/pray/6.png and b/public/images/emoji/emoji_one/pray/6.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman.png b/public/images/emoji/emoji_one/pregnant_woman.png
index 00736d5630..cf2bcf5963 100644
Binary files a/public/images/emoji/emoji_one/pregnant_woman.png and b/public/images/emoji/emoji_one/pregnant_woman.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/2.png b/public/images/emoji/emoji_one/pregnant_woman/2.png
index f8f1ce2486..56580c1dfc 100644
Binary files a/public/images/emoji/emoji_one/pregnant_woman/2.png and b/public/images/emoji/emoji_one/pregnant_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/3.png b/public/images/emoji/emoji_one/pregnant_woman/3.png
index 1dfd06fa87..89ee4dc6fd 100644
Binary files a/public/images/emoji/emoji_one/pregnant_woman/3.png and b/public/images/emoji/emoji_one/pregnant_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/4.png b/public/images/emoji/emoji_one/pregnant_woman/4.png
index 3164bf9239..574f05dc28 100644
Binary files a/public/images/emoji/emoji_one/pregnant_woman/4.png and b/public/images/emoji/emoji_one/pregnant_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/5.png b/public/images/emoji/emoji_one/pregnant_woman/5.png
index 3d848dc331..203890a7eb 100644
Binary files a/public/images/emoji/emoji_one/pregnant_woman/5.png and b/public/images/emoji/emoji_one/pregnant_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/pregnant_woman/6.png b/public/images/emoji/emoji_one/pregnant_woman/6.png
index 050fc456a3..dcd67e1d51 100644
Binary files a/public/images/emoji/emoji_one/pregnant_woman/6.png and b/public/images/emoji/emoji_one/pregnant_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/pretzel.png b/public/images/emoji/emoji_one/pretzel.png
index 9116d6ee9a..5088dc9255 100644
Binary files a/public/images/emoji/emoji_one/pretzel.png and b/public/images/emoji/emoji_one/pretzel.png differ
diff --git a/public/images/emoji/emoji_one/prince.png b/public/images/emoji/emoji_one/prince.png
index f4bb4cd881..1597761ddc 100644
Binary files a/public/images/emoji/emoji_one/prince.png and b/public/images/emoji/emoji_one/prince.png differ
diff --git a/public/images/emoji/emoji_one/prince/2.png b/public/images/emoji/emoji_one/prince/2.png
index 9678a88845..78dc032e0d 100644
Binary files a/public/images/emoji/emoji_one/prince/2.png and b/public/images/emoji/emoji_one/prince/2.png differ
diff --git a/public/images/emoji/emoji_one/prince/3.png b/public/images/emoji/emoji_one/prince/3.png
index cc9040e0ff..b5dabd089b 100644
Binary files a/public/images/emoji/emoji_one/prince/3.png and b/public/images/emoji/emoji_one/prince/3.png differ
diff --git a/public/images/emoji/emoji_one/prince/4.png b/public/images/emoji/emoji_one/prince/4.png
index f8210e305b..3573a7cfb7 100644
Binary files a/public/images/emoji/emoji_one/prince/4.png and b/public/images/emoji/emoji_one/prince/4.png differ
diff --git a/public/images/emoji/emoji_one/prince/5.png b/public/images/emoji/emoji_one/prince/5.png
index 23ef84b772..65b026876e 100644
Binary files a/public/images/emoji/emoji_one/prince/5.png and b/public/images/emoji/emoji_one/prince/5.png differ
diff --git a/public/images/emoji/emoji_one/prince/6.png b/public/images/emoji/emoji_one/prince/6.png
index fb56a6ccf9..9ebb2c1419 100644
Binary files a/public/images/emoji/emoji_one/prince/6.png and b/public/images/emoji/emoji_one/prince/6.png differ
diff --git a/public/images/emoji/emoji_one/princess.png b/public/images/emoji/emoji_one/princess.png
index 59ec00767a..f70435aab9 100644
Binary files a/public/images/emoji/emoji_one/princess.png and b/public/images/emoji/emoji_one/princess.png differ
diff --git a/public/images/emoji/emoji_one/princess/2.png b/public/images/emoji/emoji_one/princess/2.png
index 70fade7021..80202dc40b 100644
Binary files a/public/images/emoji/emoji_one/princess/2.png and b/public/images/emoji/emoji_one/princess/2.png differ
diff --git a/public/images/emoji/emoji_one/princess/3.png b/public/images/emoji/emoji_one/princess/3.png
index 362360f91f..d5f2f4cca5 100644
Binary files a/public/images/emoji/emoji_one/princess/3.png and b/public/images/emoji/emoji_one/princess/3.png differ
diff --git a/public/images/emoji/emoji_one/princess/4.png b/public/images/emoji/emoji_one/princess/4.png
index d9eae5a70a..82c1bc08fa 100644
Binary files a/public/images/emoji/emoji_one/princess/4.png and b/public/images/emoji/emoji_one/princess/4.png differ
diff --git a/public/images/emoji/emoji_one/princess/5.png b/public/images/emoji/emoji_one/princess/5.png
index 39c7ecc3a2..d809881b1f 100644
Binary files a/public/images/emoji/emoji_one/princess/5.png and b/public/images/emoji/emoji_one/princess/5.png differ
diff --git a/public/images/emoji/emoji_one/princess/6.png b/public/images/emoji/emoji_one/princess/6.png
index a960ffd119..1c56383c2f 100644
Binary files a/public/images/emoji/emoji_one/princess/6.png and b/public/images/emoji/emoji_one/princess/6.png differ
diff --git a/public/images/emoji/emoji_one/punch/2.png b/public/images/emoji/emoji_one/punch/2.png
index ba746c9f2e..42f2b3cbdf 100644
Binary files a/public/images/emoji/emoji_one/punch/2.png and b/public/images/emoji/emoji_one/punch/2.png differ
diff --git a/public/images/emoji/emoji_one/punch/3.png b/public/images/emoji/emoji_one/punch/3.png
index 35ecc381dc..8171539a60 100644
Binary files a/public/images/emoji/emoji_one/punch/3.png and b/public/images/emoji/emoji_one/punch/3.png differ
diff --git a/public/images/emoji/emoji_one/punch/4.png b/public/images/emoji/emoji_one/punch/4.png
index d90a941782..c8aa4ef7a6 100644
Binary files a/public/images/emoji/emoji_one/punch/4.png and b/public/images/emoji/emoji_one/punch/4.png differ
diff --git a/public/images/emoji/emoji_one/punch/5.png b/public/images/emoji/emoji_one/punch/5.png
index 1331fa3b8a..048cb8c26c 100644
Binary files a/public/images/emoji/emoji_one/punch/5.png and b/public/images/emoji/emoji_one/punch/5.png differ
diff --git a/public/images/emoji/emoji_one/punch/6.png b/public/images/emoji/emoji_one/punch/6.png
index 6e7920e71a..13a376407e 100644
Binary files a/public/images/emoji/emoji_one/punch/6.png and b/public/images/emoji/emoji_one/punch/6.png differ
diff --git a/public/images/emoji/emoji_one/railway_car.png b/public/images/emoji/emoji_one/railway_car.png
index a1f39d4c6c..9822ebb900 100644
Binary files a/public/images/emoji/emoji_one/railway_car.png and b/public/images/emoji/emoji_one/railway_car.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/2.png b/public/images/emoji/emoji_one/raised_back_of_hand/2.png
index 1470d4df99..183b98c9e2 100644
Binary files a/public/images/emoji/emoji_one/raised_back_of_hand/2.png and b/public/images/emoji/emoji_one/raised_back_of_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/3.png b/public/images/emoji/emoji_one/raised_back_of_hand/3.png
index f27ffead6e..c05aecd9ca 100644
Binary files a/public/images/emoji/emoji_one/raised_back_of_hand/3.png and b/public/images/emoji/emoji_one/raised_back_of_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/4.png b/public/images/emoji/emoji_one/raised_back_of_hand/4.png
index f9150049e2..d512ec58be 100644
Binary files a/public/images/emoji/emoji_one/raised_back_of_hand/4.png and b/public/images/emoji/emoji_one/raised_back_of_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/5.png b/public/images/emoji/emoji_one/raised_back_of_hand/5.png
index efdfe34a54..2168d36c52 100644
Binary files a/public/images/emoji/emoji_one/raised_back_of_hand/5.png and b/public/images/emoji/emoji_one/raised_back_of_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_back_of_hand/6.png b/public/images/emoji/emoji_one/raised_back_of_hand/6.png
index 11ffcc8dd4..a5ce38e96e 100644
Binary files a/public/images/emoji/emoji_one/raised_back_of_hand/6.png and b/public/images/emoji/emoji_one/raised_back_of_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/2.png b/public/images/emoji/emoji_one/raised_hand/2.png
index 9f4b42f571..8484849fec 100644
Binary files a/public/images/emoji/emoji_one/raised_hand/2.png and b/public/images/emoji/emoji_one/raised_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/3.png b/public/images/emoji/emoji_one/raised_hand/3.png
index 49df4165bb..4469d89931 100644
Binary files a/public/images/emoji/emoji_one/raised_hand/3.png and b/public/images/emoji/emoji_one/raised_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/4.png b/public/images/emoji/emoji_one/raised_hand/4.png
index 0de00d135e..aa00db9402 100644
Binary files a/public/images/emoji/emoji_one/raised_hand/4.png and b/public/images/emoji/emoji_one/raised_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/5.png b/public/images/emoji/emoji_one/raised_hand/5.png
index 13d1da4f67..a79f3fc150 100644
Binary files a/public/images/emoji/emoji_one/raised_hand/5.png and b/public/images/emoji/emoji_one/raised_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand/6.png b/public/images/emoji/emoji_one/raised_hand/6.png
index 27d2a626e4..d0135a6614 100644
Binary files a/public/images/emoji/emoji_one/raised_hand/6.png and b/public/images/emoji/emoji_one/raised_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png
index d360cea9ed..373f6150be 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png
index c889c464ba..413cdd2b96 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png
index fa9654e786..c44bd59f71 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png
index 243d1cc157..87ef3aa7ad 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png
index 255937df93..387d9c89c9 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png and b/public/images/emoji/emoji_one/raised_hand_with_fingers_splayed/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png
index 875852eab1..e240e70ff3 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png
index bb0e4d166c..a9b70c6ea2 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png
index 1d0ec20303..105909c061 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png
index 5767172272..7f86f45adb 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png
index 4a81388be3..39efaf09e5 100644
Binary files a/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png and b/public/images/emoji/emoji_one/raised_hand_with_part_between_middle_and_ring_fingers/6.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/2.png b/public/images/emoji/emoji_one/raised_hands/2.png
index d640bf63af..8790803b36 100644
Binary files a/public/images/emoji/emoji_one/raised_hands/2.png and b/public/images/emoji/emoji_one/raised_hands/2.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/3.png b/public/images/emoji/emoji_one/raised_hands/3.png
index 7e8adf84a5..35b90979c5 100644
Binary files a/public/images/emoji/emoji_one/raised_hands/3.png and b/public/images/emoji/emoji_one/raised_hands/3.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/4.png b/public/images/emoji/emoji_one/raised_hands/4.png
index 626611bbc0..545a4232c7 100644
Binary files a/public/images/emoji/emoji_one/raised_hands/4.png and b/public/images/emoji/emoji_one/raised_hands/4.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/5.png b/public/images/emoji/emoji_one/raised_hands/5.png
index bc77f9db54..4ee48a1517 100644
Binary files a/public/images/emoji/emoji_one/raised_hands/5.png and b/public/images/emoji/emoji_one/raised_hands/5.png differ
diff --git a/public/images/emoji/emoji_one/raised_hands/6.png b/public/images/emoji/emoji_one/raised_hands/6.png
index 3518c49386..7579f20d0e 100644
Binary files a/public/images/emoji/emoji_one/raised_hands/6.png and b/public/images/emoji/emoji_one/raised_hands/6.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand.png b/public/images/emoji/emoji_one/raising_hand.png
index 7e41ad3a3b..c904fc9493 100644
Binary files a/public/images/emoji/emoji_one/raising_hand.png and b/public/images/emoji/emoji_one/raising_hand.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/2.png b/public/images/emoji/emoji_one/raising_hand/2.png
index c4f7fe286d..c9d49ae438 100644
Binary files a/public/images/emoji/emoji_one/raising_hand/2.png and b/public/images/emoji/emoji_one/raising_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/3.png b/public/images/emoji/emoji_one/raising_hand/3.png
index 1a5d9d1fee..c1285e089d 100644
Binary files a/public/images/emoji/emoji_one/raising_hand/3.png and b/public/images/emoji/emoji_one/raising_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/4.png b/public/images/emoji/emoji_one/raising_hand/4.png
index a905a7f14e..df5eb29467 100644
Binary files a/public/images/emoji/emoji_one/raising_hand/4.png and b/public/images/emoji/emoji_one/raising_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/5.png b/public/images/emoji/emoji_one/raising_hand/5.png
index e554fe4369..f2c3950ef4 100644
Binary files a/public/images/emoji/emoji_one/raising_hand/5.png and b/public/images/emoji/emoji_one/raising_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand/6.png b/public/images/emoji/emoji_one/raising_hand/6.png
index 563746c2f7..a62f4d887d 100644
Binary files a/public/images/emoji/emoji_one/raising_hand/6.png and b/public/images/emoji/emoji_one/raising_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man.png b/public/images/emoji/emoji_one/raising_hand_man.png
index e0968ea502..1f02290c28 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_man.png and b/public/images/emoji/emoji_one/raising_hand_man.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/2.png b/public/images/emoji/emoji_one/raising_hand_man/2.png
index 1c6a740a28..55335c6302 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_man/2.png and b/public/images/emoji/emoji_one/raising_hand_man/2.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/3.png b/public/images/emoji/emoji_one/raising_hand_man/3.png
index b8b5cdd493..4890d6d370 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_man/3.png and b/public/images/emoji/emoji_one/raising_hand_man/3.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/4.png b/public/images/emoji/emoji_one/raising_hand_man/4.png
index 528e2cc256..8a317afe39 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_man/4.png and b/public/images/emoji/emoji_one/raising_hand_man/4.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/5.png b/public/images/emoji/emoji_one/raising_hand_man/5.png
index eefddd6be1..a9837fbc71 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_man/5.png and b/public/images/emoji/emoji_one/raising_hand_man/5.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_man/6.png b/public/images/emoji/emoji_one/raising_hand_man/6.png
index 894a569529..2f5d82bdfa 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_man/6.png and b/public/images/emoji/emoji_one/raising_hand_man/6.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman.png b/public/images/emoji/emoji_one/raising_hand_woman.png
index 7e41ad3a3b..c904fc9493 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_woman.png and b/public/images/emoji/emoji_one/raising_hand_woman.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/2.png b/public/images/emoji/emoji_one/raising_hand_woman/2.png
index c4f7fe286d..c9d49ae438 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_woman/2.png and b/public/images/emoji/emoji_one/raising_hand_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/3.png b/public/images/emoji/emoji_one/raising_hand_woman/3.png
index 1a5d9d1fee..c1285e089d 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_woman/3.png and b/public/images/emoji/emoji_one/raising_hand_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/4.png b/public/images/emoji/emoji_one/raising_hand_woman/4.png
index a905a7f14e..df5eb29467 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_woman/4.png and b/public/images/emoji/emoji_one/raising_hand_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/5.png b/public/images/emoji/emoji_one/raising_hand_woman/5.png
index e554fe4369..f2c3950ef4 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_woman/5.png and b/public/images/emoji/emoji_one/raising_hand_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/raising_hand_woman/6.png b/public/images/emoji/emoji_one/raising_hand_woman/6.png
index 563746c2f7..a62f4d887d 100644
Binary files a/public/images/emoji/emoji_one/raising_hand_woman/6.png and b/public/images/emoji/emoji_one/raising_hand_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/red_car.png b/public/images/emoji/emoji_one/red_car.png
index 13819504f7..5e1e89327b 100644
Binary files a/public/images/emoji/emoji_one/red_car.png and b/public/images/emoji/emoji_one/red_car.png differ
diff --git a/public/images/emoji/emoji_one/relaxed.png b/public/images/emoji/emoji_one/relaxed.png
index 3c36a4c2a1..a472b6fd5e 100644
Binary files a/public/images/emoji/emoji_one/relaxed.png and b/public/images/emoji/emoji_one/relaxed.png differ
diff --git a/public/images/emoji/emoji_one/relieved.png b/public/images/emoji/emoji_one/relieved.png
index 95eec25ed3..0086d94fc9 100644
Binary files a/public/images/emoji/emoji_one/relieved.png and b/public/images/emoji/emoji_one/relieved.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png
index 37ac478031..6d4d00f77c 100644
Binary files a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/2.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png
index 69fbed14d2..37bc135b96 100644
Binary files a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/3.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png
index c1134aea0f..2b3abdbf9a 100644
Binary files a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/4.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png
index 371ee90cf9..12c2de3a50 100644
Binary files a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/5.png differ
diff --git a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png
index db57dfd098..d3a0b3f62a 100644
Binary files a/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png and b/public/images/emoji/emoji_one/reversed_hand_with_middle_finger_extended/6.png differ
diff --git a/public/images/emoji/emoji_one/rice_ball.png b/public/images/emoji/emoji_one/rice_ball.png
index b468efc552..7cda5e0038 100644
Binary files a/public/images/emoji/emoji_one/rice_ball.png and b/public/images/emoji/emoji_one/rice_ball.png differ
diff --git a/public/images/emoji/emoji_one/rice_cracker.png b/public/images/emoji/emoji_one/rice_cracker.png
index 78dbeed5d5..a55e82e12d 100644
Binary files a/public/images/emoji/emoji_one/rice_cracker.png and b/public/images/emoji/emoji_one/rice_cracker.png differ
diff --git a/public/images/emoji/emoji_one/rofl.png b/public/images/emoji/emoji_one/rofl.png
index 5c8464c9f5..ece6d1bda6 100644
Binary files a/public/images/emoji/emoji_one/rofl.png and b/public/images/emoji/emoji_one/rofl.png differ
diff --git a/public/images/emoji/emoji_one/roll_eyes.png b/public/images/emoji/emoji_one/roll_eyes.png
index dc4f8c1385..e6fa5b3d7b 100644
Binary files a/public/images/emoji/emoji_one/roll_eyes.png and b/public/images/emoji/emoji_one/roll_eyes.png differ
diff --git a/public/images/emoji/emoji_one/rolling_eyes.png b/public/images/emoji/emoji_one/rolling_eyes.png
index dc4f8c1385..e6fa5b3d7b 100644
Binary files a/public/images/emoji/emoji_one/rolling_eyes.png and b/public/images/emoji/emoji_one/rolling_eyes.png differ
diff --git a/public/images/emoji/emoji_one/rowboat.png b/public/images/emoji/emoji_one/rowboat.png
index bac92654e1..b81173b77d 100644
Binary files a/public/images/emoji/emoji_one/rowboat.png and b/public/images/emoji/emoji_one/rowboat.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/2.png b/public/images/emoji/emoji_one/rowboat/2.png
index 79f58dc55f..69726bd7b6 100644
Binary files a/public/images/emoji/emoji_one/rowboat/2.png and b/public/images/emoji/emoji_one/rowboat/2.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/3.png b/public/images/emoji/emoji_one/rowboat/3.png
index 6cc17faf6a..23dba2f0a4 100644
Binary files a/public/images/emoji/emoji_one/rowboat/3.png and b/public/images/emoji/emoji_one/rowboat/3.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/4.png b/public/images/emoji/emoji_one/rowboat/4.png
index bdac8637e5..6efb3fa795 100644
Binary files a/public/images/emoji/emoji_one/rowboat/4.png and b/public/images/emoji/emoji_one/rowboat/4.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/5.png b/public/images/emoji/emoji_one/rowboat/5.png
index bcdde26969..eb83541b5d 100644
Binary files a/public/images/emoji/emoji_one/rowboat/5.png and b/public/images/emoji/emoji_one/rowboat/5.png differ
diff --git a/public/images/emoji/emoji_one/rowboat/6.png b/public/images/emoji/emoji_one/rowboat/6.png
index c2d1c4e351..20fa842aff 100644
Binary files a/public/images/emoji/emoji_one/rowboat/6.png and b/public/images/emoji/emoji_one/rowboat/6.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man.png b/public/images/emoji/emoji_one/rowing_man.png
index bac92654e1..b81173b77d 100644
Binary files a/public/images/emoji/emoji_one/rowing_man.png and b/public/images/emoji/emoji_one/rowing_man.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/2.png b/public/images/emoji/emoji_one/rowing_man/2.png
index 79f58dc55f..69726bd7b6 100644
Binary files a/public/images/emoji/emoji_one/rowing_man/2.png and b/public/images/emoji/emoji_one/rowing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/3.png b/public/images/emoji/emoji_one/rowing_man/3.png
index 6cc17faf6a..23dba2f0a4 100644
Binary files a/public/images/emoji/emoji_one/rowing_man/3.png and b/public/images/emoji/emoji_one/rowing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/4.png b/public/images/emoji/emoji_one/rowing_man/4.png
index bdac8637e5..6efb3fa795 100644
Binary files a/public/images/emoji/emoji_one/rowing_man/4.png and b/public/images/emoji/emoji_one/rowing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/5.png b/public/images/emoji/emoji_one/rowing_man/5.png
index bcdde26969..eb83541b5d 100644
Binary files a/public/images/emoji/emoji_one/rowing_man/5.png and b/public/images/emoji/emoji_one/rowing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/rowing_man/6.png b/public/images/emoji/emoji_one/rowing_man/6.png
index c2d1c4e351..20fa842aff 100644
Binary files a/public/images/emoji/emoji_one/rowing_man/6.png and b/public/images/emoji/emoji_one/rowing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman.png b/public/images/emoji/emoji_one/rowing_woman.png
index c8295bf593..1d5e29cd79 100644
Binary files a/public/images/emoji/emoji_one/rowing_woman.png and b/public/images/emoji/emoji_one/rowing_woman.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/2.png b/public/images/emoji/emoji_one/rowing_woman/2.png
index 9c72c4ea9f..099240239d 100644
Binary files a/public/images/emoji/emoji_one/rowing_woman/2.png and b/public/images/emoji/emoji_one/rowing_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/3.png b/public/images/emoji/emoji_one/rowing_woman/3.png
index 33590ced9a..db9d4472ad 100644
Binary files a/public/images/emoji/emoji_one/rowing_woman/3.png and b/public/images/emoji/emoji_one/rowing_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/4.png b/public/images/emoji/emoji_one/rowing_woman/4.png
index 1d6eebb6cf..ea9e33396e 100644
Binary files a/public/images/emoji/emoji_one/rowing_woman/4.png and b/public/images/emoji/emoji_one/rowing_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/5.png b/public/images/emoji/emoji_one/rowing_woman/5.png
index d377886442..8cbe43aab7 100644
Binary files a/public/images/emoji/emoji_one/rowing_woman/5.png and b/public/images/emoji/emoji_one/rowing_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/rowing_woman/6.png b/public/images/emoji/emoji_one/rowing_woman/6.png
index 417fd8d2d4..2d5445767d 100644
Binary files a/public/images/emoji/emoji_one/rowing_woman/6.png and b/public/images/emoji/emoji_one/rowing_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/runner.png b/public/images/emoji/emoji_one/runner.png
index 99d62ddf22..0a0e4bf1fc 100644
Binary files a/public/images/emoji/emoji_one/runner.png and b/public/images/emoji/emoji_one/runner.png differ
diff --git a/public/images/emoji/emoji_one/runner/2.png b/public/images/emoji/emoji_one/runner/2.png
index 885b2a92fe..3ee047b2da 100644
Binary files a/public/images/emoji/emoji_one/runner/2.png and b/public/images/emoji/emoji_one/runner/2.png differ
diff --git a/public/images/emoji/emoji_one/runner/3.png b/public/images/emoji/emoji_one/runner/3.png
index 33425ec5d5..d91f37a10f 100644
Binary files a/public/images/emoji/emoji_one/runner/3.png and b/public/images/emoji/emoji_one/runner/3.png differ
diff --git a/public/images/emoji/emoji_one/runner/4.png b/public/images/emoji/emoji_one/runner/4.png
index e5139b002d..9be2537a8d 100644
Binary files a/public/images/emoji/emoji_one/runner/4.png and b/public/images/emoji/emoji_one/runner/4.png differ
diff --git a/public/images/emoji/emoji_one/runner/5.png b/public/images/emoji/emoji_one/runner/5.png
index 664bbf6def..dc887483b5 100644
Binary files a/public/images/emoji/emoji_one/runner/5.png and b/public/images/emoji/emoji_one/runner/5.png differ
diff --git a/public/images/emoji/emoji_one/runner/6.png b/public/images/emoji/emoji_one/runner/6.png
index c0a6b9f63c..627cc69a85 100644
Binary files a/public/images/emoji/emoji_one/runner/6.png and b/public/images/emoji/emoji_one/runner/6.png differ
diff --git a/public/images/emoji/emoji_one/running_man.png b/public/images/emoji/emoji_one/running_man.png
index 99d62ddf22..0a0e4bf1fc 100644
Binary files a/public/images/emoji/emoji_one/running_man.png and b/public/images/emoji/emoji_one/running_man.png differ
diff --git a/public/images/emoji/emoji_one/running_man/2.png b/public/images/emoji/emoji_one/running_man/2.png
index 885b2a92fe..3ee047b2da 100644
Binary files a/public/images/emoji/emoji_one/running_man/2.png and b/public/images/emoji/emoji_one/running_man/2.png differ
diff --git a/public/images/emoji/emoji_one/running_man/3.png b/public/images/emoji/emoji_one/running_man/3.png
index 33425ec5d5..d91f37a10f 100644
Binary files a/public/images/emoji/emoji_one/running_man/3.png and b/public/images/emoji/emoji_one/running_man/3.png differ
diff --git a/public/images/emoji/emoji_one/running_man/4.png b/public/images/emoji/emoji_one/running_man/4.png
index e5139b002d..9be2537a8d 100644
Binary files a/public/images/emoji/emoji_one/running_man/4.png and b/public/images/emoji/emoji_one/running_man/4.png differ
diff --git a/public/images/emoji/emoji_one/running_man/5.png b/public/images/emoji/emoji_one/running_man/5.png
index 664bbf6def..dc887483b5 100644
Binary files a/public/images/emoji/emoji_one/running_man/5.png and b/public/images/emoji/emoji_one/running_man/5.png differ
diff --git a/public/images/emoji/emoji_one/running_man/6.png b/public/images/emoji/emoji_one/running_man/6.png
index c0a6b9f63c..627cc69a85 100644
Binary files a/public/images/emoji/emoji_one/running_man/6.png and b/public/images/emoji/emoji_one/running_man/6.png differ
diff --git a/public/images/emoji/emoji_one/running_woman.png b/public/images/emoji/emoji_one/running_woman.png
index 14ab5b717e..56a6ad32d0 100644
Binary files a/public/images/emoji/emoji_one/running_woman.png and b/public/images/emoji/emoji_one/running_woman.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/2.png b/public/images/emoji/emoji_one/running_woman/2.png
index b6c332f3b5..9fa5a1b40f 100644
Binary files a/public/images/emoji/emoji_one/running_woman/2.png and b/public/images/emoji/emoji_one/running_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/3.png b/public/images/emoji/emoji_one/running_woman/3.png
index 5013c3fef1..0e03b313bf 100644
Binary files a/public/images/emoji/emoji_one/running_woman/3.png and b/public/images/emoji/emoji_one/running_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/4.png b/public/images/emoji/emoji_one/running_woman/4.png
index acc8abbdfe..3d841effa7 100644
Binary files a/public/images/emoji/emoji_one/running_woman/4.png and b/public/images/emoji/emoji_one/running_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/5.png b/public/images/emoji/emoji_one/running_woman/5.png
index 8df764add3..24f90556a0 100644
Binary files a/public/images/emoji/emoji_one/running_woman/5.png and b/public/images/emoji/emoji_one/running_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/running_woman/6.png b/public/images/emoji/emoji_one/running_woman/6.png
index 82e65002ce..06cf112fe6 100644
Binary files a/public/images/emoji/emoji_one/running_woman/6.png and b/public/images/emoji/emoji_one/running_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/sandwich.png b/public/images/emoji/emoji_one/sandwich.png
index d3e6208858..6dcb5a2f63 100644
Binary files a/public/images/emoji/emoji_one/sandwich.png and b/public/images/emoji/emoji_one/sandwich.png differ
diff --git a/public/images/emoji/emoji_one/santa.png b/public/images/emoji/emoji_one/santa.png
index 60656dd07a..b64fcd987e 100644
Binary files a/public/images/emoji/emoji_one/santa.png and b/public/images/emoji/emoji_one/santa.png differ
diff --git a/public/images/emoji/emoji_one/santa/2.png b/public/images/emoji/emoji_one/santa/2.png
index a74de50052..8528bd70ce 100644
Binary files a/public/images/emoji/emoji_one/santa/2.png and b/public/images/emoji/emoji_one/santa/2.png differ
diff --git a/public/images/emoji/emoji_one/santa/3.png b/public/images/emoji/emoji_one/santa/3.png
index a59a1a3a8b..ccbc4bb029 100644
Binary files a/public/images/emoji/emoji_one/santa/3.png and b/public/images/emoji/emoji_one/santa/3.png differ
diff --git a/public/images/emoji/emoji_one/santa/4.png b/public/images/emoji/emoji_one/santa/4.png
index d3eba6d319..8113938ecc 100644
Binary files a/public/images/emoji/emoji_one/santa/4.png and b/public/images/emoji/emoji_one/santa/4.png differ
diff --git a/public/images/emoji/emoji_one/santa/5.png b/public/images/emoji/emoji_one/santa/5.png
index 9d3197c673..18a9a065a3 100644
Binary files a/public/images/emoji/emoji_one/santa/5.png and b/public/images/emoji/emoji_one/santa/5.png differ
diff --git a/public/images/emoji/emoji_one/santa/6.png b/public/images/emoji/emoji_one/santa/6.png
index befd15b804..02118a9d64 100644
Binary files a/public/images/emoji/emoji_one/santa/6.png and b/public/images/emoji/emoji_one/santa/6.png differ
diff --git a/public/images/emoji/emoji_one/satisfied.png b/public/images/emoji/emoji_one/satisfied.png
index ffa2477caa..42b85c1c98 100644
Binary files a/public/images/emoji/emoji_one/satisfied.png and b/public/images/emoji/emoji_one/satisfied.png differ
diff --git a/public/images/emoji/emoji_one/sauropod.png b/public/images/emoji/emoji_one/sauropod.png
index 2f4d619997..2431cb4726 100644
Binary files a/public/images/emoji/emoji_one/sauropod.png and b/public/images/emoji/emoji_one/sauropod.png differ
diff --git a/public/images/emoji/emoji_one/scarf.png b/public/images/emoji/emoji_one/scarf.png
index 73653eee2b..817b5a9506 100644
Binary files a/public/images/emoji/emoji_one/scarf.png and b/public/images/emoji/emoji_one/scarf.png differ
diff --git a/public/images/emoji/emoji_one/scream.png b/public/images/emoji/emoji_one/scream.png
index 1511a5e4e3..441386f6d6 100644
Binary files a/public/images/emoji/emoji_one/scream.png and b/public/images/emoji/emoji_one/scream.png differ
diff --git a/public/images/emoji/emoji_one/selfie/2.png b/public/images/emoji/emoji_one/selfie/2.png
index 2b041e7a75..49a48bf652 100644
Binary files a/public/images/emoji/emoji_one/selfie/2.png and b/public/images/emoji/emoji_one/selfie/2.png differ
diff --git a/public/images/emoji/emoji_one/selfie/3.png b/public/images/emoji/emoji_one/selfie/3.png
index d044c4a12e..4bba81cd42 100644
Binary files a/public/images/emoji/emoji_one/selfie/3.png and b/public/images/emoji/emoji_one/selfie/3.png differ
diff --git a/public/images/emoji/emoji_one/selfie/4.png b/public/images/emoji/emoji_one/selfie/4.png
index c4580ad9e0..2acb4b2f38 100644
Binary files a/public/images/emoji/emoji_one/selfie/4.png and b/public/images/emoji/emoji_one/selfie/4.png differ
diff --git a/public/images/emoji/emoji_one/selfie/5.png b/public/images/emoji/emoji_one/selfie/5.png
index 058d9fd8aa..66a4ede342 100644
Binary files a/public/images/emoji/emoji_one/selfie/5.png and b/public/images/emoji/emoji_one/selfie/5.png differ
diff --git a/public/images/emoji/emoji_one/selfie/6.png b/public/images/emoji/emoji_one/selfie/6.png
index 7c9abea6b8..a9ff6f3426 100644
Binary files a/public/images/emoji/emoji_one/selfie/6.png and b/public/images/emoji/emoji_one/selfie/6.png differ
diff --git a/public/images/emoji/emoji_one/shark.png b/public/images/emoji/emoji_one/shark.png
index e7ba34f974..75419bae03 100644
Binary files a/public/images/emoji/emoji_one/shark.png and b/public/images/emoji/emoji_one/shark.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/2.png b/public/images/emoji/emoji_one/sign_of_the_horns/2.png
index 58823b056c..e67d5a5079 100644
Binary files a/public/images/emoji/emoji_one/sign_of_the_horns/2.png and b/public/images/emoji/emoji_one/sign_of_the_horns/2.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/3.png b/public/images/emoji/emoji_one/sign_of_the_horns/3.png
index 7649f660d6..7a62d35c6d 100644
Binary files a/public/images/emoji/emoji_one/sign_of_the_horns/3.png and b/public/images/emoji/emoji_one/sign_of_the_horns/3.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/4.png b/public/images/emoji/emoji_one/sign_of_the_horns/4.png
index 587ce13ef0..947ca5b1bd 100644
Binary files a/public/images/emoji/emoji_one/sign_of_the_horns/4.png and b/public/images/emoji/emoji_one/sign_of_the_horns/4.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/5.png b/public/images/emoji/emoji_one/sign_of_the_horns/5.png
index 6f5a7f9a1a..9eb041cbfc 100644
Binary files a/public/images/emoji/emoji_one/sign_of_the_horns/5.png and b/public/images/emoji/emoji_one/sign_of_the_horns/5.png differ
diff --git a/public/images/emoji/emoji_one/sign_of_the_horns/6.png b/public/images/emoji/emoji_one/sign_of_the_horns/6.png
index 90670b6792..f670879ac8 100644
Binary files a/public/images/emoji/emoji_one/sign_of_the_horns/6.png and b/public/images/emoji/emoji_one/sign_of_the_horns/6.png differ
diff --git a/public/images/emoji/emoji_one/skier.png b/public/images/emoji/emoji_one/skier.png
index 46d2181201..99c640ccda 100644
Binary files a/public/images/emoji/emoji_one/skier.png and b/public/images/emoji/emoji_one/skier.png differ
diff --git a/public/images/emoji/emoji_one/sled.png b/public/images/emoji/emoji_one/sled.png
index 01805b1fe7..ed86ab6c43 100644
Binary files a/public/images/emoji/emoji_one/sled.png and b/public/images/emoji/emoji_one/sled.png differ
diff --git a/public/images/emoji/emoji_one/sleeping.png b/public/images/emoji/emoji_one/sleeping.png
index 0529449992..0aa765424a 100644
Binary files a/public/images/emoji/emoji_one/sleeping.png and b/public/images/emoji/emoji_one/sleeping.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/2.png b/public/images/emoji/emoji_one/sleeping_accommodation/2.png
index c5b63b88ab..d4ebd31b45 100644
Binary files a/public/images/emoji/emoji_one/sleeping_accommodation/2.png and b/public/images/emoji/emoji_one/sleeping_accommodation/2.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/3.png b/public/images/emoji/emoji_one/sleeping_accommodation/3.png
index 84ff296189..42df6586ab 100644
Binary files a/public/images/emoji/emoji_one/sleeping_accommodation/3.png and b/public/images/emoji/emoji_one/sleeping_accommodation/3.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/4.png b/public/images/emoji/emoji_one/sleeping_accommodation/4.png
index 900d4c8993..7090f9f817 100644
Binary files a/public/images/emoji/emoji_one/sleeping_accommodation/4.png and b/public/images/emoji/emoji_one/sleeping_accommodation/4.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/5.png b/public/images/emoji/emoji_one/sleeping_accommodation/5.png
index 02ebcc0f6b..96b52aa080 100644
Binary files a/public/images/emoji/emoji_one/sleeping_accommodation/5.png and b/public/images/emoji/emoji_one/sleeping_accommodation/5.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_accommodation/6.png b/public/images/emoji/emoji_one/sleeping_accommodation/6.png
index 1d09852601..d270e54a77 100644
Binary files a/public/images/emoji/emoji_one/sleeping_accommodation/6.png and b/public/images/emoji/emoji_one/sleeping_accommodation/6.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/2.png b/public/images/emoji/emoji_one/sleeping_bed/2.png
index c5b63b88ab..d4ebd31b45 100644
Binary files a/public/images/emoji/emoji_one/sleeping_bed/2.png and b/public/images/emoji/emoji_one/sleeping_bed/2.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/3.png b/public/images/emoji/emoji_one/sleeping_bed/3.png
index 84ff296189..42df6586ab 100644
Binary files a/public/images/emoji/emoji_one/sleeping_bed/3.png and b/public/images/emoji/emoji_one/sleeping_bed/3.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/4.png b/public/images/emoji/emoji_one/sleeping_bed/4.png
index 900d4c8993..7090f9f817 100644
Binary files a/public/images/emoji/emoji_one/sleeping_bed/4.png and b/public/images/emoji/emoji_one/sleeping_bed/4.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/5.png b/public/images/emoji/emoji_one/sleeping_bed/5.png
index 02ebcc0f6b..96b52aa080 100644
Binary files a/public/images/emoji/emoji_one/sleeping_bed/5.png and b/public/images/emoji/emoji_one/sleeping_bed/5.png differ
diff --git a/public/images/emoji/emoji_one/sleeping_bed/6.png b/public/images/emoji/emoji_one/sleeping_bed/6.png
index 1d09852601..d270e54a77 100644
Binary files a/public/images/emoji/emoji_one/sleeping_bed/6.png and b/public/images/emoji/emoji_one/sleeping_bed/6.png differ
diff --git a/public/images/emoji/emoji_one/sleepy.png b/public/images/emoji/emoji_one/sleepy.png
index bc5e0e6211..dfe30f7f13 100644
Binary files a/public/images/emoji/emoji_one/sleepy.png and b/public/images/emoji/emoji_one/sleepy.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy.png b/public/images/emoji/emoji_one/sleuth_or_spy.png
index dda052dfbb..8d0cfe50b6 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy.png and b/public/images/emoji/emoji_one/sleuth_or_spy.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/2.png b/public/images/emoji/emoji_one/sleuth_or_spy/2.png
index 22f8a4fa1b..248be42171 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy/2.png and b/public/images/emoji/emoji_one/sleuth_or_spy/2.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/3.png b/public/images/emoji/emoji_one/sleuth_or_spy/3.png
index 028d6d8e16..620aadaf24 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy/3.png and b/public/images/emoji/emoji_one/sleuth_or_spy/3.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/4.png b/public/images/emoji/emoji_one/sleuth_or_spy/4.png
index 467e372e51..d6ed01d7e1 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy/4.png and b/public/images/emoji/emoji_one/sleuth_or_spy/4.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/5.png b/public/images/emoji/emoji_one/sleuth_or_spy/5.png
index 69c952c3b7..6d06155f7e 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy/5.png and b/public/images/emoji/emoji_one/sleuth_or_spy/5.png differ
diff --git a/public/images/emoji/emoji_one/sleuth_or_spy/6.png b/public/images/emoji/emoji_one/sleuth_or_spy/6.png
index 3caf1bcfc8..890777db04 100644
Binary files a/public/images/emoji/emoji_one/sleuth_or_spy/6.png and b/public/images/emoji/emoji_one/sleuth_or_spy/6.png differ
diff --git a/public/images/emoji/emoji_one/smiling_imp.png b/public/images/emoji/emoji_one/smiling_imp.png
index 15dd76b14d..09e1e4d3c4 100644
Binary files a/public/images/emoji/emoji_one/smiling_imp.png and b/public/images/emoji/emoji_one/smiling_imp.png differ
diff --git a/public/images/emoji/emoji_one/smirk.png b/public/images/emoji/emoji_one/smirk.png
index 4352c78f17..a4cb74aa4f 100644
Binary files a/public/images/emoji/emoji_one/smirk.png and b/public/images/emoji/emoji_one/smirk.png differ
diff --git a/public/images/emoji/emoji_one/sneezing_face.png b/public/images/emoji/emoji_one/sneezing_face.png
index ed2115a34f..c7180f1a0a 100644
Binary files a/public/images/emoji/emoji_one/sneezing_face.png and b/public/images/emoji/emoji_one/sneezing_face.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/2.png b/public/images/emoji/emoji_one/snowboarder/2.png
index d75f80a272..9d944d1d8f 100644
Binary files a/public/images/emoji/emoji_one/snowboarder/2.png and b/public/images/emoji/emoji_one/snowboarder/2.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/3.png b/public/images/emoji/emoji_one/snowboarder/3.png
index 57f8d32290..8acd85321f 100644
Binary files a/public/images/emoji/emoji_one/snowboarder/3.png and b/public/images/emoji/emoji_one/snowboarder/3.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/4.png b/public/images/emoji/emoji_one/snowboarder/4.png
index f1d6be361e..064fb5a470 100644
Binary files a/public/images/emoji/emoji_one/snowboarder/4.png and b/public/images/emoji/emoji_one/snowboarder/4.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/5.png b/public/images/emoji/emoji_one/snowboarder/5.png
index c81607fc79..969a884341 100644
Binary files a/public/images/emoji/emoji_one/snowboarder/5.png and b/public/images/emoji/emoji_one/snowboarder/5.png differ
diff --git a/public/images/emoji/emoji_one/snowboarder/6.png b/public/images/emoji/emoji_one/snowboarder/6.png
index 50869272ee..dd2898ea3d 100644
Binary files a/public/images/emoji/emoji_one/snowboarder/6.png and b/public/images/emoji/emoji_one/snowboarder/6.png differ
diff --git a/public/images/emoji/emoji_one/sob.png b/public/images/emoji/emoji_one/sob.png
index 7cebf5c5ba..5f2e4ee738 100644
Binary files a/public/images/emoji/emoji_one/sob.png and b/public/images/emoji/emoji_one/sob.png differ
diff --git a/public/images/emoji/emoji_one/socks.png b/public/images/emoji/emoji_one/socks.png
index 49e7c5df85..012f1ea945 100644
Binary files a/public/images/emoji/emoji_one/socks.png and b/public/images/emoji/emoji_one/socks.png differ
diff --git a/public/images/emoji/emoji_one/spaghetti.png b/public/images/emoji/emoji_one/spaghetti.png
index 42223ee671..36c6858b6a 100644
Binary files a/public/images/emoji/emoji_one/spaghetti.png and b/public/images/emoji/emoji_one/spaghetti.png differ
diff --git a/public/images/emoji/emoji_one/spy.png b/public/images/emoji/emoji_one/spy.png
index dda052dfbb..8d0cfe50b6 100644
Binary files a/public/images/emoji/emoji_one/spy.png and b/public/images/emoji/emoji_one/spy.png differ
diff --git a/public/images/emoji/emoji_one/spy/2.png b/public/images/emoji/emoji_one/spy/2.png
index 22f8a4fa1b..248be42171 100644
Binary files a/public/images/emoji/emoji_one/spy/2.png and b/public/images/emoji/emoji_one/spy/2.png differ
diff --git a/public/images/emoji/emoji_one/spy/3.png b/public/images/emoji/emoji_one/spy/3.png
index 028d6d8e16..620aadaf24 100644
Binary files a/public/images/emoji/emoji_one/spy/3.png and b/public/images/emoji/emoji_one/spy/3.png differ
diff --git a/public/images/emoji/emoji_one/spy/4.png b/public/images/emoji/emoji_one/spy/4.png
index 467e372e51..d6ed01d7e1 100644
Binary files a/public/images/emoji/emoji_one/spy/4.png and b/public/images/emoji/emoji_one/spy/4.png differ
diff --git a/public/images/emoji/emoji_one/spy/5.png b/public/images/emoji/emoji_one/spy/5.png
index 69c952c3b7..6d06155f7e 100644
Binary files a/public/images/emoji/emoji_one/spy/5.png and b/public/images/emoji/emoji_one/spy/5.png differ
diff --git a/public/images/emoji/emoji_one/spy/6.png b/public/images/emoji/emoji_one/spy/6.png
index 3caf1bcfc8..890777db04 100644
Binary files a/public/images/emoji/emoji_one/spy/6.png and b/public/images/emoji/emoji_one/spy/6.png differ
diff --git a/public/images/emoji/emoji_one/star_struck.png b/public/images/emoji/emoji_one/star_struck.png
index 6b11651cd2..6c58e7ed2c 100644
Binary files a/public/images/emoji/emoji_one/star_struck.png and b/public/images/emoji/emoji_one/star_struck.png differ
diff --git a/public/images/emoji/emoji_one/station.png b/public/images/emoji/emoji_one/station.png
index 0cd5a8a3c7..6deaae5e4d 100644
Binary files a/public/images/emoji/emoji_one/station.png and b/public/images/emoji/emoji_one/station.png differ
diff --git a/public/images/emoji/emoji_one/steam_locomotive.png b/public/images/emoji/emoji_one/steam_locomotive.png
index 3ac96bb542..68c3ed8ae6 100644
Binary files a/public/images/emoji/emoji_one/steam_locomotive.png and b/public/images/emoji/emoji_one/steam_locomotive.png differ
diff --git a/public/images/emoji/emoji_one/stuck_out_tongue.png b/public/images/emoji/emoji_one/stuck_out_tongue.png
index 85b042cb2b..1173425a2e 100644
Binary files a/public/images/emoji/emoji_one/stuck_out_tongue.png and b/public/images/emoji/emoji_one/stuck_out_tongue.png differ
diff --git a/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png b/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png
index 98430e5eac..89f9b748b6 100644
Binary files a/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png and b/public/images/emoji/emoji_one/stuck_out_tongue_closed_eyes.png differ
diff --git a/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png b/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png
index cf7d7d1b9a..95716847d7 100644
Binary files a/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png and b/public/images/emoji/emoji_one/stuck_out_tongue_winking_eye.png differ
diff --git a/public/images/emoji/emoji_one/sunglasses.png b/public/images/emoji/emoji_one/sunglasses.png
index 92cff83415..b8f6e3b104 100644
Binary files a/public/images/emoji/emoji_one/sunglasses.png and b/public/images/emoji/emoji_one/sunglasses.png differ
diff --git a/public/images/emoji/emoji_one/surfer.png b/public/images/emoji/emoji_one/surfer.png
index 51a39cfd49..766b177ec9 100644
Binary files a/public/images/emoji/emoji_one/surfer.png and b/public/images/emoji/emoji_one/surfer.png differ
diff --git a/public/images/emoji/emoji_one/surfer/2.png b/public/images/emoji/emoji_one/surfer/2.png
index 9bc980175f..a0d198944d 100644
Binary files a/public/images/emoji/emoji_one/surfer/2.png and b/public/images/emoji/emoji_one/surfer/2.png differ
diff --git a/public/images/emoji/emoji_one/surfer/3.png b/public/images/emoji/emoji_one/surfer/3.png
index dd14853d95..50d3017cda 100644
Binary files a/public/images/emoji/emoji_one/surfer/3.png and b/public/images/emoji/emoji_one/surfer/3.png differ
diff --git a/public/images/emoji/emoji_one/surfer/4.png b/public/images/emoji/emoji_one/surfer/4.png
index 79a42b2c09..2ba4475e8a 100644
Binary files a/public/images/emoji/emoji_one/surfer/4.png and b/public/images/emoji/emoji_one/surfer/4.png differ
diff --git a/public/images/emoji/emoji_one/surfer/5.png b/public/images/emoji/emoji_one/surfer/5.png
index 5e92807f3a..70f8e34b32 100644
Binary files a/public/images/emoji/emoji_one/surfer/5.png and b/public/images/emoji/emoji_one/surfer/5.png differ
diff --git a/public/images/emoji/emoji_one/surfer/6.png b/public/images/emoji/emoji_one/surfer/6.png
index c86606c7af..2132090b4f 100644
Binary files a/public/images/emoji/emoji_one/surfer/6.png and b/public/images/emoji/emoji_one/surfer/6.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man.png b/public/images/emoji/emoji_one/surfing_man.png
index 51a39cfd49..766b177ec9 100644
Binary files a/public/images/emoji/emoji_one/surfing_man.png and b/public/images/emoji/emoji_one/surfing_man.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/2.png b/public/images/emoji/emoji_one/surfing_man/2.png
index 9bc980175f..a0d198944d 100644
Binary files a/public/images/emoji/emoji_one/surfing_man/2.png and b/public/images/emoji/emoji_one/surfing_man/2.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/3.png b/public/images/emoji/emoji_one/surfing_man/3.png
index dd14853d95..50d3017cda 100644
Binary files a/public/images/emoji/emoji_one/surfing_man/3.png and b/public/images/emoji/emoji_one/surfing_man/3.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/4.png b/public/images/emoji/emoji_one/surfing_man/4.png
index 79a42b2c09..2ba4475e8a 100644
Binary files a/public/images/emoji/emoji_one/surfing_man/4.png and b/public/images/emoji/emoji_one/surfing_man/4.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/5.png b/public/images/emoji/emoji_one/surfing_man/5.png
index 5e92807f3a..70f8e34b32 100644
Binary files a/public/images/emoji/emoji_one/surfing_man/5.png and b/public/images/emoji/emoji_one/surfing_man/5.png differ
diff --git a/public/images/emoji/emoji_one/surfing_man/6.png b/public/images/emoji/emoji_one/surfing_man/6.png
index c86606c7af..2132090b4f 100644
Binary files a/public/images/emoji/emoji_one/surfing_man/6.png and b/public/images/emoji/emoji_one/surfing_man/6.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman.png b/public/images/emoji/emoji_one/surfing_woman.png
index 90c105ee7c..3c3639b8cd 100644
Binary files a/public/images/emoji/emoji_one/surfing_woman.png and b/public/images/emoji/emoji_one/surfing_woman.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/2.png b/public/images/emoji/emoji_one/surfing_woman/2.png
index 0716646d8b..7fa0d59102 100644
Binary files a/public/images/emoji/emoji_one/surfing_woman/2.png and b/public/images/emoji/emoji_one/surfing_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/3.png b/public/images/emoji/emoji_one/surfing_woman/3.png
index 45b13a495b..060bd1b115 100644
Binary files a/public/images/emoji/emoji_one/surfing_woman/3.png and b/public/images/emoji/emoji_one/surfing_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/4.png b/public/images/emoji/emoji_one/surfing_woman/4.png
index 16440a8ccc..a00ae12f8e 100644
Binary files a/public/images/emoji/emoji_one/surfing_woman/4.png and b/public/images/emoji/emoji_one/surfing_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/5.png b/public/images/emoji/emoji_one/surfing_woman/5.png
index 062adee4ea..c9d477140b 100644
Binary files a/public/images/emoji/emoji_one/surfing_woman/5.png and b/public/images/emoji/emoji_one/surfing_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/surfing_woman/6.png b/public/images/emoji/emoji_one/surfing_woman/6.png
index d822aa163f..d56e133b3e 100644
Binary files a/public/images/emoji/emoji_one/surfing_woman/6.png and b/public/images/emoji/emoji_one/surfing_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/sushi.png b/public/images/emoji/emoji_one/sushi.png
index 86bf8f2dce..a24be79be7 100644
Binary files a/public/images/emoji/emoji_one/sushi.png and b/public/images/emoji/emoji_one/sushi.png differ
diff --git a/public/images/emoji/emoji_one/sushing_face.png b/public/images/emoji/emoji_one/sushing_face.png
index 85d7e1446a..b792bac92a 100644
Binary files a/public/images/emoji/emoji_one/sushing_face.png and b/public/images/emoji/emoji_one/sushing_face.png differ
diff --git a/public/images/emoji/emoji_one/suspension_railway.png b/public/images/emoji/emoji_one/suspension_railway.png
index c98bc888c1..e87c6a6669 100644
Binary files a/public/images/emoji/emoji_one/suspension_railway.png and b/public/images/emoji/emoji_one/suspension_railway.png differ
diff --git a/public/images/emoji/emoji_one/sweat.png b/public/images/emoji/emoji_one/sweat.png
index 8f37bd3bca..596b82b58f 100644
Binary files a/public/images/emoji/emoji_one/sweat.png and b/public/images/emoji/emoji_one/sweat.png differ
diff --git a/public/images/emoji/emoji_one/sweet_potato.png b/public/images/emoji/emoji_one/sweet_potato.png
index 558361732c..8726f6ad25 100644
Binary files a/public/images/emoji/emoji_one/sweet_potato.png and b/public/images/emoji/emoji_one/sweet_potato.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/2.png b/public/images/emoji/emoji_one/swimmer/2.png
index 76acd61bcc..847d23a580 100644
Binary files a/public/images/emoji/emoji_one/swimmer/2.png and b/public/images/emoji/emoji_one/swimmer/2.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/3.png b/public/images/emoji/emoji_one/swimmer/3.png
index 4e71d938b8..1437a5097e 100644
Binary files a/public/images/emoji/emoji_one/swimmer/3.png and b/public/images/emoji/emoji_one/swimmer/3.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/4.png b/public/images/emoji/emoji_one/swimmer/4.png
index 7f1979a7f5..5a840726dd 100644
Binary files a/public/images/emoji/emoji_one/swimmer/4.png and b/public/images/emoji/emoji_one/swimmer/4.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/5.png b/public/images/emoji/emoji_one/swimmer/5.png
index 3e0c791a76..1e1ed8cb46 100644
Binary files a/public/images/emoji/emoji_one/swimmer/5.png and b/public/images/emoji/emoji_one/swimmer/5.png differ
diff --git a/public/images/emoji/emoji_one/swimmer/6.png b/public/images/emoji/emoji_one/swimmer/6.png
index 5b4d808e4e..a050020993 100644
Binary files a/public/images/emoji/emoji_one/swimmer/6.png and b/public/images/emoji/emoji_one/swimmer/6.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/2.png b/public/images/emoji/emoji_one/swimming_man/2.png
index 76acd61bcc..847d23a580 100644
Binary files a/public/images/emoji/emoji_one/swimming_man/2.png and b/public/images/emoji/emoji_one/swimming_man/2.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/3.png b/public/images/emoji/emoji_one/swimming_man/3.png
index 4e71d938b8..1437a5097e 100644
Binary files a/public/images/emoji/emoji_one/swimming_man/3.png and b/public/images/emoji/emoji_one/swimming_man/3.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/4.png b/public/images/emoji/emoji_one/swimming_man/4.png
index 7f1979a7f5..5a840726dd 100644
Binary files a/public/images/emoji/emoji_one/swimming_man/4.png and b/public/images/emoji/emoji_one/swimming_man/4.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/5.png b/public/images/emoji/emoji_one/swimming_man/5.png
index 3e0c791a76..1e1ed8cb46 100644
Binary files a/public/images/emoji/emoji_one/swimming_man/5.png and b/public/images/emoji/emoji_one/swimming_man/5.png differ
diff --git a/public/images/emoji/emoji_one/swimming_man/6.png b/public/images/emoji/emoji_one/swimming_man/6.png
index 5b4d808e4e..a050020993 100644
Binary files a/public/images/emoji/emoji_one/swimming_man/6.png and b/public/images/emoji/emoji_one/swimming_man/6.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/2.png b/public/images/emoji/emoji_one/swimming_woman/2.png
index 363e81e496..819233c154 100644
Binary files a/public/images/emoji/emoji_one/swimming_woman/2.png and b/public/images/emoji/emoji_one/swimming_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/3.png b/public/images/emoji/emoji_one/swimming_woman/3.png
index 03dd5f3e09..2c89827610 100644
Binary files a/public/images/emoji/emoji_one/swimming_woman/3.png and b/public/images/emoji/emoji_one/swimming_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/4.png b/public/images/emoji/emoji_one/swimming_woman/4.png
index 63d057378f..c6c30eb5bc 100644
Binary files a/public/images/emoji/emoji_one/swimming_woman/4.png and b/public/images/emoji/emoji_one/swimming_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/5.png b/public/images/emoji/emoji_one/swimming_woman/5.png
index c4dfaacff1..330ae72267 100644
Binary files a/public/images/emoji/emoji_one/swimming_woman/5.png and b/public/images/emoji/emoji_one/swimming_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/swimming_woman/6.png b/public/images/emoji/emoji_one/swimming_woman/6.png
index 269aaf0f02..75d6361122 100644
Binary files a/public/images/emoji/emoji_one/swimming_woman/6.png and b/public/images/emoji/emoji_one/swimming_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/t_rex.png b/public/images/emoji/emoji_one/t_rex.png
index 324f744909..0d0a8710dd 100644
Binary files a/public/images/emoji/emoji_one/t_rex.png and b/public/images/emoji/emoji_one/t_rex.png differ
diff --git a/public/images/emoji/emoji_one/takeout_box.png b/public/images/emoji/emoji_one/takeout_box.png
index a50b71ed12..01959c1ecd 100644
Binary files a/public/images/emoji/emoji_one/takeout_box.png and b/public/images/emoji/emoji_one/takeout_box.png differ
diff --git a/public/images/emoji/emoji_one/taxi.png b/public/images/emoji/emoji_one/taxi.png
index d3626b4701..fb6a21a11e 100644
Binary files a/public/images/emoji/emoji_one/taxi.png and b/public/images/emoji/emoji_one/taxi.png differ
diff --git a/public/images/emoji/emoji_one/telephone.png b/public/images/emoji/emoji_one/telephone.png
index 41071e5804..e40b890329 100644
Binary files a/public/images/emoji/emoji_one/telephone.png and b/public/images/emoji/emoji_one/telephone.png differ
diff --git a/public/images/emoji/emoji_one/thermometer_face.png b/public/images/emoji/emoji_one/thermometer_face.png
index abfed8eb56..9ba627bbaf 100644
Binary files a/public/images/emoji/emoji_one/thermometer_face.png and b/public/images/emoji/emoji_one/thermometer_face.png differ
diff --git a/public/images/emoji/emoji_one/thinking.png b/public/images/emoji/emoji_one/thinking.png
index 110c4e2fba..b1272b402c 100644
Binary files a/public/images/emoji/emoji_one/thinking.png and b/public/images/emoji/emoji_one/thinking.png differ
diff --git a/public/images/emoji/emoji_one/thinking_face.png b/public/images/emoji/emoji_one/thinking_face.png
index 110c4e2fba..b1272b402c 100644
Binary files a/public/images/emoji/emoji_one/thinking_face.png and b/public/images/emoji/emoji_one/thinking_face.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown.png b/public/images/emoji/emoji_one/thumbsdown.png
index 609e825618..3feb01c56c 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown.png and b/public/images/emoji/emoji_one/thumbsdown.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/2.png b/public/images/emoji/emoji_one/thumbsdown/2.png
index 322c518f75..0803889326 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown/2.png and b/public/images/emoji/emoji_one/thumbsdown/2.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/3.png b/public/images/emoji/emoji_one/thumbsdown/3.png
index 0c7a4ca2ce..91fbda2d09 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown/3.png and b/public/images/emoji/emoji_one/thumbsdown/3.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/4.png b/public/images/emoji/emoji_one/thumbsdown/4.png
index 9734764304..bba84d3f7e 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown/4.png and b/public/images/emoji/emoji_one/thumbsdown/4.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/5.png b/public/images/emoji/emoji_one/thumbsdown/5.png
index 39e2360bf9..e660885f03 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown/5.png and b/public/images/emoji/emoji_one/thumbsdown/5.png differ
diff --git a/public/images/emoji/emoji_one/thumbsdown/6.png b/public/images/emoji/emoji_one/thumbsdown/6.png
index cb21abb2dc..0647aeda56 100644
Binary files a/public/images/emoji/emoji_one/thumbsdown/6.png and b/public/images/emoji/emoji_one/thumbsdown/6.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup.png b/public/images/emoji/emoji_one/thumbsup.png
index 76e9adb153..fdbf5f8213 100644
Binary files a/public/images/emoji/emoji_one/thumbsup.png and b/public/images/emoji/emoji_one/thumbsup.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/2.png b/public/images/emoji/emoji_one/thumbsup/2.png
index 411f6e0da8..8d6845de63 100644
Binary files a/public/images/emoji/emoji_one/thumbsup/2.png and b/public/images/emoji/emoji_one/thumbsup/2.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/3.png b/public/images/emoji/emoji_one/thumbsup/3.png
index 2b6cb70447..361ee4e1c9 100644
Binary files a/public/images/emoji/emoji_one/thumbsup/3.png and b/public/images/emoji/emoji_one/thumbsup/3.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/4.png b/public/images/emoji/emoji_one/thumbsup/4.png
index 385abbf4de..29b08bf2fa 100644
Binary files a/public/images/emoji/emoji_one/thumbsup/4.png and b/public/images/emoji/emoji_one/thumbsup/4.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/5.png b/public/images/emoji/emoji_one/thumbsup/5.png
index 36bca309c9..7ed0ca9bf9 100644
Binary files a/public/images/emoji/emoji_one/thumbsup/5.png and b/public/images/emoji/emoji_one/thumbsup/5.png differ
diff --git a/public/images/emoji/emoji_one/thumbsup/6.png b/public/images/emoji/emoji_one/thumbsup/6.png
index 2d9460c949..56210de91e 100644
Binary files a/public/images/emoji/emoji_one/thumbsup/6.png and b/public/images/emoji/emoji_one/thumbsup/6.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man.png b/public/images/emoji/emoji_one/tipping_hand_man.png
index 4d2c0b2469..19b1a44604 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_man.png and b/public/images/emoji/emoji_one/tipping_hand_man.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/2.png b/public/images/emoji/emoji_one/tipping_hand_man/2.png
index 36b06ff17a..699facf000 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_man/2.png and b/public/images/emoji/emoji_one/tipping_hand_man/2.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/3.png b/public/images/emoji/emoji_one/tipping_hand_man/3.png
index cdd549704d..507011654f 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_man/3.png and b/public/images/emoji/emoji_one/tipping_hand_man/3.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/4.png b/public/images/emoji/emoji_one/tipping_hand_man/4.png
index 83756971d4..8ee857db66 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_man/4.png and b/public/images/emoji/emoji_one/tipping_hand_man/4.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/5.png b/public/images/emoji/emoji_one/tipping_hand_man/5.png
index 12872ae983..9a5bc17d43 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_man/5.png and b/public/images/emoji/emoji_one/tipping_hand_man/5.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_man/6.png b/public/images/emoji/emoji_one/tipping_hand_man/6.png
index 1d049eea24..6552aa57d0 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_man/6.png and b/public/images/emoji/emoji_one/tipping_hand_man/6.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman.png b/public/images/emoji/emoji_one/tipping_hand_woman.png
index 919dff8d5b..97f8256ad4 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_woman.png and b/public/images/emoji/emoji_one/tipping_hand_woman.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/2.png b/public/images/emoji/emoji_one/tipping_hand_woman/2.png
index c5ac40f6d7..4e2ffc47e9 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_woman/2.png and b/public/images/emoji/emoji_one/tipping_hand_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/3.png b/public/images/emoji/emoji_one/tipping_hand_woman/3.png
index 40d67b2e4e..5796ae4861 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_woman/3.png and b/public/images/emoji/emoji_one/tipping_hand_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/4.png b/public/images/emoji/emoji_one/tipping_hand_woman/4.png
index 28e222afc0..b61d746b06 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_woman/4.png and b/public/images/emoji/emoji_one/tipping_hand_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/5.png b/public/images/emoji/emoji_one/tipping_hand_woman/5.png
index cf2033c7d9..5da96c0d6f 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_woman/5.png and b/public/images/emoji/emoji_one/tipping_hand_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/tipping_hand_woman/6.png b/public/images/emoji/emoji_one/tipping_hand_woman/6.png
index 2284126f87..9e580ed02e 100644
Binary files a/public/images/emoji/emoji_one/tipping_hand_woman/6.png and b/public/images/emoji/emoji_one/tipping_hand_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/tired_face.png b/public/images/emoji/emoji_one/tired_face.png
index 9a29d60b7b..6006834911 100644
Binary files a/public/images/emoji/emoji_one/tired_face.png and b/public/images/emoji/emoji_one/tired_face.png differ
diff --git a/public/images/emoji/emoji_one/tractor.png b/public/images/emoji/emoji_one/tractor.png
index eb9ec2811f..017b238b6b 100644
Binary files a/public/images/emoji/emoji_one/tractor.png and b/public/images/emoji/emoji_one/tractor.png differ
diff --git a/public/images/emoji/emoji_one/train.png b/public/images/emoji/emoji_one/train.png
index 711031fe44..13cd3f9fec 100644
Binary files a/public/images/emoji/emoji_one/train.png and b/public/images/emoji/emoji_one/train.png differ
diff --git a/public/images/emoji/emoji_one/tram.png b/public/images/emoji/emoji_one/tram.png
index 06dc800d5c..b0353a1cbc 100644
Binary files a/public/images/emoji/emoji_one/tram.png and b/public/images/emoji/emoji_one/tram.png differ
diff --git a/public/images/emoji/emoji_one/triumph.png b/public/images/emoji/emoji_one/triumph.png
index 02ced4c4eb..76baedde92 100644
Binary files a/public/images/emoji/emoji_one/triumph.png and b/public/images/emoji/emoji_one/triumph.png differ
diff --git a/public/images/emoji/emoji_one/trolleybus.png b/public/images/emoji/emoji_one/trolleybus.png
index 33c5af16dd..1214b9d88b 100644
Binary files a/public/images/emoji/emoji_one/trolleybus.png and b/public/images/emoji/emoji_one/trolleybus.png differ
diff --git a/public/images/emoji/emoji_one/truck.png b/public/images/emoji/emoji_one/truck.png
index eeb215ae89..15cc7f3df8 100644
Binary files a/public/images/emoji/emoji_one/truck.png and b/public/images/emoji/emoji_one/truck.png differ
diff --git a/public/images/emoji/emoji_one/two_men_holding_hands.png b/public/images/emoji/emoji_one/two_men_holding_hands.png
index 3613eb310b..c2bcba0557 100644
Binary files a/public/images/emoji/emoji_one/two_men_holding_hands.png and b/public/images/emoji/emoji_one/two_men_holding_hands.png differ
diff --git a/public/images/emoji/emoji_one/two_women_holding_hands.png b/public/images/emoji/emoji_one/two_women_holding_hands.png
index 48a4621d64..0f76e88b4b 100644
Binary files a/public/images/emoji/emoji_one/two_women_holding_hands.png and b/public/images/emoji/emoji_one/two_women_holding_hands.png differ
diff --git a/public/images/emoji/emoji_one/unamused.png b/public/images/emoji/emoji_one/unamused.png
index 37b0970397..b523b511ba 100644
Binary files a/public/images/emoji/emoji_one/unamused.png and b/public/images/emoji/emoji_one/unamused.png differ
diff --git a/public/images/emoji/emoji_one/v/2.png b/public/images/emoji/emoji_one/v/2.png
index c4e6bd5ad2..0c0900510c 100644
Binary files a/public/images/emoji/emoji_one/v/2.png and b/public/images/emoji/emoji_one/v/2.png differ
diff --git a/public/images/emoji/emoji_one/v/3.png b/public/images/emoji/emoji_one/v/3.png
index ec80f47009..902168c852 100644
Binary files a/public/images/emoji/emoji_one/v/3.png and b/public/images/emoji/emoji_one/v/3.png differ
diff --git a/public/images/emoji/emoji_one/v/4.png b/public/images/emoji/emoji_one/v/4.png
index 27d4353f3c..ec3d6e6ec5 100644
Binary files a/public/images/emoji/emoji_one/v/4.png and b/public/images/emoji/emoji_one/v/4.png differ
diff --git a/public/images/emoji/emoji_one/v/5.png b/public/images/emoji/emoji_one/v/5.png
index 4c22a4b85d..4548a5771e 100644
Binary files a/public/images/emoji/emoji_one/v/5.png and b/public/images/emoji/emoji_one/v/5.png differ
diff --git a/public/images/emoji/emoji_one/v/6.png b/public/images/emoji/emoji_one/v/6.png
index e4d5d5ecb5..00de366b12 100644
Binary files a/public/images/emoji/emoji_one/v/6.png and b/public/images/emoji/emoji_one/v/6.png differ
diff --git a/public/images/emoji/emoji_one/vampire.png b/public/images/emoji/emoji_one/vampire.png
index 962288bd17..aaf7ad565c 100644
Binary files a/public/images/emoji/emoji_one/vampire.png and b/public/images/emoji/emoji_one/vampire.png differ
diff --git a/public/images/emoji/emoji_one/vampire/2.png b/public/images/emoji/emoji_one/vampire/2.png
index 154f2b6e35..8c7993d7e9 100644
Binary files a/public/images/emoji/emoji_one/vampire/2.png and b/public/images/emoji/emoji_one/vampire/2.png differ
diff --git a/public/images/emoji/emoji_one/vampire/3.png b/public/images/emoji/emoji_one/vampire/3.png
index 540b48d887..5388c5e7b1 100644
Binary files a/public/images/emoji/emoji_one/vampire/3.png and b/public/images/emoji/emoji_one/vampire/3.png differ
diff --git a/public/images/emoji/emoji_one/vampire/4.png b/public/images/emoji/emoji_one/vampire/4.png
index b05d3bad9a..7545b4042e 100644
Binary files a/public/images/emoji/emoji_one/vampire/4.png and b/public/images/emoji/emoji_one/vampire/4.png differ
diff --git a/public/images/emoji/emoji_one/vampire/5.png b/public/images/emoji/emoji_one/vampire/5.png
index 2bd9a7b71b..a97271ea71 100644
Binary files a/public/images/emoji/emoji_one/vampire/5.png and b/public/images/emoji/emoji_one/vampire/5.png differ
diff --git a/public/images/emoji/emoji_one/vampire/6.png b/public/images/emoji/emoji_one/vampire/6.png
index c88f4ad73b..02d37f1846 100644
Binary files a/public/images/emoji/emoji_one/vampire/6.png and b/public/images/emoji/emoji_one/vampire/6.png differ
diff --git a/public/images/emoji/emoji_one/video_camera.png b/public/images/emoji/emoji_one/video_camera.png
index 52c2913626..97b1c4a043 100644
Binary files a/public/images/emoji/emoji_one/video_camera.png and b/public/images/emoji/emoji_one/video_camera.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/2.png b/public/images/emoji/emoji_one/vulcan/2.png
index 875852eab1..e240e70ff3 100644
Binary files a/public/images/emoji/emoji_one/vulcan/2.png and b/public/images/emoji/emoji_one/vulcan/2.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/3.png b/public/images/emoji/emoji_one/vulcan/3.png
index bb0e4d166c..a9b70c6ea2 100644
Binary files a/public/images/emoji/emoji_one/vulcan/3.png and b/public/images/emoji/emoji_one/vulcan/3.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/4.png b/public/images/emoji/emoji_one/vulcan/4.png
index 1d0ec20303..105909c061 100644
Binary files a/public/images/emoji/emoji_one/vulcan/4.png and b/public/images/emoji/emoji_one/vulcan/4.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/5.png b/public/images/emoji/emoji_one/vulcan/5.png
index 5767172272..7f86f45adb 100644
Binary files a/public/images/emoji/emoji_one/vulcan/5.png and b/public/images/emoji/emoji_one/vulcan/5.png differ
diff --git a/public/images/emoji/emoji_one/vulcan/6.png b/public/images/emoji/emoji_one/vulcan/6.png
index 4a81388be3..39efaf09e5 100644
Binary files a/public/images/emoji/emoji_one/vulcan/6.png and b/public/images/emoji/emoji_one/vulcan/6.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/2.png b/public/images/emoji/emoji_one/vulcan_salute/2.png
index 875852eab1..e240e70ff3 100644
Binary files a/public/images/emoji/emoji_one/vulcan_salute/2.png and b/public/images/emoji/emoji_one/vulcan_salute/2.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/3.png b/public/images/emoji/emoji_one/vulcan_salute/3.png
index bb0e4d166c..a9b70c6ea2 100644
Binary files a/public/images/emoji/emoji_one/vulcan_salute/3.png and b/public/images/emoji/emoji_one/vulcan_salute/3.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/4.png b/public/images/emoji/emoji_one/vulcan_salute/4.png
index 1d0ec20303..105909c061 100644
Binary files a/public/images/emoji/emoji_one/vulcan_salute/4.png and b/public/images/emoji/emoji_one/vulcan_salute/4.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/5.png b/public/images/emoji/emoji_one/vulcan_salute/5.png
index 5767172272..7f86f45adb 100644
Binary files a/public/images/emoji/emoji_one/vulcan_salute/5.png and b/public/images/emoji/emoji_one/vulcan_salute/5.png differ
diff --git a/public/images/emoji/emoji_one/vulcan_salute/6.png b/public/images/emoji/emoji_one/vulcan_salute/6.png
index 4a81388be3..39efaf09e5 100644
Binary files a/public/images/emoji/emoji_one/vulcan_salute/6.png and b/public/images/emoji/emoji_one/vulcan_salute/6.png differ
diff --git a/public/images/emoji/emoji_one/walking.png b/public/images/emoji/emoji_one/walking.png
index 320f3b4d25..66c1b25b37 100644
Binary files a/public/images/emoji/emoji_one/walking.png and b/public/images/emoji/emoji_one/walking.png differ
diff --git a/public/images/emoji/emoji_one/walking/2.png b/public/images/emoji/emoji_one/walking/2.png
index 8d6ad0d16a..d3b673ee8e 100644
Binary files a/public/images/emoji/emoji_one/walking/2.png and b/public/images/emoji/emoji_one/walking/2.png differ
diff --git a/public/images/emoji/emoji_one/walking/3.png b/public/images/emoji/emoji_one/walking/3.png
index 4062a9da56..557b7aaa0f 100644
Binary files a/public/images/emoji/emoji_one/walking/3.png and b/public/images/emoji/emoji_one/walking/3.png differ
diff --git a/public/images/emoji/emoji_one/walking/4.png b/public/images/emoji/emoji_one/walking/4.png
index baadb7d719..d276172229 100644
Binary files a/public/images/emoji/emoji_one/walking/4.png and b/public/images/emoji/emoji_one/walking/4.png differ
diff --git a/public/images/emoji/emoji_one/walking/5.png b/public/images/emoji/emoji_one/walking/5.png
index ec92544c0a..c82ede3372 100644
Binary files a/public/images/emoji/emoji_one/walking/5.png and b/public/images/emoji/emoji_one/walking/5.png differ
diff --git a/public/images/emoji/emoji_one/walking/6.png b/public/images/emoji/emoji_one/walking/6.png
index f7d50331b7..3eb060c4f4 100644
Binary files a/public/images/emoji/emoji_one/walking/6.png and b/public/images/emoji/emoji_one/walking/6.png differ
diff --git a/public/images/emoji/emoji_one/walking_man.png b/public/images/emoji/emoji_one/walking_man.png
index 320f3b4d25..66c1b25b37 100644
Binary files a/public/images/emoji/emoji_one/walking_man.png and b/public/images/emoji/emoji_one/walking_man.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/2.png b/public/images/emoji/emoji_one/walking_man/2.png
index 8d6ad0d16a..d3b673ee8e 100644
Binary files a/public/images/emoji/emoji_one/walking_man/2.png and b/public/images/emoji/emoji_one/walking_man/2.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/3.png b/public/images/emoji/emoji_one/walking_man/3.png
index 4062a9da56..557b7aaa0f 100644
Binary files a/public/images/emoji/emoji_one/walking_man/3.png and b/public/images/emoji/emoji_one/walking_man/3.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/4.png b/public/images/emoji/emoji_one/walking_man/4.png
index baadb7d719..d276172229 100644
Binary files a/public/images/emoji/emoji_one/walking_man/4.png and b/public/images/emoji/emoji_one/walking_man/4.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/5.png b/public/images/emoji/emoji_one/walking_man/5.png
index ec92544c0a..c82ede3372 100644
Binary files a/public/images/emoji/emoji_one/walking_man/5.png and b/public/images/emoji/emoji_one/walking_man/5.png differ
diff --git a/public/images/emoji/emoji_one/walking_man/6.png b/public/images/emoji/emoji_one/walking_man/6.png
index f7d50331b7..3eb060c4f4 100644
Binary files a/public/images/emoji/emoji_one/walking_man/6.png and b/public/images/emoji/emoji_one/walking_man/6.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman.png b/public/images/emoji/emoji_one/walking_woman.png
index 4890b927ce..d45ceba915 100644
Binary files a/public/images/emoji/emoji_one/walking_woman.png and b/public/images/emoji/emoji_one/walking_woman.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/2.png b/public/images/emoji/emoji_one/walking_woman/2.png
index 9df9b8f55a..97c3f8e318 100644
Binary files a/public/images/emoji/emoji_one/walking_woman/2.png and b/public/images/emoji/emoji_one/walking_woman/2.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/3.png b/public/images/emoji/emoji_one/walking_woman/3.png
index f08f754894..b8ce47c836 100644
Binary files a/public/images/emoji/emoji_one/walking_woman/3.png and b/public/images/emoji/emoji_one/walking_woman/3.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/4.png b/public/images/emoji/emoji_one/walking_woman/4.png
index adb31c9237..dc03392385 100644
Binary files a/public/images/emoji/emoji_one/walking_woman/4.png and b/public/images/emoji/emoji_one/walking_woman/4.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/5.png b/public/images/emoji/emoji_one/walking_woman/5.png
index e9bf1842f8..b93eb97312 100644
Binary files a/public/images/emoji/emoji_one/walking_woman/5.png and b/public/images/emoji/emoji_one/walking_woman/5.png differ
diff --git a/public/images/emoji/emoji_one/walking_woman/6.png b/public/images/emoji/emoji_one/walking_woman/6.png
index 5d5c123da8..bca8efbbad 100644
Binary files a/public/images/emoji/emoji_one/walking_woman/6.png and b/public/images/emoji/emoji_one/walking_woman/6.png differ
diff --git a/public/images/emoji/emoji_one/wave/2.png b/public/images/emoji/emoji_one/wave/2.png
index 0f3967e69b..a32a2e17da 100644
Binary files a/public/images/emoji/emoji_one/wave/2.png and b/public/images/emoji/emoji_one/wave/2.png differ
diff --git a/public/images/emoji/emoji_one/wave/3.png b/public/images/emoji/emoji_one/wave/3.png
index c019447ad7..2b4e657fb5 100644
Binary files a/public/images/emoji/emoji_one/wave/3.png and b/public/images/emoji/emoji_one/wave/3.png differ
diff --git a/public/images/emoji/emoji_one/wave/4.png b/public/images/emoji/emoji_one/wave/4.png
index f0023f9663..2dcf4eef09 100644
Binary files a/public/images/emoji/emoji_one/wave/4.png and b/public/images/emoji/emoji_one/wave/4.png differ
diff --git a/public/images/emoji/emoji_one/wave/5.png b/public/images/emoji/emoji_one/wave/5.png
index ed8c181200..9566448450 100644
Binary files a/public/images/emoji/emoji_one/wave/5.png and b/public/images/emoji/emoji_one/wave/5.png differ
diff --git a/public/images/emoji/emoji_one/wave/6.png b/public/images/emoji/emoji_one/wave/6.png
index 9685d03459..441f344ec9 100644
Binary files a/public/images/emoji/emoji_one/wave/6.png and b/public/images/emoji/emoji_one/wave/6.png differ
diff --git a/public/images/emoji/emoji_one/weary.png b/public/images/emoji/emoji_one/weary.png
index c8a4c3d925..f951e0a0b7 100644
Binary files a/public/images/emoji/emoji_one/weary.png and b/public/images/emoji/emoji_one/weary.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter.png b/public/images/emoji/emoji_one/weight_lifter.png
index e559b73ffe..b7cb2b519a 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter.png and b/public/images/emoji/emoji_one/weight_lifter.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/2.png b/public/images/emoji/emoji_one/weight_lifter/2.png
index a31a1aab29..61086831f9 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter/2.png and b/public/images/emoji/emoji_one/weight_lifter/2.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/3.png b/public/images/emoji/emoji_one/weight_lifter/3.png
index 45ebbc67df..4471efca72 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter/3.png and b/public/images/emoji/emoji_one/weight_lifter/3.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/4.png b/public/images/emoji/emoji_one/weight_lifter/4.png
index c5d5f63edc..48bc828d30 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter/4.png and b/public/images/emoji/emoji_one/weight_lifter/4.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/5.png b/public/images/emoji/emoji_one/weight_lifter/5.png
index eeb1fa21c7..3818123af8 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter/5.png and b/public/images/emoji/emoji_one/weight_lifter/5.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifter/6.png b/public/images/emoji/emoji_one/weight_lifter/6.png
index a3308e8869..b6daa47178 100644
Binary files a/public/images/emoji/emoji_one/weight_lifter/6.png and b/public/images/emoji/emoji_one/weight_lifter/6.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man.png b/public/images/emoji/emoji_one/weight_lifting_man.png
index e559b73ffe..b7cb2b519a 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_man.png and b/public/images/emoji/emoji_one/weight_lifting_man.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/2.png b/public/images/emoji/emoji_one/weight_lifting_man/2.png
index a31a1aab29..61086831f9 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_man/2.png and b/public/images/emoji/emoji_one/weight_lifting_man/2.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/3.png b/public/images/emoji/emoji_one/weight_lifting_man/3.png
index 45ebbc67df..4471efca72 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_man/3.png and b/public/images/emoji/emoji_one/weight_lifting_man/3.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/4.png b/public/images/emoji/emoji_one/weight_lifting_man/4.png
index c5d5f63edc..48bc828d30 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_man/4.png and b/public/images/emoji/emoji_one/weight_lifting_man/4.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/5.png b/public/images/emoji/emoji_one/weight_lifting_man/5.png
index eeb1fa21c7..3818123af8 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_man/5.png and b/public/images/emoji/emoji_one/weight_lifting_man/5.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_man/6.png b/public/images/emoji/emoji_one/weight_lifting_man/6.png
index a3308e8869..b6daa47178 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_man/6.png and b/public/images/emoji/emoji_one/weight_lifting_man/6.png differ
diff --git a/public/images/emoji/emoji_one/weight_lifting_woman.png b/public/images/emoji/emoji_one/weight_lifting_woman.png
index e0d7d24400..608e0e501a 100644
Binary files a/public/images/emoji/emoji_one/weight_lifting_woman.png and b/public/images/emoji/emoji_one/weight_lifting_woman.png differ
diff --git a/public/images/emoji/emoji_one/wind_blowing_face.png b/public/images/emoji/emoji_one/wind_blowing_face.png
index a1af40102e..aa5f428a40 100644
Binary files a/public/images/emoji/emoji_one/wind_blowing_face.png and b/public/images/emoji/emoji_one/wind_blowing_face.png differ
diff --git a/public/images/emoji/emoji_one/wind_face.png b/public/images/emoji/emoji_one/wind_face.png
index a1af40102e..aa5f428a40 100644
Binary files a/public/images/emoji/emoji_one/wind_face.png and b/public/images/emoji/emoji_one/wind_face.png differ
diff --git a/public/images/emoji/emoji_one/wink.png b/public/images/emoji/emoji_one/wink.png
index ec4272d1df..11c4ab4dba 100644
Binary files a/public/images/emoji/emoji_one/wink.png and b/public/images/emoji/emoji_one/wink.png differ
diff --git a/public/images/emoji/emoji_one/woman.png b/public/images/emoji/emoji_one/woman.png
index ba297e7a87..c808e9a66c 100644
Binary files a/public/images/emoji/emoji_one/woman.png and b/public/images/emoji/emoji_one/woman.png differ
diff --git a/public/images/emoji/emoji_one/woman/2.png b/public/images/emoji/emoji_one/woman/2.png
index 1a202110d0..cf8d9ce9cc 100644
Binary files a/public/images/emoji/emoji_one/woman/2.png and b/public/images/emoji/emoji_one/woman/2.png differ
diff --git a/public/images/emoji/emoji_one/woman/3.png b/public/images/emoji/emoji_one/woman/3.png
index b09feb39b4..0a61434bff 100644
Binary files a/public/images/emoji/emoji_one/woman/3.png and b/public/images/emoji/emoji_one/woman/3.png differ
diff --git a/public/images/emoji/emoji_one/woman/4.png b/public/images/emoji/emoji_one/woman/4.png
index 59b06db034..a8d7afbe75 100644
Binary files a/public/images/emoji/emoji_one/woman/4.png and b/public/images/emoji/emoji_one/woman/4.png differ
diff --git a/public/images/emoji/emoji_one/woman/5.png b/public/images/emoji/emoji_one/woman/5.png
index 8b880d3718..439bd695d2 100644
Binary files a/public/images/emoji/emoji_one/woman/5.png and b/public/images/emoji/emoji_one/woman/5.png differ
diff --git a/public/images/emoji/emoji_one/woman/6.png b/public/images/emoji/emoji_one/woman/6.png
index 9e9361f87a..e1ec44e9e0 100644
Binary files a/public/images/emoji/emoji_one/woman/6.png and b/public/images/emoji/emoji_one/woman/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist.png b/public/images/emoji/emoji_one/woman_artist.png
index df7d508b5d..09382790d3 100644
Binary files a/public/images/emoji/emoji_one/woman_artist.png and b/public/images/emoji/emoji_one/woman_artist.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/2.png b/public/images/emoji/emoji_one/woman_artist/2.png
index 0c0c280cea..17c22ecd1f 100644
Binary files a/public/images/emoji/emoji_one/woman_artist/2.png and b/public/images/emoji/emoji_one/woman_artist/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/3.png b/public/images/emoji/emoji_one/woman_artist/3.png
index bb20920a80..24e7522127 100644
Binary files a/public/images/emoji/emoji_one/woman_artist/3.png and b/public/images/emoji/emoji_one/woman_artist/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/4.png b/public/images/emoji/emoji_one/woman_artist/4.png
index bf24c333ff..93ff137cad 100644
Binary files a/public/images/emoji/emoji_one/woman_artist/4.png and b/public/images/emoji/emoji_one/woman_artist/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/5.png b/public/images/emoji/emoji_one/woman_artist/5.png
index 9ed45087d2..e90c76d634 100644
Binary files a/public/images/emoji/emoji_one/woman_artist/5.png and b/public/images/emoji/emoji_one/woman_artist/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_artist/6.png b/public/images/emoji/emoji_one/woman_artist/6.png
index de910b3c26..b6a5d4c14c 100644
Binary files a/public/images/emoji/emoji_one/woman_artist/6.png and b/public/images/emoji/emoji_one/woman_artist/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut.png b/public/images/emoji/emoji_one/woman_astronaut.png
index d884c4642f..6b4204b006 100644
Binary files a/public/images/emoji/emoji_one/woman_astronaut.png and b/public/images/emoji/emoji_one/woman_astronaut.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/2.png b/public/images/emoji/emoji_one/woman_astronaut/2.png
index c9894d25d4..e6e288fbc3 100644
Binary files a/public/images/emoji/emoji_one/woman_astronaut/2.png and b/public/images/emoji/emoji_one/woman_astronaut/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/3.png b/public/images/emoji/emoji_one/woman_astronaut/3.png
index 6186dac7e5..dd0c540a85 100644
Binary files a/public/images/emoji/emoji_one/woman_astronaut/3.png and b/public/images/emoji/emoji_one/woman_astronaut/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/4.png b/public/images/emoji/emoji_one/woman_astronaut/4.png
index b1a42bf4b9..ce30222b5f 100644
Binary files a/public/images/emoji/emoji_one/woman_astronaut/4.png and b/public/images/emoji/emoji_one/woman_astronaut/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/5.png b/public/images/emoji/emoji_one/woman_astronaut/5.png
index b45574862d..479c455596 100644
Binary files a/public/images/emoji/emoji_one/woman_astronaut/5.png and b/public/images/emoji/emoji_one/woman_astronaut/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_astronaut/6.png b/public/images/emoji/emoji_one/woman_astronaut/6.png
index 164ab8a19d..beefa8ba3d 100644
Binary files a/public/images/emoji/emoji_one/woman_astronaut/6.png and b/public/images/emoji/emoji_one/woman_astronaut/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling.png b/public/images/emoji/emoji_one/woman_cartwheeling.png
index b7ed44d989..d12b4184d1 100644
Binary files a/public/images/emoji/emoji_one/woman_cartwheeling.png and b/public/images/emoji/emoji_one/woman_cartwheeling.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/2.png b/public/images/emoji/emoji_one/woman_cartwheeling/2.png
index c39ccd7f8b..0767cdc83d 100644
Binary files a/public/images/emoji/emoji_one/woman_cartwheeling/2.png and b/public/images/emoji/emoji_one/woman_cartwheeling/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/3.png b/public/images/emoji/emoji_one/woman_cartwheeling/3.png
index 2f5742529a..0fd1705ee0 100644
Binary files a/public/images/emoji/emoji_one/woman_cartwheeling/3.png and b/public/images/emoji/emoji_one/woman_cartwheeling/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/4.png b/public/images/emoji/emoji_one/woman_cartwheeling/4.png
index 9ccb8ed754..f37d93537b 100644
Binary files a/public/images/emoji/emoji_one/woman_cartwheeling/4.png and b/public/images/emoji/emoji_one/woman_cartwheeling/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/5.png b/public/images/emoji/emoji_one/woman_cartwheeling/5.png
index f58d895262..3229065205 100644
Binary files a/public/images/emoji/emoji_one/woman_cartwheeling/5.png and b/public/images/emoji/emoji_one/woman_cartwheeling/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_cartwheeling/6.png b/public/images/emoji/emoji_one/woman_cartwheeling/6.png
index e9f09ea9bf..723b135430 100644
Binary files a/public/images/emoji/emoji_one/woman_cartwheeling/6.png and b/public/images/emoji/emoji_one/woman_cartwheeling/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook.png b/public/images/emoji/emoji_one/woman_cook.png
index db48bcfbe1..57c033a82c 100644
Binary files a/public/images/emoji/emoji_one/woman_cook.png and b/public/images/emoji/emoji_one/woman_cook.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/2.png b/public/images/emoji/emoji_one/woman_cook/2.png
index 5941b57c0f..99d15f62fe 100644
Binary files a/public/images/emoji/emoji_one/woman_cook/2.png and b/public/images/emoji/emoji_one/woman_cook/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/3.png b/public/images/emoji/emoji_one/woman_cook/3.png
index 93f065cb12..4f61ae788c 100644
Binary files a/public/images/emoji/emoji_one/woman_cook/3.png and b/public/images/emoji/emoji_one/woman_cook/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/4.png b/public/images/emoji/emoji_one/woman_cook/4.png
index 24ed0e4f23..878f03f5ac 100644
Binary files a/public/images/emoji/emoji_one/woman_cook/4.png and b/public/images/emoji/emoji_one/woman_cook/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/5.png b/public/images/emoji/emoji_one/woman_cook/5.png
index fd7df3945f..a817e52038 100644
Binary files a/public/images/emoji/emoji_one/woman_cook/5.png and b/public/images/emoji/emoji_one/woman_cook/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_cook/6.png b/public/images/emoji/emoji_one/woman_cook/6.png
index 25c27f6e89..16ef3e4fcb 100644
Binary files a/public/images/emoji/emoji_one/woman_cook/6.png and b/public/images/emoji/emoji_one/woman_cook/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming.png b/public/images/emoji/emoji_one/woman_facepalming.png
index 1fd9b1e63e..e38eb0ae75 100644
Binary files a/public/images/emoji/emoji_one/woman_facepalming.png and b/public/images/emoji/emoji_one/woman_facepalming.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/2.png b/public/images/emoji/emoji_one/woman_facepalming/2.png
index 9da5b3cb87..a2b46c1595 100644
Binary files a/public/images/emoji/emoji_one/woman_facepalming/2.png and b/public/images/emoji/emoji_one/woman_facepalming/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/3.png b/public/images/emoji/emoji_one/woman_facepalming/3.png
index eef8155983..4551b7e391 100644
Binary files a/public/images/emoji/emoji_one/woman_facepalming/3.png and b/public/images/emoji/emoji_one/woman_facepalming/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/4.png b/public/images/emoji/emoji_one/woman_facepalming/4.png
index 4ceed5477a..fa24b099b9 100644
Binary files a/public/images/emoji/emoji_one/woman_facepalming/4.png and b/public/images/emoji/emoji_one/woman_facepalming/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/5.png b/public/images/emoji/emoji_one/woman_facepalming/5.png
index 2607a2f2c2..870da75d41 100644
Binary files a/public/images/emoji/emoji_one/woman_facepalming/5.png and b/public/images/emoji/emoji_one/woman_facepalming/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_facepalming/6.png b/public/images/emoji/emoji_one/woman_facepalming/6.png
index f2c9a7f81d..a747d2599a 100644
Binary files a/public/images/emoji/emoji_one/woman_facepalming/6.png and b/public/images/emoji/emoji_one/woman_facepalming/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker.png b/public/images/emoji/emoji_one/woman_factory_worker.png
index 5fb29ea5ba..f7489a8637 100644
Binary files a/public/images/emoji/emoji_one/woman_factory_worker.png and b/public/images/emoji/emoji_one/woman_factory_worker.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/2.png b/public/images/emoji/emoji_one/woman_factory_worker/2.png
index df11eace4b..e609e73dc6 100644
Binary files a/public/images/emoji/emoji_one/woman_factory_worker/2.png and b/public/images/emoji/emoji_one/woman_factory_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/3.png b/public/images/emoji/emoji_one/woman_factory_worker/3.png
index 0397dca1db..65b3ffe8a1 100644
Binary files a/public/images/emoji/emoji_one/woman_factory_worker/3.png and b/public/images/emoji/emoji_one/woman_factory_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/4.png b/public/images/emoji/emoji_one/woman_factory_worker/4.png
index 6821c82441..d8fb288dc5 100644
Binary files a/public/images/emoji/emoji_one/woman_factory_worker/4.png and b/public/images/emoji/emoji_one/woman_factory_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/5.png b/public/images/emoji/emoji_one/woman_factory_worker/5.png
index 07200e727d..47a3a49689 100644
Binary files a/public/images/emoji/emoji_one/woman_factory_worker/5.png and b/public/images/emoji/emoji_one/woman_factory_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_factory_worker/6.png b/public/images/emoji/emoji_one/woman_factory_worker/6.png
index d03d5914f7..ccaf9f20e0 100644
Binary files a/public/images/emoji/emoji_one/woman_factory_worker/6.png and b/public/images/emoji/emoji_one/woman_factory_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer.png b/public/images/emoji/emoji_one/woman_farmer.png
index 254e745b54..cace086815 100644
Binary files a/public/images/emoji/emoji_one/woman_farmer.png and b/public/images/emoji/emoji_one/woman_farmer.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/2.png b/public/images/emoji/emoji_one/woman_farmer/2.png
index 356e74f499..247a4e3b15 100644
Binary files a/public/images/emoji/emoji_one/woman_farmer/2.png and b/public/images/emoji/emoji_one/woman_farmer/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/3.png b/public/images/emoji/emoji_one/woman_farmer/3.png
index f9b3e314d9..b2df552bae 100644
Binary files a/public/images/emoji/emoji_one/woman_farmer/3.png and b/public/images/emoji/emoji_one/woman_farmer/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/4.png b/public/images/emoji/emoji_one/woman_farmer/4.png
index 98f2ad9c96..406969c347 100644
Binary files a/public/images/emoji/emoji_one/woman_farmer/4.png and b/public/images/emoji/emoji_one/woman_farmer/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/5.png b/public/images/emoji/emoji_one/woman_farmer/5.png
index f5b440ee18..21a4d5a1ca 100644
Binary files a/public/images/emoji/emoji_one/woman_farmer/5.png and b/public/images/emoji/emoji_one/woman_farmer/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_farmer/6.png b/public/images/emoji/emoji_one/woman_farmer/6.png
index b1bca1dd4d..04b5f63c65 100644
Binary files a/public/images/emoji/emoji_one/woman_farmer/6.png and b/public/images/emoji/emoji_one/woman_farmer/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter.png b/public/images/emoji/emoji_one/woman_firefighter.png
index 8ffa29cf78..de06dcd31f 100644
Binary files a/public/images/emoji/emoji_one/woman_firefighter.png and b/public/images/emoji/emoji_one/woman_firefighter.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/2.png b/public/images/emoji/emoji_one/woman_firefighter/2.png
index 853b9bed81..37259650cd 100644
Binary files a/public/images/emoji/emoji_one/woman_firefighter/2.png and b/public/images/emoji/emoji_one/woman_firefighter/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/3.png b/public/images/emoji/emoji_one/woman_firefighter/3.png
index 86bbf79b3b..822edeb4cb 100644
Binary files a/public/images/emoji/emoji_one/woman_firefighter/3.png and b/public/images/emoji/emoji_one/woman_firefighter/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/4.png b/public/images/emoji/emoji_one/woman_firefighter/4.png
index 0b5f148f87..f790badc78 100644
Binary files a/public/images/emoji/emoji_one/woman_firefighter/4.png and b/public/images/emoji/emoji_one/woman_firefighter/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/5.png b/public/images/emoji/emoji_one/woman_firefighter/5.png
index 41c34e3f10..332b78d80c 100644
Binary files a/public/images/emoji/emoji_one/woman_firefighter/5.png and b/public/images/emoji/emoji_one/woman_firefighter/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_firefighter/6.png b/public/images/emoji/emoji_one/woman_firefighter/6.png
index c5ed0a2abc..8952941570 100644
Binary files a/public/images/emoji/emoji_one/woman_firefighter/6.png and b/public/images/emoji/emoji_one/woman_firefighter/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker.png b/public/images/emoji/emoji_one/woman_health_worker.png
index e2e4c83f51..e327add017 100644
Binary files a/public/images/emoji/emoji_one/woman_health_worker.png and b/public/images/emoji/emoji_one/woman_health_worker.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/2.png b/public/images/emoji/emoji_one/woman_health_worker/2.png
index 84061ca080..503f6be6dc 100644
Binary files a/public/images/emoji/emoji_one/woman_health_worker/2.png and b/public/images/emoji/emoji_one/woman_health_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/3.png b/public/images/emoji/emoji_one/woman_health_worker/3.png
index 0a065c4b43..3c8ce0ddea 100644
Binary files a/public/images/emoji/emoji_one/woman_health_worker/3.png and b/public/images/emoji/emoji_one/woman_health_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/4.png b/public/images/emoji/emoji_one/woman_health_worker/4.png
index 979ff387cb..89f477455e 100644
Binary files a/public/images/emoji/emoji_one/woman_health_worker/4.png and b/public/images/emoji/emoji_one/woman_health_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/5.png b/public/images/emoji/emoji_one/woman_health_worker/5.png
index 6348a939cb..d8740a739b 100644
Binary files a/public/images/emoji/emoji_one/woman_health_worker/5.png and b/public/images/emoji/emoji_one/woman_health_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_health_worker/6.png b/public/images/emoji/emoji_one/woman_health_worker/6.png
index d47ad69ab5..ab18b8200a 100644
Binary files a/public/images/emoji/emoji_one/woman_health_worker/6.png and b/public/images/emoji/emoji_one/woman_health_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge.png b/public/images/emoji/emoji_one/woman_judge.png
index 06f1dd9333..7a3e20c611 100644
Binary files a/public/images/emoji/emoji_one/woman_judge.png and b/public/images/emoji/emoji_one/woman_judge.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/2.png b/public/images/emoji/emoji_one/woman_judge/2.png
index c7d3c6bca6..1fcccda360 100644
Binary files a/public/images/emoji/emoji_one/woman_judge/2.png and b/public/images/emoji/emoji_one/woman_judge/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/3.png b/public/images/emoji/emoji_one/woman_judge/3.png
index 0cdd87676a..51bd760fe6 100644
Binary files a/public/images/emoji/emoji_one/woman_judge/3.png and b/public/images/emoji/emoji_one/woman_judge/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/4.png b/public/images/emoji/emoji_one/woman_judge/4.png
index e08f8948e0..57484e2418 100644
Binary files a/public/images/emoji/emoji_one/woman_judge/4.png and b/public/images/emoji/emoji_one/woman_judge/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/5.png b/public/images/emoji/emoji_one/woman_judge/5.png
index 30b76c1722..709d16d5dc 100644
Binary files a/public/images/emoji/emoji_one/woman_judge/5.png and b/public/images/emoji/emoji_one/woman_judge/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_judge/6.png b/public/images/emoji/emoji_one/woman_judge/6.png
index efd5fdd10c..a85e2d78d2 100644
Binary files a/public/images/emoji/emoji_one/woman_judge/6.png and b/public/images/emoji/emoji_one/woman_judge/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling.png b/public/images/emoji/emoji_one/woman_juggling.png
index 7cdfcc20a2..39bcecba88 100644
Binary files a/public/images/emoji/emoji_one/woman_juggling.png and b/public/images/emoji/emoji_one/woman_juggling.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/2.png b/public/images/emoji/emoji_one/woman_juggling/2.png
index f7cfbd7eb7..737435ba2d 100644
Binary files a/public/images/emoji/emoji_one/woman_juggling/2.png and b/public/images/emoji/emoji_one/woman_juggling/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/3.png b/public/images/emoji/emoji_one/woman_juggling/3.png
index f9a3d68926..aa9398881a 100644
Binary files a/public/images/emoji/emoji_one/woman_juggling/3.png and b/public/images/emoji/emoji_one/woman_juggling/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/4.png b/public/images/emoji/emoji_one/woman_juggling/4.png
index 43bf31cb56..174216af98 100644
Binary files a/public/images/emoji/emoji_one/woman_juggling/4.png and b/public/images/emoji/emoji_one/woman_juggling/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/5.png b/public/images/emoji/emoji_one/woman_juggling/5.png
index 090e4b5cfc..baffa99a57 100644
Binary files a/public/images/emoji/emoji_one/woman_juggling/5.png and b/public/images/emoji/emoji_one/woman_juggling/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_juggling/6.png b/public/images/emoji/emoji_one/woman_juggling/6.png
index 59939bef54..7aea92ea09 100644
Binary files a/public/images/emoji/emoji_one/woman_juggling/6.png and b/public/images/emoji/emoji_one/woman_juggling/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic.png b/public/images/emoji/emoji_one/woman_mechanic.png
index 38825ae3c1..bf25d0a8a3 100644
Binary files a/public/images/emoji/emoji_one/woman_mechanic.png and b/public/images/emoji/emoji_one/woman_mechanic.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/2.png b/public/images/emoji/emoji_one/woman_mechanic/2.png
index 4480dcb83a..18253c66d3 100644
Binary files a/public/images/emoji/emoji_one/woman_mechanic/2.png and b/public/images/emoji/emoji_one/woman_mechanic/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/3.png b/public/images/emoji/emoji_one/woman_mechanic/3.png
index 20fac44d10..31a5ede704 100644
Binary files a/public/images/emoji/emoji_one/woman_mechanic/3.png and b/public/images/emoji/emoji_one/woman_mechanic/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/4.png b/public/images/emoji/emoji_one/woman_mechanic/4.png
index 24fd392ac0..b40c278c4e 100644
Binary files a/public/images/emoji/emoji_one/woman_mechanic/4.png and b/public/images/emoji/emoji_one/woman_mechanic/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/5.png b/public/images/emoji/emoji_one/woman_mechanic/5.png
index 232fdd56c1..d0707674ba 100644
Binary files a/public/images/emoji/emoji_one/woman_mechanic/5.png and b/public/images/emoji/emoji_one/woman_mechanic/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_mechanic/6.png b/public/images/emoji/emoji_one/woman_mechanic/6.png
index bf50ef4680..0eb9fbf943 100644
Binary files a/public/images/emoji/emoji_one/woman_mechanic/6.png and b/public/images/emoji/emoji_one/woman_mechanic/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker.png b/public/images/emoji/emoji_one/woman_office_worker.png
index 09ae32ecb3..58f1cb8dc8 100644
Binary files a/public/images/emoji/emoji_one/woman_office_worker.png and b/public/images/emoji/emoji_one/woman_office_worker.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/2.png b/public/images/emoji/emoji_one/woman_office_worker/2.png
index d8e4c7f3e7..cdf5250716 100644
Binary files a/public/images/emoji/emoji_one/woman_office_worker/2.png and b/public/images/emoji/emoji_one/woman_office_worker/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/3.png b/public/images/emoji/emoji_one/woman_office_worker/3.png
index a732692349..1ee11b69fb 100644
Binary files a/public/images/emoji/emoji_one/woman_office_worker/3.png and b/public/images/emoji/emoji_one/woman_office_worker/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/4.png b/public/images/emoji/emoji_one/woman_office_worker/4.png
index b0368bde76..17b8898689 100644
Binary files a/public/images/emoji/emoji_one/woman_office_worker/4.png and b/public/images/emoji/emoji_one/woman_office_worker/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/5.png b/public/images/emoji/emoji_one/woman_office_worker/5.png
index c9f76b7f51..0bf4992767 100644
Binary files a/public/images/emoji/emoji_one/woman_office_worker/5.png and b/public/images/emoji/emoji_one/woman_office_worker/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_office_worker/6.png b/public/images/emoji/emoji_one/woman_office_worker/6.png
index 3172a8ddf2..60c5ba150e 100644
Binary files a/public/images/emoji/emoji_one/woman_office_worker/6.png and b/public/images/emoji/emoji_one/woman_office_worker/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot.png b/public/images/emoji/emoji_one/woman_pilot.png
index 6cf43ed718..70c1d705b9 100644
Binary files a/public/images/emoji/emoji_one/woman_pilot.png and b/public/images/emoji/emoji_one/woman_pilot.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/2.png b/public/images/emoji/emoji_one/woman_pilot/2.png
index 038f316881..66ef293d6f 100644
Binary files a/public/images/emoji/emoji_one/woman_pilot/2.png and b/public/images/emoji/emoji_one/woman_pilot/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/3.png b/public/images/emoji/emoji_one/woman_pilot/3.png
index 117cea7c71..3021e1cb54 100644
Binary files a/public/images/emoji/emoji_one/woman_pilot/3.png and b/public/images/emoji/emoji_one/woman_pilot/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/4.png b/public/images/emoji/emoji_one/woman_pilot/4.png
index 5dfc1a5395..9f0be713a6 100644
Binary files a/public/images/emoji/emoji_one/woman_pilot/4.png and b/public/images/emoji/emoji_one/woman_pilot/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/5.png b/public/images/emoji/emoji_one/woman_pilot/5.png
index f466a19606..9a4cd02713 100644
Binary files a/public/images/emoji/emoji_one/woman_pilot/5.png and b/public/images/emoji/emoji_one/woman_pilot/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_pilot/6.png b/public/images/emoji/emoji_one/woman_pilot/6.png
index 2be37aade0..3bc0bb615a 100644
Binary files a/public/images/emoji/emoji_one/woman_pilot/6.png and b/public/images/emoji/emoji_one/woman_pilot/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball.png b/public/images/emoji/emoji_one/woman_playing_handball.png
index b76d637af0..83cffc80cb 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_handball.png and b/public/images/emoji/emoji_one/woman_playing_handball.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/2.png b/public/images/emoji/emoji_one/woman_playing_handball/2.png
index f44176a098..33041ef7ac 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_handball/2.png and b/public/images/emoji/emoji_one/woman_playing_handball/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/3.png b/public/images/emoji/emoji_one/woman_playing_handball/3.png
index 0395a52cad..1a7383c8c2 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_handball/3.png and b/public/images/emoji/emoji_one/woman_playing_handball/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/4.png b/public/images/emoji/emoji_one/woman_playing_handball/4.png
index f31e21106d..e1acbf43e8 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_handball/4.png and b/public/images/emoji/emoji_one/woman_playing_handball/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/5.png b/public/images/emoji/emoji_one/woman_playing_handball/5.png
index db6ee69af5..d762cba00e 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_handball/5.png and b/public/images/emoji/emoji_one/woman_playing_handball/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_handball/6.png b/public/images/emoji/emoji_one/woman_playing_handball/6.png
index 345314c854..1ee1898f54 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_handball/6.png and b/public/images/emoji/emoji_one/woman_playing_handball/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo.png b/public/images/emoji/emoji_one/woman_playing_water_polo.png
index 1c47125ff9..72879d16df 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_water_polo.png and b/public/images/emoji/emoji_one/woman_playing_water_polo.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/2.png b/public/images/emoji/emoji_one/woman_playing_water_polo/2.png
index 906d1605a5..0b98f903e2 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_water_polo/2.png and b/public/images/emoji/emoji_one/woman_playing_water_polo/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/3.png b/public/images/emoji/emoji_one/woman_playing_water_polo/3.png
index 2a3adc6976..03fbce0e69 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_water_polo/3.png and b/public/images/emoji/emoji_one/woman_playing_water_polo/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/4.png b/public/images/emoji/emoji_one/woman_playing_water_polo/4.png
index c47a2c88bf..cfe204f860 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_water_polo/4.png and b/public/images/emoji/emoji_one/woman_playing_water_polo/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/5.png b/public/images/emoji/emoji_one/woman_playing_water_polo/5.png
index 2c4ee06395..7f608c8d5e 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_water_polo/5.png and b/public/images/emoji/emoji_one/woman_playing_water_polo/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_playing_water_polo/6.png b/public/images/emoji/emoji_one/woman_playing_water_polo/6.png
index cb776e45c1..ac6a3b2056 100644
Binary files a/public/images/emoji/emoji_one/woman_playing_water_polo/6.png and b/public/images/emoji/emoji_one/woman_playing_water_polo/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist.png b/public/images/emoji/emoji_one/woman_scientist.png
index 89e4850622..fbcf1a09d9 100644
Binary files a/public/images/emoji/emoji_one/woman_scientist.png and b/public/images/emoji/emoji_one/woman_scientist.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/2.png b/public/images/emoji/emoji_one/woman_scientist/2.png
index 14a368f873..627f7e712f 100644
Binary files a/public/images/emoji/emoji_one/woman_scientist/2.png and b/public/images/emoji/emoji_one/woman_scientist/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/3.png b/public/images/emoji/emoji_one/woman_scientist/3.png
index 90e60c1c80..b7a9504e47 100644
Binary files a/public/images/emoji/emoji_one/woman_scientist/3.png and b/public/images/emoji/emoji_one/woman_scientist/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/4.png b/public/images/emoji/emoji_one/woman_scientist/4.png
index cfca1820c9..ac0db89750 100644
Binary files a/public/images/emoji/emoji_one/woman_scientist/4.png and b/public/images/emoji/emoji_one/woman_scientist/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/5.png b/public/images/emoji/emoji_one/woman_scientist/5.png
index e7c7d1de67..bf873e9f3f 100644
Binary files a/public/images/emoji/emoji_one/woman_scientist/5.png and b/public/images/emoji/emoji_one/woman_scientist/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_scientist/6.png b/public/images/emoji/emoji_one/woman_scientist/6.png
index d1a9c5d19f..69c066ece4 100644
Binary files a/public/images/emoji/emoji_one/woman_scientist/6.png and b/public/images/emoji/emoji_one/woman_scientist/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging.png b/public/images/emoji/emoji_one/woman_shrugging.png
index e437955ee7..ad45b1424e 100644
Binary files a/public/images/emoji/emoji_one/woman_shrugging.png and b/public/images/emoji/emoji_one/woman_shrugging.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/2.png b/public/images/emoji/emoji_one/woman_shrugging/2.png
index 8e7bbed7a0..5f7600a8b5 100644
Binary files a/public/images/emoji/emoji_one/woman_shrugging/2.png and b/public/images/emoji/emoji_one/woman_shrugging/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/3.png b/public/images/emoji/emoji_one/woman_shrugging/3.png
index 3d9b0060f9..8b6d50942c 100644
Binary files a/public/images/emoji/emoji_one/woman_shrugging/3.png and b/public/images/emoji/emoji_one/woman_shrugging/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/4.png b/public/images/emoji/emoji_one/woman_shrugging/4.png
index 7ffb49d763..ebb7bee5dd 100644
Binary files a/public/images/emoji/emoji_one/woman_shrugging/4.png and b/public/images/emoji/emoji_one/woman_shrugging/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/5.png b/public/images/emoji/emoji_one/woman_shrugging/5.png
index 30b3774987..bbacca400b 100644
Binary files a/public/images/emoji/emoji_one/woman_shrugging/5.png and b/public/images/emoji/emoji_one/woman_shrugging/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_shrugging/6.png b/public/images/emoji/emoji_one/woman_shrugging/6.png
index cda85e9cc4..e62abcef64 100644
Binary files a/public/images/emoji/emoji_one/woman_shrugging/6.png and b/public/images/emoji/emoji_one/woman_shrugging/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer.png b/public/images/emoji/emoji_one/woman_singer.png
index f412f27476..dde46aa176 100644
Binary files a/public/images/emoji/emoji_one/woman_singer.png and b/public/images/emoji/emoji_one/woman_singer.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/2.png b/public/images/emoji/emoji_one/woman_singer/2.png
index 6d14d8c162..aea9d650d6 100644
Binary files a/public/images/emoji/emoji_one/woman_singer/2.png and b/public/images/emoji/emoji_one/woman_singer/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/3.png b/public/images/emoji/emoji_one/woman_singer/3.png
index 9754d70650..61b2d7f339 100644
Binary files a/public/images/emoji/emoji_one/woman_singer/3.png and b/public/images/emoji/emoji_one/woman_singer/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/4.png b/public/images/emoji/emoji_one/woman_singer/4.png
index 5fa71c50c5..5047039b02 100644
Binary files a/public/images/emoji/emoji_one/woman_singer/4.png and b/public/images/emoji/emoji_one/woman_singer/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/5.png b/public/images/emoji/emoji_one/woman_singer/5.png
index c363412cf3..07a1da4c20 100644
Binary files a/public/images/emoji/emoji_one/woman_singer/5.png and b/public/images/emoji/emoji_one/woman_singer/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_singer/6.png b/public/images/emoji/emoji_one/woman_singer/6.png
index 39b235a7a9..ac70a64380 100644
Binary files a/public/images/emoji/emoji_one/woman_singer/6.png and b/public/images/emoji/emoji_one/woman_singer/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_student.png b/public/images/emoji/emoji_one/woman_student.png
index 9d00e2abed..0657847fb3 100644
Binary files a/public/images/emoji/emoji_one/woman_student.png and b/public/images/emoji/emoji_one/woman_student.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/2.png b/public/images/emoji/emoji_one/woman_student/2.png
index 9a754752ae..5b07bc2b11 100644
Binary files a/public/images/emoji/emoji_one/woman_student/2.png and b/public/images/emoji/emoji_one/woman_student/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/3.png b/public/images/emoji/emoji_one/woman_student/3.png
index 27f26dc074..d440d867b0 100644
Binary files a/public/images/emoji/emoji_one/woman_student/3.png and b/public/images/emoji/emoji_one/woman_student/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/4.png b/public/images/emoji/emoji_one/woman_student/4.png
index ac85cfa64c..33591e2b17 100644
Binary files a/public/images/emoji/emoji_one/woman_student/4.png and b/public/images/emoji/emoji_one/woman_student/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/5.png b/public/images/emoji/emoji_one/woman_student/5.png
index c2bfd0f056..535ed24ba9 100644
Binary files a/public/images/emoji/emoji_one/woman_student/5.png and b/public/images/emoji/emoji_one/woman_student/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_student/6.png b/public/images/emoji/emoji_one/woman_student/6.png
index 89f47c0acd..c6ad97cd20 100644
Binary files a/public/images/emoji/emoji_one/woman_student/6.png and b/public/images/emoji/emoji_one/woman_student/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher.png b/public/images/emoji/emoji_one/woman_teacher.png
index 99cd5f3afe..21e5007557 100644
Binary files a/public/images/emoji/emoji_one/woman_teacher.png and b/public/images/emoji/emoji_one/woman_teacher.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/2.png b/public/images/emoji/emoji_one/woman_teacher/2.png
index 852548df24..f478de8f77 100644
Binary files a/public/images/emoji/emoji_one/woman_teacher/2.png and b/public/images/emoji/emoji_one/woman_teacher/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/3.png b/public/images/emoji/emoji_one/woman_teacher/3.png
index e0c9391a6d..1a70859b0a 100644
Binary files a/public/images/emoji/emoji_one/woman_teacher/3.png and b/public/images/emoji/emoji_one/woman_teacher/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/4.png b/public/images/emoji/emoji_one/woman_teacher/4.png
index c08c48635b..0d7465daee 100644
Binary files a/public/images/emoji/emoji_one/woman_teacher/4.png and b/public/images/emoji/emoji_one/woman_teacher/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/5.png b/public/images/emoji/emoji_one/woman_teacher/5.png
index 437eddb6f8..cb99069046 100644
Binary files a/public/images/emoji/emoji_one/woman_teacher/5.png and b/public/images/emoji/emoji_one/woman_teacher/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_teacher/6.png b/public/images/emoji/emoji_one/woman_teacher/6.png
index 43b162ced3..13fc1e8d4a 100644
Binary files a/public/images/emoji/emoji_one/woman_teacher/6.png and b/public/images/emoji/emoji_one/woman_teacher/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist.png b/public/images/emoji/emoji_one/woman_technologist.png
index 776fbfcab4..f0faff4abd 100644
Binary files a/public/images/emoji/emoji_one/woman_technologist.png and b/public/images/emoji/emoji_one/woman_technologist.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/2.png b/public/images/emoji/emoji_one/woman_technologist/2.png
index 5f161cbee6..731697bb94 100644
Binary files a/public/images/emoji/emoji_one/woman_technologist/2.png and b/public/images/emoji/emoji_one/woman_technologist/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/3.png b/public/images/emoji/emoji_one/woman_technologist/3.png
index 9e00f7b143..a058ebd102 100644
Binary files a/public/images/emoji/emoji_one/woman_technologist/3.png and b/public/images/emoji/emoji_one/woman_technologist/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/4.png b/public/images/emoji/emoji_one/woman_technologist/4.png
index 7235d0108f..afb2176155 100644
Binary files a/public/images/emoji/emoji_one/woman_technologist/4.png and b/public/images/emoji/emoji_one/woman_technologist/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/5.png b/public/images/emoji/emoji_one/woman_technologist/5.png
index 26770ddeb7..29ac8e0b39 100644
Binary files a/public/images/emoji/emoji_one/woman_technologist/5.png and b/public/images/emoji/emoji_one/woman_technologist/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_technologist/6.png b/public/images/emoji/emoji_one/woman_technologist/6.png
index ea37a55bbe..d5b942fc1b 100644
Binary files a/public/images/emoji/emoji_one/woman_technologist/6.png and b/public/images/emoji/emoji_one/woman_technologist/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf.png b/public/images/emoji/emoji_one/woman_with_headscarf.png
index f7e6fb99f7..67ffd44141 100644
Binary files a/public/images/emoji/emoji_one/woman_with_headscarf.png and b/public/images/emoji/emoji_one/woman_with_headscarf.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/2.png b/public/images/emoji/emoji_one/woman_with_headscarf/2.png
new file mode 100644
index 0000000000..4f2bdfe86d
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/3.png b/public/images/emoji/emoji_one/woman_with_headscarf/3.png
new file mode 100644
index 0000000000..88b8a9b48f
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/4.png b/public/images/emoji/emoji_one/woman_with_headscarf/4.png
new file mode 100644
index 0000000000..fd3a258317
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/5.png b/public/images/emoji/emoji_one/woman_with_headscarf/5.png
new file mode 100644
index 0000000000..20506a656e
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_headscarf/6.png b/public/images/emoji/emoji_one/woman_with_headscarf/6.png
new file mode 100644
index 0000000000..7593783299
Binary files /dev/null and b/public/images/emoji/emoji_one/woman_with_headscarf/6.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban.png b/public/images/emoji/emoji_one/woman_with_turban.png
index 864b5727a5..6a14664a48 100644
Binary files a/public/images/emoji/emoji_one/woman_with_turban.png and b/public/images/emoji/emoji_one/woman_with_turban.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/2.png b/public/images/emoji/emoji_one/woman_with_turban/2.png
index 2b50d77b88..833f6d6ee5 100644
Binary files a/public/images/emoji/emoji_one/woman_with_turban/2.png and b/public/images/emoji/emoji_one/woman_with_turban/2.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/3.png b/public/images/emoji/emoji_one/woman_with_turban/3.png
index 5eafe2592a..1e6d42f5a9 100644
Binary files a/public/images/emoji/emoji_one/woman_with_turban/3.png and b/public/images/emoji/emoji_one/woman_with_turban/3.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/4.png b/public/images/emoji/emoji_one/woman_with_turban/4.png
index a9f86d7c87..84c3524407 100644
Binary files a/public/images/emoji/emoji_one/woman_with_turban/4.png and b/public/images/emoji/emoji_one/woman_with_turban/4.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/5.png b/public/images/emoji/emoji_one/woman_with_turban/5.png
index 9720d94218..1aa5162a85 100644
Binary files a/public/images/emoji/emoji_one/woman_with_turban/5.png and b/public/images/emoji/emoji_one/woman_with_turban/5.png differ
diff --git a/public/images/emoji/emoji_one/woman_with_turban/6.png b/public/images/emoji/emoji_one/woman_with_turban/6.png
index 4897f0e583..a414e72d80 100644
Binary files a/public/images/emoji/emoji_one/woman_with_turban/6.png and b/public/images/emoji/emoji_one/woman_with_turban/6.png differ
diff --git a/public/images/emoji/emoji_one/women_wrestling.png b/public/images/emoji/emoji_one/women_wrestling.png
index ba1175b4ad..a1f5bf6791 100644
Binary files a/public/images/emoji/emoji_one/women_wrestling.png and b/public/images/emoji/emoji_one/women_wrestling.png differ
diff --git a/public/images/emoji/emoji_one/worried.png b/public/images/emoji/emoji_one/worried.png
index 89aefe61c5..7a6168d4c7 100644
Binary files a/public/images/emoji/emoji_one/worried.png and b/public/images/emoji/emoji_one/worried.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/2.png b/public/images/emoji/emoji_one/writing_hand/2.png
index 69ddfaa4f3..a29b270808 100644
Binary files a/public/images/emoji/emoji_one/writing_hand/2.png and b/public/images/emoji/emoji_one/writing_hand/2.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/3.png b/public/images/emoji/emoji_one/writing_hand/3.png
index 77155df4b5..5151d2aca8 100644
Binary files a/public/images/emoji/emoji_one/writing_hand/3.png and b/public/images/emoji/emoji_one/writing_hand/3.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/4.png b/public/images/emoji/emoji_one/writing_hand/4.png
index 60c5749354..02c0859599 100644
Binary files a/public/images/emoji/emoji_one/writing_hand/4.png and b/public/images/emoji/emoji_one/writing_hand/4.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/5.png b/public/images/emoji/emoji_one/writing_hand/5.png
index 8e21ae3182..0306698c2b 100644
Binary files a/public/images/emoji/emoji_one/writing_hand/5.png and b/public/images/emoji/emoji_one/writing_hand/5.png differ
diff --git a/public/images/emoji/emoji_one/writing_hand/6.png b/public/images/emoji/emoji_one/writing_hand/6.png
index cf40b2bf4c..6011f6aeb6 100644
Binary files a/public/images/emoji/emoji_one/writing_hand/6.png and b/public/images/emoji/emoji_one/writing_hand/6.png differ
diff --git a/public/images/emoji/emoji_one/yum.png b/public/images/emoji/emoji_one/yum.png
index f5a38e15f8..0a063880ee 100644
Binary files a/public/images/emoji/emoji_one/yum.png and b/public/images/emoji/emoji_one/yum.png differ
diff --git a/public/images/emoji/emoji_one/zebra.png b/public/images/emoji/emoji_one/zebra.png
index 6faa14f55d..324632dd46 100644
Binary files a/public/images/emoji/emoji_one/zebra.png and b/public/images/emoji/emoji_one/zebra.png differ
diff --git a/public/images/emoji/emoji_one/zipper_mouth.png b/public/images/emoji/emoji_one/zipper_mouth.png
index 8e4cf03f40..59f618fdb7 100644
Binary files a/public/images/emoji/emoji_one/zipper_mouth.png and b/public/images/emoji/emoji_one/zipper_mouth.png differ
diff --git a/public/images/emoji/emoji_one/zipper_mouth_face.png b/public/images/emoji/emoji_one/zipper_mouth_face.png
index 8e4cf03f40..59f618fdb7 100644
Binary files a/public/images/emoji/emoji_one/zipper_mouth_face.png and b/public/images/emoji/emoji_one/zipper_mouth_face.png differ
diff --git a/public/images/emoji/emoji_one/zombie.png b/public/images/emoji/emoji_one/zombie.png
index 1bf288fcd4..d46f18de17 100644
Binary files a/public/images/emoji/emoji_one/zombie.png and b/public/images/emoji/emoji_one/zombie.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming.png b/public/images/emoji/facebook_messenger/man_facepalming.png
index 4967e238dc..c819f4029a 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_facepalming/2.png b/public/images/emoji/facebook_messenger/man_facepalming/2.png
index 797300f215..890aa9695f 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/2.png and b/public/images/emoji/facebook_messenger/man_facepalming/2.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/3.png b/public/images/emoji/facebook_messenger/man_facepalming/3.png
index 407e8054b5..58aee73c58 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/3.png and b/public/images/emoji/facebook_messenger/man_facepalming/3.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/4.png b/public/images/emoji/facebook_messenger/man_facepalming/4.png
index 6254233090..94355c5aca 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/4.png and b/public/images/emoji/facebook_messenger/man_facepalming/4.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/5.png b/public/images/emoji/facebook_messenger/man_facepalming/5.png
index 5e7da37f05..ddd6d4a05a 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/5.png and b/public/images/emoji/facebook_messenger/man_facepalming/5.png differ
diff --git a/public/images/emoji/facebook_messenger/man_facepalming/6.png b/public/images/emoji/facebook_messenger/man_facepalming/6.png
index eca03f4a44..9263f22556 100644
Binary files a/public/images/emoji/facebook_messenger/man_facepalming/6.png and b/public/images/emoji/facebook_messenger/man_facepalming/6.png differ
diff --git a/public/images/emoji/google/man_facepalming.png b/public/images/emoji/google/man_facepalming.png
index 545a28a2ab..59aa5d58f3 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_facepalming/2.png b/public/images/emoji/google/man_facepalming/2.png
index b4c1b9189f..cfb55f5866 100644
Binary files a/public/images/emoji/google/man_facepalming/2.png and b/public/images/emoji/google/man_facepalming/2.png differ
diff --git a/public/images/emoji/google/man_facepalming/3.png b/public/images/emoji/google/man_facepalming/3.png
index 34678c776b..01e26582fd 100644
Binary files a/public/images/emoji/google/man_facepalming/3.png and b/public/images/emoji/google/man_facepalming/3.png differ
diff --git a/public/images/emoji/google/man_facepalming/4.png b/public/images/emoji/google/man_facepalming/4.png
index a951cc15b7..ccfae915f2 100644
Binary files a/public/images/emoji/google/man_facepalming/4.png and b/public/images/emoji/google/man_facepalming/4.png differ
diff --git a/public/images/emoji/google/man_facepalming/5.png b/public/images/emoji/google/man_facepalming/5.png
index 54e377054f..9ac68142d9 100644
Binary files a/public/images/emoji/google/man_facepalming/5.png and b/public/images/emoji/google/man_facepalming/5.png differ
diff --git a/public/images/emoji/google/man_facepalming/6.png b/public/images/emoji/google/man_facepalming/6.png
index 5a432ab436..23a150b900 100644
Binary files a/public/images/emoji/google/man_facepalming/6.png and b/public/images/emoji/google/man_facepalming/6.png differ
diff --git a/public/images/emoji/twitter/man_facepalming.png b/public/images/emoji/twitter/man_facepalming.png
index 4967e238dc..c819f4029a 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_facepalming/2.png b/public/images/emoji/twitter/man_facepalming/2.png
index 797300f215..890aa9695f 100644
Binary files a/public/images/emoji/twitter/man_facepalming/2.png and b/public/images/emoji/twitter/man_facepalming/2.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/3.png b/public/images/emoji/twitter/man_facepalming/3.png
index 407e8054b5..58aee73c58 100644
Binary files a/public/images/emoji/twitter/man_facepalming/3.png and b/public/images/emoji/twitter/man_facepalming/3.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/4.png b/public/images/emoji/twitter/man_facepalming/4.png
index 6254233090..94355c5aca 100644
Binary files a/public/images/emoji/twitter/man_facepalming/4.png and b/public/images/emoji/twitter/man_facepalming/4.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/5.png b/public/images/emoji/twitter/man_facepalming/5.png
index 5e7da37f05..ddd6d4a05a 100644
Binary files a/public/images/emoji/twitter/man_facepalming/5.png and b/public/images/emoji/twitter/man_facepalming/5.png differ
diff --git a/public/images/emoji/twitter/man_facepalming/6.png b/public/images/emoji/twitter/man_facepalming/6.png
index eca03f4a44..9263f22556 100644
Binary files a/public/images/emoji/twitter/man_facepalming/6.png and b/public/images/emoji/twitter/man_facepalming/6.png differ
diff --git a/public/images/emoji/win10/man_facepalming.png b/public/images/emoji/win10/man_facepalming.png
index 44ca8d78b2..4ad3c56dbb 100644
Binary files a/public/images/emoji/win10/man_facepalming.png and b/public/images/emoji/win10/man_facepalming.png differ
diff --git a/public/images/emoji/win10/man_facepalming/2.png b/public/images/emoji/win10/man_facepalming/2.png
index b3c8601eab..5428ba49fb 100644
Binary files a/public/images/emoji/win10/man_facepalming/2.png and b/public/images/emoji/win10/man_facepalming/2.png differ
diff --git a/public/images/emoji/win10/man_facepalming/3.png b/public/images/emoji/win10/man_facepalming/3.png
index dd0aa37b99..7ce6ce6a20 100644
Binary files a/public/images/emoji/win10/man_facepalming/3.png and b/public/images/emoji/win10/man_facepalming/3.png differ
diff --git a/public/images/emoji/win10/man_facepalming/4.png b/public/images/emoji/win10/man_facepalming/4.png
index f7431f6048..e217cbc3a2 100644
Binary files a/public/images/emoji/win10/man_facepalming/4.png and b/public/images/emoji/win10/man_facepalming/4.png differ
diff --git a/public/images/emoji/win10/man_facepalming/5.png b/public/images/emoji/win10/man_facepalming/5.png
index 2dfe7989d4..7b167172b1 100644
Binary files a/public/images/emoji/win10/man_facepalming/5.png and b/public/images/emoji/win10/man_facepalming/5.png differ
diff --git a/public/images/emoji/win10/man_facepalming/6.png b/public/images/emoji/win10/man_facepalming/6.png
index 3ad9344645..8ba3d73cda 100644
Binary files a/public/images/emoji/win10/man_facepalming/6.png and b/public/images/emoji/win10/man_facepalming/6.png differ
diff --git a/script/.gitignore b/script/.gitignore
new file mode 100644
index 0000000000..1fb9ef5745
--- /dev/null
+++ b/script/.gitignore
@@ -0,0 +1 @@
+tmp/*
diff --git a/script/bench.rb b/script/bench.rb
index 9de35492a8..84893f5ebd 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -64,7 +64,6 @@ end
 
 @timings = {}
 
-
 def measure(name)
   start = Time.now
   yield
@@ -100,7 +99,6 @@ unless $? == 0
   abort "Apache Bench is not installed. Try: apt-get install apache2-utils or brew install ab"
 end
 
-
 unless File.exists?("config/database.yml")
   puts "Copying database.yml.development.sample to database.yml"
   `cp config/database.yml.development-sample config/database.yml`
@@ -108,7 +106,6 @@ end
 
 ENV["RAILS_ENV"] = "profile"
 
-
 discourse_env_vars = %w(DISCOURSE_DUMP_HEAP RUBY_GC_HEAP_INIT_SLOTS RUBY_GC_HEAP_FREE_SLOTS RUBY_GC_HEAP_GROWTH_FACTOR RUBY_GC_HEAP_GROWTH_MAX_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_GC_OLDMALLOC_LIMIT RUBY_GC_MALLOC_LIMIT_MAX RUBY_GC_OLDMALLOC_LIMIT_MAX RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR)
 
 if @include_env
@@ -124,7 +121,7 @@ else
   end
 end
 
-def port_available? port
+def port_available?(port)
   server = TCPServer.open("0.0.0.0", port)
   server.close
   true
@@ -174,13 +171,14 @@ begin
   puts "precompiling assets"
   run("bundle exec rake assets:precompile")
 
-  pid = if @unicorn
-          ENV['UNICORN_PORT'] = @port.to_s
-          FileUtils.mkdir_p(File.join('tmp', 'pids'))
-          spawn("bundle exec unicorn -c config/unicorn.conf.rb")
-        else
-          spawn("bundle exec thin start -p #{@port}")
-        end
+  pid =
+    if @unicorn
+      ENV['UNICORN_PORT'] = @port.to_s
+      FileUtils.mkdir_p(File.join('tmp', 'pids'))
+      spawn("bundle exec unicorn -c config/unicorn.conf.rb")
+    else
+      spawn("bundle exec thin start -p #{@port}")
+    end
 
   while port_available? @port
     sleep 1
@@ -199,7 +197,7 @@ begin
     # ["user", "/u/admin1/activity"],
   ]
 
-  tests = tests.map{|k,url| ["#{k}_admin", "#{url}#{append}"]} + tests
+  tests = tests.map { |k, url| ["#{k}_admin", "#{url}#{append}"] } + tests
 
   # NOTE: we run the most expensive page first in the bench
 
@@ -210,15 +208,13 @@ begin
     a[50] < b[50] ? a : b
   end
 
-
   results = {}
   @best_of.times do
     tests.each do |name, url|
-      results[name] = best_of(bench(url, name),results[name])
+      results[name] = best_of(bench(url, name), results[name])
     end
   end
 
-
   puts "Your Results: (note for timings- percentile is first, duration is second in millisecs)"
 
   # Prevent using external facts because it breaks when running in the
@@ -226,8 +222,8 @@ begin
   Facter::Util::Config.external_facts_dirs = []
   facts = Facter.to_hash
 
-  facts.delete_if{|k,v|
-    !["operatingsystem","architecture","kernelversion",
+  facts.delete_if { |k, v|
+    !["operatingsystem", "architecture", "kernelversion",
     "memorysize", "physicalprocessorcount", "processor0",
     "virtual"].include?(k)
   }
@@ -238,15 +234,12 @@ begin
     YAML.load `ruby script/memstats.rb #{pid} --yaml`
   end
 
-
   mem = get_mem(pid)
 
-  results = results.merge({
-    "timings" => @timings,
-    "ruby-version" => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
-    "rss_kb" => mem["rss_kb"],
-    "pss_kb" => mem["pss_kb"]
-  }).merge(facts)
+  results = results.merge("timings" => @timings,
+                          "ruby-version" => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
+                          "rss_kb" => mem["rss_kb"],
+                          "pss_kb" => mem["pss_kb"]).merge(facts)
 
   if @unicorn
     child_pids = `ps --ppid #{pid} | awk '{ print $1; }' | grep -v PID`.split("\n")
@@ -270,7 +263,7 @@ begin
   end
 
   if @result_file
-    File.open(@result_file,"wb") do |f|
+    File.open(@result_file, "wb") do |f|
       f.write(results)
     end
   end
diff --git a/script/benchmarks/markdown/bench.rb b/script/benchmarks/markdown/bench.rb
index a27158eeec..74926c95a2 100644
--- a/script/benchmarks/markdown/bench.rb
+++ b/script/benchmarks/markdown/bench.rb
@@ -1,6 +1,8 @@
 require 'benchmark/ips'
 require File.expand_path('../../../../config/environment', __FILE__)
 
+# set any flags here
+# MiniRacer::Platform.set_flags! :noturbo
 
 tests = [
   ["tiny post", "**hello**"],
@@ -9,7 +11,6 @@ tests = [
   ["lots of mentions", File.read("lots_of_mentions.md")]
 ]
 
-SiteSetting.enable_experimental_markdown_it = true
 PrettyText.cook("")
 PrettyText.v8.eval("window.commonmark = window.markdownit('commonmark')")
 
@@ -26,25 +27,14 @@ PrettyText.v8.eval("window.commonmark = window.markdownit('commonmark')")
 # exit
 
 Benchmark.ips do |x|
-  [true,false].each do |sanitize|
-    {
-      "markdown js" =>
-        lambda{SiteSetting.enable_experimental_markdown_it = false},
-
-      "markdown it" =>
-        lambda{SiteSetting.enable_experimental_markdown_it = true}
-    }.each do |name, before|
-      before.call
-
-      tests.each do |test, text|
-        x.report("#{name} #{test} sanitize: #{sanitize}") do
-          PrettyText.markdown(text, sanitize: sanitize)
-        end
+  [true, false].each do |sanitize|
+    tests.each do |test, text|
+      x.report("#{test} sanitize: #{sanitize}") do
+        PrettyText.markdown(text, sanitize: sanitize)
       end
     end
   end
 
-
   tests.each do |test, text|
     x.report("markdown it no extensions commonmark #{test}") do
       PrettyText.v8.eval("window.commonmark.render(#{text.inspect})")
@@ -52,3 +42,89 @@ Benchmark.ips do |x|
   end
 end
 
+# 27-07-2017 - Sam's NUC
+#
+# v8 5.7
+#
+#
+# tiny post sanitize: true
+#                         160.678  (±19.9%) i/s -    760.000  in   5.005630s
+# giant post sanitize: true
+#                         132.195  (±14.4%) i/s -    649.000  in   5.042695s
+# most features sanitize: true
+#                          56.205  (± 8.9%) i/s -    280.000  in   5.038138s
+# lots of mentions sanitize: true
+#                           0.318  (± 0.0%) i/s -      2.000  in   6.293644s
+# tiny post sanitize: false
+#                         404.304  (±20.8%) i/s -      1.920k in   5.019903s
+# giant post sanitize: false
+#                         327.721  (±11.9%) i/s -      1.624k in   5.033749s
+# most features sanitize: false
+#                          76.649  (±10.4%) i/s -    385.000  in   5.085552s
+# lots of mentions sanitize: false
+#                           0.306  (± 0.0%) i/s -      2.000  in   6.525968s
+# markdown it no extensions commonmark tiny post
+#                           5.871k (±19.1%) i/s -     28.544k in   5.073585s
+# markdown it no extensions commonmark giant post
+#                           1.006k (±12.5%) i/s -      4.960k in   5.041623s
+# markdown it no extensions commonmark most features
+#                           1.447k (± 8.9%) i/s -      7.205k in   5.029094s
+# markdown it no extensions commonmark lots of mentions
+#                           1.962k (± 8.3%) i/s -      9.850k in   5.061684s
+#
+#
+# v8 5.9
+#
+#
+# tiny post sanitize: true
+#                         156.179  (±16.0%) i/s -    765.000  in   5.059401s
+# giant post sanitize: true
+#                         129.972  (±10.8%) i/s -    650.000  in   5.071824s
+# most features sanitize: true
+#                          54.960  (± 9.1%) i/s -    275.000  in   5.051284s
+# lots of mentions sanitize: true
+#                           0.321  (± 0.0%) i/s -      2.000  in   6.251009s
+# tiny post sanitize: false
+#                         431.159  (±10.4%) i/s -      2.166k in   5.085303s
+# giant post sanitize: false
+#                         300.236  (±11.7%) i/s -      1.479k in   5.029557s
+# most features sanitize: false
+#                          73.808  (±10.8%) i/s -    371.000  in   5.092310s
+# lots of mentions sanitize: false
+#                           0.297  (± 0.0%) i/s -      2.000  in   6.729708s
+# markdown it no extensions commonmark tiny post
+#                           6.421k (±13.0%) i/s -     32.012k in   5.084672s
+# markdown it no extensions commonmark giant post
+#                         901.622  (± 9.2%) i/s -      4.452k in   5.016748s
+# markdown it no extensions commonmark most features
+#                           1.410k (± 6.5%) i/s -      7.112k in   5.070053s
+# markdown it no extensions commonmark lots of mentions
+#                           1.934k (± 6.4%) i/s -      9.672k in   5.025858s
+#
+# v8 noturbo 5.9
+#
+#
+# tiny post sanitize: true
+#                         105.152  (±17.1%) i/s -    512.000  in   5.034419s
+# giant post sanitize: true
+#                          97.002  (±12.4%) i/s -    480.000  in   5.038382s
+# most features sanitize: true
+#                          46.355  (±12.9%) i/s -    228.000  in   5.009251s
+# lots of mentions sanitize: true
+#                           0.278  (± 0.0%) i/s -      2.000  in   7.205837s
+# tiny post sanitize: false
+#                         201.166  (±13.4%) i/s -    990.000  in   5.017725s
+# giant post sanitize: false
+#                         174.212  (±10.9%) i/s -    867.000  in   5.040859s
+# most features sanitize: false
+#                          60.272  (±14.9%) i/s -    295.000  in   5.029353s
+# lots of mentions sanitize: false
+#                           0.309  (± 0.0%) i/s -      2.000  in   6.483433s
+# markdown it no extensions commonmark tiny post
+#                           6.331k (±13.8%) i/s -     31.065k in   5.023613s
+# markdown it no extensions commonmark giant post
+#                           1.045k (± 9.6%) i/s -      5.208k in   5.053733s
+# markdown it no extensions commonmark most features
+#                           1.448k (± 6.7%) i/s -      7.239k in   5.024831s
+# markdown it no extensions commonmark lots of mentions
+#                           1.986k (± 5.2%) i/s -      9.990k in   5.044624s
diff --git a/script/bulk_import/base.rb b/script/bulk_import/base.rb
index 7b25467838..189d154740 100644
--- a/script/bulk_import/base.rb
+++ b/script/bulk_import/base.rb
@@ -10,7 +10,7 @@ module BulkImport; end
 class BulkImport::Base
 
   NOW ||= "now()".freeze
-  PRIVATE_OFFSET ||= 2 ** 30
+  PRIVATE_OFFSET ||= 2**30
 
   def initialize
     db = ActiveRecord::Base.connection_config
@@ -93,7 +93,8 @@ class BulkImport::Base
 
     puts "Loading users indexes..."
     @last_user_id = User.unscoped.maximum(:id)
-    @emails = User.unscoped.pluck(:email).to_set
+    @last_user_email_id = UserEmail.unscoped.maximum(:id)
+    @emails = User.unscoped.joins(:user_emails).pluck(:"user_emails.email").to_set
     @usernames_lower = User.unscoped.pluck(:username_lower).to_set
     @mapped_usernames = UserCustomField.joins(:user).where(name: "import_username").pluck("user_custom_fields.value", "users.username").to_h
 
@@ -109,6 +110,9 @@ class BulkImport::Base
     @last_post_id = Post.unscoped.maximum(:id)
     @post_number_by_post_id = Post.unscoped.pluck(:id, :post_number).to_h
     @topic_id_by_post_id = Post.unscoped.pluck(:id, :topic_id).to_h
+
+    puts "Loading post actions indexes..."
+    @last_post_action_id = PostAction.unscoped.maximum(:id) || 0
   end
 
   def execute
@@ -119,9 +123,11 @@ class BulkImport::Base
     puts "Updating primary key sequences..."
     @raw_connection.exec("SELECT setval('#{Group.sequence_name}', #{@last_group_id})")
     @raw_connection.exec("SELECT setval('#{User.sequence_name}', #{@last_user_id})")
+    @raw_connection.exec("SELECT setval('#{UserEmail.sequence_name}', #{@last_user_email_id})")
     @raw_connection.exec("SELECT setval('#{Category.sequence_name}', #{@last_category_id})")
     @raw_connection.exec("SELECT setval('#{Topic.sequence_name}', #{@last_topic_id})")
     @raw_connection.exec("SELECT setval('#{Post.sequence_name}', #{@last_post_id})")
+    @raw_connection.exec("SELECT setval('#{PostAction.sequence_name}', #{@last_post_action_id})")
   end
 
   def group_id_from_imported_id(id); @groups[id.to_s]; end
@@ -138,11 +144,22 @@ class BulkImport::Base
   }
 
   USER_COLUMNS ||= %i{
-    id username username_lower name email active trust_level admin moderator
+    id username username_lower name active trust_level admin moderator
     date_of_birth ip_address registration_ip_address primary_group_id
     suspended_at suspended_till last_emailed_at created_at updated_at
   }
 
+  USER_EMAIL_COLUMNS ||= %i{
+    id user_id email primary created_at updated_at
+  }
+
+  USER_STAT_COLUMNS ||= %i{
+    user_id topics_entered time_read days_visited posts_read_count
+    likes_given likes_received topic_reply_count new_since read_faq
+    first_post_created_at post_count topic_count bounce_score
+    reset_bounce_score_after
+  }
+
   USER_PROFILE_COLUMNS ||= %i{
     user_id location website bio_raw bio_cooked views
   }
@@ -163,7 +180,13 @@ class BulkImport::Base
 
   POST_COLUMNS ||= %i{
     id user_id last_editor_id topic_id post_number sort_order reply_to_post_number
-    raw cooked hidden word_count created_at last_version_at updated_at
+    like_count raw cooked hidden word_count created_at last_version_at updated_at
+  }
+
+  POST_ACTION_COLUMNS ||= %i{
+    id post_id user_id post_action_type_id deleted_at created_at updated_at
+    deleted_by_id related_post_id staff_took_action deferred_by_id targets_topic
+    agreed_at agreed_by_id deferred_at disagreed_at disagreed_by_id
   }
 
   TOPIC_ALLOWED_USER_COLUMNS ||= %i{
@@ -185,11 +208,14 @@ class BulkImport::Base
     end
   end
 
+  def create_user_emails(rows, &block) create_records(rows, "user_email", USER_EMAIL_COLUMNS, &block); end
+  def create_user_stats(rows, &block) create_records(rows, "user_stat", USER_STAT_COLUMNS, &block); end
   def create_user_profiles(rows, &block); create_records(rows, "user_profile", USER_PROFILE_COLUMNS, &block); end
   def create_group_users(rows, &block); create_records(rows, "group_user", GROUP_USER_COLUMNS, &block); end
   def create_categories(rows, &block); create_records(rows, "category", CATEGORY_COLUMNS, &block); end
   def create_topics(rows, &block); create_records(rows, "topic", TOPIC_COLUMNS, &block); end
   def create_posts(rows, &block); create_records(rows, "post", POST_COLUMNS, &block); end
+  def create_post_actions(rows, &block); create_records(rows, "post_action", POST_ACTION_COLUMNS, &block); end
   def create_topic_allowed_users(rows, &block); create_records(rows, "topic_allowed_user", TOPIC_ALLOWED_USER_COLUMNS, &block); end
 
   def process_group(group)
@@ -246,6 +272,38 @@ class BulkImport::Base
     user
   end
 
+  def process_user_email(user_email)
+    user_email[:id] = @last_user_email_id += 1;
+    user_email[:user_id] = @users[user_email[:imported_user_id].to_s]
+    user_email[:primary] = true
+    user_email[:created_at] ||= NOW
+    user_email[:updated_at] ||= user_email[:created_at]
+    user_email[:email] ||= random_email
+    user_email[:email].downcase!
+
+    # unique email
+    user_email[:email] = random_email until user_email[:email] =~ EmailValidator.email_regex && @emails.add?(user_email[:email])
+
+    user_email
+  end
+
+  def process_user_stat(user_stat)
+    user_stat[:user_id] = @users[user_stat[:imported_user_id].to_s]
+    user_stat[:topic_reply_count] = user_stat[:post_count] - user_stat[:topic_count]
+    user_stat[:topics_entered] ||= 0
+    user_stat[:time_read] ||= 0
+    user_stat[:days_visited] ||= 0
+    user_stat[:posts_read_count] ||= 0
+    user_stat[:likes_given] ||= 0
+    user_stat[:likes_received] ||= 0
+    user_stat[:topic_reply_count] ||= 0
+    user_stat[:new_since] ||= NOW
+    user_stat[:post_count] ||= 0
+    user_stat[:topic_count] ||= 0
+    user_stat[:bounce_score] ||= 0
+    user_stat
+  end
+
   def process_user_profile(user_profile)
     user_profile[:bio_raw]    = (user_profile[:bio_raw].presence || "").scrub.strip.presence
     user_profile[:bio_cooked] = pre_cook(user_profile[:bio_raw]) if user_profile[:bio_raw].present?
@@ -259,7 +317,8 @@ class BulkImport::Base
   end
 
   def process_category(category)
-    @categories[category[:imported_id].to_s] = category[:id] = @last_category_id += 1
+    category[:id] ||= @last_category_id += 1
+    @categories[category[:imported_id].to_s] ||= category[:id]
     category[:name] = category[:name][0...50].scrub.strip
     # TODO: unique name
     category[:name_lower] = category[:name].downcase
@@ -300,6 +359,7 @@ class BulkImport::Base
     @topic_id_by_post_id[post[:id]] = post[:topic_id]
     post[:raw] = (post[:raw] || "").scrub.strip.presence || "<Empty imported post>"
     post[:raw] = process_raw post[:raw]
+    post[:like_count] ||= 0
     post[:cooked] = pre_cook post[:raw]
     post[:hidden] ||= false
     post[:word_count] = post[:raw].scan(/[[:word:]]+/).size
@@ -309,6 +369,15 @@ class BulkImport::Base
     post
   end
 
+  def process_post_action(post_action)
+    post_action[:id] ||= @last_post_action_id += 1
+    post_action[:staff_took_action] ||= false
+    post_action[:targets_topic] ||= false
+    post_action[:created_at] ||= NOW
+    post_action[:updated_at] ||= post_action[:created_at]
+    post_action
+  end
+
   def process_topic_allowed_user(topic_allowed_user)
     topic_allowed_user[:created_at] = NOW
     topic_allowed_user[:updated_at] = NOW
@@ -428,17 +497,17 @@ class BulkImport::Base
 
   def create_records(rows, name, columns)
     start = Time.now
-
     imported_ids = []
     process_method_name = "process_#{name}"
-    sql = "COPY #{name.pluralize} (#{columns.join(",")}) FROM STDIN"
+    sql = "COPY #{name.pluralize} (#{columns.map { |c| "\"#{c}\"" }.join(",")}) FROM STDIN"
 
     @raw_connection.copy_data(sql, @encoder) do
       rows.each do |row|
         mapped = yield(row)
         next unless mapped
         processed = send(process_method_name, mapped)
-        imported_ids << mapped[:imported_id]
+        imported_ids << mapped[:imported_id] unless mapped[:imported_id].nil?
+        imported_ids |= mapped[:imported_ids] unless mapped[:imported_ids].nil?
         @raw_connection.put_copy_data columns.map { |c| processed[c] }
         print "\r%7d - %6d/sec".freeze % [imported_ids.size, imported_ids.size.to_f / (Time.now - start)] if imported_ids.size % 5000 == 0
       end
@@ -472,8 +541,8 @@ class BulkImport::Base
   end
 
   def fix_name(name)
+    name.scrub! if name.valid_encoding? == false
     return if name.blank?
-    name.scrub!
     name = ActiveSupport::Inflector.transliterate(name)
     name.gsub!(/[^\w.-]+/, "_")
     name.gsub!(/^\W+/, "")
@@ -492,7 +561,18 @@ class BulkImport::Base
   end
 
   def pre_cook(raw)
-    cooked = @markdown.render(raw).scrub.strip
+    cooked = raw
+
+    # Convert YouTube URLs to lazyYT DOMs before being transformed into links
+    cooked.gsub!(/\nhttps\:\/\/www.youtube.com\/watch\?v=(\w+)\n/) do
+      video_id = $1
+      result = <<-HTML
+        <div class="lazyYT" data-youtube-id="#{video_id}" data-width="480" data-height="270" data-parameters="feature=oembed&amp;wmode=opaque"></div>
+      HTML
+      result.strip
+    end
+
+    cooked = @markdown.render(cooked).scrub.strip
 
     cooked.gsub!(/\[QUOTE="?([^,"]+)(?:, post:(\d+), topic:(\d+))?"?\](.+?)\[\/QUOTE\]/im) do
       username, post_id, topic_id = $1, $2, $3
diff --git a/script/bulk_import/vbulletin.rb b/script/bulk_import/vbulletin.rb
index 2121a47b2d..d9d394a716 100644
--- a/script/bulk_import/vbulletin.rb
+++ b/script/bulk_import/vbulletin.rb
@@ -1,10 +1,49 @@
 require_relative "base"
+require "set"
 require "mysql2"
 require "htmlentities"
 
 class BulkImport::VBulletin < BulkImport::Base
 
   SUSPENDED_TILL ||= Date.new(3000, 1, 1)
+  CHARSET_MAP = {
+    "armscii8" => nil,
+    "ascii"    => Encoding::US_ASCII,
+    "big5"     => Encoding::Big5,
+    "binary"   => Encoding::ASCII_8BIT,
+    "cp1250"   => Encoding::Windows_1250,
+    "cp1251"   => Encoding::Windows_1251,
+    "cp1256"   => Encoding::Windows_1256,
+    "cp1257"   => Encoding::Windows_1257,
+    "cp850"    => Encoding::CP850,
+    "cp852"    => Encoding::CP852,
+    "cp866"    => Encoding::IBM866,
+    "cp932"    => Encoding::Windows_31J,
+    "dec8"     => nil,
+    "eucjpms"  => Encoding::EucJP_ms,
+    "euckr"    => Encoding::EUC_KR,
+    "gb2312"   => Encoding::EUC_CN,
+    "gbk"      => Encoding::GBK,
+    "geostd8"  => nil,
+    "greek"    => Encoding::ISO_8859_7,
+    "hebrew"   => Encoding::ISO_8859_8,
+    "hp8"      => nil,
+    "keybcs2"  => nil,
+    "koi8r"    => Encoding::KOI8_R,
+    "koi8u"    => Encoding::KOI8_U,
+    "latin1"   => Encoding::ISO_8859_1,
+    "latin2"   => Encoding::ISO_8859_2,
+    "latin5"   => Encoding::ISO_8859_9,
+    "latin7"   => Encoding::ISO_8859_13,
+    "macce"    => Encoding::MacCentEuro,
+    "macroman" => Encoding::MacRoman,
+    "sjis"     => Encoding::SHIFT_JIS,
+    "swe7"     => nil,
+    "tis620"   => Encoding::TIS_620,
+    "ucs2"     => Encoding::UTF_16BE,
+    "ujis"     => Encoding::EucJP_ms,
+    "utf8"     => Encoding::UTF_8,
+  }
 
   def initialize
     super
@@ -13,11 +52,29 @@ class BulkImport::VBulletin < BulkImport::Base
     username = ENV["DB_USERNAME"] || "root"
     password = ENV["DB_PASSWORD"]
     database = ENV["DB_NAME"] || "vbulletin"
+    charset  = ENV["DB_CHARSET"] || "utf8"
 
     @html_entities = HTMLEntities.new
+    @encoding = CHARSET_MAP[charset]
+
+    @client = Mysql2::Client.new(
+      host: host,
+      username: username,
+      password: password,
+      database: database,
+      encoding: charset
+    )
 
-    @client = Mysql2::Client.new(host: host, username: username, password: password, database: database)
     @client.query_options.merge!(as: :array, cache_rows: false)
+
+    @has_post_thanks = mysql_query(<<-SQL
+        SELECT `COLUMN_NAME`
+          FROM `INFORMATION_SCHEMA`.`COLUMNS`
+         WHERE `TABLE_SCHEMA`='#{database}'
+           AND `TABLE_NAME`='user'
+           AND `COLUMN_NAME` LIKE 'post_thanks_%'
+    SQL
+    ).to_a.count > 0
   end
 
   def execute
@@ -25,6 +82,9 @@ class BulkImport::VBulletin < BulkImport::Base
     import_users
     import_group_users
 
+    import_user_emails
+    import_user_stats
+
     import_user_passwords
     import_user_salts
     import_user_profiles
@@ -33,6 +93,8 @@ class BulkImport::VBulletin < BulkImport::Base
     import_topics
     import_posts
 
+    import_likes
+
     import_private_topics
     import_topic_allowed_users
     import_private_posts
@@ -51,9 +113,9 @@ class BulkImport::VBulletin < BulkImport::Base
     create_groups(groups) do |row|
       {
         imported_id: row[0],
-        name: html_decode(row[1]),
-        bio_raw: html_decode(row[2]),
-        title: html_decode(row[3]),
+        name: normalize_text(row[1]),
+        bio_raw: normalize_text(row[2]),
+        title: normalize_text(row[3]),
       }
     end
   end
@@ -72,8 +134,7 @@ class BulkImport::VBulletin < BulkImport::Base
     create_users(users) do |row|
       u = {
         imported_id: row[0],
-        username: row[1],
-        email: row[2],
+        username: normalize_text(row[1]),
         created_at: Time.zone.at(row[3]),
         date_of_birth: parse_birthday(row[4]),
         primary_group_id: group_id_from_imported_id(row[6]),
@@ -87,6 +148,59 @@ class BulkImport::VBulletin < BulkImport::Base
     end
   end
 
+  def import_user_emails
+    puts "Importing user emails..."
+
+    users = mysql_stream <<-SQL
+        SELECT user.userid, email, joindate
+          FROM user
+         WHERE user.userid > #{@last_imported_user_id}
+      ORDER BY user.userid
+    SQL
+
+    create_user_emails(users) do |row|
+      {
+        imported_id: row[0],
+        imported_user_id: row[0],
+        email: row[1],
+        created_at: Time.zone.at(row[2])
+      }
+    end
+  end
+
+  def import_user_stats
+    puts "Importing user stats..."
+
+    users = mysql_stream <<-SQL
+              SELECT user.userid, joindate, posts, COUNT(thread.threadid) AS threads, post.dateline
+                     #{", post_thanks_user_amount, post_thanks_thanked_times" if @has_post_thanks}
+                FROM user
+     LEFT OUTER JOIN post ON post.postid = user.lastpostid
+     LEFT OUTER JOIN thread ON user.userid = thread.postuserid
+               WHERE user.userid > #{@last_imported_user_id}
+            GROUP BY user.userid
+            ORDER BY user.userid
+    SQL
+
+    create_user_stats(users) do |row|
+      user = {
+        imported_id: row[0],
+        imported_user_id: row[0],
+        new_since: Time.zone.at(row[1]),
+        post_count: row[2],
+        topic_count: row[3],
+        first_post_created_at: row[4] && Time.zone.at(row[4])
+      }
+
+      if @has_post_thanks
+        user[:likes_given] = row[5]
+        user[:likes_received] = row[6]
+      end
+
+      user
+    end
+  end
+
   def import_group_users
     puts "Importing group users..."
 
@@ -189,8 +303,8 @@ class BulkImport::VBulletin < BulkImport::Base
     create_categories(parent_categories) do |row|
       {
         imported_id: row[0],
-        name: html_decode(row[2]),
-        description: html_decode(row[3]),
+        name: normalize_text(row[2]),
+        description: normalize_text(row[3]),
         position: row[4],
       }
     end
@@ -199,8 +313,8 @@ class BulkImport::VBulletin < BulkImport::Base
     create_categories(children_categories) do |row|
       {
         imported_id: row[0],
-        name: html_decode(row[2]),
-        description: html_decode(row[3]),
+        name: normalize_text(row[2]),
+        description: normalize_text(row[3]),
         position: row[4],
         parent_category_id: category_id_from_imported_id(row[1]),
       }
@@ -223,7 +337,7 @@ class BulkImport::VBulletin < BulkImport::Base
 
       t = {
         imported_id: row[0],
-        title: html_decode(row[1]),
+        title: normalize_text(row[1]),
         category_id: category_id_from_imported_id(row[2]),
         user_id: user_id_from_imported_id(row[3]),
         closed: row[4] == 0,
@@ -243,6 +357,8 @@ class BulkImport::VBulletin < BulkImport::Base
 
     posts = mysql_stream <<-SQL
         SELECT postid, post.threadid, parentid, userid, post.dateline, post.visible, pagetext
+               #{", post_thanks_amount" if @has_post_thanks}
+
           FROM post
           JOIN thread ON thread.threadid = post.threadid
          WHERE postid > #{@last_imported_post_id}
@@ -254,14 +370,47 @@ class BulkImport::VBulletin < BulkImport::Base
       replied_post_topic_id = topic_id_from_imported_post_id(row[2])
       reply_to_post_number = topic_id == replied_post_topic_id ? post_number_from_imported_id(row[2]) : nil
 
-      {
+      post = {
         imported_id: row[0],
         topic_id: topic_id,
         reply_to_post_number: reply_to_post_number,
         user_id: user_id_from_imported_id(row[3]),
         created_at: Time.zone.at(row[4]),
         hidden: row[5] == 0,
-        raw: html_decode(row[6]),
+        raw: normalize_text(row[6]),
+      }
+
+      post[:like_count] = row[7] if @has_post_thanks
+      post
+    end
+  end
+
+  def import_likes
+    return unless @has_post_thanks
+    puts "Importing likes..."
+
+    @imported_likes = Set.new
+    @last_imported_post_id = 0
+
+    post_thanks = mysql_stream <<-SQL
+        SELECT postid, userid, date
+          FROM post_thanks
+         WHERE postid > #{@last_imported_post_id}
+      ORDER BY postid
+    SQL
+
+    create_post_actions(post_thanks) do |row|
+      post_id = post_id_from_imported_id(row[0])
+      user_id = user_id_from_imported_id(row[1])
+
+      next if post_id.nil? || user_id.nil?
+      next if @imported_likes.add?([post_id, user_id]).nil?
+
+      {
+        post_id: post_id_from_imported_id(row[0]),
+        user_id: user_id_from_imported_id(row[1]),
+        post_action_type_id: 2,
+        created_at: Time.zone.at(row[2])
       }
     end
   end
@@ -285,7 +434,6 @@ class BulkImport::VBulletin < BulkImport::Base
 
       next if @imported_topics.has_key?(key)
       @imported_topics[key] = row[0] + PRIVATE_OFFSET
-
       {
         archetype: Archetype.private_message,
         imported_id: row[0] + PRIVATE_OFFSET,
@@ -299,7 +447,7 @@ class BulkImport::VBulletin < BulkImport::Base
   def import_topic_allowed_users
     puts "Importing topic allowed users..."
 
-    allowed_users = []
+    allowed_users = Set.new
 
     mysql_stream(<<-SQL
         SELECT pmtextid, touserarray
@@ -345,22 +493,28 @@ class BulkImport::VBulletin < BulkImport::Base
         topic_id: topic_id,
         user_id: user_id_from_imported_id(row[2]),
         created_at: Time.zone.at(row[4]),
-        raw: html_decode(row[5]),
+        raw: normalize_text(row[5]),
       }
     end
   end
 
   def extract_pm_title(title)
-    html_decode(title).scrub.gsub(/^Re\s*:\s*/i, "")
+    normalize_text(title).scrub.gsub(/^Re\s*:\s*/i, "")
   end
 
-  def html_decode(text)
-    @html_entities.decode((text.presence || "").scrub)
+  def normalize_text(text)
+    @html_entities.decode(normalize_charset(text.presence || "").scrub)
+  end
+
+  def normalize_charset(text)
+    return text if @encoding == Encoding::UTF_8
+    return text && text.encode(@encoding).force_encoding(Encoding::UTF_8)
   end
 
   def parse_birthday(birthday)
     return if birthday.blank?
-    date_of_birth = Date.strptime(birthday, "%m-%d-%Y")
+    date_of_birth = Date.strptime(birthday.gsub(/[^\d-]+/, ""), "%m-%d-%Y") rescue nil
+    return if date_of_birth.nil?
     date_of_birth.year < 1904 ? Date.new(1904, date_of_birth.month, date_of_birth.day) : date_of_birth
   end
 
diff --git a/script/diff_heaps.rb b/script/diff_heaps.rb
index e854f2f65a..947f4b02b3 100644
--- a/script/diff_heaps.rb
+++ b/script/diff_heaps.rb
@@ -30,11 +30,10 @@ end
 
 diff.group_by do |x|
   [x["type"], x["file"], x["line"]]
-end.map {|x,y|
- [x, y.count]
-}.sort{ |a,b|
- b[1] <=> a[1]
-}.each{ |x,y|
+end.map { |x, y|
+  [x, y.count]
+}.sort { |a, b|
+  b[1] <=> a[1]
+}.each { |x, y|
   puts "Leaked #{y} #{x[0]} objects at: #{x[1]}:#{x[2]}"
 }
-
diff --git a/script/discourse b/script/discourse
index c07d6685ef..7bbb2714ab 100755
--- a/script/discourse
+++ b/script/discourse
@@ -28,8 +28,8 @@ class DiscourseCLI < Thor
 
     discourse remap --regex "\[\/?color(=[^\]]*)*]" "" # removing "color" bbcodes
   LONGDESC
-  option :global, :type => :boolean
-  option :regex, :type => :boolean
+  option :global, type: :boolean
+  option :regex, type: :boolean
   def remap(from, to)
     load_rails
 
@@ -48,7 +48,7 @@ class DiscourseCLI < Thor
 
     if options[:global]
       RailsMultisite::ConnectionManagement.each_connection do |db|
-        puts "","Remapping tables on #{db}...",""
+        puts "", "Remapping tables on #{db}...", ""
         do_remap(from, to, options[:regex])
       end
     else
@@ -85,7 +85,7 @@ class DiscourseCLI < Thor
   end
 
   desc "restore", "Restore a Discourse backup"
-  def restore(filename=nil)
+  def restore(filename = nil)
 
     if !filename
       puts "You must provide a filename to restore. Did you mean one of the following?\n\n"
@@ -175,7 +175,7 @@ class DiscourseCLI < Thor
   end
 
   desc "export_category", "Export a category, all its topics, and all users who posted in those topics"
-  def export_category(category_id, filename=nil)
+  def export_category(category_id, filename = nil)
     raise "Category id argument is missing!" unless category_id
 
     load_rails
@@ -225,7 +225,7 @@ class DiscourseCLI < Thor
     require File.expand_path(File.dirname(__FILE__) + "/../lib/import_export/import_export")
   end
 
-  def do_remap(from, to, regex=false)
+  def do_remap(from, to, regex = false)
     sql = "SELECT table_name, column_name
 FROM information_schema.columns
 WHERE table_schema='public' and (data_type like 'char%' or data_type like 'text%') and is_updatable = 'YES'"
@@ -257,7 +257,6 @@ WHERE table_schema='public' and (data_type like 'char%' or data_type like 'text%
     end
   end
 
-
 end
 
 DiscourseCLI.start(ARGV)
diff --git a/script/import_scripts/askbot.rb b/script/import_scripts/askbot.rb
index ec0cfc7cb8..5620f0aa29 100644
--- a/script/import_scripts/askbot.rb
+++ b/script/import_scripts/askbot.rb
@@ -24,11 +24,11 @@ class ImportScripts::MyAskBot < ImportScripts::Base
     @tagmap = []
     @td = PG::TextDecoder::TimestampWithTimeZone.new
     @client = PG.connect(
-      :dbname   => DB_NAME,
-      :host     => DB_HOST,
-      :port     => DB_PORT,
-      :user     => DB_USER,
-      :password => DB_PASS
+      dbname: DB_NAME,
+      host: DB_HOST,
+      port: DB_PORT,
+      user: DB_USER,
+      password: DB_PASS
     )
   end
 
@@ -79,7 +79,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
         tid = tag["thread_id"].to_i
         tnm = tag["name"].downcase
         if @tagmap[tid]
-          @tagmap[tid].push( tnm )
+          @tagmap[tid].push(tnm)
         else
           @tagmap[tid] = [ tnm ]
         end
@@ -110,7 +110,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
 
       break if users.ntuples() < 1
 
-      next if all_records_exist? :users, users.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
       create_users(users, total: total_count, offset: offset) do |user|
         {
@@ -155,7 +155,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
 
       break if posts.ntuples() < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p["id"].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p["id"].to_i }
 
       create_posts(posts, total: post_count, offset: offset) do |post|
         pid = post["id"]
@@ -174,7 +174,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
           id: pid,
           title: post["title"],
           category: cat,
-          custom_fields: {import_id: pid, import_thread_id: tid, import_tags: tags},
+          custom_fields: { import_id: pid, import_thread_id: tid, import_tags: tags },
           user_id: user_id_from_imported_user_id(post["author_id"]) || Discourse::SYSTEM_USER_ID,
           created_at: Time.zone.at(@td.decode(post["added_at"])),
           raw: post["text"],
@@ -210,7 +210,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
 
       break if posts.ntuples() < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p["id"].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p["id"].to_i }
 
       create_posts(posts, total: post_count, offset: offset) do |post|
         tid = post["thread_id"].to_i
@@ -220,7 +220,7 @@ class ImportScripts::MyAskBot < ImportScripts::Base
         {
           id: pid,
           topic_id: parent[:topic_id],
-          custom_fields: {import_id: pid},
+          custom_fields: { import_id: pid },
           user_id: user_id_from_imported_user_id(post["author_id"]) || Discourse::SYSTEM_USER_ID,
           created_at: Time.zone.at(@td.decode(post["added_at"])),
           raw: post["text"]
@@ -230,47 +230,48 @@ class ImportScripts::MyAskBot < ImportScripts::Base
   end
 
   def post_process_posts
-      puts "", "Postprocessing posts..."
-      current = 0
-      max = Post.count
-      # Rewrite internal links; e.g.
-      # ask.cvxr.com/question/(\d+)/[^'"}]*
-      # I am sure this is incomplete, but we didn't make heavy use of internal
-      # links on our site.
-      tmp = Regexp.quote("http://" << OLD_SITE)
-      r1 = /"(#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?"/
-      r2 = /\((#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?\)/
-      r3 = /<?#tmp\/question\/(\d+)\/[a-zA-Z-]*\/?>?/
-      Post.find_each do |post|
-        raw = post.raw.gsub(r1) do
-          if topic = topic_lookup_from_imported_post_id($2)
-            "\"#{topic[:url]}\""
-          else
-            $&
-          end
+    puts "", "Postprocessing posts..."
+    current = 0
+    max = Post.count
+    # Rewrite internal links; e.g.
+    # ask.cvxr.com/question/(\d+)/[^'"}]*
+    # I am sure this is incomplete, but we didn't make heavy use of internal
+    # links on our site.
+    tmp = Regexp.quote("http://" << OLD_SITE)
+    r1 = /"(#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?"/
+    r2 = /\((#{tmp})?\/question\/(\d+)\/[a-zA-Z-]*\/?\)/
+    r3 = /<?#tmp\/question\/(\d+)\/[a-zA-Z-]*\/?>?/
+    Post.find_each do |post|
+      raw = post.raw.gsub(r1) do
+        if topic = topic_lookup_from_imported_post_id($2)
+          "\"#{topic[:url]}\""
+        else
+          $&
         end
-        raw = raw.gsub(r2) do
-          if topic = topic_lookup_from_imported_post_id($2)
-            "(#{topic[:url]})"
-          else
-            $&
-          end
-        end
-        raw = raw.gsub(r3) do
-           if topic = topic_lookup_from_imported_post_id($1)
-            trec = Topic.find_by(id: topic[:topic_id])
-            "[#{trec.title}](#{topic[:url]})"
-          else
-            $&
-          end
-        end
-        if raw != post.raw
-          post.raw = raw
-          post.save
-        end
-        print_status(current += 1, max)
       end
+      raw = raw.gsub(r2) do
+        if topic = topic_lookup_from_imported_post_id($2)
+          "(#{topic[:url]})"
+        else
+          $&
+        end
+      end
+      raw = raw.gsub(r3) do
+        if topic = topic_lookup_from_imported_post_id($1)
+          trec = Topic.find_by(id: topic[:topic_id])
+          "[#{trec.title}](#{topic[:url]})"
+        else
+          $&
+        end
+      end
+
+      if raw != post.raw
+        post.raw = raw
+        post.save
+      end
+      print_status(current += 1, max)
     end
   end
+end
 
 ImportScripts::MyAskBot.new.perform
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index 616a534a5d..b156a0f70c 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -30,7 +30,7 @@ class ImportScripts::Base
     @bbcode_to_md = true if use_bbcode_to_md?
     @site_settings_during_import = {}
     @old_site_settings = {}
-    @start_times = {import: Time.now}
+    @start_times = { import: Time.now }
   end
 
   def preload_i18n
@@ -56,7 +56,7 @@ class ImportScripts::Base
     reset_topic_counters
 
     elapsed = Time.now - @start_times[:import]
-    puts '', '', 'Done (%02dh %02dmin %02dsec)' % [elapsed/3600, elapsed/60%60, elapsed%60]
+    puts '', '', 'Done (%02dh %02dmin %02dsec)' % [elapsed / 3600, elapsed / 60 % 60, elapsed % 60]
 
   ensure
     reset_site_settings
@@ -118,7 +118,7 @@ class ImportScripts::Base
     delegate method_name, to: :@lookup
   end
 
-  def create_admin(opts={})
+  def create_admin(opts = {})
     admin = User.new
     admin.email = opts[:email] || "sam.saffron@gmail.com"
     admin.username = opts[:username] || "sam"
@@ -140,7 +140,7 @@ class ImportScripts::Base
   # Required fields are :id and :name, where :id is the id of the
   # group in the original datasource. The given id will not be used
   # to create the Discourse group record.
-  def create_groups(results, opts={})
+  def create_groups(results, opts = {})
     created = 0
     skipped = 0
     failed = 0
@@ -171,12 +171,12 @@ class ImportScripts::Base
   end
 
   def create_group(opts, import_id)
-    opts = opts.dup.tap {|o| o.delete(:id) }
+    opts = opts.dup.tap { |o| o.delete(:id) }
     import_name = opts[:name]
     opts[:name] = UserNameSuggester.suggest(import_name)
 
     existing = Group.where(name: opts[:name]).first
-    return existing if existing and existing.custom_fields["import_id"].to_i == import_id.to_i
+    return existing if existing && existing.custom_fields["import_id"].to_i == (import_id.to_i)
     g = existing || Group.new(opts)
     g.custom_fields["import_id"] = import_id
     g.custom_fields["import_name"] = import_name
@@ -196,14 +196,14 @@ class ImportScripts::Base
 
     existing = "#{type.to_s.classify}CustomField".constantize
     existing = existing.where(name: 'import_id')
-                       .joins('JOIN import_ids ON val = value')
-                       .count
+      .joins('JOIN import_ids ON val = value')
+      .count
     if existing == import_ids.length
       puts "Skipping #{import_ids.length} already imported #{type}"
       return true
     end
   ensure
-    connection.exec('DROP TABLE import_ids')
+    connection.exec('DROP TABLE import_ids') unless connection.nil?
   end
 
   def created_user(user)
@@ -216,7 +216,7 @@ class ImportScripts::Base
   # Required fields are :id and :email, where :id is the id of the
   # user in the original datasource. The given id will not be used to
   # create the Discourse user record.
-  def create_users(results, opts={})
+  def create_users(results, opts = {})
     created = 0
     skipped = 0
     failed = 0
@@ -267,7 +267,7 @@ class ImportScripts::Base
     merge = opts.delete(:merge)
     post_create_action = opts.delete(:post_create_action)
 
-    existing = User.where("email = ? OR username = ?", opts[:email].downcase, opts[:username]).first
+    existing = User.joins(:user_emails).where("user_emails.email = ? OR username = ?", opts[:email].downcase, opts[:username]).first
     return existing if existing && (merge || existing.custom_fields["import_id"].to_i == import_id.to_i)
 
     bio_raw = opts.delete(:bio_raw)
@@ -323,8 +323,8 @@ class ImportScripts::Base
       end
     rescue => e
       # try based on email
-      if e.try(:record).try(:errors).try(:messages).try(:[], :email).present?
-        if existing = User.find_by(email: opts[:email].downcase)
+      if e.try(:record).try(:errors).try(:messages).try(:[], :primary_email).present?
+        if existing = User.find_by_email(opts[:email].downcase)
           existing.custom_fields["import_id"] = import_id
           existing.save!
           u = existing
@@ -422,7 +422,7 @@ class ImportScripts::Base
   # Attributes will be passed to the PostCreator.
   # Topics should give attributes title and category.
   # Replies should provide topic_id. Use topic_lookup_from_imported_post_id to find the topic.
-  def create_posts(results, opts={})
+  def create_posts(results, opts = {})
     skipped = 0
     created = 0
     total = opts[:total] || results.size
@@ -502,7 +502,7 @@ class ImportScripts::Base
   # Block should return a hash with the attributes for the bookmark.
   # Required fields are :user_id and :post_id, where both ids are
   # the values in the original datasource.
-  def create_bookmarks(results, opts={})
+  def create_bookmarks(results, opts = {})
     created = 0
     skipped = 0
     total = opts[:total] || results.size
@@ -539,7 +539,7 @@ class ImportScripts::Base
     [created, skipped]
   end
 
-  def close_inactive_topics(opts={})
+  def close_inactive_topics(opts = {})
     num_days = opts[:days] || 30
     puts '', "Closing topics that have been inactive for more than #{num_days} days."
 
@@ -775,7 +775,7 @@ class ImportScripts::Base
   end
 
   def get_start_time(key)
-    @start_times.fetch(key) {|k| @start_times[k] = Time.now}
+    @start_times.fetch(key) { |k| @start_times[k] = Time.now }
   end
 
   def batches(batch_size)
diff --git a/script/import_scripts/base/csv_helper.rb b/script/import_scripts/base/csv_helper.rb
index c505ce7101..e70f850bc4 100644
--- a/script/import_scripts/base/csv_helper.rb
+++ b/script/import_scripts/base/csv_helper.rb
@@ -10,7 +10,7 @@ module ImportScripts
       end
 
       def initialize(cols)
-        cols.each_with_index do |col,idx|
+        cols.each_with_index do |col, idx|
           self.class.send(:define_method, col.downcase.gsub(/[\W]/, '_').squeeze('_')) do
             @row[idx]
           end
@@ -72,4 +72,4 @@ module ImportScripts
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb
index e91b8ef8ae..7b3a35afd5 100644
--- a/script/import_scripts/bbpress.rb
+++ b/script/import_scripts/bbpress.rb
@@ -1,7 +1,6 @@
 require 'mysql2'
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
-
 # Before running this script, paste these lines into your shell,
 # then use arrow keys to edit the values
 =begin
@@ -125,7 +124,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
     end
 
     # gather every existent username
-    anon_posts.each do |id,post|
+    anon_posts.each do |id, post|
       anon_names[post['name']] = Hash.new if not anon_names[post['name']]
       # overwriting email address, one user can only use one email address
       anon_names[post['name']]['email'] = post['email']
@@ -133,7 +132,7 @@ class ImportScripts::Bbpress < ImportScripts::Base
     end
 
     # make sure every user name has a unique email address
-    anon_names.each do |k,name|
+    anon_names.each do |k, name|
       if not emails.include? name['email']
         emails.push ( name['email'])
       else
@@ -141,7 +140,6 @@ class ImportScripts::Bbpress < ImportScripts::Base
       end
     end
 
-
     create_users(anon_names) do |k, n|
       {
         id: k,
diff --git a/script/import_scripts/bespoke_1.rb b/script/import_scripts/bespoke_1.rb
index 5cd1744212..0026ff30ac 100644
--- a/script/import_scripts/bespoke_1.rb
+++ b/script/import_scripts/bespoke_1.rb
@@ -43,7 +43,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
     end
 
     def initialize(cols)
-      cols.each_with_index do |col,idx|
+      cols.each_with_index do |col, idx|
         self.class.send(:define_method, col) do
           @row[idx]
         end
@@ -71,7 +71,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
     File.open(filename).each_line do |line|
 
       # escaping is mental here
-      line.gsub!(/\\(.{1})/){|m| m[-1] == '"'? '""': m[-1]}
+      line.gsub!(/\\(.{1})/) { |m| m[-1] == '"' ? '""' : m[-1] }
       line.strip!
 
       current_row << "\n" unless current_row.empty?
@@ -119,7 +119,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
   end
 
   def total_rows(table)
-    File.foreach("#{@path}/#{table}.csv").inject(0) {|c, line| c+1} - 1
+    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
   end
 
   def import_users
@@ -169,7 +169,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
   def import_categories
     rows = []
     csv_parse("categories") do |row|
-      rows << {id: row.id, name: row.name, description: row.description}
+      rows << { id: row.id, name: row.name, description: row.description }
     end
 
     create_categories(rows) do |row|
@@ -181,46 +181,46 @@ class ImportScripts::Bespoke < ImportScripts::Base
     # purple and #1223f3
     raw.gsub!(/\[color=[#a-z0-9]+\]/i, "")
     raw.gsub!(/\[\/color\]/i, "")
-    raw.gsub!(/\[signature\].+\[\/signature\]/im,"")
+    raw.gsub!(/\[signature\].+\[\/signature\]/im, "")
     raw
   end
 
   def import_post_batch!(posts, topics, offset, total)
-      create_posts(posts, total: total, offset: offset) do |post|
+    create_posts(posts, total: total, offset: offset) do |post|
 
-        mapped = {}
+      mapped = {}
 
-        mapped[:id] = post[:id]
-        mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-        mapped[:raw] = post[:body]
-        mapped[:created_at] = post[:created_at]
+      mapped[:id] = post[:id]
+      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
+      mapped[:raw] = post[:body]
+      mapped[:created_at] = post[:created_at]
 
-        topic = topics[post[:topic_id]]
+      topic = topics[post[:topic_id]]
 
-        unless topic[:post_id]
-          mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
-          mapped[:title] = post[:title]
-          topic[:post_id] = post[:id]
-        else
-          parent = topic_lookup_from_imported_post_id(topic[:post_id])
-          next unless parent
+      unless topic[:post_id]
+        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
+        mapped[:title] = post[:title]
+        topic[:post_id] = post[:id]
+      else
+        parent = topic_lookup_from_imported_post_id(topic[:post_id])
+        next unless parent
 
-          mapped[:topic_id] = parent[:topic_id]
+        mapped[:topic_id] = parent[:topic_id]
 
-          reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-          if reply_to_post_id
-            reply_to_post_number = @post_number_map[reply_to_post_id]
-            if reply_to_post_number && reply_to_post_number > 1
-              mapped[:reply_to_post_number] = reply_to_post_number
-            end
+        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
+        if reply_to_post_id
+          reply_to_post_number = @post_number_map[reply_to_post_id]
+          if reply_to_post_number && reply_to_post_number > 1
+            mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
-
-        next if topic[:deleted] or post[:deleted]
-
-        mapped
       end
 
+      next if topic[:deleted] || post[:deleted]
+
+      mapped
+    end
+
       posts.clear
   end
 
@@ -262,7 +262,7 @@ class ImportScripts::Bespoke < ImportScripts::Base
         created_at: DateTime.parse(row.dcreate)
       }
       posts << row
-      count+=1
+      count += 1
 
       if posts.length > 0 && posts.length % BATCH_SIZE == 0
         import_post_batch!(posts, topic_map, count - posts.length, total)
@@ -274,7 +274,6 @@ class ImportScripts::Bespoke < ImportScripts::Base
     exit
   end
 
-
 end
 
 unless ARGV[0] && Dir.exist?(ARGV[0])
diff --git a/script/import_scripts/discuz_x.rb b/script/import_scripts/discuz_x.rb
index 791b6c38da..8ee30b359c 100644
--- a/script/import_scripts/discuz_x.rb
+++ b/script/import_scripts/discuz_x.rb
@@ -176,11 +176,11 @@ class ImportScripts::DiscuzX < ImportScripts::Base
           last_posted_at: user['last_posted_at'],
           moderator: @moderator_group_id.include?(user['group_id']),
           admin: @admin_group_id.include?(user['group_id']),
-          website: (user['website'] and user['website'].include?('.')) ? user['website'].strip : ( user['qq'] and user['qq'].strip == user['qq'].strip.to_i and user['qq'].strip.to_i > 10000 ) ? 'http://user.qzone.qq.com/' + user['qq'].strip : nil,
-          bio_raw: first_exists((user['bio'] and CGI.unescapeHTML(user['bio'])), user['sightml'], user['spacenote']).strip[0,3000],
-          location: first_exists(user['address'], (!user['resideprovince'].blank? ? [user['resideprovince'],  user['residecity'], user['residedist'], user['residecommunity']] : [user['birthprovince'],  user['birthcity'], user['birthdist'], user['birthcommunity']]).reject{|location|location.blank?}.join(' ')),
+          website: (user['website'] && user['website'].include?('.')) ? user['website'].strip : (user['qq'] && user['qq'].strip == (user['qq'].strip.to_i) && user['qq'].strip.to_i > (10000)) ? 'http://user.qzone.qq.com/' + user['qq'].strip : nil,
+          bio_raw: first_exists((user['bio'] && CGI.unescapeHTML(user['bio'])), user['sightml'], user['spacenote']).strip[0, 3000],
+          location: first_exists(user['address'], (!user['resideprovince'].blank? ? [user['resideprovince'],  user['residecity'], user['residedist'], user['residecommunity']] : [user['birthprovince'],  user['birthcity'], user['birthdist'], user['birthcommunity']]).reject { |location|location.blank? }.join(' ')),
           post_create_action: lambda do |newmember|
-            if user['avatar_exists'] == 1 and newmember.uploaded_avatar_id.blank?
+            if user['avatar_exists'] == (1) && newmember.uploaded_avatar_id.blank?
               path, filename = discuzx_avatar_fullpath(user['id'])
               if path
                 begin
@@ -199,7 +199,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
                 end
               end
             end
-            if !user['spacecss'].blank? and newmember.user_profile.profile_background.blank?
+            if !user['spacecss'].blank? && newmember.user_profile.profile_background.blank?
               # profile background
               if matched = user['spacecss'].match(/body\s*{[^}]*url\('?(.+?)'?\)/i)
                 body_background = matched[1].split(ORIGINAL_SITE_PREFIX, 2).last
@@ -234,7 +234,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
 
             # we don't send email to the unconfirmed user
             newmember.update(email_digests: user['email_confirmed'] == 1) if newmember.email_digests
-            newmember.update(name: '') if !newmember.name.blank? and newmember.name == newmember.username
+            newmember.update(name: '') if !newmember.name.blank? && newmember.name == (newmember.username)
           end
         }
       end
@@ -259,10 +259,10 @@ class ImportScripts::DiscuzX < ImportScripts::Base
 
     max_position = Category.all.max_by(&:position).position
     create_categories(results) do |row|
-      next if row['type'] == 'group' or row['status'] == 2 # or row['status'].to_i == 3 # 如果不想导入群组，取消注释
+      next if row['type'] == ('group') || row['status'] == (2) # or row['status'].to_i == 3 # 如果不想导入群组，取消注释
       extra = PHP.unserialize(row['extra']) if !row['extra'].blank?
-      if extra and !extra["namecolor"].blank?
-        color = extra["namecolor"][1,6]
+      if extra && !extra["namecolor"].blank?
+        color = extra["namecolor"][1, 6]
       end
 
       Category.all.max_by(&:position).position
@@ -273,7 +273,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
         description: row['description'],
         position: row['position'].to_i + max_position,
         color: color,
-        suppress_from_homepage: (row['status'] == 0 or row['status'] == 3),
+        suppress_from_homepage: (row['status'] == (0) || row['status'] == (3)),
         post_create_action: lambda do |category|
           if slug = @category_slug[row['id']]
             category.update(slug: slug)
@@ -289,7 +289,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
             if upload
               category.logo_url = upload.url
               # FIXME: I don't know how to get '/shared' by script. May change to Rails.root
-              category.color = Miro::DominantColors.new(File.join('/shared', category.logo_url)).to_hex.first[1,6] if !color
+              category.color = Miro::DominantColors.new(File.join('/shared', category.logo_url)).to_hex.first[1, 6] if !color
               category.save!
             end
           end
@@ -332,10 +332,10 @@ class ImportScripts::DiscuzX < ImportScripts::Base
              LIMIT #{BATCH_SIZE}
             OFFSET #{offset};
           ")
-          # u.status != -1 AND u.groupid != 4 AND u.groupid != 5 用户未被锁定、禁访或禁言。在现实中的 Discuz 论坛，禁止的用户通常是广告机或驱逐的用户，这些不需要导入。
+      # u.status != -1 AND u.groupid != 4 AND u.groupid != 5 用户未被锁定、禁访或禁言。在现实中的 Discuz 论坛，禁止的用户通常是广告机或驱逐的用户，这些不需要导入。
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| p["id"].to_i}
+      next if all_records_exist? :posts, results.map { |p| p["id"].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
@@ -364,7 +364,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
             if results.empty?
               puts "WARNING: can't find poll options for topic #{m['topic_id']}, skip poll"
             else
-              mapped[:raw].prepend "[poll#{poll['multiple'] ? ' type=multiple' : ''}#{poll['maxchoices'] > 0 ? " max=#{poll['maxchoices']}" : ''}]\n#{results.map{|option|'- ' + option['polloption']}.join("\n")}\n[/poll]\n"
+              mapped[:raw].prepend "[poll#{poll['multiple'] ? ' type=multiple' : ''}#{poll['maxchoices'] > 0 ? " max=#{poll['maxchoices']}" : ''}]\n#{results.map { |option|'- ' + option['polloption'] }.join("\n")}\n[/poll]\n"
             end
           end
         else
@@ -398,7 +398,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
           end
         elsif (m['status'] & 2) >> 1 == 1 # waiting for approve
           mapped[:post_create_action] = lambda do |post|
-            PostAction.act(Discourse.system_user, post, 6, {take_action: false})
+            PostAction.act(Discourse.system_user, post, 6, take_action: false)
           end
         end
         skip ? nil : mapped
@@ -423,7 +423,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
 
       break if results.size < 1
 
-       # next if all_records_exist?
+      # next if all_records_exist?
 
       create_bookmarks(results, total: total_count, offset: offset) do |row|
         {
@@ -434,7 +434,6 @@ class ImportScripts::DiscuzX < ImportScripts::Base
     end
   end
 
-
   def import_private_messages
     puts '', 'creating private messages'
 
@@ -494,7 +493,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
                 SELECT plid thread_id, uid user_id
                   FROM #{table_name 'ucenter_pm_members'}
                  WHERE plid = #{m['thread_id']};
-              ").map {|r| r['user_id']}.uniq
+              ").map { |r| r['user_id'] }.uniq
 
           mapped[:target_usernames] = import_user_ids.map! do |import_user_id|
             import_user_id.to_s == m['user_id'].to_s ? nil : User.find_by(id: user_id_from_imported_user_id(import_user_id)).try(:username)
@@ -587,7 +586,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
     s.gsub!(/\[img[^\]]*\]https?:\/\/#{ORIGINAL_SITE_PREFIX}\/(.*)\[\/img\]/i, '[x-attach]\1[/x-attach]') # dont convert attachment
     s.gsub!(/<img[^>]*src="https?:\/\/#{ORIGINAL_SITE_PREFIX}\/(.*)".*?>/i, '[x-attach]\1[/x-attach]') # dont convert attachment
     s.gsub!(/\[img[^\]]*\]https?:\/\/www\.touhou\.cc\/blog\/(.*)\[\/img\]/i, '[x-attach]../blog/\1[/x-attach]') # 私货
-    s.gsub!(/\[img[^\]]*\]https?:\/\/www\.touhou\.cc\/ucenter\/avatar.php\?uid=(\d+)[^\]]*\[\/img\]/i) { "[x-attach]#{discuzx_avatar_fullpath($1,false)[0]}[/x-attach]" } # 私货
+    s.gsub!(/\[img[^\]]*\]https?:\/\/www\.touhou\.cc\/ucenter\/avatar.php\?uid=(\d+)[^\]]*\[\/img\]/i) { "[x-attach]#{discuzx_avatar_fullpath($1, false)[0]}[/x-attach]" } # 私货
     s.gsub!(/\[img=(\d+),(\d+)\]([^\]]*)\[\/img\]/i, '<img width="\1" height="\2" src="\3">')
     s.gsub!(/\[img\]([^\]]*)\[\/img\]/i, '<img src="\1">')
 
@@ -671,7 +670,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
     # @someone without the url
     s.gsub!(/@\[url=[^\[\]]*?\](\S*)\[\/url\]/i, '@\1')
 
-    s.scan(/http(?:s)?:\/\/#{ORIGINAL_SITE_PREFIX.gsub('.', '\.')}\/[^\[\]\s]*/) {|link|puts "WARNING: post #{import_id} can't replace internal url #{link}"}
+    s.scan(/http(?:s)?:\/\/#{ORIGINAL_SITE_PREFIX.gsub('.', '\.')}\/[^\[\]\s]*/) { |link|puts "WARNING: post #{import_id} can't replace internal url #{link}" }
 
     s.strip
   end
@@ -785,7 +784,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
           FROM #{table_name 'forum_attachment'}
           WHERE pid = #{post.custom_fields['import_id']}"
       if !inline_attachments.empty?
-          sql << " AND aid NOT IN (#{inline_attachments.join(',')})"
+        sql << " AND aid NOT IN (#{inline_attachments.join(',')})"
       end
 
       results = mysql_query(sql)
@@ -805,7 +804,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
       end
 
       if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: '从 Discuz 中导入附件' })
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: '从 Discuz 中导入附件')
       end
 
       success_count += 1
@@ -818,7 +817,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
   end
 
   # Create the full path to the discuz avatar specified from user id
-  def discuzx_avatar_fullpath(user_id, absolute=true)
+  def discuzx_avatar_fullpath(user_id, absolute = true)
     padded_id = user_id.to_s.rjust(9, '0')
 
     part_1 = padded_id[0..2]
@@ -945,7 +944,7 @@ class ImportScripts::DiscuzX < ImportScripts::Base
   end
 
   def first_exists(*items)
-    items.find{|item|!item.blank?} || ''
+    items.find { |item|!item.blank? } || ''
   end
 
   def mysql_query(sql)
diff --git a/script/import_scripts/disqus.rb b/script/import_scripts/disqus.rb
index 6f0929d858..a73febe476 100644
--- a/script/import_scripts/disqus.rb
+++ b/script/import_scripts/disqus.rb
@@ -11,7 +11,7 @@ class ImportScripts::Disqus < ImportScripts::Base
   def initialize
     abort("File '#{IMPORT_FILE}' not found") if !File.exist?(IMPORT_FILE)
 
-    @category = Category.where(name: IMPORT_CATEGORY).first 
+    @category = Category.where(name: IMPORT_CATEGORY).first
     abort("Category #{IMPORT_CATEGORY} not found") if @category.blank?
 
     @parser = DisqusSAX.new
@@ -135,7 +135,7 @@ class DisqusSAX < Nokogiri::XML::SAX::Document
         thread = @threads[id]
         thread[:posts] << @post
       else
-        @thread = {id: id, posts: []}
+        @thread = { id: id, posts: [] }
       end
     when 'parent'
       if @post
@@ -194,7 +194,7 @@ class DisqusSAX < Nokogiri::XML::SAX::Document
   end
 
   def inside?(*params)
-    return !params.find{|p| !@inside[p]}
+    return !params.find { |p| !@inside[p] }
   end
 
   def normalize
@@ -203,7 +203,7 @@ class DisqusSAX < Nokogiri::XML::SAX::Document
         # Remove any threads that have no posts
         @threads.delete(id)
       else
-        t[:posts].delete_if {|p| p[:is_spam] == 'true' || p[:is_deleted] == 'true'}
+        t[:posts].delete_if { |p| p[:is_spam] == 'true' || p[:is_deleted] == 'true' }
       end
     end
 
diff --git a/script/import_scripts/drupal-6.rb b/script/import_scripts/drupal-6.rb
index 1df513df40..018a1fba90 100644
--- a/script/import_scripts/drupal-6.rb
+++ b/script/import_scripts/drupal-6.rb
@@ -5,7 +5,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   DRUPAL_DB = ENV['DRUPAL_DB'] || "newsite3"
   VID = ENV['DRUPAL_VID'] || 1
-  
+
   def initialize
     super
 
@@ -23,7 +23,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   def execute
     create_users(@client.query("SELECT uid id, name, mail email, created FROM users;")) do |row|
-      {id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created'])}
+      { id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created']) }
     end
 
     # You'll need to edit the following query for your Drupal install:
@@ -32,7 +32,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     #   * Table name may be term_data.
     #   * May need to select a vid other than 1.
     create_categories(categories_query) do |c|
-      {id: c['tid'], name: c['name'], description: c['description']}
+      { id: c['tid'], name: c['name'], description: c['description'] }
     end
 
     # "Nodes" in Drupal are divided into types. Here we import two types,
@@ -65,8 +65,8 @@ class ImportScripts::Drupal < ImportScripts::Base
 
     results = @client.query("
       SELECT n.nid nid,
-	n.title title, 
-	n.uid uid, 
+	n.title title,
+	n.uid uid,
 	n.created created,
 	n.sticky sticky,
 	nr.body body
@@ -85,7 +85,7 @@ class ImportScripts::Drupal < ImportScripts::Base
         created_at: Time.zone.at(row['created']),
         pinned_at: row['sticky'].to_i == 1 ? Time.zone.at(row['created']) : nil,
         title: row['title'].try(:strip),
-        custom_fields: {import_id: "nid:#{row['nid']}"}
+        custom_fields: { import_id: "nid:#{row['nid']}" }
       }
     end
   end
@@ -123,7 +123,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "nid:#{p['nid']}"}
+      next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         {
@@ -141,7 +141,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   def create_replies
     puts '', "creating replies in topics"
-    
+
     if ENV['DRUPAL_IMPORT_BLOG']
       node_types = "('forum','blog')"
     else
@@ -149,7 +149,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     end
 
     total_count = @client.query("
-      SELECT COUNT(*) count 
+      SELECT COUNT(*) count
       FROM comments c
       LEFT JOIN node n ON n.nid=c.nid
       WHERE node.type IN #{node_types}
@@ -167,18 +167,18 @@ class ImportScripts::Drupal < ImportScripts::Base
                c.uid,
                c.timestamp,
                c.comment body
-        FROM comments c 
+        FROM comments c
         LEFT JOIN node n ON n.nid=c.nid
         WHERE n.type IN #{node_types}
           AND n.status = 1
-          AND c.status=0 
+          AND c.status=0
         LIMIT #{batch_size}
           OFFSET #{offset};
       ", cache_rows: false)
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -192,7 +192,7 @@ class ImportScripts::Drupal < ImportScripts::Base
           }
           if row['pid']
             parent = topic_lookup_from_imported_post_id("cid:#{row['pid']}")
-            h[:reply_to_post_number] = parent[:post_number] if parent and parent[:post_number] > 1
+            h[:reply_to_post_number] = parent[:post_number] if parent && parent[:post_number] > (1)
           end
           h
         else
@@ -205,6 +205,6 @@ class ImportScripts::Drupal < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Drupal.new.perform
 end
diff --git a/script/import_scripts/drupal.rb b/script/import_scripts/drupal.rb
index a15933b10c..6b773486d0 100644
--- a/script/import_scripts/drupal.rb
+++ b/script/import_scripts/drupal.rb
@@ -23,7 +23,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
   def execute
     create_users(@client.query("SELECT uid id, name, mail email, created FROM users;")) do |row|
-      {id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created'])}
+      { id: row['id'], username: row['name'], email: row['email'], created_at: Time.zone.at(row['created']) }
     end
 
     # You'll need to edit the following query for your Drupal install:
@@ -32,7 +32,7 @@ class ImportScripts::Drupal < ImportScripts::Base
     #   * Table name may be term_data.
     #   * May need to select a vid other than 1.
     create_categories(categories_query) do |c|
-      {id: c['tid'], name: c['name'], description: c['description']}
+      { id: c['tid'], name: c['name'], description: c['description'] }
     end
 
     # "Nodes" in Drupal are divided into types. Here we import two types,
@@ -82,7 +82,7 @@ class ImportScripts::Drupal < ImportScripts::Base
         created_at: Time.zone.at(row['created']),
         pinned_at: row['sticky'].to_i == 1 ? Time.zone.at(row['created']) : nil,
         title: row['title'].try(:strip),
-        custom_fields: {import_id: "nid:#{row['nid']}"}
+        custom_fields: { import_id: "nid:#{row['nid']}" }
       }
     end
   end
@@ -121,7 +121,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "nid:#{p['nid']}"}
+      next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         {
@@ -169,7 +169,7 @@ class ImportScripts::Drupal < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -183,7 +183,7 @@ class ImportScripts::Drupal < ImportScripts::Base
           }
           if row['pid']
             parent = topic_lookup_from_imported_post_id("cid:#{row['pid']}")
-            h[:reply_to_post_number] = parent[:post_number] if parent and parent[:post_number] > 1
+            h[:reply_to_post_number] = parent[:post_number] if parent && parent[:post_number] > (1)
           end
           h
         else
@@ -196,6 +196,6 @@ class ImportScripts::Drupal < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Drupal.new.perform
 end
diff --git a/script/import_scripts/drupal_json.rb b/script/import_scripts/drupal_json.rb
index ac40525caf..d99fb86f87 100644
--- a/script/import_scripts/drupal_json.rb
+++ b/script/import_scripts/drupal_json.rb
@@ -8,7 +8,7 @@ class ImportScripts::DrupalJson < ImportScripts::Base
 
   def initialize
     super
-    @users_json  = load_json("formatted_users.json")
+    @users_json = load_json("formatted_users.json")
   end
 
   def execute
@@ -40,6 +40,6 @@ class ImportScripts::DrupalJson < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::DrupalJson.new.perform
 end
diff --git a/script/import_scripts/drupal_qa.rb b/script/import_scripts/drupal_qa.rb
index 9899f73ad5..98d7919864 100644
--- a/script/import_scripts/drupal_qa.rb
+++ b/script/import_scripts/drupal_qa.rb
@@ -56,7 +56,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "nid:#{p['nid']}"}
+      next if all_records_exist? :posts, results.map { |p| "nid:#{p['nid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         {
@@ -102,7 +102,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -155,7 +155,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -207,7 +207,7 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| "cid:#{p['cid']}"}
+      next if all_records_exist? :posts, results.map { |p| "cid:#{p['cid']}" }
 
       create_posts(results, total: total_count, offset: offset) do |row|
         topic_mapping = topic_lookup_from_imported_post_id("nid:#{row['nid']}")
@@ -235,6 +235,6 @@ class ImportScripts::DrupalQA < ImportScripts::Drupal
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::DrupalQA.new.perform
 end
diff --git a/script/import_scripts/fluxbb.rb b/script/import_scripts/fluxbb.rb
index d754c5db0c..7b88644715 100644
--- a/script/import_scripts/fluxbb.rb
+++ b/script/import_scripts/fluxbb.rb
@@ -74,7 +74,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         { id: user['id'],
@@ -91,7 +91,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
           admin: user['group_id'] == 1 }
       end
 
-      groupusers = results.select{ |user| user['group_id'] > 2 }
+      groupusers = results.select { |user| user['group_id'] > 2 }
 
       groupusers.each do |user|
         if user['group_id']
@@ -164,7 +164,7 @@ class ImportScripts::FluxBB < ImportScripts::Base
       ").to_a
 
       break if results.size < 1
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/getsatisfaction.rb b/script/import_scripts/getsatisfaction.rb
index de5ff13a62..ffa0b0388e 100644
--- a/script/import_scripts/getsatisfaction.rb
+++ b/script/import_scripts/getsatisfaction.rb
@@ -37,7 +37,6 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     super
   end
 
-
   def execute
     c = Category.find_by(name: 'Old Forum') ||
       Category.create!(name: 'Old Forum', user: Discourse.system_user)
@@ -61,7 +60,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
     end
 
     def initialize(cols)
-      cols.each_with_index do |col,idx|
+      cols.each_with_index do |col, idx|
         self.class.send(:define_method, col) do
           @row[idx]
         end
@@ -134,7 +133,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
   def total_rows(table)
     # In case of Excel export file, I converted it to CSV and used:
     # CSV.foreach("#{@path}/#{table}.csv", encoding:'iso-8859-1:utf-8').inject(0) {|c, line| c+1} - 1
-    File.foreach("#{@path}/#{table}.csv").inject(0) {|c, line| c+1} - 1
+    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
   end
 
   def import_users
@@ -191,7 +190,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
   def import_categories
     rows = []
     csv_parse("categories") do |row|
-      rows << {id: row.id, name: row.name, description: row.description}
+      rows << { id: row.id, name: row.name, description: row.description }
     end
 
     create_categories(rows) do |row|
@@ -209,7 +208,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
       code = $2
       hoist = SecureRandom.hex
       # tidy code, wow, this is impressively crazy
-      code.gsub!(/  (\s*)/,"\n\\1")
+      code.gsub!(/  (\s*)/, "\n\\1")
       code.gsub!(/^\s*\n$/, "\n")
       code.gsub!(/\n+/m, "\n")
       code.strip!
@@ -231,48 +230,47 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
   end
 
   def import_post_batch!(posts, topics, offset, total)
-      create_posts(posts, total: total, offset: offset) do |post|
+    create_posts(posts, total: total, offset: offset) do |post|
 
-        mapped = {}
+      mapped = {}
 
-        mapped[:id] = post[:id]
-        mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-        mapped[:raw] = post[:body]
-        mapped[:created_at] = post[:created_at]
+      mapped[:id] = post[:id]
+      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
+      mapped[:raw] = post[:body]
+      mapped[:created_at] = post[:created_at]
 
-        topic = topics[post[:topic_id]]
+      topic = topics[post[:topic_id]]
 
-        unless topic
-          p "MISSING TOPIC #{post[:topic_id]}"
-          p post
-          next
-        end
+      unless topic
+        p "MISSING TOPIC #{post[:topic_id]}"
+        p post
+        next
+      end
 
+      unless topic[:post_id]
+        mapped[:title] = post[:title] || "Topic title missing"
+        topic[:post_id] = post[:id]
+        mapped[:category] = post[:category]
+      else
+        parent = topic_lookup_from_imported_post_id(topic[:post_id])
+        next unless parent
 
-        unless topic[:post_id]
-          mapped[:title] = post[:title] || "Topic title missing"
-          topic[:post_id] = post[:id]
-          mapped[:category] = post[:category]
-        else
-          parent = topic_lookup_from_imported_post_id(topic[:post_id])
-          next unless parent
+        mapped[:topic_id] = parent[:topic_id]
 
-          mapped[:topic_id] = parent[:topic_id]
-
-          reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-          if reply_to_post_id
-            reply_to_post_number = @post_number_map[reply_to_post_id]
-            if reply_to_post_number && reply_to_post_number > 1
-              mapped[:reply_to_post_number] = reply_to_post_number
-            end
+        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
+        if reply_to_post_id
+          reply_to_post_number = @post_number_map[reply_to_post_id]
+          if reply_to_post_number && reply_to_post_number > 1
+            mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
-
-        next if topic[:deleted] or post[:deleted]
-
-        mapped
       end
 
+      next if topic[:deleted] || post[:deleted]
+
+      mapped
+    end
+
       posts.clear
   end
 
@@ -324,7 +322,7 @@ class ImportScripts::GetSatisfaction < ImportScripts::Base
         created_at: DateTime.parse(row.created_at)
       }
       posts << row
-      count+=1
+      count += 1
 
       if posts.length > 0 && posts.length % BATCH_SIZE == 0
         import_post_batch!(posts, topic_map, count - posts.length, total)
diff --git a/script/import_scripts/jive.rb b/script/import_scripts/jive.rb
index c64e87a66b..ae077bda2e 100644
--- a/script/import_scripts/jive.rb
+++ b/script/import_scripts/jive.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 class ImportScripts::Jive < ImportScripts::Base
 
   BATCH_SIZE = 1000
-  CATEGORY_IDS = [2023,2003,2004,2042,2036,2029] # categories that should be imported
+  CATEGORY_IDS = [2023, 2003, 2004, 2042, 2036, 2029] # categories that should be imported
 
   def initialize(path)
     @path = path
@@ -45,7 +45,7 @@ class ImportScripts::Jive < ImportScripts::Base
     end
 
     def initialize(cols)
-      cols.each_with_index do |col,idx|
+      cols.each_with_index do |col, idx|
         self.class.send(:define_method, col) do
           @row[idx]
         end
@@ -72,7 +72,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     File.open(filename).each_line do |line|
 
-      line.gsub!(/\\(.{1})/){|m| m[-1] == '"'? '""': m[-1]}
+      line.gsub!(/\\(.{1})/) { |m| m[-1] == '"' ? '""' : m[-1] }
       line.strip!
 
       current_row << "\n" unless current_row.empty?
@@ -120,7 +120,7 @@ class ImportScripts::Jive < ImportScripts::Base
   end
 
   def total_rows(table)
-    File.foreach("#{@path}/#{table}.csv").inject(0) {|c, line| c+1} - 1
+    File.foreach("#{@path}/#{table}.csv").inject(0) { |c, line| c + 1 } - 1
   end
 
   def import_groups
@@ -128,7 +128,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     rows = []
     csv_parse("groups") do |row|
-      rows << {id: row.groupid, name: row.name}
+      rows << { id: row.groupid, name: row.name }
     end
 
     create_groups(rows) do |row|
@@ -204,7 +204,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     csv_parse("communities") do |row|
       next unless CATEGORY_IDS.include?(row.communityid.to_i)
-      rows << {id: row.communityid, name: "#{row.name} (#{row.communityid})"}
+      rows << { id: row.communityid, name: "#{row.name} (#{row.communityid})" }
     end
 
     create_categories(rows) do |row|
@@ -228,47 +228,47 @@ class ImportScripts::Jive < ImportScripts::Base
   end
 
   def import_post_batch!(posts, topics, offset, total)
-      create_posts(posts, total: total, offset: offset) do |post|
+    create_posts(posts, total: total, offset: offset) do |post|
 
-        mapped = {}
+      mapped = {}
 
-        mapped[:id] = post[:id]
-        mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
-        mapped[:raw] = post[:body]
-        mapped[:created_at] = post[:created_at]
+      mapped[:id] = post[:id]
+      mapped[:user_id] = user_id_from_imported_user_id(post[:user_id]) || -1
+      mapped[:raw] = post[:body]
+      mapped[:created_at] = post[:created_at]
 
-        topic = topics[post[:topic_id]]
+      topic = topics[post[:topic_id]]
 
-        unless topic
-          p "MISSING TOPIC #{post[:topic_id]}"
-          p post
-          next
-        end
+      unless topic
+        p "MISSING TOPIC #{post[:topic_id]}"
+        p post
+        next
+      end
 
-        unless topic[:post_id]
-          mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
-          mapped[:title] = post[:title]
-          topic[:post_id] = post[:id]
-        else
-          parent = topic_lookup_from_imported_post_id(topic[:post_id])
-          next unless parent
+      unless topic[:post_id]
+        mapped[:category] = category_id_from_imported_category_id(topic[:category_id])
+        mapped[:title] = post[:title]
+        topic[:post_id] = post[:id]
+      else
+        parent = topic_lookup_from_imported_post_id(topic[:post_id])
+        next unless parent
 
-          mapped[:topic_id] = parent[:topic_id]
+        mapped[:topic_id] = parent[:topic_id]
 
-          reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
-          if reply_to_post_id
-            reply_to_post_number = @post_number_map[reply_to_post_id]
-            if reply_to_post_number && reply_to_post_number > 1
-              mapped[:reply_to_post_number] = reply_to_post_number
-            end
+        reply_to_post_id = post_id_from_imported_post_id(post[:reply_id])
+        if reply_to_post_id
+          reply_to_post_number = @post_number_map[reply_to_post_id]
+          if reply_to_post_number && reply_to_post_number > 1
+            mapped[:reply_to_post_number] = reply_to_post_number
           end
         end
-
-        next if topic[:deleted] or post[:deleted]
-
-        mapped
       end
 
+      next if topic[:deleted] || post[:deleted]
+
+      mapped
+    end
+
       posts.clear
   end
 
@@ -290,14 +290,14 @@ class ImportScripts::Jive < ImportScripts::Base
         #IMAGE UPLOADER
         if thread.imagecount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             photo_path = "/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, photo_path, File.basename(photo_path))
                if upload.persisted?
-                  puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
+                 puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
                else
-                  puts "Error: Image upload is not successful for #{photo_path}!"
+                 puts "Error: Image upload is not successful for #{photo_path}!"
                end
           end
         end
@@ -305,15 +305,15 @@ class ImportScripts::Jive < ImportScripts::Base
         #ATTACHMENT UPLOADER
         if thread.attachmentcount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             attach_path = "/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, attach_path, File.basename(attach_path))
                if upload.persisted?
-                  puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
-                  thread.body << "<br/><br/> #{attachment_html(upload,item)}"
+                 puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
+                  thread.body << "<br/><br/> #{attachment_html(upload, item)}"
                else
-                  puts "Error: Attachment upload is not successful for #{attach_path}!"
+                 puts "Error: Attachment upload is not successful for #{attach_path}!"
                end
           end
         end
@@ -337,7 +337,7 @@ class ImportScripts::Jive < ImportScripts::Base
 
     topic_map.each do |_, topic|
       posts << topic if topic[:body]
-      count+=1
+      count += 1
     end
 
     csv_parse("messages") do |thread|
@@ -350,14 +350,14 @@ class ImportScripts::Jive < ImportScripts::Base
         #IMAGE UPLOADER
         if thread.imagecount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             photo_path = "/var/www/discourse/script/import_scripts/jive/img/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, photo_path, File.basename(photo_path))
                if upload.persisted?
-                  puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
+                 puts "Image upload is successful for #{photo_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
                else
-                  puts "Error: Image upload is not successful for #{photo_path}!"
+                 puts "Error: Image upload is not successful for #{photo_path}!"
                end
           end
         end
@@ -365,15 +365,15 @@ class ImportScripts::Jive < ImportScripts::Base
         #ATTACHMENT UPLOADER
         if thread.attachmentcount
           Dir.foreach("/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}") do |item|
-          next if item == '.' or item == '..' or item == '.DS_Store'
+            next if item == ('.') || item == ('..') || item == ('.DS_Store')
             attach_path = "/var/www/discourse/script/import_scripts/jive/attach/#{thread.messageid}/#{item}"
             upload = create_upload(thread.userid, attach_path, File.basename(attach_path))
                if upload.persisted?
-                  puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
-                  thread.body.gsub!(item,upload.url)
-                  thread.body << "<br/><br/> #{attachment_html(upload,item)}"
+                 puts "Attachment upload is successful for #{attach_path}, new path is #{upload.url}!"
+                  thread.body.gsub!(item, upload.url)
+                  thread.body << "<br/><br/> #{attachment_html(upload, item)}"
                else
-                  puts "Error: Attachment upload is not successful for #{attach_path}!"
+                 puts "Error: Attachment upload is not successful for #{attach_path}!"
                end
           end
         end
@@ -387,7 +387,7 @@ class ImportScripts::Jive < ImportScripts::Base
           created_at: DateTime.parse(thread.creationdate)
         }
         posts << row
-        count+=1
+        count += 1
 
         if posts.length > 0 && posts.length % BATCH_SIZE == 0
           import_post_batch!(posts, topic_map, count - posts.length, total)
diff --git a/script/import_scripts/jive_api.rb b/script/import_scripts/jive_api.rb
index 0441db2628..f8c3734a35 100644
--- a/script/import_scripts/jive_api.rb
+++ b/script/import_scripts/jive_api.rb
@@ -334,7 +334,7 @@ class ImportScripts::JiveApi < ImportScripts::Base
     SQL
   end
 
-  def get(url_or_path, authenticated=false)
+  def get(url_or_path, authenticated = false)
     tries ||= 3
 
     command = ["curl", "--silent"]
diff --git a/script/import_scripts/json_generic.rb b/script/import_scripts/json_generic.rb
index c6474b2667..f98bcebcbc 100755
--- a/script/import_scripts/json_generic.rb
+++ b/script/import_scripts/json_generic.rb
@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 class ImportScripts::JsonGeneric < ImportScripts::Base
 
   JSON_FILE_PATH = ENV['JSON_FILE']
-  BATCH_SIZE  ||= 1000
+  BATCH_SIZE ||= 1000
 
   def initialize
     super
@@ -59,7 +59,6 @@ class ImportScripts::JsonGeneric < ImportScripts::Base
     end
   end
 
-
   def import_discussions
     puts "", "Importing discussions"
 
@@ -103,6 +102,6 @@ class ImportScripts::JsonGeneric < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::JsonGeneric.new.perform
 end
diff --git a/script/import_scripts/kunena.rb b/script/import_scripts/kunena.rb
index 3cb52e7b38..1aa333593e 100644
--- a/script/import_scripts/kunena.rb
+++ b/script/import_scripts/kunena.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 
 class ImportScripts::Kunena < ImportScripts::Base
 
-  KUNENA_DB    = "kunena"
+  KUNENA_DB = "kunena"
 
   def initialize
     super
@@ -38,7 +38,7 @@ class ImportScripts::Kunena < ImportScripts::Base
     @users = nil
 
     create_categories(@client.query("SELECT id, parent, name, description, ordering FROM jos_kunena_categories ORDER BY parent, id;")) do |c|
-      h = {id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i}
+      h = { id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i }
       if c['parent'].to_i > 0
         h[:parent_category_id] = category_id_from_imported_category_id(c['parent'])
       end
@@ -61,12 +61,12 @@ class ImportScripts::Kunena < ImportScripts::Base
     puts "fetching Joomla users data from mysql"
     results = @client.query("SELECT id, username, email, registerDate FROM jos_users;", cache_rows: false)
     results.each do |u|
-      next unless u['id'].to_i > 0 and u['username'].present? and u['email'].present?
-      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0,User.username_length.end]
+      next unless u['id'].to_i > (0) && u['username'].present? && u['email'].present?
+      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0, User.username_length.end]
       if username.length < User.username_length.first
         username = username * User.username_length.first
       end
-      @users[u['id'].to_i] = {id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate']}
+      @users[u['id'].to_i] = { id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate'] }
     end
 
     puts "fetching Kunena user data from mysql"
@@ -109,7 +109,7 @@ class ImportScripts::Kunena < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| p['id'].to_i}
+      next if all_records_exist? :posts, results.map { |p| p['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/kunena3.rb b/script/import_scripts/kunena3.rb
index 2f4d7808c4..4a27120274 100644
--- a/script/import_scripts/kunena3.rb
+++ b/script/import_scripts/kunena3.rb
@@ -60,7 +60,7 @@ class ImportScripts::Kunena < ImportScripts::Base
     @users = nil
 
     create_categories(@client.query("SELECT id, #{PARENT_FIELD} as parent_id, name, description, ordering FROM #{KUNENA_PREFIX}kunena_categories ORDER BY #{PARENT_FIELD}, id;")) do |c|
-      h = {id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i}
+      h = { id: c['id'], name: c['name'], description: c['description'], position: c['ordering'].to_i }
       if c['parent_id'].to_i > 0
         h[:parent_category_id] = category_id_from_imported_category_id(c['parent_id'])
       end
@@ -83,12 +83,12 @@ class ImportScripts::Kunena < ImportScripts::Base
     puts "fetching Joomla users data from mysql"
     results = @client.query("SELECT id, username, email, registerDate FROM #{KUNENA_PREFIX}users;", cache_rows: false)
     results.each do |u|
-      next unless u['id'].to_i > 0 and u['username'].present? and u['email'].present?
-      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0,User.username_length.end]
+      next unless u['id'].to_i > (0) && u['username'].present? && u['email'].present?
+      username = u['username'].gsub(' ', '_').gsub(/[^A-Za-z0-9_]/, '')[0, User.username_length.end]
       if username.length < User.username_length.first
         username = username * User.username_length.first
       end
-      @users[u['id'].to_i] = {id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate']}
+      @users[u['id'].to_i] = { id: u['id'].to_i, username: username, email: u['email'], created_at: u['registerDate'] }
     end
 
     puts "fetching Kunena user data from mysql"
@@ -131,7 +131,7 @@ class ImportScripts::Kunena < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|p| p['id'].to_i}
+      next if all_records_exist? :posts, results.map { |p| p['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index bd0a6f0055..b366a2a4d7 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -10,8 +10,6 @@
 # that was done using import_scripts/support/convert_mysql_xml_to_mysql.rb
 #
 
-
-
 require 'mysql2'
 require 'csv'
 require 'reverse_markdown'
@@ -19,7 +17,7 @@ require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'htmlentities'
 
 # remove table conversion
-[:table,:td,:tr,:th,:thead,:tbody].each do |tag|
+[:table, :td, :tr, :th, :thead, :tbody].each do |tag|
   ReverseMarkdown::Converters.unregister(tag)
 end
 
@@ -53,7 +51,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   def execute
 
-    SiteSetting.allow_html_tables = true
     @max_start_id = Post.maximum(:id)
 
     import_categories
@@ -102,7 +99,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       break if users.size < 1
 
-      next if all_records_exist? :users, users.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
       create_users(users, total: user_count, offset: offset) do |user|
 
@@ -124,7 +121,7 @@ class ImportScripts::Lithium < ImportScripts::Base
   end
 
   def unix_time(t)
-    Time.at(t/1000.0)
+    Time.at(t / 1000.0)
   end
 
   def import_profile_picture(old_user, imported_user)
@@ -192,7 +189,6 @@ class ImportScripts::Lithium < ImportScripts::Base
     top_level_ids = Set.new
     child_ids = Set.new
 
-
     parent = nil
     CSV.foreach(CATEGORY_CSV) do |row|
       display_id = row[2].strip
@@ -217,7 +213,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     top_level_categories = categories.select { |c| top_level_ids.include? c["display_id"] }
 
-
     create_categories(top_level_categories) do |category|
       info = category_info[category["display_id"]]
       info[:id] = category["node_id"]
@@ -229,7 +224,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       }
     end
 
-
     puts "", "importing children categories..."
 
     children_categories = categories.select { |c| child_ids.include? c["display_id"] }
@@ -247,7 +241,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     end
 
     puts "", "securing categories"
-    category_info.each do |_,info|
+    category_info.each do |_, info|
       if info[:secure]
         id = category_id_from_imported_category_id(info[:id])
         if id
@@ -279,7 +273,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       break if topics.size < 1
 
-      next if all_records_exist? :posts, topics.map {|topic| "#{topic["node_id"]} #{topic["id"]}"}
+      next if all_records_exist? :posts, topics.map { |topic| "#{topic["node_id"]} #{topic["id"]}" }
 
       create_posts(topics, total: topic_count, offset: offset) do |topic|
 
@@ -296,7 +290,7 @@ class ImportScripts::Lithium < ImportScripts::Base
             raw: raw,
             created_at: unix_time(topic["post_date"]),
             views: topic["views"],
-            custom_fields: {import_unique_id: topic["unique_id"]},
+            custom_fields: { import_unique_id: topic["unique_id"] },
             import_mode: true
           }
         else
@@ -327,7 +321,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
       break if posts.size < 1
 
-      next if all_records_exist? :posts, posts.map {|post| "#{post["node_id"]} #{post["root_id"]} #{post["id"]}"}
+      next if all_records_exist? :posts, posts.map { |post| "#{post["node_id"]} #{post["root_id"]} #{post["id"]}" }
 
       create_posts(posts, total: post_count, offset: offset) do |post|
         raw = post["raw"]
@@ -341,7 +335,7 @@ class ImportScripts::Lithium < ImportScripts::Base
           topic_id: topic[:topic_id],
           raw: raw,
           created_at: unix_time(post["post_date"]),
-          custom_fields: {import_unique_id: post["unique_id"]},
+          custom_fields: { import_unique_id: post["unique_id"] },
           import_mode: true
         }
 
@@ -366,7 +360,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     "smileysurprised" => "dizzy_face",
     "smileytongue" => "stuck_out_tongue",
     "smileyvery-happy" => "grin",
-    "smileywink"  => "wink",
+    "smileywink" => "wink",
     "smileyfrustrated" => "confounded",
     "smileyembarrassed" => "flushed",
     "smileylol" => "laughing",
@@ -383,7 +377,6 @@ class ImportScripts::Lithium < ImportScripts::Base
     "catlol" => "joy_cat"
   }
 
-
   def import_likes
     puts "\nimporting likes..."
 
@@ -396,8 +389,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       existing_map[import_id] = post_id
     end
 
-
-
     puts "loading data into temp table"
     PostAction.exec_sql("create temp table like_data(user_id int, post_id int, created_at timestamp without time zone)")
     PostAction.transaction do
@@ -437,7 +428,6 @@ class ImportScripts::Lithium < ImportScripts::Base
              WHERE ua.id IS NULL AND pa.post_action_type_id = 2
     SQL
 
-
     # reverse action
     UserAction.exec_sql <<-SQL
     INSERT INTO user_actions (user_id, action_type, target_topic_id, target_post_id, acting_user_id, created_at, updated_at)
@@ -491,7 +481,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       existing_map[import_id] = post_id
     end
 
-
     puts "loading data into temp table"
     PostAction.exec_sql("create temp table accepted_data(post_id int primary key)")
     PostAction.transaction do
@@ -508,7 +497,6 @@ class ImportScripts::Lithium < ImportScripts::Base
       end
     end
 
-
     puts "deleting dupe answers"
     PostAction.exec_sql <<-SQL
     DELETE FROM accepted_data WHERE post_id NOT IN (
@@ -554,7 +542,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     users = {}
 
-    [inbox,outbox].each do |r|
+    [inbox, outbox].each do |r|
       r.each do |row|
         ary = (users[row["note_id"]] ||= Set.new)
         user_id = user_id_from_imported_user_id(row["user_id"])
@@ -568,7 +556,7 @@ class ImportScripts::Lithium < ImportScripts::Base
     subject_to_first_note = {}
 
     mysql_query("SELECT note_id, subject, sender_user_id FROM tblia_notes_content order by note_id").each do |row|
-        user_id = user_id_from_imported_user_id(row["sender_user_id"])
+      user_id = user_id_from_imported_user_id(row["sender_user_id"])
         ary = (users[row["note_id"]] ||= Set.new)
         if user_id
           ary << user_id
@@ -582,7 +570,7 @@ class ImportScripts::Lithium < ImportScripts::Base
 
     puts "Loading user_id to username map"
     user_map = {}
-    User.pluck(:id, :username).each do |id,username|
+    User.pluck(:id, :username).each do |id, username|
       user_map[id] = username
     end
 
@@ -597,17 +585,16 @@ class ImportScripts::Lithium < ImportScripts::Base
           OFFSET #{offset}
       SQL
 
-
       break if topics.size < 1
 
-      next if all_records_exist? :posts, topics.map {|topic| "pm_#{topic["note_id"]}"}
+      next if all_records_exist? :posts, topics.map { |topic| "pm_#{topic["note_id"]}" }
 
       create_posts(topics, total: topic_count, offset: offset) do |topic|
 
         user_id = user_id_from_imported_user_id(topic["sender_user_id"]) || Discourse::SYSTEM_USER_ID
         participants = users[topic["note_id"]]
 
-        usernames = (participants - [user_id]).map{|id| user_map[id]}
+        usernames = (participants - [user_id]).map { |id| user_map[id] }
 
         subject = topic["subject"]
         topic_id = nil
@@ -647,7 +634,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   def close_topics
 
-
     puts "\nclosing closed topics..."
 
     sql = "select unique_id post_id from message2 where root_id = id AND (attributes & 0x0002 ) != 0;"
@@ -659,8 +645,8 @@ class ImportScripts::Lithium < ImportScripts::Base
       existing_map[import_id.to_i] = post_id.to_i
     end
 
-    results.map{|r| r["post_id"]}.each_slice(500) do |ids|
-      mapped = ids.map{|id| existing_map[id]}.compact
+    results.map { |r| r["post_id"] }.each_slice(500) do |ids|
+      mapped = ids.map { |id| existing_map[id] }.compact
       Topic.exec_sql("
                      UPDATE topics SET closed = true
                      WHERE id IN (SELECT topic_id FROM posts where id in (:ids))
@@ -669,7 +655,6 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   end
 
-
   def create_permalinks
     puts "Creating permalinks"
 
@@ -740,7 +725,6 @@ SQL
   def post_process_posts
     puts "", "Postprocessing posts..."
 
-
     current = 0
     max = Post.count
 
@@ -767,7 +751,6 @@ SQL
     end
   end
 
-
   def postprocess_post_raw(raw, user_id)
 
     doc = Nokogiri::HTML.fragment(raw)
@@ -828,7 +811,7 @@ SQL
       ":#{SMILEY_SUBS[$1] || $1}:"
     end
     # nbsp central
-    raw.gsub!(/([a-zA-Z0-9])&nbsp;([a-zA-Z0-9])/,"\\1 \\2")
+    raw.gsub!(/([a-zA-Z0-9])&nbsp;([a-zA-Z0-9])/, "\\1 \\2")
     raw
   end
 
diff --git a/script/import_scripts/mbox-experimental.rb b/script/import_scripts/mbox-experimental.rb
index 065b0111bd..12c18515ab 100644
--- a/script/import_scripts/mbox-experimental.rb
+++ b/script/import_scripts/mbox-experimental.rb
@@ -14,4 +14,3 @@ module ImportScripts
     Importer.new(@settings).perform
   end
 end
-
diff --git a/script/import_scripts/mbox.rb b/script/import_scripts/mbox.rb
index e7c25ed18c..d0b379aa12 100755
--- a/script/import_scripts/mbox.rb
+++ b/script/import_scripts/mbox.rb
@@ -46,7 +46,7 @@ class ImportScripts::Mbox < ImportScripts::Base
     exit
   end
 
-  validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :create
+  validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, on: :create
 
   def execute
     import_categories
@@ -63,7 +63,7 @@ class ImportScripts::Mbox < ImportScripts::Base
     mappings = CATEGORY_MAPPINGS.values - ['uncategorized']
 
     create_categories(mappings) do |c|
-      {id: c, name: c}
+      { id: c, name: c }
     end
   end
 
@@ -109,7 +109,7 @@ class ImportScripts::Mbox < ImportScripts::Base
         each_line(f) do |line|
           line = line.scrub
           if line =~ SPLIT_AT
-p            message_count += 1
+            p message_count += 1
             if !msg.empty?
               mail = Mail.read_from_string(msg)
               yield mail, f
@@ -163,7 +163,7 @@ p            message_count += 1
 
     puts "#{not_found.size} records couldn't be associated with parents"
     if not_found.present?
-      db.execute "UPDATE emails SET reply_to = NULL WHERE msg_id IN (#{not_found.map {|nf| "'#{nf}'"}.join(',')})"
+      db.execute "UPDATE emails SET reply_to = NULL WHERE msg_id IN (#{not_found.map { |nf| "'#{nf}'" }.join(',')})"
     end
 
     dupe_titles = db.execute "SELECT title, COUNT(*) FROM emails GROUP BY title HAVING count(*) > 1"
@@ -197,7 +197,7 @@ p            message_count += 1
           from_email.gsub!(/ /, '')
         end
       end
-p    end
+    end
 
     display_names = from.try(:display_names)
     if display_names.present?
@@ -308,7 +308,7 @@ p    end
     title.strip
 
     #In case of mixed localized prefixes there could be many of them if the mail client didn't strip the localized ones
-    if original_length >  title.length
+    if original_length > title.length
       clean_title(title)
     else
       title
@@ -331,9 +331,9 @@ p    end
     total_count = all_users.size
 
     batches(BATCH_SIZE) do |offset|
-      users = all_users[offset..offset+BATCH_SIZE-1]
+      users = all_users[offset..offset + BATCH_SIZE - 1]
       break if users.nil?
-      next if all_records_exist? :users, users.map {|u| u[1]}
+      next if all_records_exist? :users, users.map { |u| u[1] }
 
       create_users(users, total: total_count, offset: offset) do |u|
         {
@@ -374,7 +374,7 @@ p    end
         new_raw = p.raw.dup
         new_raw = new_raw.gsub!(/#{Regexp.escape(find)}/i, replace) || new_raw
         if new_raw != p.raw
-          p.revise(Discourse.system_user, { raw: new_raw }, { bypass_bump: true })
+          p.revise(Discourse.system_user, { raw: new_raw }, bypass_bump: true)
           print_warning "\nReplaced #{find} with #{replace} in topic #{p.topic_id}"
         end
       end
@@ -411,10 +411,10 @@ p    end
     topic_count = all_topics.size
 
     batches(BATCH_SIZE) do |offset|
-      topics = all_topics[offset..offset+BATCH_SIZE-1]
+      topics = all_topics[offset..offset + BATCH_SIZE - 1]
       break if topics.nil?
 
-      next if all_records_exist? :posts, topics.map {|t| t[0]}
+      next if all_records_exist? :posts, topics.map { |t| t[0] }
 
       create_posts(topics, total: topic_count, offset: offset) do |t|
         raw_email = t[5]
@@ -454,7 +454,7 @@ p    end
         raw = clean_raw(raw)
         raw = raw.dup.to_s
         raw.gsub!(/#{from_email}/, "@#{username}")
-        cleaned_email = from_email.dup.sub(/@/,' at ')
+        cleaned_email = from_email.dup.sub(/@/, ' at ')
         raw.gsub!(/#{cleaned_email}/, "@#{username}")
         { id: t[0],
           title: clean_title(title),
@@ -490,11 +490,11 @@ p    end
     puts "Replies: #{post_count}"
 
     batches(BATCH_SIZE) do |offset|
-      posts = replies[offset..offset+BATCH_SIZE-1]
+      posts = replies[offset..offset + BATCH_SIZE - 1]
       break if posts.nil?
       break if posts.count < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p[0]}
+      next if all_records_exist? :posts, posts.map { |p| p[0] }
 
       create_posts(posts, total: post_count, offset: offset) do |p|
         parent_id = p[6]
@@ -521,7 +521,7 @@ p    end
         user_id = user_id_from_imported_user_id(from_email) || Discourse::SYSTEM_USER_ID
         raw = clean_raw(raw).to_s
         raw.gsub!(/#{from_email}/, "@#{username}")
-        cleaned_email = from_email.dup.sub(/@/,' at ')
+        cleaned_email = from_email.dup.sub(/@/, ' at ')
         raw.gsub!(/#{cleaned_email}/, "@#{username}")
         # import the attachments
         mail.attachments.each do |attachment|
diff --git a/script/import_scripts/muut.rb b/script/import_scripts/muut.rb
index ccd356d90d..24134ee3f9 100644
--- a/script/import_scripts/muut.rb
+++ b/script/import_scripts/muut.rb
@@ -59,7 +59,6 @@ class ImportScripts::Muut < ImportScripts::Base
     end
   end
 
-
   def import_categories
     puts "", "Importing categories"
 
@@ -72,7 +71,6 @@ class ImportScripts::Muut < ImportScripts::Base
     end
   end
 
-
   def import_discussions
     puts "", "Importing discussions"
 
@@ -81,7 +79,6 @@ class ImportScripts::Muut < ImportScripts::Base
 
     @imported_json['categories'].each do |category|
 
-
       @imported_json['threads'][category['path']].each do |thread|
 
         next if thread["seed"]["key"] == "skip-this-topic"
@@ -96,7 +93,7 @@ class ImportScripts::Muut < ImportScripts::Base
         end
 
         # update user display name
-        if thread["seed"]["author"] && thread["seed"]["author"]["displayname"] != ""  && mapped[:user_id] != -1
+        if thread["seed"]["author"] && thread["seed"]["author"]["displayname"] != "" && mapped[:user_id] != -1
           user = User.find_by(id: mapped[:user_id])
           if user
             user.name = thread["seed"]["author"]["displayname"]
@@ -181,6 +178,6 @@ class ImportScripts::Muut < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Muut.new.perform
 end
diff --git a/script/import_scripts/mybb.rb b/script/import_scripts/mybb.rb
index 8bf101c39a..f9201ecacf 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 = true
     import_users
     import_categories
     import_posts
@@ -66,7 +66,7 @@ class ImportScripts::MyBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         { id: user['id'],
@@ -87,7 +87,7 @@ class ImportScripts::MyBB < ImportScripts::Base
     ")
 
     create_categories(results) do |row|
-      h = {id: row['id'], name: CGI.unescapeHTML(row['name']), description: CGI.unescapeHTML(row['description'])}
+      h = { id: row['id'], name: CGI.unescapeHTML(row['name']), description: CGI.unescapeHTML(row['description']) }
       if row['parent_id'].to_i > 0
         h[:parent_category_id] = category_id_from_imported_category_id(row['parent_id'])
       end
@@ -120,7 +120,7 @@ class ImportScripts::MyBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
@@ -235,7 +235,7 @@ class ImportScripts::MyBB < ImportScripts::Base
   def create_permalinks
     puts '', 'Creating redirects...', ''
 
-    SiteSetting.permalink_normalizations= '/(\\w+)-(\\d+)[-.].*/\\1-\\2.html'
+    SiteSetting.permalink_normalizations = '/(\\w+)-(\\d+)[-.].*/\\1-\\2.html'
     puts '', 'Users...', ''
     total_users = User.count
     start_time = Time.now
@@ -244,7 +244,7 @@ class ImportScripts::MyBB < ImportScripts::Base
       ucf = u.custom_fields
       count += 1
       if ucf && ucf["import_id"] && ucf["import_username"]
-        Permalink.create(url: "#{BASE}/user-#{ucf['import_id']}.html", external_url: "/u/#{u.username}" ) rescue nil
+        Permalink.create(url: "#{BASE}/user-#{ucf['import_id']}.html", external_url: "/u/#{u.username}") rescue nil
       end
       print_status(count, total_users, start_time)
     end
@@ -260,7 +260,7 @@ class ImportScripts::MyBB < ImportScripts::Base
       unless QUIET
         puts ("forum-#{id}.html --> /c/#{cat.id}")
       end
-      Permalink.create( url: "#{BASE}/forum-#{id}.html", category_id: cat.id ) rescue nil
+      Permalink.create(url: "#{BASE}/forum-#{id}.html", category_id: cat.id) rescue nil
       print_status(count, total_categories, start_time)
     end
 
@@ -286,7 +286,7 @@ class ImportScripts::MyBB < ImportScripts::Base
         count += 1
         if topic = topic_lookup_from_imported_post_id(post['id'])
           id = post['topic_id']
-          Permalink.create( url: "#{BASE}/thread-#{id}.html", topic_id: topic[:topic_id] ) rescue nil
+          Permalink.create(url: "#{BASE}/thread-#{id}.html", topic_id: topic[:topic_id]) rescue nil
           unless QUIET
             puts ("#{BASE}/thread-#{id}.html --> http://localhost:3000/t/#{topic[:topic_id]}")
           end
@@ -296,8 +296,6 @@ class ImportScripts::MyBB < ImportScripts::Base
     end
   end
 
-
-
   def mysql_query(sql)
     @client.query(sql, cache_rows: false)
   end
diff --git a/script/import_scripts/mylittleforum.rb b/script/import_scripts/mylittleforum.rb
index fbec5dad46..f0ec152472 100644
--- a/script/import_scripts/mylittleforum.rb
+++ b/script/import_scripts/mylittleforum.rb
@@ -2,7 +2,6 @@ require "mysql2"
 require File.expand_path(File.dirname(__FILE__) + "/base.rb")
 require 'htmlentities'
 
-
 # Before running this script, paste these lines into your shell,
 # then use arrow keys to edit the values
 =begin
@@ -16,7 +15,6 @@ export IMAGE_BASE="http://www.example.com/forum"
 export BASE="forum"
 =end
 
-
 class ImportScripts::MylittleforumSQL < ImportScripts::Base
 
   DB_HOST ||= ENV['DB_HOST'] || "localhost"
@@ -37,10 +35,9 @@ class ImportScripts::MylittleforumSQL < ImportScripts::Base
   # Site settings
   SiteSetting.disable_emails = true
   if FORCE_HOSTNAME
-    SiteSetting.force_hostname=FORCE_HOSTNAME
+    SiteSetting.force_hostname = FORCE_HOSTNAME
   end
 
-
   def initialize
 
     if IMPORT_AFTER > "1970-01-01"
@@ -57,7 +54,7 @@ class ImportScripts::MylittleforumSQL < ImportScripts::Base
         database: DB_NAME
       )
     rescue Exception => e
-      puts '='*50
+      puts '=' * 50
       puts e.message
       puts <<EOM
 Cannot log in to database.
@@ -123,7 +120,7 @@ EOM
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u['UserID'].to_i}
+      next if all_records_exist? :users, results.map { |u| u['UserID'].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         next if user['Email'].blank?
@@ -151,15 +148,15 @@ EOM
 
   def fix_username(username)
     olduser = username.dup
-    username.gsub!(/Dr\. /,"Dr") # no &
-    username.gsub!(/[ +!\/,*()?]/,"_") # can't have these
-    username.gsub!(/&/,"_and_") # no &
-    username.gsub!(/@/,"_at_") # no @
-    username.gsub!(/#/,"_hash_") # no &
-    username.gsub!(/\'/,"") # seriously?
-    username.gsub!(/[._]+/,"_") # can't have 2 special in a row
-    username.gsub!(/_+/,"_") # could result in dupes, but wtf?
-    username.gsub!(/_$/,"") # could result in dupes, but wtf?
+    username.gsub!(/Dr\. /, "Dr") # no &
+    username.gsub!(/[ +!\/,*()?]/, "_") # can't have these
+    username.gsub!(/&/, "_and_") # no &
+    username.gsub!(/@/, "_at_") # no @
+    username.gsub!(/#/, "_hash_") # no &
+    username.gsub!(/\'/, "") # seriously?
+    username.gsub!(/[._]+/, "_") # can't have 2 special in a row
+    username.gsub!(/_+/, "_") # could result in dupes, but wtf?
+    username.gsub!(/_$/, "") # could result in dupes, but wtf?
     if olduser != username
       print_warning ("#{olduser} --> #{username}")
     end
@@ -210,7 +207,7 @@ EOM
          OFFSET #{offset};")
 
       break if discussions.size < 1
-      next if all_records_exist? :posts, discussions.map {|t| "discussion#" + t['DiscussionID'].to_s}
+      next if all_records_exist? :posts, discussions.map { |t| "discussion#" + t['DiscussionID'].to_s }
 
       create_posts(discussions, total: total_count, offset: offset) do |discussion|
 
@@ -226,7 +223,7 @@ EOM
         {
           id: "discussion#" + discussion['DiscussionID'].to_s,
           user_id: user_id_from_imported_user_id(discussion['InsertUserID']) || Discourse::SYSTEM_USER_ID,
-          title: discussion['Name'].gsub('\\"','"'),
+          title: discussion['Name'].gsub('\\"', '"'),
           category: category_id_from_imported_category_id(discussion['CategoryID']),
           raw: raw,
           created_at: Time.zone.at(discussion['DateInserted']),
@@ -260,7 +257,7 @@ EOM
          OFFSET #{offset};")
 
       break if comments.size < 1
-      next if all_records_exist? :posts, comments.map {|comment| "comment#" + comment['CommentID'].to_s}
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['CommentID'].to_s }
 
       create_posts(comments, total: total_count, offset: offset) do |comment|
         next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['DiscussionID'].to_s)
@@ -286,9 +283,9 @@ EOM
     youtube_cooked = clean_up(youtube_raw.dup.to_s)
     # get just src from <iframe> and put on a line by itself
     re = /<iframe.+?src="(\S+?)".+?<\/iframe>/mix
-    youtube_cooked.gsub!(re) {"\n#{$1}\n"}
+    youtube_cooked.gsub!(re) { "\n#{$1}\n" }
     re = /<object.+?src="(\S+?)".+?<\/object>/mix
-    youtube_cooked.gsub!(re) {"\n#{$1}\n"}
+    youtube_cooked.gsub!(re) { "\n#{$1}\n" }
     youtube_cooked.gsub!(/^\/\//, "https://") # make sure it has a protocol
     unless /http/.match(youtube_cooked) # handle case of only youtube object number
       if youtube_cooked.length < 8 || /[<>=]/.match(youtube_cooked)
@@ -298,7 +295,7 @@ EOM
         youtube_cooked = 'https://www.youtube.com/watch?v=' + youtube_cooked
       end
     end
-    print_warning("#{'-'*40}\nBefore: #{youtube_raw}\nAfter: #{youtube_cooked}") unless QUIET
+    print_warning("#{'-' * 40}\nBefore: #{youtube_raw}\nAfter: #{youtube_cooked}") unless QUIET
 
     youtube_cooked
   end
@@ -310,8 +307,8 @@ EOM
     raw = @htmlentities.decode(raw)
 
     # don't \ quotes
-    raw = raw.gsub('\\"','"')
-    raw = raw.gsub("\\'","'")
+    raw = raw.gsub('\\"', '"')
+    raw = raw.gsub("\\'", "'")
 
     raw = raw.gsub(/\[b\]/i, "<strong>")
     raw = raw.gsub(/\[\/b\]/i, "</strong>")
@@ -322,12 +319,12 @@ EOM
     raw = raw.gsub(/\[u\]/i, "<em>")
     raw = raw.gsub(/\[\/u\]/i, "</em>")
 
-    raw = raw.gsub(/\[url\](\S+)\[\/url\]/im) { "#{$1}"}
-    raw = raw.gsub(/\[link\](\S+)\[\/link\]/im) { "#{$1}"}
+    raw = raw.gsub(/\[url\](\S+)\[\/url\]/im) { "#{$1}" }
+    raw = raw.gsub(/\[link\](\S+)\[\/link\]/im) { "#{$1}" }
 
     # URL & LINK with text
-    raw = raw.gsub(/\[url=(\S+?)\](.*?)\[\/url\]/im) { "<a href=\"#{$1}\">#{$2}</a>"}
-    raw = raw.gsub(/\[link=(\S+?)\](.*?)\[\/link\]/im) { "<a href=\"#{$1}\">#{$2}</a>"}
+    raw = raw.gsub(/\[url=(\S+?)\](.*?)\[\/url\]/im) { "<a href=\"#{$1}\">#{$2}</a>" }
+    raw = raw.gsub(/\[link=(\S+?)\](.*?)\[\/link\]/im) { "<a href=\"#{$1}\">#{$2}</a>" }
 
     # remote images
     raw = raw.gsub(/\[img\](https?:.+?)\[\/img\]/im) { "<img src=\"#{$1}\">" }
@@ -347,22 +344,22 @@ EOM
     raw.gsub(/\[postedby\](.+?)\[b\](.+?)\[\/b\]\[\/postedby\]/i) { "#{$1}@#{$2}" }
 
     # CODE (not tested)
-    raw = raw.gsub(/\[code\](\S+)\[\/code\]/im) { "```\n#{$1}\n```"}
-    raw = raw.gsub(/\[pre\](\S+)\[\/pre\]/im) { "```\n#{$1}\n```"}
+    raw = raw.gsub(/\[code\](\S+)\[\/code\]/im) { "```\n#{$1}\n```" }
+    raw = raw.gsub(/\[pre\](\S+)\[\/pre\]/im) { "```\n#{$1}\n```" }
 
     raw = raw.gsub(/(https:\/\/youtu\S+)/i) { "\n#{$1}\n" } #youtube links on line by themselves
 
     # no center
-    raw = raw.gsub(/\[\/?center\]/i,"")
+    raw = raw.gsub(/\[\/?center\]/i, "")
 
     # no size
-    raw = raw.gsub(/\[\/?size.*?\]/i,"")
+    raw = raw.gsub(/\[\/?size.*?\]/i, "")
 
     ### FROM VANILLA:
 
     # fix whitespaces
     raw = raw.gsub(/(\\r)?\\n/, "\n")
-             .gsub("\\t", "\t")
+      .gsub("\\t", "\t")
 
     unless CONVERT_HTML
       # replace all chevrons with HTML entities
@@ -370,12 +367,12 @@ EOM
       #  - AFTER all the "code" processing
       #  - BEFORE the "quote" processing
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-               .gsub("<", "&lt;")
-               .gsub("\u2603", "<")
+        .gsub("<", "&lt;")
+        .gsub("\u2603", "<")
 
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-               .gsub(">", "&gt;")
-               .gsub("\u2603", ">")
+        .gsub(">", "&gt;")
+        .gsub("\u2603", ">")
     end
 
     # Remove the color tag
@@ -402,7 +399,7 @@ EOM
     User.find_each do |u|
       ucf = u.custom_fields
       if ucf && ucf["import_id"] && ucf["import_username"]
-        Permalink.create( url: "#{BASE}/user-id-#{ucf['import_id']}.html", external_url: "/u/#{u.username}" ) rescue nil
+        Permalink.create(url: "#{BASE}/user-id-#{ucf['import_id']}.html", external_url: "/u/#{u.username}") rescue nil
         print '.'
       end
     end
@@ -414,12 +411,12 @@ EOM
         topic = post.topic
         id = pcf["import_id"].split('#').last
         if post.post_number == 1
-          Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", topic_id: topic.id ) rescue nil
+          Permalink.create(url: "#{BASE}/forum_entry-id-#{id}.html", topic_id: topic.id) rescue nil
           unless QUIET
             print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}")
           end
         else
-          Permalink.create( url: "#{BASE}/forum_entry-id-#{id}.html", post_id: post.id ) rescue nil
+          Permalink.create(url: "#{BASE}/forum_entry-id-#{id}.html", post_id: post.id) rescue nil
           unless QUIET
             print_warning("forum_entry-id-#{id}.html --> http://localhost:3000/t/#{topic.id}/#{post.id}")
           end
@@ -435,7 +432,7 @@ EOM
       unless QUIET
         print_warning("forum-category-#{id}.html --> /t/#{cat.id}")
       end
-      Permalink.create( url: "#{BASE}/forum-category-#{id}.html", category_id: cat.id ) rescue nil
+      Permalink.create(url: "#{BASE}/forum-category-#{id}.html", category_id: cat.id) rescue nil
       print '.'
     end
   end
@@ -444,8 +441,6 @@ EOM
     $stderr.puts "#{message}"
   end
 
-
-
 end
 
 ImportScripts::MylittleforumSQL.new.perform
diff --git a/script/import_scripts/nabble.rb b/script/import_scripts/nabble.rb
index 529f46509d..ac3a93f8dc 100644
--- a/script/import_scripts/nabble.rb
+++ b/script/import_scripts/nabble.rb
@@ -3,12 +3,12 @@ require 'pg'
 require_relative 'base/uploader'
 
 =begin
- if you want to create mock users for posts made by anonymous participants, 
+ if you want to create mock users for posts made by anonymous participants,
  run the following SQL prior to importing.
 
 -- first attribute any anonymous posts to existing users (if any)
 
-UPDATE node 
+UPDATE node
 SET owner_id = p.user_id, anonymous_name = NULL
 FROM ( SELECT lower(name) AS name, user_id FROM user_ ) p
 WHERE p.name = lower(node.anonymous_name)
@@ -25,7 +25,7 @@ INSERT INTO user_ (email, name, joined, registered)
 -- then move these posts to the new users
 -- (yes, this is the same query as the first one indeed)
 
-UPDATE node 
+UPDATE node
 SET owner_id = p.user_id, anonymous_name = NULL
 FROM ( SELECT lower(name) AS name, user_id FROM user_ ) p
 WHERE p.name = lower(node.anonymous_name)
@@ -33,7 +33,6 @@ WHERE p.name = lower(node.anonymous_name)
 
 =end
 
-
 class ImportScripts::Nabble < ImportScripts::Base
   # CHANGE THESE BEFORE RUNNING THE IMPORTER
 
@@ -74,7 +73,7 @@ class ImportScripts::Nabble < ImportScripts::Base
 
       break if users.ntuples() < 1
 
-      next if all_records_exist? :users, users.map {|u| u["user_id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["user_id"].to_i }
 
       create_users(users, total: total_count, offset: offset) do |row|
         {
@@ -144,7 +143,7 @@ class ImportScripts::Nabble < ImportScripts::Base
 
       break if topics.ntuples() < 1
 
-      next if all_records_exist? :posts, topics.map {|t| t['node_id'].to_i}
+      next if all_records_exist? :posts, topics.map { |t| t['node_id'].to_i }
 
       create_posts(topics, total: topic_count, offset: offset) do |t|
         raw = body_from(t)
@@ -173,7 +172,7 @@ class ImportScripts::Nabble < ImportScripts::Base
     txt.gsub! /\<quote author="(.*?)"\>/, '[quote="\1"]'
     txt.gsub! /\<\/quote\>/, '[/quote]'
     txt.gsub!(/\<raw\>(.*?)\<\/raw\>/m) do |match|
-       c = Regexp.last_match[1].indent(4);
+      c = Regexp.last_match[1].indent(4);
        "\n#{c}\n"
     end
 
@@ -246,7 +245,7 @@ class ImportScripts::Nabble < ImportScripts::Base
 
       break if posts.ntuples() < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p['node_id'].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p['node_id'].to_i }
 
       create_posts(posts, total: post_count, offset: offset) do |p|
         parent_id = p['parent_id']
@@ -289,5 +288,4 @@ class String
   end
 end
 
-
 ImportScripts::Nabble.new.perform
diff --git a/script/import_scripts/ning.rb b/script/import_scripts/ning.rb
index 47b9ce8535..7646b37f3f 100644
--- a/script/import_scripts/ning.rb
+++ b/script/import_scripts/ning.rb
@@ -164,7 +164,6 @@ class ImportScripts::Ning < ImportScripts::Base
     puts "", "Marked #{suspended} users as suspended."
   end
 
-
   def import_categories
     puts "", "Importing categories"
     create_categories((["Blog", "Pages", "Photos"] + @discussions_json.map { |d| d["category"] }).uniq.compact) do |name|
@@ -179,7 +178,6 @@ class ImportScripts::Ning < ImportScripts::Base
     end
   end
 
-
   def import_discussions
     puts "", "Importing discussions"
     import_topics(@discussions_json)
@@ -200,7 +198,7 @@ class ImportScripts::Ning < ImportScripts::Base
     import_topics(@pages_json, "Pages")
   end
 
-  def import_topics(topics_json, default_category=nil)
+  def import_topics(topics_json, default_category = nil)
     topics = 0
     posts = 0
     total = topics_json.size # number of topics. posts are embedded in the topic json, so we can't get total post count quickly.
@@ -398,6 +396,6 @@ class ImportScripts::Ning < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Ning.new.perform
 end
diff --git a/script/import_scripts/phpbb3/importers/avatar_importer.rb b/script/import_scripts/phpbb3/importers/avatar_importer.rb
index 8a5e3a0c6f..a9cd22d4c9 100644
--- a/script/import_scripts/phpbb3/importers/avatar_importer.rb
+++ b/script/import_scripts/phpbb3/importers/avatar_importer.rb
@@ -47,15 +47,15 @@ module ImportScripts::PhpBB3
 
     def get_avatar_path(avatar_type, filename)
       case avatar_type
-        when Constants::AVATAR_TYPE_UPLOADED then
-          filename.gsub!(/_[0-9]+\./, '.') # we need 1337.jpg, not 1337_2983745.jpg
+      when Constants::AVATAR_TYPE_UPLOADED then
+        filename.gsub!(/_[0-9]+\./, '.') # we need 1337.jpg, not 1337_2983745.jpg
           get_uploaded_path(filename)
-        when Constants::AVATAR_TYPE_GALLERY then
-          get_gallery_path(filename)
-        when Constants::AVATAR_TYPE_REMOTE then
-          download_avatar(filename)
+      when Constants::AVATAR_TYPE_GALLERY then
+        get_gallery_path(filename)
+      when Constants::AVATAR_TYPE_REMOTE then
+        download_avatar(filename)
         else
-          Rails.logger.error("Invalid avatar type #{avatar_type}. Skipping...")
+        Rails.logger.error("Invalid avatar type #{avatar_type}. Skipping...")
           nil
       end
     end
@@ -97,14 +97,14 @@ module ImportScripts::PhpBB3
 
     def is_allowed_avatar_type?(avatar_type)
       case avatar_type
-        when Constants::AVATAR_TYPE_UPLOADED then
-          @settings.import_uploaded_avatars
-        when Constants::AVATAR_TYPE_REMOTE then
-          @settings.import_remote_avatars
-        when Constants::AVATAR_TYPE_GALLERY then
-          @settings.import_gallery_avatars
+      when Constants::AVATAR_TYPE_UPLOADED then
+        @settings.import_uploaded_avatars
+      when Constants::AVATAR_TYPE_REMOTE then
+        @settings.import_remote_avatars
+      when Constants::AVATAR_TYPE_GALLERY then
+        @settings.import_gallery_avatars
         else
-          false
+        false
       end
     end
   end
diff --git a/script/import_scripts/phpbb3/importers/category_importer.rb b/script/import_scripts/phpbb3/importers/category_importer.rb
index f7d825c3f2..d7d8addfda 100644
--- a/script/import_scripts/phpbb3/importers/category_importer.rb
+++ b/script/import_scripts/phpbb3/importers/category_importer.rb
@@ -41,8 +41,8 @@ module ImportScripts::PhpBB3
       end
 
       if row[:forum_desc].present?
-        changes = {raw: @text_processor.process_raw_text(row[:forum_desc])}
-        opts = {revised_at: post.created_at, bypass_bump: true}
+        changes = { raw: @text_processor.process_raw_text(row[:forum_desc]) }
+        opts = { revised_at: post.created_at, bypass_bump: true }
         post.revise(Discourse.system_user, changes, opts)
       end
     end
diff --git a/script/import_scripts/phpbb3/importers/message_importer.rb b/script/import_scripts/phpbb3/importers/message_importer.rb
index 1289122cb9..0a9e356450 100644
--- a/script/import_scripts/phpbb3/importers/message_importer.rb
+++ b/script/import_scripts/phpbb3/importers/message_importer.rb
@@ -17,7 +17,6 @@ module ImportScripts::PhpBB3
       rows.map { |row| get_import_id(row[:msg_id]) }
     end
 
-
     def map_message(row)
       user_id = @lookup.user_id_from_imported_user_id(row[:author_id]) || Discourse.system_user.id
       attachments = import_attachments(row, user_id)
@@ -54,7 +53,7 @@ module ImportScripts::PhpBB3
       mapped[:title] = get_topic_title(row)
       mapped[:archetype] = Archetype.private_message
       mapped[:target_usernames] = get_recipient_usernames(row)
-      mapped[:custom_fields] = {import_user_ids: current_user_ids.join(',')}
+      mapped[:custom_fields] = { import_user_ids: current_user_ids.join(',') }
 
       if mapped[:target_usernames].empty?
         puts "Private message without recipients. Skipping #{row[:msg_id]}: #{row[:message_subject][0..40]}"
@@ -127,7 +126,7 @@ module ImportScripts::PhpBB3
         .joins(:topic)
         .joins(:_custom_fields)
         .where(["LOWER(topics.title) IN (:titles) AND post_custom_fields.name = 'import_user_ids' AND post_custom_fields.value = :user_ids",
-                {titles: topic_titles, user_ids: current_user_ids.join(',')}])
+                { titles: topic_titles, user_ids: current_user_ids.join(',') }])
         .order('topics.created_at DESC')
         .first.try(:topic_id)
     end
diff --git a/script/import_scripts/phpbb3/importers/permalink_importer.rb b/script/import_scripts/phpbb3/importers/permalink_importer.rb
index 54d620e44d..140a160d8f 100644
--- a/script/import_scripts/phpbb3/importers/permalink_importer.rb
+++ b/script/import_scripts/phpbb3/importers/permalink_importer.rb
@@ -1,5 +1,6 @@
 module ImportScripts::PhpBB3
   class PermalinkImporter
+    CATEGORY_LINK_NORMALIZATION = '/(viewforum.php\?)(?:.*&)?(f=\d+).*/\1\2'
     POST_LINK_NORMALIZATION = '/(viewtopic.php\?)(?:.*&)?(p=\d+).*/\1\2'
     TOPIC_LINK_NORMALIZATION = '/(viewtopic.php\?)(?:.*&)?(t=\d+).*/\1\2'
 
@@ -12,13 +13,9 @@ module ImportScripts::PhpBB3
       normalizations = SiteSetting.permalink_normalizations
       normalizations = normalizations.blank? ? [] : normalizations.split('|')
 
-      if @settings.create_post_links && !normalizations.include?(POST_LINK_NORMALIZATION)
-        normalizations << POST_LINK_NORMALIZATION
-      end
-
-      if @settings.create_topic_links && !normalizations.include?(TOPIC_LINK_NORMALIZATION)
-        normalizations << TOPIC_LINK_NORMALIZATION
-      end
+      add_normalization(normalizations, CATEGORY_LINK_NORMALIZATION) if @settings.create_category_links
+      add_normalization(normalizations, POST_LINK_NORMALIZATION) if @settings.create_post_links
+      add_normalization(normalizations, TOPIC_LINK_NORMALIZATION) if @settings.create_topic_links
 
       SiteSetting.permalink_normalizations = normalizations.join('|')
     end
@@ -28,9 +25,7 @@ module ImportScripts::PhpBB3
 
       url = "viewforum.php?f=#{import_id}"
 
-      if !Permalink.find_by(url: url)
-        Permalink.create(url: url, category_id: category.id)
-      end
+      Permalink.create(url: url, category_id: category.id) unless permalink_exists(url)
     end
 
     def create_for_topic(topic, import_id)
@@ -38,9 +33,7 @@ module ImportScripts::PhpBB3
 
       url = "viewtopic.php?t=#{import_id}"
 
-      if !Permalink.find_by(url: url)
-        Permalink.create(url: url, topic_id: topic.id)
-      end
+      Permalink.create(url: url, topic_id: topic.id) unless permalink_exists(url)
     end
 
     def create_for_post(post, import_id)
@@ -48,9 +41,17 @@ module ImportScripts::PhpBB3
 
       url = "viewtopic.php?p=#{import_id}"
 
-      if !Permalink.find_by(url: url)
-        Permalink.create(url: url, post_id: post.id)
-      end
+      Permalink.create(url: url, post_id: post.id) unless permalink_exists(url)
+    end
+
+    protected
+
+    def add_normalization(normalizations, normalization)
+      normalizations << normalization unless normalizations.include?(normalization)
+    end
+
+    def permalink_exists(url)
+      Permalink.find_by(url: url)
     end
   end
 end
diff --git a/script/import_scripts/phpbb3/importers/poll_importer.rb b/script/import_scripts/phpbb3/importers/poll_importer.rb
index f69a5f27b0..261e46b43d 100644
--- a/script/import_scripts/phpbb3/importers/poll_importer.rb
+++ b/script/import_scripts/phpbb3/importers/poll_importer.rb
@@ -35,7 +35,7 @@ module ImportScripts::PhpBB3
 
     def get_poll_options(topic_id)
       rows = @database.fetch_poll_options(topic_id)
-      options_by_text = Hash.new { |h, k| h[k] = {ids: [], total_votes: 0, anonymous_votes: 0} }
+      options_by_text = Hash.new { |h, k| h[k] = { ids: [], total_votes: 0, anonymous_votes: 0 } }
 
       rows.each do |row|
         option_text = @text_processor.process_raw_text(row[:poll_option_text]).delete("\n")
@@ -100,7 +100,7 @@ module ImportScripts::PhpBB3
 
     # @param custom_fields [Hash]
     def add_poll_to_custom_fields(custom_fields, extracted_poll)
-      custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] = {DiscoursePoll::DEFAULT_POLL_NAME => extracted_poll}
+      custom_fields[DiscoursePoll::POLLS_CUSTOM_FIELD] = { DiscoursePoll::DEFAULT_POLL_NAME => extracted_poll }
     end
 
     # @param custom_fields [Hash]
diff --git a/script/import_scripts/phpbb3/importers/post_importer.rb b/script/import_scripts/phpbb3/importers/post_importer.rb
index 1884190d4b..051695585b 100644
--- a/script/import_scripts/phpbb3/importers/post_importer.rb
+++ b/script/import_scripts/phpbb3/importers/post_importer.rb
@@ -56,6 +56,7 @@ module ImportScripts::PhpBB3
       mapped[:pinned_globally] = row[:topic_type] == Constants::POST_GLOBAL
       mapped[:post_create_action] = proc do |post|
         @permalink_importer.create_for_topic(post.topic, row[:topic_id])
+        @permalink_importer.create_for_post(post, row[:post_id])
       end
 
       add_poll(row, mapped) if @settings.import_polls
diff --git a/script/import_scripts/phpbb3/support/settings.rb b/script/import_scripts/phpbb3/support/settings.rb
index 870c162b76..9c63e2ae25 100644
--- a/script/import_scripts/phpbb3/support/settings.rb
+++ b/script/import_scripts/phpbb3/support/settings.rb
@@ -44,7 +44,7 @@ module ImportScripts::PhpBB3
       @import_remote_avatars = avatar_settings['remote']
       @import_gallery_avatars = avatar_settings['gallery']
 
-      @use_bbcode_to_md =import_settings['use_bbcode_to_md']
+      @use_bbcode_to_md = import_settings['use_bbcode_to_md']
 
       @original_site_prefix = import_settings['site_prefix']['original']
       @new_site_prefix = import_settings['site_prefix']['new']
diff --git a/script/import_scripts/punbb.rb b/script/import_scripts/punbb.rb
index 6b8fad7f50..88c35f3096 100644
--- a/script/import_scripts/punbb.rb
+++ b/script/import_scripts/punbb.rb
@@ -43,7 +43,7 @@ class ImportScripts::PunBB < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         { id: user['id'],
@@ -120,7 +120,7 @@ class ImportScripts::PunBB < ImportScripts::Base
       ").to_a
 
       break if results.size < 1
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/quandora/export.rb b/script/import_scripts/quandora/export.rb
index 529486f1d7..7f4efc4f1f 100644
--- a/script/import_scripts/quandora/export.rb
+++ b/script/import_scripts/quandora/export.rb
@@ -1,8 +1,8 @@
 require 'yaml'
 require_relative 'quandora_api'
 
-def load_config file
-    config = YAML::load_file(File.join(__dir__, file))
+def load_config(file)
+  config = YAML::load_file(File.join(__dir__, file))
     @domain = config['domain']
     @username = config['username']
     @password = config['password']
@@ -27,4 +27,3 @@ end
 
 load_config ARGV.shift
 export
-
diff --git a/script/import_scripts/quandora/import.rb b/script/import_scripts/quandora/import.rb
index 01e04b89fb..c02e15277b 100644
--- a/script/import_scripts/quandora/import.rb
+++ b/script/import_scripts/quandora/import.rb
@@ -10,7 +10,7 @@ class ImportScripts::Quandora < ImportScripts::Base
     @system_user = Discourse.system_user
     @questions = []
     Dir.foreach(JSON_FILES_DIR) do |filename|
-      next if filename == '.' or filename == '..'
+      next if filename == ('.') || filename == ('..')
       question = File.read JSON_FILES_DIR + '/' + filename
       @questions << question
     end
@@ -23,7 +23,7 @@ class ImportScripts::Quandora < ImportScripts::Base
     puts "", "Done"
   end
 
-  def import_questions questions
+  def import_questions(questions)
     topics = 0
     total = questions.size
 
@@ -40,13 +40,13 @@ class ImportScripts::Quandora < ImportScripts::Base
     puts "", "Imported #{topics} topics."
   end
 
-  def import_users users
+  def import_users(users)
     users.each do |user|
       create_user user, user[:id]
     end
   end
 
-  def import_topic topic
+  def import_topic(topic)
     post = nil
     if post_id = post_id_from_imported_post_id(topic[:id])
       post = Post.find(post_id) # already imported this topic
@@ -65,13 +65,13 @@ class ImportScripts::Quandora < ImportScripts::Base
     post
   end
 
-  def import_posts posts, topic_id
+  def import_posts(posts, topic_id)
     posts.each do |post|
       import_post post, topic_id
     end
   end
 
-  def import_post post, topic_id
+  def import_post(post, topic_id)
     if post_id_from_imported_post_id(post[:id])
       return # already imported
     end
@@ -89,6 +89,6 @@ class ImportScripts::Quandora < ImportScripts::Base
   end
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Quandora.new.perform
 end
diff --git a/script/import_scripts/quandora/quandora_api.rb b/script/import_scripts/quandora/quandora_api.rb
index c559d8a710..08c2f3db98 100644
--- a/script/import_scripts/quandora/quandora_api.rb
+++ b/script/import_scripts/quandora/quandora_api.rb
@@ -5,26 +5,26 @@ class QuandoraApi
 
   attr_accessor :domain, :username, :password
 
-  def initialize domain, username, password
+  def initialize(domain, username, password)
     @domain = domain
     @username = username
     @password = password
   end
 
-  def base_url domain
+  def base_url(domain)
     "https://#{domain}.quandora.com/m/json"
   end
 
-  def auth_header username, password
+  def auth_header(username, password)
     encoded = Base64.encode64 "#{username}:#{password}"
-    {:Authorization => "Basic #{encoded.strip!}"}
+    { Authorization: "Basic #{encoded.strip!}" }
   end
 
   def list_bases_url
     "#{base_url @domain}/kb"
   end
 
-  def list_questions_url kb_id, limit
+  def list_questions_url(kb_id, limit)
     url = "#{base_url @domain}/kb/#{kb_id}/list"
     url = "#{url}?l=#{limit}" if limit
     url
@@ -39,13 +39,13 @@ class QuandoraApi
     response['data']
   end
 
-  def list_questions kb_id, limit = nil
+  def list_questions(kb_id, limit = nil)
     url = list_questions_url(kb_id, limit)
     response = request url
     response['data']['result']
   end
 
-  def get_question question_id
+  def get_question(question_id)
     url = "#{base_url @domain}/q/#{question_id}"
     response = request url
     response['data']
diff --git a/script/import_scripts/quandora/quandora_question.rb b/script/import_scripts/quandora/quandora_question.rb
index c8611b558c..6105ef895d 100644
--- a/script/import_scripts/quandora/quandora_question.rb
+++ b/script/import_scripts/quandora/quandora_question.rb
@@ -4,9 +4,9 @@ require 'time'
 
 class QuandoraQuestion
 
-   def initialize question_json
-     @question = JSON.parse question_json
-   end
+  def initialize(question_json)
+    @question = JSON.parse question_json
+  end
 
    def topic
      topic = {}
@@ -24,19 +24,19 @@ class QuandoraQuestion
      users[user[:id]] = user
      replies.each do |reply|
        user = user_from_author reply[:author]
-       users[user[:id]] = user 
+       users[user[:id]] = user
      end
      users.values.to_a
    end
 
-   def user_from_author author
+   def user_from_author(author)
      email = author['email']
      email = "#{author['uid']}@noemail.com" unless email
 
      user = {}
      user[:id] = author['uid']
      user[:name] = "#{author['firstName']} #{author['lastName']}"
-     user[:email] = email 
+     user[:email] = email
      user[:staged] = true
      user
    end
@@ -55,10 +55,10 @@ class QuandoraQuestion
          posts << post_from_comment(comment, i, answer)
        end
      end
-     order_replies posts 
+     order_replies posts
    end
 
-   def order_replies posts
+   def order_replies(posts)
      posts = posts.sort_by { |p| p[:created_at] }
      posts.each_with_index do |p, i|
        p[:post_number] = i + 2
@@ -70,7 +70,7 @@ class QuandoraQuestion
      posts
    end
 
-   def post_from_answer answer
+   def post_from_answer(answer)
      post = {}
      post[:id] = answer['uid']
      post[:parent_id] = @question['uid']
@@ -81,17 +81,17 @@ class QuandoraQuestion
      post
    end
 
-   def post_from_comment comment, index, parent
+   def post_from_comment(comment, index, parent)
      if comment['created']
        created_at = Time.parse comment['created']
      else
        created_at = Time.parse parent['created']
      end
      parent_id = parent['uid']
-     parent_id = "#{parent['uid']}-#{index-1}" if index > 0
+     parent_id = "#{parent['uid']}-#{index - 1}" if index > 0
      post = {}
      id = "#{parent['uid']}-#{index}"
-     post[:id] = id 
+     post[:id] = id
      post[:parent_id] = parent_id
      post[:author] = comment['author']
      post[:author_id] = comment['author']['uid']
@@ -102,7 +102,7 @@ class QuandoraQuestion
 
    private
 
-   def unescape html
+   def unescape(html)
      return nil unless html
      CGI.unescapeHTML html
    end
diff --git a/script/import_scripts/quandora/test/test_quandora_api.rb b/script/import_scripts/quandora/test/test_quandora_api.rb
index ecdb976e0b..5fd04e428f 100644
--- a/script/import_scripts/quandora/test/test_quandora_api.rb
+++ b/script/import_scripts/quandora/test/test_quandora_api.rb
@@ -7,7 +7,7 @@ class TestQuandoraApi < Minitest::Test
 
   DEBUG = false
 
-  def initialize args
+  def initialize(args)
     config = YAML::load_file(File.join(__dir__, 'config.yml'))
     @domain = config['domain']
     @username = config['username']
@@ -52,7 +52,7 @@ class TestQuandoraApi < Minitest::Test
   end
 
   def test_get_question_has_expected_structure
-    question = @quandora.get_question @question_id 
+    question = @quandora.get_question @question_id
     expected = JSON.parse(QUESTION)['data']
     check_keys expected, question
 
@@ -71,14 +71,14 @@ class TestQuandoraApi < Minitest::Test
 
   private
 
-  def check_keys expected, actual
+  def check_keys(expected, actual)
     msg = "### caller[0]:\nKey not found in actual keys: #{actual.keys}\n"
     expected.keys.each do |k|
       assert (actual.keys.include? k), "#{k}"
     end
   end
 
-  def debug message, show=false
+  def debug(message, show = false)
     if show || DEBUG
       puts '### ' + caller[0]
       puts ''
diff --git a/script/import_scripts/quandora/test/test_quandora_question.rb b/script/import_scripts/quandora/test/test_quandora_question.rb
index ceba01e006..a52b800150 100644
--- a/script/import_scripts/quandora/test/test_quandora_question.rb
+++ b/script/import_scripts/quandora/test/test_quandora_question.rb
@@ -67,9 +67,9 @@ class TestQuandoraQuestion < Minitest::Test
     answer['uid'] = 'uid'
     answer['content'] = 'content'
     answer['created'] = '2013-01-06T18:24:54.62Z'
-    answer['author'] = {'uid' => 'auid'}
+    answer['author'] = { 'uid' => 'auid' }
 
-    post = @question.post_from_answer answer 
+    post = @question.post_from_answer answer
 
     assert_equal 'uid', post[:id]
     assert_equal @question.topic[:id], post[:parent_id]
@@ -83,8 +83,8 @@ class TestQuandoraQuestion < Minitest::Test
     comment = {}
     comment['text'] = 'text'
     comment['created'] = '2013-01-06T18:24:54.62Z'
-    comment['author'] = {'uid' => 'auid'}
-    parent = {'uid' => 'parent-uid'}
+    comment['author'] = { 'uid' => 'auid' }
+    parent = { 'uid' => 'parent-uid' }
 
     post = @question.post_from_comment comment, 0, parent
 
@@ -98,8 +98,8 @@ class TestQuandoraQuestion < Minitest::Test
 
   def test_post_from_comment_uses_parent_created_if_necessary
     comment = {}
-    comment['author'] = {'uid' => 'auid'}
-    parent = {'created' => '2013-01-06T18:24:54.62Z'}
+    comment['author'] = { 'uid' => 'auid' }
+    parent = { 'created' => '2013-01-06T18:24:54.62Z' }
 
     post = @question.post_from_comment comment, 0, parent
 
@@ -108,8 +108,8 @@ class TestQuandoraQuestion < Minitest::Test
 
   def test_post_from_comment_uses_previous_comment_as_parent
     comment = {}
-    comment['author'] = {'uid' => 'auid'}
-    parent = {'uid' => 'parent-uid', 'created' => '2013-01-06T18:24:54.62Z'}
+    comment['author'] = { 'uid' => 'auid' }
+    parent = { 'uid' => 'parent-uid', 'created' => '2013-01-06T18:24:54.62Z' }
 
     post = @question.post_from_comment comment, 1, parent
 
@@ -117,7 +117,7 @@ class TestQuandoraQuestion < Minitest::Test
     assert_equal 'parent-uid-0', post[:parent_id]
     assert_equal Time.parse('2013-01-06T18:24:54.62Z'), post[:created_at]
   end
-  
+
   def test_users
     users = @question.users
     assert_equal 5, users.size
@@ -127,10 +127,10 @@ class TestQuandoraQuestion < Minitest::Test
     assert_equal 'Greta Greatful', users[3][:name]
     assert_equal 'Eddy Excited', users[4][:name]
   end
-  
+
   private
 
-  def unescape html
+  def unescape(html)
     CGI.unescapeHTML html
   end
 end
diff --git a/script/import_scripts/sfn.rb b/script/import_scripts/sfn.rb
index 64a1dc54a9..3c32969c00 100644
--- a/script/import_scripts/sfn.rb
+++ b/script/import_scripts/sfn.rb
@@ -77,7 +77,7 @@ class ImportScripts::Sfn < ImportScripts::Base
       SQL
 
       break if users.size < 1
-      next if all_records_exist? :users, users.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, users.map { |u| u["id"].to_i }
 
       create_users(users, total: user_count, offset: offset) do |user|
         external_user = @external_users[user["id"]]
@@ -232,7 +232,7 @@ class ImportScripts::Sfn < ImportScripts::Base
       SQL
 
       break if topics.size < 1
-      next if all_records_exist? :posts, topics.map {|t| t['id'].to_i}
+      next if all_records_exist? :posts, topics.map { |t| t['id'].to_i }
 
       create_posts(topics, total: topic_count, offset: offset) do |topic|
         next unless category_id = CATEGORY_MAPPING[topic["category_id"]]
@@ -284,7 +284,7 @@ class ImportScripts::Sfn < ImportScripts::Base
 
       break if posts.size < 1
 
-      next if all_records_exist? :posts, posts.map {|p| p['id'].to_i}
+      next if all_records_exist? :posts, posts.map { |p| p['id'].to_i }
 
       create_posts(posts, total: posts_count, offset: offset) do |post|
         next unless parent = topic_lookup_from_imported_post_id(post["topic_id"])
diff --git a/script/import_scripts/simplepress.rb b/script/import_scripts/simplepress.rb
index 2f4e20ab75..62663842bc 100644
--- a/script/import_scripts/simplepress.rb
+++ b/script/import_scripts/simplepress.rb
@@ -5,7 +5,7 @@ class ImportScripts::SimplePress < ImportScripts::Base
 
   SIMPLE_PRESS_DB ||= ENV['SIMPLEPRESS_DB'] || "simplepress"
   TABLE_PREFIX = "wp_sf"
-  BATCH_SIZE  ||= 1000
+  BATCH_SIZE ||= 1000
 
   def initialize
     super
@@ -120,7 +120,7 @@ class ImportScripts::SimplePress < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :posts, results.map {|m| m['id'].to_i}
+      next if all_records_exist? :posts, results.map { |m| m['id'].to_i }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb
index c65d13bedb..3fc091b0c4 100644
--- a/script/import_scripts/smf2.rb
+++ b/script/import_scripts/smf2.rb
@@ -53,7 +53,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
     if options.password == :ask
       require 'highline'
       $stderr.print "Enter password for MySQL database `#{options.database}`: "
-      options.password = HighLine.new.ask('') {|q| q.echo = false }
+      options.password = HighLine.new.ask('') { |q| q.echo = false }
     end
 
     @default_db_connection = create_db_connection
@@ -76,7 +76,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
       WHERE min_posts = -1 AND group_type IN (1, 2)
     SQL
 
-    create_groups(query(<<-SQL), total: total) {|group| group }
+    create_groups(query(<<-SQL), total: total) { |group| group }
       SELECT id_group AS id, group_name AS name
       FROM {prefix}membergroups
       WHERE min_posts = -1 AND group_type IN (1, 2)
@@ -124,12 +124,12 @@ class ImportScripts::Smf2 < ImportScripts::Base
           user.save
           GroupUser.transaction do
             group_ids.each do |gid|
-              group_id = group_id_from_imported_group_id(gid) and
+              (group_id = group_id_from_imported_group_id(gid)) &&
                 GroupUser.find_or_create_by(user: user, group_id: group_id)
             end
           end
-          if options.smfroot and member[:id_attach].present? and user.uploaded_avatar_id.blank?
-            path = find_smf_attachment_path(member[:id_attach], member[:file_hash], member[:filename]) and begin
+          if options.smfroot && member[:id_attach].present? && user.uploaded_avatar_id.blank?
+            (path = find_smf_attachment_path(member[:id_attach], member[:file_hash], member[:filename])) && begin
               upload = create_upload(user.id, path, member[:filename])
               if upload.persisted?
                 user.update(uploaded_avatar_id: upload.id)
@@ -160,7 +160,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
         post_create_action: restricted && proc do |category|
           category.update(read_restricted: true)
           groups.each do |imported_group_id|
-            group_id = group_id_from_imported_group_id(imported_group_id) and
+            (group_id = group_id_from_imported_group_id(imported_group_id)) &&
             CategoryGroup.find_or_create_by(category: category, group_id: group_id) do |cg|
               cg.permission_type = CategoryGroup.permission_types[:full]
             end
@@ -184,11 +184,10 @@ class ImportScripts::Smf2 < ImportScripts::Base
       end
     end
 
-
     db2 = create_db_connection
 
     create_posts(query(<<-SQL), total: total) do |message|
-      SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body, 
+      SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body,
              m.subject, t.id_board, t.id_first_msg, COUNT(a.id_attach) AS attachment_count
       FROM {prefix}messages AS m
       LEFT JOIN {prefix}topics AS t ON t.id_topic = m.id_topic
@@ -226,7 +225,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
         WHERE attachment_type = 0 AND id_msg = #{message[:id_msg]}
         ORDER BY id_attach ASC
       SQL
-      attachments.map! {|a| import_attachment(post, a) rescue (puts $! ; nil) }
+      attachments.map! { |a| import_attachment(post, a) rescue (puts $! ; nil) }
       post[:raw] = convert_message_body(message[:body], attachments, ignore_quotes: ignore_quotes)
       next post
     end
@@ -265,7 +264,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
 
   def create_db_connection
     Mysql2::Client.new(host: options.host, username: options.username,
-      password: options.password, database: options.database)
+                       password: options.password, database: options.database)
   end
 
   def query(sql, **opts, &block)
@@ -278,7 +277,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
 
   def __query(db, sql, **opts)
     db.query(sql.gsub('{prefix}', options.prefix),
-      {symbolize_keys: true, cache_rows: false}.merge(opts))
+      { symbolize_keys: true, cache_rows: false }.merge(opts))
   end
 
   TRTR_TABLE = begin
@@ -289,14 +288,14 @@ class ImportScripts::Smf2 < ImportScripts::Base
 
   def find_smf_attachment_path(attachment_id, file_hash, filename)
     cleaned_name = filename.dup
-    TRTR_TABLE.each {|from,to| cleaned_name.gsub!(from, to) }
+    TRTR_TABLE.each { |from, to| cleaned_name.gsub!(from, to) }
     cleaned_name.gsub!(/\s/, '_')
     cleaned_name.gsub!(/[^\w_\.\-]/, '')
     legacy_name = "#{attachment_id}_#{cleaned_name.gsub('.', '_')}#{Digest::MD5.hexdigest(cleaned_name)}"
 
     [ filename, "#{attachment_id}_#{file_hash}", legacy_name ]
-      .map {|name| File.join(options.smfroot, 'attachments', name) }
-      .detect {|file| File.exists?(file) }
+      .map { |name| File.join(options.smfroot, 'attachments', name) }
+      .detect { |file| File.exists?(file) }
   end
 
   def decode_entities(*args)
@@ -313,7 +312,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
     end
     body.gsub!(XListPattern) do |s|
       r = "\n[ul]"
-      s.lines.each {|l| r << '[li]' << l.strip.sub(/^\[x\]\s*/, '') << '[/li]' }
+      s.lines.each { |l| r << '[li]' << l.strip.sub(/^\[x\]\s*/, '') << '[/li]' }
       r << "[/ul]\n"
     end
 
@@ -331,8 +330,8 @@ class ImportScripts::Smf2 < ImportScripts::Base
       if use_count.keys.length < attachments.select(&:present?).length
         body << "\n\n---"
         attachments.each_with_index do |upload, num|
-          if upload.present? and use_count[num] == 0
-            body << ( "\n\n" + get_upload_markdown(upload) )
+          if upload.present? && use_count[num] == (0)
+            body << ("\n\n" + get_upload_markdown(upload))
           end
         end
       end
@@ -378,7 +377,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
   # => {'param1' => 'value1=still1 value1', 'param2' => 'value2 ...'}
   def parse_tag_params(params)
     params.to_s.strip.scan(/(?<param>\w+)=(?<value>(?:(?>\S+)|\s+(?!\w+=))*)/).
-      inject({}) {|h,e| h[e[0]] = e[1]; h }
+      inject({}) { |h, e| h[e[0]] = e[1]; h }
   end
 
   class << self
@@ -391,7 +390,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
     # => match[:params] == 'param=value param2=value2'
     #    match[:inner] == "\n  text\n  [tag nested=true]text[/tag]\n"
     def build_nested_tag_regex(ltag, rtag = nil)
-      rtag ||= '/'+ltag
+      rtag ||= '/' + ltag
       %r{
         \[#{ltag}(?-x:[ =](?<params>[^\]]*))?\]            # consume open tag, followed by...
           (?<inner>(?:
@@ -422,11 +421,10 @@ class ImportScripts::Smf2 < ImportScripts::Base
   ColorPattern = build_nested_tag_regex('color')
   ListPattern = build_nested_tag_regex('list')
   AttachmentPatterns = [
-    [/^\[attach(?:|img|url|mini)=(?<num>\d+)\]$/, ->(u) { "\n"+get_upload_markdown(u)+"\n" }],
+    [/^\[attach(?:|img|url|mini)=(?<num>\d+)\]$/, ->(u) { "\n" + get_upload_markdown(u) + "\n" }],
     [/\[attach(?:|img|url|mini)=(?<num>\d+)\]/, ->(u) { get_upload_markdown(u) }]
   ]
 
-
   # Provides command line options and parses the SMF settings file.
   class Options
 
@@ -494,18 +492,17 @@ class ImportScripts::Smf2 < ImportScripts::Base
       @parser ||= OptionParser.new(nil, 12) do |o|
         o.banner = "Usage:\t#{File.basename($0)} <SMFROOT> [options]\n"
         o.banner << "\t#{File.basename($0)} -d <DATABASE> [options]"
-        o.on('-h HOST', :REQUIRED, "MySQL server hostname [\"#{self.host}\"]") {|s| self.host = s }
-        o.on('-u USER', :REQUIRED, "MySQL username [\"#{self.username}\"]") {|s| self.username = s }
-        o.on('-p [PASS]', :OPTIONAL, 'MySQL password. Without argument, reads password from STDIN.') {|s| self.password = s || :ask }
-        o.on('-d DBNAME', :REQUIRED, 'Name of SMF database') {|s| self.database = s }
-        o.on('-f PREFIX', :REQUIRED, "Table names prefix [\"#{self.prefix}\"]") {|s| self.prefix = s }
-        o.on('-t TIMEZONE', :REQUIRED, 'Timezone used by SMF2 [auto-detected from PHP]') {|s| self.timezone = s }
+        o.on('-h HOST', :REQUIRED, "MySQL server hostname [\"#{self.host}\"]") { |s| self.host = s }
+        o.on('-u USER', :REQUIRED, "MySQL username [\"#{self.username}\"]") { |s| self.username = s }
+        o.on('-p [PASS]', :OPTIONAL, 'MySQL password. Without argument, reads password from STDIN.') { |s| self.password = s || :ask }
+        o.on('-d DBNAME', :REQUIRED, 'Name of SMF database') { |s| self.database = s }
+        o.on('-f PREFIX', :REQUIRED, "Table names prefix [\"#{self.prefix}\"]") { |s| self.prefix = s }
+        o.on('-t TIMEZONE', :REQUIRED, 'Timezone used by SMF2 [auto-detected from PHP]') { |s| self.timezone = s }
       end
     end
 
   end #Options
 
-
   # Framework around TSort, used to build a dependency graph over messages
   # to find and solve cyclic quotations.
   class MessageDependencyGraph
@@ -532,10 +529,9 @@ class ImportScripts::Smf2 < ImportScripts::Base
     end
 
     def cycles
-      strongly_connected_components.select {|c| c.length > 1 }.to_a
+      strongly_connected_components.select { |c| c.length > 1 }.to_a
     end
 
-
     class Node
       attr_reader :id
 
@@ -551,7 +547,7 @@ class ImportScripts::Smf2 < ImportScripts::Base
       end
 
       def quoted
-        @quoted.map {|id| @graph[id] }.reject(&:nil?)
+        @quoted.map { |id| @graph[id] }.reject(&:nil?)
       end
 
       def ignore_quotes?
diff --git a/script/import_scripts/socialcast/create_title.rb b/script/import_scripts/socialcast/create_title.rb
index 0987f7a455..1d571876dd 100644
--- a/script/import_scripts/socialcast/create_title.rb
+++ b/script/import_scripts/socialcast/create_title.rb
@@ -34,7 +34,7 @@ class CreateTitle
   end
 
   def self.first_long_line(text)
-    lines = text.split("\n").select {|t| t.strip.size >= 20}
+    lines = text.split("\n").select { |t| t.strip.size >= 20 }
     return if lines.empty?
     lines[0].strip
   end
diff --git a/script/import_scripts/socialcast/export.rb b/script/import_scripts/socialcast/export.rb
index 9301128185..01d87a583d 100644
--- a/script/import_scripts/socialcast/export.rb
+++ b/script/import_scripts/socialcast/export.rb
@@ -2,8 +2,8 @@ require 'yaml'
 require 'fileutils'
 require_relative 'socialcast_api'
 
-def load_config file
-    config = YAML::load_file(File.join(__dir__, file))
+def load_config(file)
+  config = YAML::load_file(File.join(__dir__, file))
     @domain = config['domain']
     @username = config['username']
     @password = config['password']
@@ -17,8 +17,8 @@ def export
   export_messages
 end
 
-def export_users(page=1)
-  users = @api.list_users({page: page})
+def export_users(page = 1)
+  users = @api.list_users(page: page)
   return if users.empty?
   users.each do |user|
     File.open("output/users/#{user['id']}.json", 'w') do |f|
@@ -30,8 +30,8 @@ def export_users(page=1)
   export_users page + 1
 end
 
-def export_messages(page=1)
-  messages = @api.list_messages({page: page})
+def export_messages(page = 1)
+  messages = @api.list_messages(page: page)
   return if messages.empty?
   messages.each do |message|
     File.open("output/messages/#{message['id']}.json", 'w') do |f|
diff --git a/script/import_scripts/socialcast/import.rb b/script/import_scripts/socialcast/import.rb
index 7aaee20e18..38a711a815 100644
--- a/script/import_scripts/socialcast/import.rb
+++ b/script/import_scripts/socialcast/import.rb
@@ -27,7 +27,7 @@ class ImportScripts::Socialcast < ImportScripts::Base
     imported = 0
     total = count_files(MESSAGES_DIR)
     Dir.foreach(MESSAGES_DIR) do |filename|
-      next if filename == '.' or filename == '..'
+      next if filename == ('.') || filename == ('..')
       topics += 1
       message_json = File.read MESSAGES_DIR + '/' + filename
       message = SocialcastMessage.new(message_json)
@@ -46,7 +46,7 @@ class ImportScripts::Socialcast < ImportScripts::Base
     users = 0
     total = count_files(USERS_DIR)
     Dir.foreach(USERS_DIR) do |filename|
-      next if filename == '.' or filename == '..'
+      next if filename == ('.') || filename == ('..')
       user_json = File.read USERS_DIR + '/' + filename
       user = SocialcastUser.new(user_json).user
       create_user user, user[:id]
@@ -56,10 +56,10 @@ class ImportScripts::Socialcast < ImportScripts::Base
   end
 
   def count_files(path)
-    Dir.foreach(path).select {|f| f != '.' && f != '..'}.count
+    Dir.foreach(path).select { |f| f != '.' && f != '..' }.count
   end
 
-  def import_topic topic
+  def import_topic(topic)
     post = nil
     if post_id = post_id_from_imported_post_id(topic[:id])
       post = Post.find(post_id) # already imported this topic
@@ -77,13 +77,13 @@ class ImportScripts::Socialcast < ImportScripts::Base
     post
   end
 
-  def import_posts posts, topic_id
+  def import_posts(posts, topic_id)
     posts.each do |post|
       import_post post, topic_id
     end
   end
 
-  def import_post post, topic_id
+  def import_post(post, topic_id)
     return if post_id_from_imported_post_id(post[:id]) # already imported
     post[:topic_id] = topic_id
     post[:user_id] = user_id_from_imported_user_id(post[:author_id]) || -1
@@ -96,6 +96,6 @@ class ImportScripts::Socialcast < ImportScripts::Base
 
 end
 
-if __FILE__==$0
+if __FILE__ == $0
   ImportScripts::Socialcast.new.perform
 end
diff --git a/script/import_scripts/socialcast/socialcast_api.rb b/script/import_scripts/socialcast/socialcast_api.rb
index 2c9399b122..587775ad06 100644
--- a/script/import_scripts/socialcast/socialcast_api.rb
+++ b/script/import_scripts/socialcast/socialcast_api.rb
@@ -5,7 +5,7 @@ class SocialcastApi
 
   attr_accessor :domain, :username, :password
 
-  def initialize domain, username, password
+  def initialize(domain, username, password)
     @domain = domain
     @username = username
     @password = password
@@ -17,22 +17,22 @@ class SocialcastApi
 
   def headers
     encoded = Base64.encode64 "#{@username}:#{@password}"
-    {:Authorization => "Basic #{encoded.strip!}", :Accept => "application/json"}
+    { Authorization: "Basic #{encoded.strip!}", Accept: "application/json" }
   end
 
-  def request url
-    JSON.parse(Excon.get(url, headers: headers)
+  def request(url)
+    JSON.parse(Excon.get(url, headers: headers))
   end
 
-  def list_users(opts={})
+  def list_users(opts = {})
     page = opts[:page] ? opts[:page] : 1
     response = request "#{base_url}/users?page=#{page}"
-    response['users'].sort {|u| u['id']}
+    response['users'].sort { |u| u['id'] }
   end
 
-  def list_messages(opts={})
+  def list_messages(opts = {})
     page = opts[:page] ? opts[:page] : 1
     response = request "#{base_url}/messages?page=#{page}"
-    response['messages'].sort {|m| m['id']}
+    response['messages'].sort { |m| m['id'] }
   end
 end
diff --git a/script/import_scripts/socialcast/socialcast_message.rb b/script/import_scripts/socialcast/socialcast_message.rb
index 602252be94..a82149f2ab 100644
--- a/script/import_scripts/socialcast/socialcast_message.rb
+++ b/script/import_scripts/socialcast/socialcast_message.rb
@@ -18,7 +18,7 @@ class SocialcastMessage
     }
    }
 
-   def initialize message_json
+   def initialize(message_json)
      @parsed_json = JSON.parse message_json
    end
 
@@ -51,7 +51,6 @@ class SocialcastMessage
      tags
    end
 
-
    def category
      category = DEFAULT_CATEGORY
      if group && TAGS_AND_CATEGORIES[group]
@@ -92,7 +91,7 @@ class SocialcastMessage
 
    private
 
-   def unescape html
+   def unescape(html)
      return nil unless html
      CGI.unescapeHTML html
    end
diff --git a/script/import_scripts/socialcast/socialcast_user.rb b/script/import_scripts/socialcast/socialcast_user.rb
index a96a282e36..54107b4636 100644
--- a/script/import_scripts/socialcast/socialcast_user.rb
+++ b/script/import_scripts/socialcast/socialcast_user.rb
@@ -4,9 +4,9 @@ require 'time'
 
 class SocialcastUser
 
-   def initialize user_json
-     @parsed_json = JSON.parse user_json
-   end
+  def initialize(user_json)
+    @parsed_json = JSON.parse user_json
+  end
 
    def user
      email = @parsed_json['contact_info']['email']
diff --git a/script/import_scripts/socialcast/test/test_socialcast_api.rb b/script/import_scripts/socialcast/test/test_socialcast_api.rb
index 220531dc10..d27fec4d11 100644
--- a/script/import_scripts/socialcast/test/test_socialcast_api.rb
+++ b/script/import_scripts/socialcast/test/test_socialcast_api.rb
@@ -7,7 +7,7 @@ class TestSocialcastApi < Minitest::Test
 
   DEBUG = false
 
-  def initialize args
+  def initialize(args)
     config = YAML::load_file(File.join(__dir__, 'config.ex.yml'))
     @domain = config['domain']
     @username = config['username']
@@ -39,40 +39,40 @@ class TestSocialcastApi < Minitest::Test
 
   def test_list_users
     users = @socialcast.list_users
-    expected = JSON.parse(USERS)['users'].sort {|u| u['id']}
+    expected = JSON.parse(USERS)['users'].sort { |u| u['id'] }
     assert_equal 15, users.size
     assert_equal expected[0], users[0]
   end
 
   def test_list_users_next_page
-    users = @socialcast.list_users({page: 2})
+    users = @socialcast.list_users(page: 2)
     assert_equal 0, users.size
   end
 
   def test_list_messages
     messages = @socialcast.list_messages
-    expected = JSON.parse(MESSAGES)['messages'].sort {|m| m['id']}
+    expected = JSON.parse(MESSAGES)['messages'].sort { |m| m['id'] }
     assert_equal 20, messages.size
     check_keys expected[0], messages[0]
   end
 
   def test_messages_next_page
-    messages = @socialcast.list_messages({page: 2})
-    expected = JSON.parse(MESSAGES_PG_2)['messages'].sort {|m| m['id']}
+    messages = @socialcast.list_messages(page: 2)
+    expected = JSON.parse(MESSAGES_PG_2)['messages'].sort { |m| m['id'] }
     assert_equal 20, messages.size
     check_keys expected[0], messages[0]
   end
 
   private
 
-  def check_keys expected, actual
+  def check_keys(expected, actual)
     msg = "### caller[0]:\nKey not found in actual keys: #{actual.keys}\n"
     expected.keys.each do |k|
       assert (actual.keys.include? k), "#{k}"
     end
   end
 
-  def debug message, show=false
+  def debug(message, show = false)
     if show || DEBUG
       puts '### ' + caller[0]
       puts ''
diff --git a/script/import_scripts/socialcast/title.rb b/script/import_scripts/socialcast/title.rb
index cebf8f0ed5..846e8bffb3 100644
--- a/script/import_scripts/socialcast/title.rb
+++ b/script/import_scripts/socialcast/title.rb
@@ -9,7 +9,7 @@ def titles
   topics = 0
   total = count_files(MESSAGES_DIR)
   Dir.foreach(MESSAGES_DIR) do |filename|
-    next if filename == '.' or filename == '..'
+    next if filename == ('.') || filename == ('..')
     message_json = File.read MESSAGES_DIR + '/' + filename
     message = SocialcastMessage.new(message_json)
     next unless message.title
@@ -21,7 +21,7 @@ def titles
 end
 
 def count_files(path)
-  Dir.foreach(path).select {|f| f != '.' && f != '..'}.count
+  Dir.foreach(path).select { |f| f != '.' && f != '..' }.count
 end
 
 titles
diff --git a/script/import_scripts/sourceforge.rb b/script/import_scripts/sourceforge.rb
index d1b85366f4..12dde957e0 100644
--- a/script/import_scripts/sourceforge.rb
+++ b/script/import_scripts/sourceforge.rb
@@ -34,7 +34,7 @@ class ImportScripts::Sourceforge < ImportScripts::Base
   end
 
   def load_json
-    @json = MultiJson.load(File.read(JSON_FILE), :symbolize_keys => true)
+    @json = MultiJson.load(File.read(JSON_FILE), symbolize_keys: true)
   end
 
   def import_categories
@@ -45,8 +45,8 @@ class ImportScripts::Sourceforge < ImportScripts::Base
         id: forum[:shortname],
         name: forum[:name],
         post_create_action: proc do |category|
-          changes = {raw: forum[:description]}
-          opts = {revised_at: Time.now, bypass_bump: true}
+          changes = { raw: forum[:description] }
+          opts = { revised_at: Time.now, bypass_bump: true }
 
           post = category.topic.first_post
           post.revise(@system_user, changes, opts)
diff --git a/script/import_scripts/support/convert_mysql_xml_to_mysql.rb b/script/import_scripts/support/convert_mysql_xml_to_mysql.rb
index 1b4e4eb7b8..a711ec3328 100644
--- a/script/import_scripts/support/convert_mysql_xml_to_mysql.rb
+++ b/script/import_scripts/support/convert_mysql_xml_to_mysql.rb
@@ -11,7 +11,7 @@ class Saxy < Ox::Sax
   end
 
   def start_element(name)
-    @stack << {elem: name}
+    @stack << { elem: name }
   end
 
   def end_element(name)
@@ -40,7 +40,6 @@ class Convert < Saxy
     super()
   end
 
-
   def end_element(name)
     old = @stack.pop
     cur = @stack[-1]
@@ -71,10 +70,9 @@ class Convert < Saxy
 
     row = data[:row_data]
     col_names = row.keys.join(",")
-    vals = row.values.map{|v| "'#{v.gsub("'", "''").gsub('\\','\\\\\\')}'"}.join(",")
+    vals = row.values.map { |v| "'#{v.gsub("'", "''").gsub('\\', '\\\\\\')}'" }.join(",")
     puts "INSERT INTO #{name} (#{col_names}) VALUES (#{vals});"
   end
 end
 
 Ox.sax_parse(Convert.new(skip_data: ['metrics2', 'user_log']), File.open(ARGV[0]))
-
diff --git a/script/import_scripts/vanilla.rb b/script/import_scripts/vanilla.rb
index e60fcebca8..9471290559 100644
--- a/script/import_scripts/vanilla.rb
+++ b/script/import_scripts/vanilla.rb
@@ -69,10 +69,10 @@ class ImportScripts::Vanilla < ImportScripts::Base
     def read_file
       puts "reading file..."
       string = File.read(@vanilla_file).gsub("\\N", "")
-                                       .gsub(/\\$\n/m, "\\n")
-                                       .gsub("\\,", ",")
-                                       .gsub(/(?<!\\)\\"/, '""')
-                                       .gsub(/\\\\\\"/, '\\""')
+        .gsub(/\\$\n/m, "\\n")
+        .gsub("\\,", ",")
+        .gsub(/(?<!\\)\\"/, '""')
+        .gsub(/\\\\\\"/, '\\""')
       StringIO.new(string)
     end
 
@@ -192,10 +192,10 @@ class ImportScripts::Vanilla < ImportScripts::Base
 
         # list all other user ids in the conversation
         user_ids_in_conversation = @user_conversations.select { |uc| uc[:conversation_id] == conversation[:conversation_id] && uc[:user_id] != conversation[:insert_user_id] }
-                                                      .map { |uc| uc[:user_id] }
+          .map { |uc| uc[:user_id] }
         # retrieve their emails
         user_emails_in_conversation = @users.select { |u| user_ids_in_conversation.include?(u[:user_id]) }
-                                            .map { |u| u[:email] }
+          .map { |u| u[:email] }
         # retrieve their usernames from the database
         target_usernames = User.where("email IN (?)", user_emails_in_conversation).pluck(:username).to_a
 
@@ -243,10 +243,10 @@ class ImportScripts::Vanilla < ImportScripts::Base
     def clean_up(raw)
       return "" if raw.blank?
       raw.gsub("\\n", "\n")
-         .gsub(/<\/?pre\s*>/i, "\n```\n")
-         .gsub(/<\/?code\s*>/i, "`")
-         .gsub("&lt;", "<")
-         .gsub("&gt;", ">")
+        .gsub(/<\/?pre\s*>/i, "\n```\n")
+        .gsub(/<\/?code\s*>/i, "`")
+        .gsub("&lt;", "<")
+        .gsub("&gt;", ">")
     end
 
 end
diff --git a/script/import_scripts/vanilla_mysql.rb b/script/import_scripts/vanilla_mysql.rb
index 60b5ac1350..e59a581ba1 100644
--- a/script/import_scripts/vanilla_mysql.rb
+++ b/script/import_scripts/vanilla_mysql.rb
@@ -54,7 +54,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     username = nil
     @last_user_id = -1
     total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}User;").first['count']
-    
+
     batches(BATCH_SIZE) do |offset|
       results = mysql_query(
         "SELECT UserID, Name, Title, Location, About, Email,
@@ -66,7 +66,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
       break if results.size < 1
       @last_user_id = results.to_a.last['UserID']
-      next if all_records_exist? :users, results.map {|u| u['UserID'].to_i}
+      next if all_records_exist? :users, results.map { |u| u['UserID'].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         next if user['Email'].blank?
@@ -197,9 +197,9 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     tag_names_sql = "select t.name as tag_name from GDN_Tag t, GDN_TagDiscussion td where t.tagid = td.tagid and td.discussionid = {discussionid} and t.name != '';"
 
     total_count = mysql_query("SELECT count(*) count FROM #{TABLE_PREFIX}Discussion;").first['count']
-    
+
     @last_topic_id = -1
-    
+
     batches(BATCH_SIZE) do |offset|
       discussions = mysql_query(
         "SELECT DiscussionID, CategoryID, Name, Body,
@@ -211,7 +211,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
       break if discussions.size < 1
       @last_topic_id = discussions.to_a.last['DiscussionID']
-      next if all_records_exist? :posts, discussions.map {|t| "discussion#" + t['DiscussionID'].to_s}
+      next if all_records_exist? :posts, discussions.map { |t| "discussion#" + t['DiscussionID'].to_s }
 
       create_posts(discussions, total: total_count, offset: offset) do |discussion|
         {
@@ -223,7 +223,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
           created_at: Time.zone.at(discussion['DateInserted']),
           post_create_action: proc do |post|
             if @import_tags
-              tag_names = @client.query(tag_names_sql.gsub('{discussionid}', discussion['DiscussionID'].to_s)).map {|row| row['tag_name']}
+              tag_names = @client.query(tag_names_sql.gsub('{discussionid}', discussion['DiscussionID'].to_s)).map { |row| row['tag_name'] }
               DiscourseTagging.tag_topic_by_names(post.topic, staff_guardian, tag_names)
             end
           end
@@ -248,7 +248,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
       break if comments.size < 1
       @last_post_id = comments.to_a.last['CommentID']
-      next if all_records_exist? :posts, comments.map {|comment| "comment#" + comment['CommentID'].to_s}
+      next if all_records_exist? :posts, comments.map { |comment| "comment#" + comment['CommentID'].to_s }
 
       create_posts(comments, total: total_count, offset: offset) do |comment|
         next unless t = topic_lookup_from_imported_post_id("discussion#" + comment['DiscussionID'].to_s)
@@ -272,15 +272,15 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
     # fix whitespaces
     raw = raw.gsub(/(\\r)?\\n/, "\n")
-             .gsub("\\t", "\t")
+      .gsub("\\t", "\t")
 
     # [HTML]...[/HTML]
     raw = raw.gsub(/\[html\]/i, "\n```html\n")
-             .gsub(/\[\/html\]/i, "\n```\n")
+      .gsub(/\[\/html\]/i, "\n```\n")
 
     # [PHP]...[/PHP]
     raw = raw.gsub(/\[php\]/i, "\n```php\n")
-             .gsub(/\[\/php\]/i, "\n```\n")
+      .gsub(/\[\/php\]/i, "\n```\n")
 
     # [HIGHLIGHT="..."]
     raw = raw.gsub(/\[highlight="?(\w+)"?\]/i) { "\n```#{$1.downcase}\n" }
@@ -288,7 +288,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     # [CODE]...[/CODE]
     # [HIGHLIGHT]...[/HIGHLIGHT]
     raw = raw.gsub(/\[\/?code\]/i, "\n```\n")
-             .gsub(/\[\/?highlight\]/i, "\n```\n")
+      .gsub(/\[\/?highlight\]/i, "\n```\n")
 
     # [SAMP]...[/SAMP]
     raw.gsub!(/\[\/?samp\]/i, "`")
@@ -299,12 +299,12 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
       #  - AFTER all the "code" processing
       #  - BEFORE the "quote" processing
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-               .gsub("<", "&lt;")
-               .gsub("\u2603", "<")
+        .gsub("<", "&lt;")
+        .gsub("\u2603", "<")
 
       raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-               .gsub(">", "&gt;")
-               .gsub("\u2603", ">")
+        .gsub(">", "&gt;")
+        .gsub("\u2603", ">")
     end
 
     # [URL=...]...[/URL]
@@ -316,7 +316,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     # [URL]...[/URL]
     # [MP3]...[/MP3]
     raw = raw.gsub(/\[\/?url\]/i, "")
-             .gsub(/\[\/?mp3\]/i, "")
+      .gsub(/\[\/?mp3\]/i, "")
 
     # [QUOTE]...[/QUOTE]
     raw.gsub!(/\[quote\](.+?)\[\/quote\]/im) { "\n> #{$1}\n" }
@@ -366,7 +366,7 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
     User.find_each do |u|
       ucf = u.custom_fields
       if ucf && ucf["import_id"] && ucf["import_username"]
-        Permalink.create( url: "profile/#{ucf['import_id']}/#{ucf['import_username']}", external_url: "/users/#{u.username}" ) rescue nil
+        Permalink.create(url: "profile/#{ucf['import_id']}/#{ucf['import_username']}", external_url: "/users/#{u.username}") rescue nil
         print '.'
       end
     end
@@ -378,9 +378,9 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
         id = pcf["import_id"].split('#').last
         if post.post_number == 1
           slug = Slug.for(topic.title) # probably matches what vanilla would do...
-          Permalink.create( url: "discussion/#{id}/#{slug}", topic_id: topic.id ) rescue nil
+          Permalink.create(url: "discussion/#{id}/#{slug}", topic_id: topic.id) rescue nil
         else
-          Permalink.create( url: "discussion/comment/#{id}", post_id: post.id ) rescue nil
+          Permalink.create(url: "discussion/comment/#{id}", post_id: post.id) rescue nil
         end
         print '.'
       end
@@ -389,5 +389,4 @@ class ImportScripts::VanillaSQL < ImportScripts::Base
 
 end
 
-
 ImportScripts::VanillaSQL.new.perform
diff --git a/script/import_scripts/vbulletin.rb b/script/import_scripts/vbulletin.rb
index 0ed2bd6a91..048fea099b 100644
--- a/script/import_scripts/vbulletin.rb
+++ b/script/import_scripts/vbulletin.rb
@@ -47,7 +47,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
       database: DB_NAME
     )
     rescue Exception => e
-      puts '='*50
+      puts '=' * 50
       puts e.message
       puts <<EOM
 Cannot connect in to database.
@@ -71,7 +71,6 @@ EOM
       exit
   end
 
-
   def execute
     mysql_query("CREATE INDEX firstpostid_index ON #{TABLE_PREFIX}thread (firstpostid)") rescue nil
 
@@ -422,7 +421,6 @@ EOM
     puts sql
   end
 
-
   def import_private_messages
     puts "", "importing private messages..."
 
@@ -536,7 +534,6 @@ EOM
     end
   end
 
-
   def import_attachments
     puts '', 'importing attachments...'
 
@@ -574,7 +571,7 @@ EOM
       end
 
       if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: 'Import attachments from vBulletin' })
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from vBulletin')
       end
 
       success_count += 1
@@ -828,7 +825,6 @@ EOM
     raw
   end
 
-
   def create_permalink_file
     puts '', 'Creating Permalink File...', ''
 
@@ -858,7 +854,6 @@ EOM
 
   end
 
-
   def suspend_users
     puts '', "updating banned users"
 
diff --git a/script/import_scripts/vbulletin5.rb b/script/import_scripts/vbulletin5.rb
index 263cfb4f48..da1ceea84b 100644
--- a/script/import_scripts/vbulletin5.rb
+++ b/script/import_scripts/vbulletin5.rb
@@ -5,7 +5,7 @@ require 'htmlentities'
 class ImportScripts::VBulletin < ImportScripts::Base
   BATCH_SIZE = 1000
   DBPREFIX = "vb_"
-  ROOT_NODE=2
+  ROOT_NODE = 2
 
   # CHANGE THESE BEFORE RUNNING THE IMPORTER
   DATABASE = "yourforum"
@@ -394,7 +394,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
       end
 
       if new_raw != post.raw
-        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: 'Import attachments from vBulletin' })
+        PostRevisor.new(post).revise!(post.user, { raw: new_raw }, bypass_bump: true, edit_reason: 'Import attachments from vBulletin')
       end
 
       success_count += 1
@@ -450,15 +450,15 @@ class ImportScripts::VBulletin < ImportScripts::Base
 
     # fix whitespaces
     raw = raw.gsub(/(\\r)?\\n/, "\n")
-             .gsub("\\t", "\t")
+      .gsub("\\t", "\t")
 
     # [HTML]...[/HTML]
     raw = raw.gsub(/\[html\]/i, "\n```html\n")
-             .gsub(/\[\/html\]/i, "\n```\n")
+      .gsub(/\[\/html\]/i, "\n```\n")
 
     # [PHP]...[/PHP]
     raw = raw.gsub(/\[php\]/i, "\n```php\n")
-             .gsub(/\[\/php\]/i, "\n```\n")
+      .gsub(/\[\/php\]/i, "\n```\n")
 
     # [HIGHLIGHT="..."]
     raw = raw.gsub(/\[highlight="?(\w+)"?\]/i) { "\n```#{$1.downcase}\n" }
@@ -466,7 +466,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
     # [CODE]...[/CODE]
     # [HIGHLIGHT]...[/HIGHLIGHT]
     raw = raw.gsub(/\[\/?code\]/i, "\n```\n")
-             .gsub(/\[\/?highlight\]/i, "\n```\n")
+      .gsub(/\[\/?highlight\]/i, "\n```\n")
 
     # [SAMP]...[/SAMP]
     raw = raw.gsub(/\[\/?samp\]/i, "`")
@@ -476,12 +476,12 @@ class ImportScripts::VBulletin < ImportScripts::Base
     #  - AFTER all the "code" processing
     #  - BEFORE the "quote" processing
     raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub("<", "\u2603") + "`" }
-             .gsub("<", "&lt;")
-             .gsub("\u2603", "<")
+      .gsub("<", "&lt;")
+      .gsub("\u2603", "<")
 
     raw = raw.gsub(/`([^`]+)`/im) { "`" + $1.gsub(">", "\u2603") + "`" }
-             .gsub(">", "&gt;")
-             .gsub("\u2603", ">")
+      .gsub(">", "&gt;")
+      .gsub("\u2603", ">")
 
     # [URL=...]...[/URL]
     raw.gsub!(/\[url="?(.+?)"?\](.+?)\[\/url\]/i) { "<a href=\"#{$1}\">#{$2}</a>" }
@@ -489,7 +489,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
     # [URL]...[/URL]
     # [MP3]...[/MP3]
     raw = raw.gsub(/\[\/?url\]/i, "")
-             .gsub(/\[\/?mp3\]/i, "")
+      .gsub(/\[\/?mp3\]/i, "")
 
     # [MENTION]<username>[/MENTION]
     raw = raw.gsub(/\[mention\](.+?)\[\/mention\]/i) do
diff --git a/script/import_scripts/xenforo.rb b/script/import_scripts/xenforo.rb
index 7cfd04b6d6..217c956369 100644
--- a/script/import_scripts/xenforo.rb
+++ b/script/import_scripts/xenforo.rb
@@ -42,7 +42,7 @@ class ImportScripts::XenForo < ImportScripts::Base
 
       break if results.size < 1
 
-      next if all_records_exist? :users, results.map {|u| u["id"].to_i}
+      next if all_records_exist? :users, results.map { |u| u["id"].to_i }
 
       create_users(results, total: total_count, offset: offset) do |user|
         next if user['username'].blank?
@@ -100,7 +100,7 @@ class ImportScripts::XenForo < ImportScripts::Base
       ").to_a
 
       break if results.size < 1
-      next if all_records_exist? :posts, results.map {|p| p['id'] }
+      next if all_records_exist? :posts, results.map { |p| p['id'] }
 
       create_posts(results, total: total_count, offset: offset) do |m|
         skip = false
diff --git a/script/import_scripts/zoho.rb b/script/import_scripts/zoho.rb
index 99b15dcc64..63f374802d 100644
--- a/script/import_scripts/zoho.rb
+++ b/script/import_scripts/zoho.rb
@@ -1,6 +1,4 @@
 
-
-
 ###
 ###
 ### The output of this importer is bad.
@@ -12,14 +10,6 @@
 ###
 ###
 
-
-
-
-
-
-
-
-
 # Import from Zoho.
 # Be sure to get the posts CSV file, AND the user list csv file with people's email addresses.
 # You may need to contact Zoho support for the user list.
@@ -64,7 +54,7 @@ class ImportScripts::Zoho < ImportScripts::Base
 
   def import_users
     puts "", "Importing users"
-    create_users( CSV.parse(File.read(File.join(@path, 'users.csv'))) ) do |u|
+    create_users(CSV.parse(File.read(File.join(@path, 'users.csv')))) do |u|
       username = cleanup_zoho_username(u[0])
       {
         id: username,
@@ -105,10 +95,10 @@ class ImportScripts::Zoho < ImportScripts::Base
 
     # Create categories
     @categories.each do |parent, subcats|
-      c = create_category({name: parent}, parent)
+      c = create_category({ name: parent }, parent)
       subcats.each do |subcat|
         next if subcat == "Uncategorized" || subcat == "Uncategorised"
-        create_category({name: subcat, parent_category_id: c.id}, "#{parent}:#{subcat}")
+        create_category({ name: subcat, parent_category_id: c.id }, "#{parent}:#{subcat}")
       end
     end
 
@@ -217,7 +207,6 @@ class ImportScripts::Zoho < ImportScripts::Base
     CGI.unescapeHTML(x)
   end
 
-
   def import_post_id(row)
     # Try to make up a unique id based on the data Zoho gives us.
     # The posted_time seems to be the same for all posts in a topic, so we can't use that.
diff --git a/script/measure.rb b/script/measure.rb
index bb7a240b93..aaeadb19da 100644
--- a/script/measure.rb
+++ b/script/measure.rb
@@ -26,10 +26,10 @@ def profile_allocations(name)
     changes[k] -= initial_size[k]
   end
   puts "#{name} changes"
-  changes.sort{|a,b| b[1] <=> a[1]}.each do |a,b|
+  changes.sort { |a, b| b[1] <=> a[1] }.each do |a, b|
     next if b <= 0
     # 1 extra hash for tracking
-    puts "#{a} #{a == :T_HASH ? b-1 : b}"
+    puts "#{a} #{a == :T_HASH ? b - 1 : b}"
   end
   GC.enable
 end
@@ -61,7 +61,7 @@ def profile(name, &block)
     end
   end
 
-  items.group_by{|x| x}.sort{|a,b| b[1].length <=> a[1].length}.each do |row, group|
+  items.group_by { |x| x }.sort { |a, b| b[1].length <=> a[1].length }.each do |row, group|
     puts "#{row} x #{group.length}"
   end
 
@@ -69,8 +69,6 @@ def profile(name, &block)
   profile_allocations(name, &block)
 end
 
-
-
 def stuff
   u = User.first
   r = TopicQuery.new(u, {}).list_latest
@@ -82,72 +80,71 @@ profile_allocations "stuff" do
   stuff
 end
 
-
 # Benchmark.bmbm do |x|
-# 
+#
 #   x.report("find") do
 #     100.times{stuff}
 #   end
-# 
+#
 # end
-# 
+#
 #   x.report("grab 10 users id") do
 #     100.times{User.limit(10).select(:id).to_a}
 #   end
-# 
+#
 #   x.report("grab 10 users") do
 #     100.times{User.limit(10).to_a}
 #   end
-# 
+#
 # profile("topic query") do
 # r = TopicQuery.new(u, {}).list_latest
 # r.topics.to_a
 # end
 
-# 
+#
 # RubyProf.start
-# 
+#
 # r = TopicQuery.new(u, {}).list_latest
 # r.topics.to_a
-# 
+#
 # result = RubyProf.stop
 # printer = RubyProf::GraphPrinter.new(result)
 # # printer = RubyProf::FlatPrinter.new(result)
 # printer.print(STDOUT, :min_percent => 2)
-# 
+#
 # exit
-# 
+#
 # # User.limit(10).to_a
 # User.limit(10).select(:created_at).to_a
-# 
+#
 # profile("limit 10") do
 #   User.limit(10).select(:created_at).to_a
 # end
-# 
+#
 # exit
 # User.limit(10).to_a
 # exit
 #
 # User.select('id, 2 bob').first
 # Benchmark.bmbm do |x|
-# 
+#
 #   x.report("find") do
 #     100.times{User.find(1)}
 #   end
-# 
+#
 #   x.report("grab 10 users created_at") do
 #     100.times{User.limit(10).select(:created_at).to_a}
 #   end
-# 
+#
 #   x.report("grab 10 users id") do
 #     100.times{User.limit(10).select(:id).to_a}
 #   end
-# 
+#
 #   x.report("grab 10 users") do
 #     100.times{User.limit(10).to_a}
 #   end
-# 
-# 
+#
+#
 #   x.report("pg direct grab 10 users") do
 #     100.times do
 #       r = ActiveRecord::Base.connection.raw_connection.async_exec("select * from users limit 10")
@@ -159,9 +156,9 @@ end
 #       end
 #     end
 #   end
-# 
+#
 # end
-# 
+#
 
 # profile("find") do
 #   User.find(1)
@@ -170,4 +167,3 @@ end
 # profile("where") do
 #   User.where(id: 1).first
 # end
-
diff --git a/script/memstats.rb b/script/memstats.rb
index c41ec3f1e3..7d5d7b4072 100755
--- a/script/memstats.rb
+++ b/script/memstats.rb
@@ -45,19 +45,19 @@ class Mapping
   attr_accessor :swap
   attr_accessor :pss
 
-  def initialize( lines )
+  def initialize(lines)
 
     FIELDS.each do |field|
       self.send("#{field}=", 0)
     end
 
-    parse_first_line( lines.shift )
+    parse_first_line(lines.shift)
     lines.each do |l|
       parse_field_line(l)
     end
   end
 
-  def parse_first_line( line )
+  def parse_first_line(line)
     parts = line.strip.split
     @address_start, @address_end = parts[0].split("-")
     @perms = parts[1]
@@ -67,26 +67,26 @@ class Mapping
     @region = parts[5] || "anonymous"
   end
 
-  def parse_field_line( line )
+  def parse_field_line(line)
     parts = line.strip.split
-    field = parts[0].downcase.sub(':','')
+    field = parts[0].downcase.sub(':', '')
     if respond_to? "#{field}="
       value = Float(parts[1]).to_i
-      self.send( "#{field}=", value )
+      self.send("#{field}=", value)
     end
   end
 end
 
-def consume_mapping( map_lines, totals )
-  m = Mapping.new( map_lines )
+def consume_mapping(map_lines, totals)
+  m = Mapping.new(map_lines)
 
   Mapping::FIELDS.each do |field|
-    totals[field] += m.send( field )
+    totals[field] += m.send(field)
   end
   return m
 end
 
-def create_memstats_not_available( totals )
+def create_memstats_not_available(totals)
   Mapping::FIELDS.each do |field|
     totals[field] += Float::NAN
   end
@@ -98,7 +98,7 @@ totals = Hash.new(0)
 mappings = []
 
 begin
-  File.open( "/proc/#{pid}/smaps" ) do |smaps|
+  File.open("/proc/#{pid}/smaps") do |smaps|
 
     map_lines = []
 
@@ -110,7 +110,7 @@ begin
         map_lines << line
       when /[0-9a-f]+:[0-9a-f]+\s+/
         if map_lines.size > 0 then
-          mappings << consume_mapping( map_lines, totals )
+          mappings << consume_mapping(map_lines, totals)
         end
         map_lines.clear
         map_lines << line
@@ -120,16 +120,16 @@ begin
     end
   end
 rescue
-  create_memstats_not_available( totals )
+  create_memstats_not_available(totals)
 end
 
 # http://rubyforge.org/snippet/download.php?type=snippet&id=511
-def format_number( n )
-  n.to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/,'\1,\2')
+def format_number(n)
+  n.to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/, '\1,\2')
 end
 
-def get_commandline( pid )
-  commandline = IO.read( "/proc/#{pid}/cmdline" ).split("\0")
+def get_commandline(pid)
+  commandline = IO.read("/proc/#{pid}/cmdline").split("\0")
   if commandline.first =~ /java$/ then
     loop { break if commandline.shift == "-jar" }
     return "[java] #{commandline.shift}"
@@ -139,7 +139,7 @@ end
 
 if ARGV.include? '--yaml'
   require 'yaml'
-  puts Hash[*totals.map do |k,v|
+  puts Hash[*totals.map do |k, v|
     [k + '_kb', v]
   end.flatten].to_yaml
 else
@@ -147,8 +147,6 @@ else
   puts "#{"Command Line:".ljust(20)} #{get_commandline(pid)}"
   puts "Memory Summary:"
   totals.keys.sort.each do |k|
-    puts "  #{k.ljust(20)} #{format_number( totals[k] ).rjust(12)} kB"
+    puts "  #{k.ljust(20)} #{format_number(totals[k]).rjust(12)} kB"
   end
 end
-
-
diff --git a/script/micro_bench.rb b/script/micro_bench.rb
index b7caadf01e..1342a1b587 100644
--- a/script/micro_bench.rb
+++ b/script/micro_bench.rb
@@ -21,7 +21,6 @@ Benchmark.ips do |b|
   end
 
   b.report("raw") do
-    conn.exec("SELECT name FROM users LIMIT 1").getvalue(0,0)
+    conn.exec("SELECT name FROM users LIMIT 1").getvalue(0, 0)
   end
 end
-
diff --git a/script/profile_db_generator.rb b/script/profile_db_generator.rb
index 79b62064a7..fc9c30b448 100644
--- a/script/profile_db_generator.rb
+++ b/script/profile_db_generator.rb
@@ -10,7 +10,6 @@ class Array
   end
 end
 
-
 # based on https://gist.github.com/zaius/2643079
 def unbundled_require(gem)
   if defined?(::Bundler)
@@ -111,4 +110,3 @@ end
 # no sidekiq so update some stuff
 Category.update_stats
 Jobs::PeriodicalUpdates.new.execute(nil)
-
diff --git a/script/pull_translations.rb b/script/pull_translations.rb
index 0295183591..2acb4d2dab 100644
--- a/script/pull_translations.rb
+++ b/script/pull_translations.rb
@@ -91,7 +91,7 @@ class YamlAliasFinder < LocaleFileWalker
   def parse_file(filename)
     document = Psych.parse_file(filename)
     handle_document(document)
-    {anchors: @anchors, aliases: @aliases}
+    { anchors: @anchors, aliases: @aliases }
   end
 
   private
@@ -143,11 +143,11 @@ class YamlAliasSynchronizer < LocaleFileWalker
   end
 
   def add_needed_node(keys)
-    @required_keys[keys] = {mapping: nil, scalar: nil, alias: nil}
+    @required_keys[keys] = { mapping: nil, scalar: nil, alias: nil }
   end
 
   def write_yaml(stream, filename)
-    yaml = stream.to_yaml(nil, {:line_width => -1})
+    yaml = stream.to_yaml(nil, line_width: -1)
 
     File.open(filename, 'w') do |file|
       file.write(yaml)
diff --git a/script/redis_memory.rb b/script/redis_memory.rb
index a127ec37fd..856de2ba9e 100644
--- a/script/redis_memory.rb
+++ b/script/redis_memory.rb
@@ -22,7 +22,7 @@ stats = {}
 end
 
 puts "Top 100 keys"
-stats.sort{|a,b| b[1][0] <=> a[1][0]}.first(50).each do |k, (len, type, elems)|
+stats.sort { |a, b| b[1][0] <=> a[1][0] }.first(50).each do |k, (len, type, elems)|
   elems = " [#{elems}]" if elems
   puts "#{k} #{type} #{len}#{elems}"
 end
diff --git a/script/require_profiler.rb b/script/require_profiler.rb
index 8d760efe7c..1adc9bc86d 100644
--- a/script/require_profiler.rb
+++ b/script/require_profiler.rb
@@ -21,7 +21,7 @@ module RequireProfiler
       stop
     end
 
-    def start(tmp_options={})
+    def start(tmp_options = {})
       @start_time = Time.now
       [ ::Kernel, (class << ::Kernel; self; end) ].each do |klass|
         klass.class_eval do
@@ -61,7 +61,7 @@ module RequireProfiler
       @stack ||= []
       self.stats ||= {}
 
-      stat = self.stats.fetch(path){|key| self.stats[key] = {calls: 0, time: 0, parent_time: 0} }
+      stat = self.stats.fetch(path) { |key| self.stats[key] = { calls: 0, time: 0, parent_time: 0 } }
 
       @stack << stat
 
@@ -104,8 +104,6 @@ module RequireProfiler
   end
 end
 
-
-
 # RequireProfiler.gc_analyze do
 #   # require 'mime-types'
 #   require 'highline'
@@ -115,14 +113,14 @@ end
 RequireProfiler.profile do
   Bundler.definition.dependencies.each do |dep|
     begin
-      require dep.name unless dep.name =~ /timecop/
+      require dep.name
     rescue Exception
       # don't care
     end
   end
 end
 
-sorted = RequireProfiler.stats.to_a.sort{|a,b| b[1][:time] - b[1][:parent_time] <=> a[1][:time] - a[1][:parent_time]}
+sorted = RequireProfiler.stats.to_a.sort { |a, b| b[1][:time] - b[1][:parent_time] <=> a[1][:time] - a[1][:parent_time] }
 
 sorted[0..120].each do |k, v|
   puts "#{k} : time #{v[:time] - v[:parent_time]} "
diff --git a/script/test_email_settings.rb b/script/test_email_settings.rb
index dc8422edd6..102f5afe7e 100755
--- a/script/test_email_settings.rb
+++ b/script/test_email_settings.rb
@@ -3,11 +3,11 @@
 require 'action_mailer'
 
 # Make this your email address. Poor example.com gets SO MUCH MAIL
-YOUR_EMAIL                = "nobody@example.com"
+YOUR_EMAIL = "nobody@example.com"
 
 # Change these to be the same settings as your Discourse environment
-DISCOURSE_SMTP_ADDRESS   = "smtp.example.com"       # (mandatory)
-@DISCOURSE_SMTP_PORT      =  587                    # (optional)
+DISCOURSE_SMTP_ADDRESS = "smtp.example.com"       # (mandatory)
+@DISCOURSE_SMTP_PORT = 587                    # (optional)
 @DISCOURSE_SMTP_USER_NAME = "username"              # (optional)
 @DISCOURSE_SMTP_PASSWORD  = "blah"                  # (optional)
 #@DISCOURSE_SMTP_OPENSSL_VERIFY_MODE = "none"       # (optional) none|peer|client_once|fail_if_no_peer_cert
@@ -22,7 +22,7 @@ $delivery_options = {
   user_name: @DISCOURSE_SMTP_USER_NAME || nil,
   password:  @DISCOURSE_SMTP_PASSWORD  || nil,
   address:   DISCOURSE_SMTP_ADDRESS,
-  port:      @DISCOURSE_SMTP_PORT      || nil,
+  port:      @DISCOURSE_SMTP_PORT || nil,
   openssl_verify_mode: @DISCOURSE_SMTP_OPENSSL_VERIFY_MODE || nil }
 
 class EmailTestMailer < ActionMailer::Base
@@ -40,16 +40,16 @@ message = EmailTestMailer.email_test(MAILFROM, MAILTO)
 begin
   message.deliver_now()
 rescue SocketError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " Is the server hostname correct?\n"
 rescue OpenSSL::SSL::SSLError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " You probably need to change the ssl verify mode.\n"
 rescue Net::SMTPAuthenticationError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " Check to ensure your username and password are correct.\n"
 rescue Net::SMTPFatalError => e
-  print "Delivery failed: "+e.message.strip()+"\n"
+  print "Delivery failed: " + e.message.strip() + "\n"
   print " Check the above error and fix your settings.\n"
 else
   print "Successfully delivered.\n"
diff --git a/script/test_mem.rb b/script/test_mem.rb
index 3acf76e44a..16b16267b9 100644
--- a/script/test_mem.rb
+++ b/script/test_mem.rb
@@ -7,7 +7,7 @@ I18n.t(:posts)
 
 # load up all models and schema
 (ActiveRecord::Base.connection.tables - %w[schema_migrations]).each do |table|
-table.classify.constantize.first rescue nil
+  table.classify.constantize.first rescue nil
 end
 
 # router warm up
@@ -26,5 +26,3 @@ s = ObjectSpace.each_object(String).map do |o|
 end
 
 puts "Total strings: #{s.count} space used: #{s.sum} bytes"
-
-
diff --git a/script/test_pretty_text.rb b/script/test_pretty_text.rb
new file mode 100644
index 0000000000..974094c23f
--- /dev/null
+++ b/script/test_pretty_text.rb
@@ -0,0 +1,23 @@
+require File.expand_path("../../config/environment", __FILE__)
+
+puts PrettyText.cook "test"
+1000.times do |i|
+  # PrettyText.v8.eval <<~JS
+  #   window.markdownit().render('test');
+  # JS
+  PrettyText.cook "test"
+
+  PrettyText.v8.eval('gc()')
+
+  # if i % 500 == 0
+  #p PrettyText.v8.heap_stats
+  # end
+end
+
+# sam@ubuntu script % ruby test_pretty_text.rb
+# {:total_physical_size=>10556240, :total_heap_size_executable=>5242880, :total_heap_size=>16732160, :used_heap_size=>7483336, :heap_size_limit=>1501560832}
+# {:total_physical_size=>288670880, :total_heap_size_executable=>6291456, :total_heap_size=>292507648, :used_heap_size=>252365360, :heap_size_limit=>1501560832}
+# {:total_physical_size=>543060056, :total_heap_size_executable=>6291456, :total_heap_size=>548360192, :used_heap_size=>503699768, :heap_size_limit=>1501560832}
+# {:total_physical_size=>793401560, :total_heap_size_executable=>6291456, :total_heap_size=>801067008, :used_heap_size=>739517840, :heap_size_limit=>1501560832}
+# {:total_physical_size=>1045932696, :total_heap_size_executable=>6291456, :total_heap_size=>1055870976, :used_heap_size=>992549688, :heap_size_limit=>1501560832}
+# {:total_physical_size=>1298442008, :total_heap_size_executable=>6291456, :total_heap_size=>1309626368, :used_heap_size=>1224681072, :heap_size_limit=>1501560832}
diff --git a/script/user_simulator.rb b/script/user_simulator.rb
index 4abd344653..9552fd2535 100644
--- a/script/user_simulator.rb
+++ b/script/user_simulator.rb
@@ -40,13 +40,11 @@ unless ["profile", "development"].include? Rails.env
   exit
 end
 
-
 user = User.find(user_id)
 last_topics = Topic.order('id desc').limit(10).pluck(:id)
 
 puts "Simulating activity for user id #{user.id}: #{user.name}"
 
-
 while true
   puts "Creating a random topic"
   category = Category.where(read_restricted: false).order('random()').first
diff --git a/script/version_bump.rb b/script/version_bump.rb
index b29765a67c..d69c4ec861 100755
--- a/script/version_bump.rb
+++ b/script/version_bump.rb
@@ -33,7 +33,7 @@ if ARGV.length < 1
 end
 
 new_version = ARGV[0].split('.')
-if new_version.length < 2 and !ARGV.include?('push')
+if new_version.length < (2) && !ARGV.include?('push')
   puts "First argument must be a version number with at least 2 parts. Examples: 0.9.8, 0.10, 0.9.7.3"
   exit 1
 end
@@ -67,7 +67,7 @@ require File.expand_path('../../lib/version',  __FILE__)
 version = Discourse::VERSION::STRING
 puts "New version is: #{version}"
 
-unless ARGV.include?('no-commit') or !update_version_file
+unless ARGV.include?('no-commit') || !update_version_file
   puts "Committing..."
 
   `git add lib/version.rb`
@@ -87,4 +87,4 @@ if ARGV.include?('push')
   `git push origin latest-release`
 end
 
-puts "Done",''
+puts "Done", ''
diff --git a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
index 74f4894075..607faaab39 100644
--- a/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
+++ b/spec/components/active_record/connection_adapters/postgresql_fallback_adapter_spec.rb
@@ -6,11 +6,9 @@ describe ActiveRecord::ConnectionHandling do
   let(:replica_port) { 6432 }
 
   let(:config) do
-    ActiveRecord::Base.configurations[Rails.env].merge({
-      "adapter" => "postgresql_fallback",
-      "replica_host" => replica_host,
-      "replica_port" => replica_port
-    }).symbolize_keys!
+    ActiveRecord::Base.configurations[Rails.env].merge("adapter" => "postgresql_fallback",
+                                                       "replica_host" => replica_host,
+                                                       "replica_port" => replica_port).symbolize_keys!
   end
 
   let(:postgresql_fallback_handler) { PostgreSQLFallbackHandler.instance }
@@ -61,9 +59,7 @@ describe ActiveRecord::ConnectionHandling do
           ActiveRecord::Base.expects(:postgresql_connection).with(configuration).raises(PG::ConnectionBad)
           ActiveRecord::Base.expects(:verify_replica).with(@replica_connection)
 
-          ActiveRecord::Base.expects(:postgresql_connection).with(configuration.merge({
-            host: replica_host, port: replica_port
-          })).returns(@replica_connection)
+          ActiveRecord::Base.expects(:postgresql_connection).with(configuration.merge(host: replica_host, port: replica_port)).returns(@replica_connection)
         end
 
         expect(postgresql_fallback_handler.master_down?).to eq(nil)
@@ -71,8 +67,8 @@ describe ActiveRecord::ConnectionHandling do
         expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
           .to raise_error(PG::ConnectionBad)
 
-        expect{ ActiveRecord::Base.postgresql_fallback_connection(config) }
-          .to change{ Discourse.readonly_mode? }.from(false).to(true)
+        expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
+          .to change { Discourse.readonly_mode? }.from(false).to(true)
 
         expect(postgresql_fallback_handler.master_down?).to eq(true)
 
@@ -82,8 +78,8 @@ describe ActiveRecord::ConnectionHandling do
           expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
             .to raise_error(PG::ConnectionBad)
 
-          expect{ ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
-            .to change{ Discourse.readonly_mode? }.from(false).to(true)
+          expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
+            .to change { Discourse.readonly_mode? }.from(false).to(true)
 
           expect(postgresql_fallback_handler.master_down?).to eq(true)
         end
@@ -109,9 +105,7 @@ describe ActiveRecord::ConnectionHandling do
       it 'should raise the right error' do
         ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad).once
 
-        ActiveRecord::Base.expects(:postgresql_connection).with(config.dup.merge({
-          host: replica_host, port: replica_port
-        })).raises(PG::ConnectionBad).once
+        ActiveRecord::Base.expects(:postgresql_connection).with(config.dup.merge(host: replica_host, port: replica_port)).raises(PG::ConnectionBad).once
 
         2.times do
           expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
diff --git a/spec/components/admin_confirmation_spec.rb b/spec/components/admin_confirmation_spec.rb
index 20d74fec96..994ef9d18e 100644
--- a/spec/components/admin_confirmation_spec.rb
+++ b/spec/components/admin_confirmation_spec.rb
@@ -51,4 +51,3 @@ describe AdminConfirmation do
   end
 
 end
-
diff --git a/spec/components/admin_user_index_query_spec.rb b/spec/components/admin_user_index_query_spec.rb
index cb0bf16130..1c3fd90c08 100644
--- a/spec/components/admin_user_index_query_spec.rb
+++ b/spec/components/admin_user_index_query_spec.rb
@@ -13,32 +13,32 @@ describe AdminUserIndexQuery do
     end
 
     it "has active order" do
-      query = ::AdminUserIndexQuery.new({ query: "active" })
+      query = ::AdminUserIndexQuery.new(query: "active")
       expect(query.find_users_query.to_sql).to match("last_seen_at")
     end
 
     it "can't be injected" do
-      query = ::AdminUserIndexQuery.new({ order: "wat, no" })
+      query = ::AdminUserIndexQuery.new(order: "wat, no")
       expect(query.find_users_query.to_sql).not_to match("wat, no")
     end
 
     it "allows custom ordering" do
-      query = ::AdminUserIndexQuery.new({ order: "trust_level" })
+      query = ::AdminUserIndexQuery.new(order: "trust_level")
       expect(query.find_users_query.to_sql).to match("trust_level DESC")
     end
 
     it "allows custom ordering asc" do
-      query = ::AdminUserIndexQuery.new({ order: "trust_level", ascending: true })
-      expect(query.find_users_query.to_sql).to match("trust_level ASC" )
+      query = ::AdminUserIndexQuery.new(order: "trust_level", ascending: true)
+      expect(query.find_users_query.to_sql).to match("trust_level ASC")
     end
 
     it "allows custom ordering for stats wtih default direction" do
-      query = ::AdminUserIndexQuery.new({ order: "topics_viewed" })
+      query = ::AdminUserIndexQuery.new(order: "topics_viewed")
       expect(query.find_users_query.to_sql).to match("topics_entered DESC")
     end
 
     it "allows custom ordering and direction for stats" do
-      query = ::AdminUserIndexQuery.new({ order: "topics_viewed", ascending: true })
+      query = ::AdminUserIndexQuery.new(order: "topics_viewed", ascending: true)
       expect(query.find_users_query.to_sql).to match("topics_entered ASC")
     end
   end
@@ -50,17 +50,17 @@ describe AdminUserIndexQuery do
     end
 
     it "offsets by 100 by default for page 2" do
-      query = ::AdminUserIndexQuery.new({ page: "2"})
+      query = ::AdminUserIndexQuery.new(page: "2")
       expect(query.find_users.to_sql).to match("OFFSET 100")
     end
 
     it "offsets by limit for page 2" do
-      query = ::AdminUserIndexQuery.new({ page: "2"})
+      query = ::AdminUserIndexQuery.new(page: "2")
       expect(query.find_users(10).to_sql).to match("OFFSET 10")
     end
 
     it "ignores negative pages" do
-      query = ::AdminUserIndexQuery.new({ page: "-2" })
+      query = ::AdminUserIndexQuery.new(page: "-2")
       expect(query.find_users.to_sql).to match("OFFSET 0")
     end
   end
@@ -69,7 +69,7 @@ describe AdminUserIndexQuery do
 
     TrustLevel.levels.each do |key, value|
       it "#{key} returns no records" do
-        query = ::AdminUserIndexQuery.new({ query: key.to_s })
+        query = ::AdminUserIndexQuery.new(query: key.to_s)
         expect(real_users_count(query)).to eq(0)
       end
     end
@@ -81,7 +81,7 @@ describe AdminUserIndexQuery do
     TrustLevel.levels.each do |key, value|
       it "finds user with trust #{key}" do
         Fabricate(:user, trust_level: TrustLevel.levels[key])
-        query = ::AdminUserIndexQuery.new({ query: key.to_s })
+        query = ::AdminUserIndexQuery.new(query: key.to_s)
         expect(real_users_count(query)).to eq(1)
       end
     end
@@ -93,14 +93,14 @@ describe AdminUserIndexQuery do
     let!(:user) { Fabricate(:user, approved: false) }
 
     it "finds the unapproved user" do
-      query = ::AdminUserIndexQuery.new({ query: 'pending' })
+      query = ::AdminUserIndexQuery.new(query: 'pending')
       expect(query.find_users.count).to eq(1)
     end
 
     context 'and a suspended pending user' do
       let!(:suspended_user) { Fabricate(:user, approved: false, suspended_at: 1.hour.ago, suspended_till: 20.years.from_now) }
       it "doesn't return the suspended user" do
-        query = ::AdminUserIndexQuery.new({ query: 'pending' })
+        query = ::AdminUserIndexQuery.new(query: 'pending')
         expect(query.find_users.count).to eq(1)
       end
     end
@@ -113,17 +113,17 @@ describe AdminUserIndexQuery do
     end
 
     it "shows nil values first with asc" do
-      users = ::AdminUserIndexQuery.new({ order: "last_emailed", ascending: true }).find_users
+      users = ::AdminUserIndexQuery.new(order: "last_emailed", ascending: true).find_users
 
-      expect(users.count).to eq(2)
+      expect(users.where('users.id > -2').count).to eq(2)
       expect(users.first.username).to eq("system")
       expect(users.first.last_emailed_at).to eq(nil)
     end
 
     it "shows nil values last with desc" do
-      users = ::AdminUserIndexQuery.new({ order: "last_emailed"}).find_users
+      users = ::AdminUserIndexQuery.new(order: "last_emailed").find_users
 
-      expect(users.count).to eq(2)
+      expect(users.where('users.id > -2').count).to eq(2)
       expect(users.first.last_emailed_at).to_not eq(nil)
     end
 
@@ -134,7 +134,7 @@ describe AdminUserIndexQuery do
     let!(:user) { Fabricate(:user, admin: true) }
 
     it "finds the admin" do
-      query = ::AdminUserIndexQuery.new({ query: 'admins' })
+      query = ::AdminUserIndexQuery.new(query: 'admins')
       expect(real_users_count(query)).to eq(1)
     end
 
@@ -145,7 +145,7 @@ describe AdminUserIndexQuery do
     let!(:user) { Fabricate(:user, moderator: true) }
 
     it "finds the moderator" do
-      query = ::AdminUserIndexQuery.new({ query: 'moderators' })
+      query = ::AdminUserIndexQuery.new(query: 'moderators')
       expect(real_users_count(query)).to eq(1)
     end
 
@@ -156,7 +156,7 @@ describe AdminUserIndexQuery do
     let!(:user) { Fabricate(:user, blocked: true) }
 
     it "finds the blocked user" do
-      query = ::AdminUserIndexQuery.new({ query: 'blocked' })
+      query = ::AdminUserIndexQuery.new(query: 'blocked')
       expect(query.find_users.count).to eq(1)
     end
 
@@ -169,12 +169,12 @@ describe AdminUserIndexQuery do
       before(:each) { Fabricate(:user, email: "test1@example.com") }
 
       it "matches the email" do
-        query = ::AdminUserIndexQuery.new({ filter: " est1" })
+        query = ::AdminUserIndexQuery.new(filter: " est1")
         expect(query.find_users.count()).to eq(1)
       end
 
       it "matches the email using any case" do
-        query = ::AdminUserIndexQuery.new({ filter: "Test1\t" })
+        query = ::AdminUserIndexQuery.new(filter: "Test1\t")
         expect(query.find_users.count()).to eq(1)
       end
 
@@ -185,12 +185,12 @@ describe AdminUserIndexQuery do
       before(:each) { Fabricate(:user, username: "test_user_1") }
 
       it "matches the username" do
-        query = ::AdminUserIndexQuery.new({ filter: "user\n" })
+        query = ::AdminUserIndexQuery.new(filter: "user\n")
         expect(query.find_users.count).to eq(1)
       end
 
       it "matches the username using any case" do
-        query = ::AdminUserIndexQuery.new({ filter: "\r\nUser" })
+        query = ::AdminUserIndexQuery.new(filter: "\r\nUser")
         expect(query.find_users.count).to eq(1)
       end
     end
@@ -200,7 +200,7 @@ describe AdminUserIndexQuery do
       let!(:user) { Fabricate(:user, ip_address: "117.207.94.9") }
 
       it "matches the ip address" do
-        query = ::AdminUserIndexQuery.new({ filter: " 117.207.94.9 " })
+        query = ::AdminUserIndexQuery.new(filter: " 117.207.94.9 ")
         expect(query.find_users.count()).to eq(1)
       end
 
diff --git a/spec/components/archetype_spec.rb b/spec/components/archetype_spec.rb
index 84d6164ea0..dc8d20e02e 100644
--- a/spec/components/archetype_spec.rb
+++ b/spec/components/archetype_spec.rb
@@ -36,10 +36,9 @@ describe Archetype do
       @list = Archetype.list.dup
       Archetype.register('glados')
       expect(Archetype.list.size).to eq(@list.size + 1)
-      expect(Archetype.list.find {|a| a.id == 'glados'}).to be_present
+      expect(Archetype.list.find { |a| a.id == 'glados' }).to be_present
     end
 
   end
 
 end
-
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index a80a1b4848..4c93ed6481 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -10,14 +10,14 @@ describe Auth::DefaultCurrentUserProvider do
     end
   end
 
-  def provider(url, opts=nil)
-    opts ||= {method: "GET"}
+  def provider(url, opts = nil)
+    opts ||= { method: "GET" }
     env = Rack::MockRequest.env_for(url, opts)
     TestProvider.new(env)
   end
 
   it "raises errors for incorrect api_key" do
-    expect{
+    expect {
       provider("/?api_key=INCORRECT").current_user
     }.to raise_error(Discourse::InvalidAccess)
   end
@@ -29,13 +29,13 @@ describe Auth::DefaultCurrentUserProvider do
 
     user.update_columns(active: false)
 
-    expect{
+    expect {
       provider("/?api_key=hello").current_user
     }.to raise_error(Discourse::InvalidAccess)
 
     user.update_columns(active: true, suspended_till: 1.day.from_now)
 
-    expect{
+    expect {
       provider("/?api_key=hello").current_user
     }.to raise_error(Discourse::InvalidAccess)
   end
@@ -45,7 +45,7 @@ describe Auth::DefaultCurrentUserProvider do
     user2 = Fabricate(:user)
     ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1)
 
-    expect{
+    expect {
       provider("/?api_key=hello&api_username=#{user2.username.downcase}").current_user
     }.to raise_error(Discourse::InvalidAccess)
   end
@@ -54,7 +54,7 @@ describe Auth::DefaultCurrentUserProvider do
     user = Fabricate(:user)
     ApiKey.create!(key: "hello", user_id: user.id, created_by_id: -1, allowed_ips: ['10.0.0.0/24'])
 
-    expect{
+    expect {
       provider("/?api_key=hello&api_username=#{user.username.downcase}", "REMOTE_ADDR" => "10.1.0.1").current_user
     }.to raise_error(Discourse::InvalidAccess)
 
@@ -69,7 +69,6 @@ describe Auth::DefaultCurrentUserProvider do
 
     expect(found_user.id).to eq(user.id)
 
-
     found_user = provider("/?api_key=hello&api_username=#{user.username.downcase}",
                           "HTTP_X_FORWARDED_FOR" => "10.1.1.1, 100.0.0.22").current_user
     expect(found_user.id).to eq(user.id)
@@ -208,7 +207,7 @@ describe Auth::DefaultCurrentUserProvider do
   end
 
   it "correctly removes invalid cookies" do
-    cookies = {"_t" => SecureRandom.hex}
+    cookies = { "_t" => SecureRandom.hex }
     provider('/').refresh_session(nil, {}, cookies)
     expect(cookies.key?("_t")).to eq(false)
   end
@@ -230,7 +229,6 @@ describe Auth::DefaultCurrentUserProvider do
     cookies = {}
     provider('/').log_on_user(user, {}, cookies)
 
-
     expect(cookies["_t"][:same_site]).to eq("Lax")
     expect(cookies["_t"][:httponly]).to eq(true)
     expect(cookies["_t"][:secure]).to eq(false)
@@ -286,10 +284,9 @@ describe Auth::DefaultCurrentUserProvider do
       expect(good_provider.is_user_api?).to eq(true)
 
       expect {
-        provider("/", params.merge({"REQUEST_METHOD" => "POST"})).current_user
+        provider("/", params.merge("REQUEST_METHOD" => "POST")).current_user
       }.to raise_error(Discourse::InvalidAccess)
 
-
       user.update_columns(suspended_till: 1.year.from_now)
 
       expect {
@@ -322,7 +319,6 @@ describe Auth::DefaultCurrentUserProvider do
         provider("/", params).current_user
       }.to raise_error(RateLimiter::LimitExceeded)
 
-
       SiteSetting.max_user_api_reqs_per_day = 4
       SiteSetting.max_user_api_reqs_per_minute = 3
 
@@ -340,4 +336,3 @@ describe Auth::DefaultCurrentUserProvider do
     end
   end
 end
-
diff --git a/spec/components/auth/facebook_authenticator_spec.rb b/spec/components/auth/facebook_authenticator_spec.rb
index c5a91249b2..c7d26b6e86 100644
--- a/spec/components/auth/facebook_authenticator_spec.rb
+++ b/spec/components/auth/facebook_authenticator_spec.rb
@@ -48,7 +48,7 @@ describe Auth::FacebookAuthenticator do
           }
         },
         "info" => {
-          :email => "bob@bob.com"
+          email: "bob@bob.com"
         },
         "uid" => "100"
       }
diff --git a/spec/components/auth/github_authenticator_spec.rb b/spec/components/auth/github_authenticator_spec.rb
index 066fdecec0..ee1edd1775 100644
--- a/spec/components/auth/github_authenticator_spec.rb
+++ b/spec/components/auth/github_authenticator_spec.rb
@@ -14,20 +14,20 @@ describe Auth::GithubAuthenticator do
       user = Fabricate(:user)
 
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => user.email,
-            :primary => true,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: user.email,
+            primary: true,
+            verified: true,
           }]
         },
-        :info => {
-          :email => user.email,
-          :email_verified => true,
-          :nickname => user.username,
-          :name => user.name,
+        info: {
+          email: user.email,
+          email_verified: true,
+          nickname: user.username,
+          name: user.name,
         },
-        :uid => "100"
+        uid: "100"
       }
 
       authenticator = Auth::GithubAuthenticator.new
@@ -44,20 +44,20 @@ describe Auth::GithubAuthenticator do
       user = Fabricate(:user)
 
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => user.email,
-            :primary => true,
-            :verified => false,
+        extra: {
+          all_emails: [{
+            email: user.email,
+            primary: true,
+            verified: false,
           }]
         },
-        :info => {
-          :email => user.email,
-          :email_verified => false,
-          :nickname => user.username,
-          :name => user.name,
+        info: {
+          email: user.email,
+          email_verified: false,
+          nickname: user.username,
+          name: user.name,
         },
-        :uid => "100"
+        uid: "100"
       }
 
       authenticator = Auth::GithubAuthenticator.new
@@ -72,20 +72,20 @@ describe Auth::GithubAuthenticator do
 
     it 'can create a proper result for non existing users' do
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => "person@example.com",
-            :primary => true,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: "person@example.com",
+            primary: true,
+            verified: true,
           }]
         },
-        :info => {
-          :email => "person@example.com",
-          :email_verified => true,
-          :nickname => "person",
-          :name => "Person Lastname",
+        info: {
+          email: "person@example.com",
+          email_verified: true,
+          nickname: "person",
+          name: "Person Lastname",
         },
-        :uid => "100"
+        uid: "100"
       }
 
       authenticator = Auth::GithubAuthenticator.new
@@ -100,24 +100,24 @@ describe Auth::GithubAuthenticator do
 
     it 'will skip blacklisted domains for non existing users' do
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => "not_allowed@blacklist.com",
-            :primary => true,
-            :verified => true,
-          },{
-            :email => "allowed@whitelist.com",
-            :primary => false,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: "not_allowed@blacklist.com",
+            primary: true,
+            verified: true,
+          }, {
+            email: "allowed@whitelist.com",
+            primary: false,
+            verified: true,
           }]
         },
-        :info => {
-          :email => "not_allowed@blacklist.com",
-          :email_verified => true,
-          :nickname => "person",
-          :name => "Person Lastname",
+        info: {
+          email: "not_allowed@blacklist.com",
+          email_verified: true,
+          nickname: "person",
+          name: "Person Lastname",
         },
-        :uid => "100"
+        uid: "100"
       }
 
       authenticator = Auth::GithubAuthenticator.new
@@ -133,28 +133,28 @@ describe Auth::GithubAuthenticator do
 
     it 'will find whitelisted domains for non existing users' do
       hash = {
-        :extra => {
-          :all_emails => [{
-            :email => "person@example.com",
-            :primary => true,
-            :verified => true,
-          },{
-            :email => "not_allowed@blacklist.com",
-            :primary => true,
-            :verified => true,
-          },{
-            :email => "allowed@whitelist.com",
-            :primary => false,
-            :verified => true,
+        extra: {
+          all_emails: [{
+            email: "person@example.com",
+            primary: true,
+            verified: true,
+          }, {
+            email: "not_allowed@blacklist.com",
+            primary: true,
+            verified: true,
+          }, {
+            email: "allowed@whitelist.com",
+            primary: false,
+            verified: true,
           }]
         },
-        :info => {
-          :email => "person@example.com",
-          :email_verified => true,
-          :nickname => "person",
-          :name => "Person Lastname",
+        info: {
+          email: "person@example.com",
+          email_verified: true,
+          nickname: "person",
+          name: "Person Lastname",
         },
-        :uid => "100"
+        uid: "100"
       }
 
       authenticator = Auth::GithubAuthenticator.new
diff --git a/spec/components/auth/google_oauth2_authenticator_spec.rb b/spec/components/auth/google_oauth2_authenticator_spec.rb
index fcba68cce4..dc0a6d29b2 100644
--- a/spec/components/auth/google_oauth2_authenticator_spec.rb
+++ b/spec/components/auth/google_oauth2_authenticator_spec.rb
@@ -14,16 +14,16 @@ describe Auth::GoogleOAuth2Authenticator do
     user = Fabricate(:user)
 
     hash = {
-      :uid => "123456789",
-      :info => {
-          :name => "John Doe",
-          :email => user.email
+      uid: "123456789",
+      info: {
+          name: "John Doe",
+          email: user.email
       },
-      :extra => {
-        :raw_info => {
-          :email => user.email,
-          :email_verified => false,
-          :name => "John Doe"
+      extra: {
+        raw_info: {
+          email: user.email,
+          email_verified: false,
+          name: "John Doe"
         }
       }
     }
@@ -39,16 +39,16 @@ describe Auth::GoogleOAuth2Authenticator do
       user = Fabricate(:user)
 
       hash = {
-        :uid => "123456789",
-        :info => {
-            :name => "John Doe",
-            :email => user.email
+        uid: "123456789",
+        info: {
+            name: "John Doe",
+            email: user.email
         },
-        :extra => {
-          :raw_info => {
-            :email => user.email,
-            :email_verified => true,
-            :name => "John Doe"
+        extra: {
+          raw_info: {
+            email: user.email,
+            email_verified: true,
+            name: "John Doe"
           }
         }
       }
@@ -60,16 +60,16 @@ describe Auth::GoogleOAuth2Authenticator do
 
     it 'can create a proper result for non existing users' do
       hash = {
-        :uid => "123456789",
-        :info => {
-            :name => "Jane Doe",
-            :email => "jane.doe@the.google.com"
+        uid: "123456789",
+        info: {
+            name: "Jane Doe",
+            email: "jane.doe@the.google.com"
         },
-        :extra => {
-          :raw_info => {
-            :email => "jane.doe@the.google.com",
-            :email_verified => true,
-            :name => "Jane Doe"
+        extra: {
+          raw_info: {
+            email: "jane.doe@the.google.com",
+            email_verified: true,
+            name: "Jane Doe"
           }
         }
       }
@@ -87,9 +87,9 @@ describe Auth::GoogleOAuth2Authenticator do
       authenticator = Auth::GoogleOAuth2Authenticator.new
       user = Fabricate(:user)
       session = {
-        :email_valid => "true",
-        :extra_data => {
-          :google_user_id => 1
+        email_valid: "true",
+        extra_data: {
+          google_user_id: 1
         }
       }
       authenticator.after_create_account(user, session)
diff --git a/spec/components/auth/open_id_authenticator_spec.rb b/spec/components/auth/open_id_authenticator_spec.rb
index 6b295dcc19..983fea379a 100644
--- a/spec/components/auth/open_id_authenticator_spec.rb
+++ b/spec/components/auth/open_id_authenticator_spec.rb
@@ -13,7 +13,7 @@ describe Auth::OpenIdAuthenticator do
 
     user = Fabricate(:user)
     response = OpenStruct.new(identity_url: 'abc')
-    result = auth.after_authenticate(info: {email: user.email}, extra: {response: response})
+    result = auth.after_authenticate(info: { email: user.email }, extra: { response: response })
     expect(result.user).to eq(user)
   end
 
diff --git a/spec/components/avatar_lookup_spec.rb b/spec/components/avatar_lookup_spec.rb
index 539ef48a24..c744b6301d 100644
--- a/spec/components/avatar_lookup_spec.rb
+++ b/spec/components/avatar_lookup_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 require_dependency 'avatar_lookup'
 
 describe AvatarLookup do
-  let!(:user){ Fabricate(:user) }
+  let!(:user) { Fabricate(:user) }
 
   describe '#[]' do
     before do
diff --git a/spec/components/cache_spec.rb b/spec/components/cache_spec.rb
index 387cea9e23..23d9983f07 100644
--- a/spec/components/cache_spec.rb
+++ b/spec/components/cache_spec.rb
@@ -13,7 +13,7 @@ describe Cache do
   end
 
   it "supports hash" do
-    hash = {a: 1, b: [1,2,3]}
+    hash = { a: 1, b: [1, 2, 3] }
     cache.write("hash", hash)
     expect(cache.read("hash")).to eq(hash)
   end
@@ -50,7 +50,7 @@ describe Cache do
     expect($redis.ttl(key)).to be_within(2.seconds).of(1.minute)
 
     # we always expire withing a day
-    cache.fetch("bla"){ "hi" }
+    cache.fetch("bla") { "hi" }
 
     key = cache.namespaced_key("bla")
     expect($redis.ttl(key)).to be_within(2.seconds).of(1.day)
diff --git a/spec/components/column_dropper_spec.rb b/spec/components/column_dropper_spec.rb
index c1274ae606..46db479925 100644
--- a/spec/components/column_dropper_spec.rb
+++ b/spec/components/column_dropper_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 require 'column_dropper'
 
-describe ColumnDropper do
+RSpec.describe ColumnDropper do
 
   def has_column?(table, column)
     Topic.exec_sql("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
@@ -17,8 +17,8 @@ describe ColumnDropper do
   it "can correctly drop columns after correct delay" do
     Topic.exec_sql "ALTER TABLE topics ADD COLUMN junk int"
     name = Topic
-            .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-            .getvalue(0,0)
+      .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+      .getvalue(0, 0)
 
     Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
                   name: name, created_at: 15.minutes.ago)
@@ -30,7 +30,7 @@ describe ColumnDropper do
       after_migration: name,
       columns: ['junk'],
       delay: 20.minutes,
-      on_drop: ->(){dropped_proc_called = true}
+      on_drop: ->() { dropped_proc_called = true }
     )
 
     expect(has_column?('topics', 'junk')).to eq(true)
@@ -41,12 +41,83 @@ describe ColumnDropper do
       after_migration: name,
       columns: ['junk'],
       delay: 10.minutes,
-      on_drop: ->(){dropped_proc_called = true}
+      on_drop: ->() { dropped_proc_called = true }
     )
 
     expect(has_column?('topics', 'junk')).to eq(false)
     expect(dropped_proc_called).to eq(true)
 
   end
-end
 
+  describe '.mark_readonly' do
+    let(:table_name) { "table_with_readonly_column" }
+
+    before do
+      ActiveRecord::Base.exec_sql <<~SQL
+      CREATE TABLE #{table_name} (topic_id INTEGER, email TEXT);
+
+      INSERT INTO #{table_name} (topic_id, email)
+      VALUES (1, 'something@email.com');
+      SQL
+
+      ColumnDropper.mark_readonly(table_name, 'email')
+    end
+
+    after do
+      ActiveRecord::Base.connection.reset!
+
+      ActiveRecord::Base.exec_sql <<~SQL
+      DROP TABLE IF EXISTS #{table_name};
+      DROP TRIGGER IF EXISTS #{table_name}_email_readonly ON #{table_name};
+      SQL
+    end
+
+    it 'should prevent updates to the readonly column' do
+      expect do
+        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+        UPDATE #{table_name}
+        SET email = 'testing@email.com'
+        WHERE topic_id = 1;
+        SQL
+      end.to raise_error(
+        PG::RaiseException,
+        /Discourse: email in #{table_name} is readonly/
+      )
+    end
+
+    it 'should allow updates to the other columns' do
+      ActiveRecord::Base.exec_sql <<~SQL
+      UPDATE #{table_name}
+      SET topic_id = 2
+      WHERE topic_id = 1
+      SQL
+
+      expect(
+        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name};").values
+      ).to include(["2", "something@email.com"])
+    end
+
+    it 'should prevent insertions to the readonly column' do
+      expect do
+        ActiveRecord::Base.connection.raw_connection.exec <<~SQL
+        INSERT INTO #{table_name} (topic_id, email)
+        VALUES (2, 'something@email.com');
+        SQL
+      end.to raise_error(
+        PG::RaiseException,
+        /Discourse: email in table_with_readonly_column is readonly/
+      )
+    end
+
+    it 'should allow insertions to the other columns' do
+      ActiveRecord::Base.exec_sql <<~SQL
+      INSERT INTO #{table_name} (topic_id)
+      VALUES (2);
+      SQL
+
+      expect(
+        ActiveRecord::Base.exec_sql("SELECT * FROM #{table_name} WHERE topic_id = 2;").values
+      ).to include(["2", nil])
+    end
+  end
+end
diff --git a/spec/components/common_passwords/common_passwords_spec.rb b/spec/components/common_passwords/common_passwords_spec.rb
index 483a67c0e5..b78ebeec52 100644
--- a/spec/components/common_passwords/common_passwords_spec.rb
+++ b/spec/components/common_passwords/common_passwords_spec.rb
@@ -13,7 +13,7 @@ describe CommonPasswords do
     subject { described_class.common_password? @password }
 
     it "returns false if password isn't in the common passwords list" do
-      described_class.stubs(:password_list).returns(stub_everything(:include? => false))
+      described_class.stubs(:password_list).returns(stub_everything(include?: false))
       @password = 'uncommonPassword'
       expect(subject).to eq(false)
     end
@@ -31,7 +31,7 @@ describe CommonPasswords do
     end
 
     it "returns true if password is in the common passwords list" do
-      described_class.stubs(:password_list).returns(stub_everything(:include? => true))
+      described_class.stubs(:password_list).returns(stub_everything(include?: true))
       @password = "password"
       expect(subject).to eq(true)
     end
diff --git a/spec/components/composer_messages_finder_spec.rb b/spec/components/composer_messages_finder_spec.rb
index 8e328a3bb7..fc5b04d0d2 100644
--- a/spec/components/composer_messages_finder_spec.rb
+++ b/spec/components/composer_messages_finder_spec.rb
@@ -127,7 +127,7 @@ describe ComposerMessagesFinder do
     end
 
     it "doesn't notify users who have been notified already" do
-      UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: user.id )
+      UserHistory.create!(action: UserHistory.actions[:notified_about_avatar], target_user_id: user.id)
       expect(finder.check_avatar_notification).to be_blank
     end
 
@@ -179,12 +179,12 @@ describe ComposerMessagesFinder do
       end
 
       it "doesn't notify a user it has already notified about sequential replies" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id)
         expect(finder.check_sequential_replies).to be_blank
       end
 
       it "will notify you if it hasn't in the current topic" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id+1 )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_sequential_replies], target_user_id: user.id, topic_id: topic.id + 1)
         expect(finder.check_sequential_replies).to be_present
       end
 
@@ -259,12 +259,12 @@ describe ComposerMessagesFinder do
       end
 
       it "doesn't notify a user it has already notified in this topic" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id, target_user_id: user.id )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id, target_user_id: user.id)
         expect(finder.check_dominating_topic).to be_blank
       end
 
       it "notifies a user if the topic is different" do
-        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id+1, target_user_id: user.id )
+        UserHistory.create!(action: UserHistory.actions[:notified_about_dominating_topic], topic_id: topic.id + 1, target_user_id: user.id)
         expect(finder.check_dominating_topic).to be_present
       end
 
@@ -359,7 +359,7 @@ describe ComposerMessagesFinder do
         UserHistory.create!(
           action: UserHistory.actions[:notified_about_get_a_room],
           target_user_id: user.id,
-          topic_id: topic.id+1
+          topic_id: topic.id + 1
         )
         expect(finder.check_get_a_room(min_users_posted: 2)).to be_present
       end
@@ -420,7 +420,6 @@ describe ComposerMessagesFinder do
 
   end
 
-
   context '.check_reviving_old_topic' do
     let(:user)  { Fabricate(:user) }
     let(:topic) { Fabricate(:topic) }
diff --git a/spec/components/concern/has_custom_fields_spec.rb b/spec/components/concern/has_custom_fields_spec.rb
index d429c13a8e..75ec51dd05 100644
--- a/spec/components/concern/has_custom_fields_spec.rb
+++ b/spec/components/concern/has_custom_fields_spec.rb
@@ -1,6 +1,5 @@
 require "rails_helper"
 
-
 describe HasCustomFields do
 
   context "custom_fields" do
@@ -48,7 +47,7 @@ describe HasCustomFields do
       test_item.save
       test_item = CustomFieldsTestItem.find(test_item.id)
 
-      expect(test_item.custom_fields).to eq({"jack" => "jill"})
+      expect(test_item.custom_fields).to eq("jack" => "jill")
     end
 
     it "casts integers to string without error" do
@@ -88,35 +87,35 @@ describe HasCustomFields do
 
     it "double save actually saves" do
       test_item = CustomFieldsTestItem.new
-      test_item.custom_fields = {"a" => "b"}
+      test_item.custom_fields = { "a" => "b" }
       test_item.save
 
       test_item.custom_fields["c"] = "d"
       test_item.save
 
       db_item = CustomFieldsTestItem.find(test_item.id)
-      expect(db_item.custom_fields).to eq({"a" => "b", "c" => "d"})
+      expect(db_item.custom_fields).to eq("a" => "b", "c" => "d")
     end
 
     it "handles arrays properly" do
       test_item = CustomFieldsTestItem.new
-      test_item.custom_fields = {"a" => ["b", "c", "d"]}
+      test_item.custom_fields = { "a" => ["b", "c", "d"] }
       test_item.save
 
       db_item = CustomFieldsTestItem.find(test_item.id)
-      expect(db_item.custom_fields).to eq({"a" => ["b", "c", "d"]})
+      expect(db_item.custom_fields).to eq("a" => ["b", "c", "d"])
 
       db_item.custom_fields.update('a' => ['c', 'd'])
       db_item.save
-      expect(db_item.custom_fields).to eq({"a" => ["c", "d"]})
+      expect(db_item.custom_fields).to eq("a" => ["c", "d"])
 
       # It can be updated to the exact same value
       db_item.custom_fields.update('a' => ['c'])
       db_item.save
-      expect(db_item.custom_fields).to eq({"a" => "c"})
+      expect(db_item.custom_fields).to eq("a" => "c")
       db_item.custom_fields.update('a' => ['c'])
       db_item.save
-      expect(db_item.custom_fields).to eq({"a" => "c"})
+      expect(db_item.custom_fields).to eq("a" => "c")
 
       db_item.custom_fields.delete('a')
       expect(db_item.custom_fields).to eq({})
@@ -124,12 +123,12 @@ describe HasCustomFields do
 
     it "casts integers in arrays properly without error" do
       test_item = CustomFieldsTestItem.new
-      test_item.custom_fields = {"a" => ["b", 10, "d"]}
+      test_item.custom_fields = { "a" => ["b", 10, "d"] }
       test_item.save
-      expect(test_item.custom_fields).to eq({"a" => ["b", "10", "d"]})
+      expect(test_item.custom_fields).to eq("a" => ["b", "10", "d"])
 
       db_item = CustomFieldsTestItem.find(test_item.id)
-      expect(db_item.custom_fields).to eq({"a" => ["b", "10", "d"]})
+      expect(db_item.custom_fields).to eq("a" => ["b", "10", "d"])
     end
 
     it "supportes type coersion" do
@@ -138,11 +137,11 @@ describe HasCustomFields do
       CustomFieldsTestItem.register_custom_field_type("int", :integer)
       CustomFieldsTestItem.register_custom_field_type("json", :json)
 
-      test_item.custom_fields = {"bool" => true, "int" => 1, "json" => { "foo" => "bar" }}
+      test_item.custom_fields = { "bool" => true, "int" => 1, "json" => { "foo" => "bar" } }
       test_item.save
       test_item.reload
 
-      expect(test_item.custom_fields).to eq({"bool" => true, "int" => 1, "json" => { "foo" => "bar" }})
+      expect(test_item.custom_fields).to eq("bool" => true, "int" => 1, "json" => { "foo" => "bar" })
     end
 
     it "simple modifications don't interfere" do
@@ -165,17 +164,17 @@ describe HasCustomFields do
       test_item = CustomFieldsTestItem.find(test_item.id)
       test_item2 = CustomFieldsTestItem.find(test_item2.id)
 
-      expect(test_item.custom_fields).to eq({"jack" => "black", "bob" => "marley"})
-      expect(test_item2.custom_fields).to eq({"sixto" => "rodriguez", "de" => "la playa"})
+      expect(test_item.custom_fields).to eq("jack" => "black", "bob" => "marley")
+      expect(test_item2.custom_fields).to eq("sixto" => "rodriguez", "de" => "la playa")
     end
 
     it "supports bulk retrieval with a list of ids" do
       item1 = CustomFieldsTestItem.new
-      item1.custom_fields = {"a" => ["b", "c", "d"], 'not_whitelisted' => 'secret'}
+      item1.custom_fields = { "a" => ["b", "c", "d"], 'not_whitelisted' => 'secret' }
       item1.save
 
       item2 = CustomFieldsTestItem.new
-      item2.custom_fields = {"e" => 'hallo'}
+      item2.custom_fields = { "e" => 'hallo' }
       item2.save
 
       fields = CustomFieldsTestItem.custom_fields_for_ids([item1.id, item2.id], ['a', 'e'])
diff --git a/spec/components/concern/positionable_spec.rb b/spec/components/concern/positionable_spec.rb
index 1bf08f63e1..d8433d6711 100644
--- a/spec/components/concern/positionable_spec.rb
+++ b/spec/components/concern/positionable_spec.rb
@@ -28,19 +28,19 @@ describe Positionable do
         Topic.exec_sql("insert into test_items(id,position) values(#{i}, #{i})")
       end
 
-      expect(positions).to eq([0,1,2,3,4])
+      expect(positions).to eq([0, 1, 2, 3, 4])
       TestItem.find(3).move_to(0)
-      expect(positions).to eq([3,0,1,2,4])
-      expect(TestItem.pluck(:position).sort).to eq([0,1,2,3,4])
+      expect(positions).to eq([3, 0, 1, 2, 4])
+      expect(TestItem.pluck(:position).sort).to eq([0, 1, 2, 3, 4])
 
       TestItem.find(3).move_to(1)
-      expect(positions).to eq([0,3,1,2,4])
+      expect(positions).to eq([0, 3, 1, 2, 4])
 
       # this is somewhat odd, but when there is no such position, not much we can do
       TestItem.find(1).move_to(5)
-      expect(positions).to eq([0,3,2,4,1])
+      expect(positions).to eq([0, 3, 2, 4, 1])
 
-      expect(TestItem.pluck(:position).sort).to eq([0,1,2,3,4])
+      expect(TestItem.pluck(:position).sort).to eq([0, 1, 2, 3, 4])
 
       item = TestItem.new
       item.id = 7
diff --git a/spec/components/content_buffer_spec.rb b/spec/components/content_buffer_spec.rb
index f13492eb8c..adb8222f5c 100644
--- a/spec/components/content_buffer_spec.rb
+++ b/spec/components/content_buffer_spec.rb
@@ -5,24 +5,24 @@ describe ContentBuffer do
 
   it "handles deletion across lines properly" do
     c = ContentBuffer.new("a\nbc\nc")
-    c.apply_transform!(start: {row: 0, col: 0}, finish: {col: 1, row: 1}, operation: :delete)
+    c.apply_transform!(start: { row: 0, col: 0 }, finish: { col: 1, row: 1 }, operation: :delete)
     expect(c.to_s).to eq("c\nc")
   end
   it "handles deletion inside lines properly" do
     c = ContentBuffer.new("hello world")
-    c.apply_transform!(start: {row: 0, col: 1}, finish: {col: 4, row: 0}, operation: :delete)
+    c.apply_transform!(start: { row: 0, col: 1 }, finish: { col: 4, row: 0 }, operation: :delete)
     expect(c.to_s).to eq("ho world")
   end
 
   it "handles inserts inside lines properly" do
     c = ContentBuffer.new("hello!")
-    c.apply_transform!(start: {row: 0, col: 5}, operation: :insert, text: " world")
+    c.apply_transform!(start: { row: 0, col: 5 }, operation: :insert, text: " world")
     expect(c.to_s).to eq("hello world!")
   end
 
   it "handles multiline inserts" do
     c = ContentBuffer.new("hello!")
-    c.apply_transform!(start: {row: 0, col: 5}, operation: :insert, text: "\nworld")
+    c.apply_transform!(start: { row: 0, col: 5 }, operation: :insert, text: "\nworld")
     expect(c.to_s).to eq("hello\nworld!")
   end
 
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 9767681376..5bdef69864 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -31,7 +31,7 @@ describe CookedPostProcessor do
     end
 
     context "admin user" do
-      let(:post) { Fabricate(:post, user: Fabricate(:admin) ) }
+      let(:post) { Fabricate(:post, user: Fabricate(:admin)) }
 
       it "omits nofollow" do
         cpp = CookedPostProcessor.new(post)
@@ -41,8 +41,8 @@ describe CookedPostProcessor do
   end
 
   context ".keep_reverse_index_up_to_date" do
-    let(:video_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.mp4' ) }
-    let(:image_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.jpg' ) }
+    let(:video_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.mp4') }
+    let(:image_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.jpg') }
     let(:audio_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.ogg') }
     let(:attachment_upload) { Fabricate(:upload, url: '/uploads/default/1/1234567890123456.csv') }
 
@@ -100,7 +100,7 @@ describe CookedPostProcessor do
       before { cpp.post_process_images }
 
       context "valid" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 111, "height" => 222}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 111, "height" => 222 } } }
 
         it "uses them" do
 
@@ -113,17 +113,17 @@ describe CookedPostProcessor do
       end
 
       context "invalid width" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 0, "height" => 222 } } }
         include_examples "leave dimensions alone"
       end
 
       context "invalid height" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 111, "height" => 0}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 111, "height" => 0 } } }
         include_examples "leave dimensions alone"
       end
 
       context "invalid width & height" do
-        let(:image_sizes) { {"http://foo.bar/image.png" => {"width" => 0, "height" => 0}} }
+        let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 0, "height" => 0 } } }
         include_examples "leave dimensions alone"
       end
 
@@ -249,7 +249,7 @@ describe CookedPostProcessor do
       it "adds a topic image if there's one in the first post" do
         FastImage.stubs(:size)
         expect(post.topic.image_url).to eq(nil)
-        cpp.post_process_images
+        cpp.update_post_image
         post.topic.reload
         expect(post.topic.image_url).to be_present
       end
@@ -262,7 +262,7 @@ describe CookedPostProcessor do
       it "adds a post image if there's one in the post" do
         FastImage.stubs(:size)
         expect(reply.image_url).to eq(nil)
-        cpp.post_process_images
+        cpp.update_post_image
         reply.reload
         expect(reply.image_url).to be_present
       end
@@ -287,31 +287,31 @@ describe CookedPostProcessor do
     let(:cpp) { CookedPostProcessor.new(post) }
 
     it "returns the size when width and height are specified" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50, 'height' => 70}
+      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50, 'height' => 70 }
       expect(cpp.get_size_from_attributes(img)).to eq([50, 70])
     end
 
     it "returns the size when width and height are floats" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50.2, 'height' => 70.1}
+      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 50.2, 'height' => 70.1 }
       expect(cpp.get_size_from_attributes(img)).to eq([50, 70])
     end
 
     it "resizes when only width is specified" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 100}
+      img = { 'src' => 'http://foo.bar/image3.png', 'width' => 100 }
       SiteSetting.crawl_images = true
       FastImage.expects(:size).returns([200, 400])
       expect(cpp.get_size_from_attributes(img)).to eq([100, 200])
     end
 
     it "resizes when only height is specified" do
-      img = { 'src' => 'http://foo.bar/image3.png', 'height' => 100}
+      img = { 'src' => 'http://foo.bar/image3.png', 'height' => 100 }
       SiteSetting.crawl_images = true
       FastImage.expects(:size).returns([100, 300])
       expect(cpp.get_size_from_attributes(img)).to eq([33, 100])
     end
 
     it "doesn't raise an error with a weird url" do
-      img = { 'src' => nil, 'height' => 100}
+      img = { 'src' => nil, 'height' => 100 }
       SiteSetting.crawl_images = true
       expect(cpp.get_size_from_attributes(img)).to be_nil
     end
@@ -414,12 +414,12 @@ describe CookedPostProcessor do
     end
 
     it "returns the original filename of the upload when there is an upload" do
-      upload = build(:upload, { original_filename: "upload.jpg" })
+      upload = build(:upload, original_filename: "upload.jpg")
       expect(cpp.get_filename(upload, "http://domain.com/image.png")).to eq("upload.jpg")
     end
 
     it "returns a generic name for pasted images" do
-      upload = build(:upload, { original_filename: "blob.png" })
+      upload = build(:upload, original_filename: "blob.png")
       expect(cpp.get_filename(upload, "http://domain.com/image.png")).to eq(I18n.t('upload.pasted_image_filename'))
     end
 
@@ -432,8 +432,8 @@ describe CookedPostProcessor do
 
     before do
       Oneboxer.expects(:onebox)
-              .with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true)
-              .returns("<div>GANGNAM STYLE</div>")
+        .with("http://www.youtube.com/watch?v=9bZkp7q19f0", post_id: 123, invalidate_oneboxes: true)
+        .returns("<div>GANGNAM STYLE</div>")
       cpp.post_process_oneboxes
     end
 
@@ -652,7 +652,7 @@ describe CookedPostProcessor do
     let(:cpp) { CookedPostProcessor.new(post) }
 
     context "emoji inside a quote" do
-      let(:post) { Fabricate(:post, raw: "time to eat some sweet [quote]:candy:[/quote] mmmm") }
+      let(:post) { Fabricate(:post, raw: "time to eat some sweet \n[quote]\n:candy:\n[/quote]\n mmmm") }
 
       it "doesn't award a badge when the emoji is in a quote" do
         cpp.grant_badges
diff --git a/spec/components/demon/base_spec.rb b/spec/components/demon/base_spec.rb
deleted file mode 100644
index 1f1615fc63..0000000000
--- a/spec/components/demon/base_spec.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-require 'rails_helper'
-require 'demon/base'
-
-describe Demon do
-
-  class RudeDemon < Demon::Base
-    def self.prefix
-      "rude"
-    end
-
-    def after_fork
-      Signal.trap("HUP"){}
-      Signal.trap("TERM"){}
-      sleep 999999
-    end
-  end
-
-  it "can terminate rude demons" do
-
-    skip("forking rspec has side effects")
-    # Forking rspec has all sorts of weird side effects
-    #  this spec works but we must skip it to keep rspec
-    #  state happy
-
-
-    RudeDemon.start
-    _,demon = RudeDemon.demons.first
-    pid = demon.pid
-    wait_for {
-      demon.alive?
-    }
-
-    demon.stop_timeout = 0.05
-    demon.stop
-    demon.start
-
-    running = !!(Process.kill(0, pid)) rescue false
-    expect(running).to eq(false)
-  end
-end
diff --git a/spec/components/discourse_diff_spec.rb b/spec/components/discourse_diff_spec.rb
index 53150a5dfb..b089124e57 100644
--- a/spec/components/discourse_diff_spec.rb
+++ b/spec/components/discourse_diff_spec.rb
@@ -11,7 +11,7 @@ describe DiscourseDiff do
       prev = "<div>#{CGI::escapeHTML(a)}</div>"
       cur = "<div>#{CGI::escapeHTML(b)}</div>"
 
-      diff = DiscourseDiff.new(prev,cur)
+      diff = DiscourseDiff.new(prev, cur)
       expect(diff.inline_html).not_to match(/<\/?test>/)
       expect(diff.side_by_side_html).not_to match(/<\/?test>/)
     end
diff --git a/spec/components/discourse_event_spec.rb b/spec/components/discourse_event_spec.rb
index a5ff80116c..9a618565c2 100644
--- a/spec/components/discourse_event_spec.rb
+++ b/spec/components/discourse_event_spec.rb
@@ -61,7 +61,7 @@ describe DiscourseEvent do
 
       before do
         DiscourseEvent.on(:acid_face) do |user|
-          user.job =  'Supervillian'
+          user.job = 'Supervillian'
         end
 
         DiscourseEvent.trigger(:acid_face, harvey)
diff --git a/spec/components/discourse_hub_spec.rb b/spec/components/discourse_hub_spec.rb
index a08b0856a1..c97e7940e6 100644
--- a/spec/components/discourse_hub_spec.rb
+++ b/spec/components/discourse_hub_spec.rb
@@ -4,7 +4,7 @@ require_dependency 'discourse_hub'
 describe DiscourseHub do
   describe '.discourse_version_check' do
     it 'should return just return the json that the hub returns' do
-      hub_response = {'success' => 'OK', 'latest_version' => '0.8.1', 'critical_updates' => false}
+      hub_response = { 'success' => 'OK', 'latest_version' => '0.8.1', 'critical_updates' => false }
 
       stub_request(:get, (ENV['HUB_BASE_URL'] || "http://local.hub:3000/api") + "/version_check").
         with(query: DiscourseHub.version_check_payload).
diff --git a/spec/components/discourse_i18n_spec.rb b/spec/components/discourse_i18n_spec.rb
index c3fc16da1a..0074b2e464 100644
--- a/spec/components/discourse_i18n_spec.rb
+++ b/spec/components/discourse_i18n_spec.rb
@@ -8,10 +8,10 @@ describe I18n::Backend::DiscourseI18n do
 
   before do
     I18n.reload!
-    backend.store_translations(:en, :foo => 'Foo in :en', :bar => 'Bar in :en', :wat => "Hello %{count}")
-    backend.store_translations(:en, :items => {:one => 'one item', :other => "%{count} items" })
-    backend.store_translations(:de, :bar => 'Bar in :de')
-    backend.store_translations(:'de-AT', :baz => 'Baz in :de-AT')
+    backend.store_translations(:en, foo: 'Foo in :en', bar: 'Bar in :en', wat: "Hello %{count}")
+    backend.store_translations(:en, items: { one: 'one item', other: "%{count} items" })
+    backend.store_translations(:de, bar: 'Bar in :de')
+    backend.store_translations(:'de-AT', baz: 'Baz in :de-AT')
   end
 
   after do
@@ -27,11 +27,11 @@ describe I18n::Backend::DiscourseI18n do
   end
 
   it 'can be searched by key or value' do
-    expect(backend.search(:en, 'fo')).to eq({'foo' => 'Foo in :en'})
-    expect(backend.search(:en, 'foo')).to eq({'foo' => 'Foo in :en' })
-    expect(backend.search(:en, 'Foo')).to eq({'foo' => 'Foo in :en' })
-    expect(backend.search(:en, 'hello')).to eq({'wat' => 'Hello %{count}' })
-    expect(backend.search(:en, 'items.one')).to eq({'items.one' => 'one item' })
+    expect(backend.search(:en, 'fo')).to eq('foo' => 'Foo in :en')
+    expect(backend.search(:en, 'foo')).to eq('foo' => 'Foo in :en')
+    expect(backend.search(:en, 'Foo')).to eq('foo' => 'Foo in :en')
+    expect(backend.search(:en, 'hello')).to eq('wat' => 'Hello %{count}')
+    expect(backend.search(:en, 'items.one')).to eq('items.one' => 'one item')
   end
 
   it 'can return multiple results' do
@@ -42,8 +42,8 @@ describe I18n::Backend::DiscourseI18n do
   end
 
   it 'uses fallback locales for searching' do
-    expect(backend.search(:de, 'bar')).to eq({'bar' => 'Bar in :de'})
-    expect(backend.search(:de, 'foo')).to eq({'foo' => 'Foo in :en'})
+    expect(backend.search(:de, 'bar')).to eq('bar' => 'Bar in :de')
+    expect(backend.search(:de, 'foo')).to eq('foo' => 'Foo in :en')
   end
 
   describe '#exists?' do
@@ -98,8 +98,8 @@ describe I18n::Backend::DiscourseI18n do
 
     it "can be searched" do
       TranslationOverride.upsert!('en', 'wat', 'Overwritten value')
-      expect(I18n.search('wat', backend: backend)).to eq({'wat' => 'Overwritten value'})
-      expect(I18n.search('Overwritten', backend: backend)).to eq({'wat' => 'Overwritten value'})
+      expect(I18n.search('wat', backend: backend)).to eq('wat' => 'Overwritten value')
+      expect(I18n.search('Overwritten', backend: backend)).to eq('wat' => 'Overwritten value')
       expect(I18n.search('Hello', backend: backend)).to eq({})
     end
 
@@ -163,7 +163,20 @@ describe I18n::Backend::DiscourseI18n do
         .to eq('snow is the new queen')
     end
 
-    it 'supports ActiveModel::Naming#human' do
+    it "returns override if it exists before falling back" do
+      I18n.backend.store_translations(:en, got: 'winter')
+
+      expect(I18n.translate('got', default: '')).to eq('winter')
+      expect(I18n.with_locale(:ru) { I18n.translate('got', default: '') }).to eq('winter')
+
+      TranslationOverride.upsert!('ru', 'got', "summer")
+      I18n.backend.store_translations(:en, got: 'winter')
+
+      expect(I18n.translate('got', default: '')).to eq('winter')
+      expect(I18n.with_locale(:ru) { I18n.translate('got', default: '') }).to eq('summer')
+    end
+
+    it 'does not affect ActiveModel::Naming#human' do
       Fish = Class.new(ActiveRecord::Base)
 
       TranslationOverride.upsert!('en', 'fish', "fake fish")
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index c0d644cc5a..a6568427ef 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -5,9 +5,7 @@ describe DiscourseRedis do
   let(:slave_port) { 1234 }
 
   let(:config) do
-    DiscourseRedis.config.dup.merge({
-      slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector
-    })
+    DiscourseRedis.config.dup.merge(slave_host: 'testhost', slave_port: 1234, connector: DiscourseRedis::Connector)
   end
 
   let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
@@ -95,13 +93,16 @@ describe DiscourseRedis do
   describe DiscourseRedis::FallbackHandler do
     after do
       fallback_handler.master = true
+      MessageBus.keepalive_interval = -1
     end
 
     describe '#initiate_fallback_to_master' do
       it 'should return the right value if the master server is still down' do
         fallback_handler.master = false
         Redis::Client.any_instance.expects(:call).with([:info]).returns("Some other stuff")
+
         expect(fallback_handler.initiate_fallback_to_master).to eq(false)
+        expect(MessageBus.keepalive_interval).to eq(0)
       end
 
       it 'should fallback to the master server once it is up' do
@@ -115,6 +116,7 @@ describe DiscourseRedis do
         expect(fallback_handler.initiate_fallback_to_master).to eq(true)
         expect(fallback_handler.master).to eq(true)
         expect(Discourse.recently_readonly?).to eq(false)
+        expect(MessageBus.keepalive_interval).to eq(-1)
       end
     end
   end
diff --git a/spec/components/discourse_spec.rb b/spec/components/discourse_spec.rb
index 3b458e3131..d887a4dde9 100644
--- a/spec/components/discourse_spec.rb
+++ b/spec/components/discourse_spec.rb
@@ -103,17 +103,25 @@ describe Discourse do
       expect($redis.get(key)).to eq(nil)
     end
 
+    def get_readonly_message
+      messages = MessageBus.track_publish do
+        yield
+      end
+
+      messages.first { |m| m.channel == Discourse.readonly_channel }
+    end
+
     describe ".enable_readonly_mode" do
       it "adds a key in redis and publish a message through the message bus" do
         expect($redis.get(readonly_mode_key)).to eq(nil)
-        message = MessageBus.track_publish { Discourse.enable_readonly_mode }.first
+        message = get_readonly_message { Discourse.enable_readonly_mode }
         assert_readonly_mode(message, readonly_mode_key, readonly_mode_ttl)
       end
 
       context 'user enabled readonly mode' do
         it "adds a key in redis and publish a message through the message bus" do
           expect($redis.get(user_readonly_mode_key)).to eq(nil)
-          message = MessageBus.track_publish { Discourse.enable_readonly_mode(user_readonly_mode_key) }.first
+          message = get_readonly_message { Discourse.enable_readonly_mode(user_readonly_mode_key) }
           assert_readonly_mode(message, user_readonly_mode_key)
         end
       end
@@ -123,9 +131,9 @@ describe Discourse do
       it "removes a key from redis and publish a message through the message bus" do
         Discourse.enable_readonly_mode
 
-        message = MessageBus.track_publish do
+        message = get_readonly_message do
           Discourse.disable_readonly_mode
-        end.first
+        end
 
         assert_readonly_mode_disabled(message, readonly_mode_key)
       end
@@ -133,7 +141,7 @@ describe Discourse do
       context 'user disabled readonly mode' do
         it "removes readonly key in redis and publish a message through the message bus" do
           Discourse.enable_readonly_mode(user_enabled: true)
-          message = MessageBus.track_publish { Discourse.disable_readonly_mode(user_enabled: true) }.first
+          message = get_readonly_message { Discourse.disable_readonly_mode(user_enabled: true) }
           assert_readonly_mode_disabled(message, user_readonly_mode_key)
         end
       end
@@ -199,7 +207,7 @@ describe Discourse do
     it "correctly passes extra context" do
       exception = StandardError.new
 
-      Discourse.handle_job_exception(exception, {message: "Doing a test", post_id: 31}, nil)
+      Discourse.handle_job_exception(exception, { message: "Doing a test", post_id: 31 }, nil)
       expect(logger.exception).to eq(exception)
       expect(logger.context.keys.sort).to eq([:current_db, :current_hostname, :message, :post_id].sort)
     end
diff --git a/spec/components/distributed_cache_spec.rb b/spec/components/distributed_cache_spec.rb
index f1deda95d2..c0b5c29bef 100644
--- a/spec/components/distributed_cache_spec.rb
+++ b/spec/components/distributed_cache_spec.rb
@@ -3,6 +3,10 @@ require 'distributed_cache'
 
 describe DistributedCache do
 
+  before :all do
+    $redis.flushall
+  end
+
   let! :cache1 do
     DistributedCache.new("test")
   end
@@ -31,7 +35,7 @@ describe DistributedCache do
 
     set << 5
 
-    c2["cats"] == set
+    c2["cats"] = set
 
     wait_for do
       c1["cats"] == set
diff --git a/spec/components/distributed_mutex_spec.rb b/spec/components/distributed_mutex_spec.rb
index e8b3082797..69080c5051 100644
--- a/spec/components/distributed_mutex_spec.rb
+++ b/spec/components/distributed_mutex_spec.rb
@@ -26,7 +26,6 @@ describe DistributedMutex do
 
     $redis.setnx "test_mutex_key", Time.now.to_i - 1
 
-
     start = Time.now.to_i
     m.synchronize do
       "nop"
@@ -41,7 +40,7 @@ describe DistributedMutex do
 
     expect {
       m.synchronize do
-        m.synchronize{}
+        m.synchronize {}
       end
     }.to raise_error(ThreadError)
   end
diff --git a/spec/components/email/message_builder_spec.rb b/spec/components/email/message_builder_spec.rb
index 3ad30558ed..9283f87262 100644
--- a/spec/components/email/message_builder_spec.rb
+++ b/spec/components/email/message_builder_spec.rb
@@ -5,7 +5,7 @@ describe Email::MessageBuilder do
 
   let(:to_address) { "jake@adventuretime.ooo" }
   let(:subject) { "Tree Trunks has made some apple pie!" }
-  let(:body) { "oh my glob Jake, Tree Trunks just made the tastiest apple pie ever!"}
+  let(:body) { "oh my glob Jake, Tree Trunks just made the tastiest apple pie ever!" }
   let(:builder) { Email::MessageBuilder.new(to_address, subject: subject, body: body) }
   let(:build_args) { builder.build_args }
   let(:header_args) { builder.header_args }
diff --git a/spec/components/email/processor_spec.rb b/spec/components/email/processor_spec.rb
index c30b09ad4e..73a54d9b53 100644
--- a/spec/components/email/processor_spec.rb
+++ b/spec/components/email/processor_spec.rb
@@ -3,9 +3,11 @@ require "email/processor"
 
 describe Email::Processor do
 
+  let(:from) { "foo@bar.com" }
+
   describe "rate limits" do
 
-    let(:mail) { "From: foo@bar.com\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
+    let(:mail) { "From: #{from}\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
     let(:limit_exceeded) { RateLimiter::LimitExceeded.new(10) }
 
     before do
@@ -24,4 +26,65 @@ describe Email::Processor do
 
   end
 
+  context "known error" do
+
+    let(:mail) { "From: #{from}\nTo: bar@foo.com" }
+    let(:mail2) { "From: #{from}\nTo: foo@foo.com" }
+    let(:mail3) { "From: #{from}\nTo: foobar@foo.com" }
+
+    it "only sends one rejection email per day" do
+      key = "rejection_email:#{[from]}:email_reject_empty:#{Date.today}"
+      $redis.expire(key, 0)
+
+      expect {
+        Email::Processor.process!(mail)
+      }.to change { EmailLog.count }.by(1)
+
+      expect {
+        Email::Processor.process!(mail2)
+      }.to change { EmailLog.count }.by(0)
+
+      freeze_time(Date.today + 1)
+
+      key = "rejection_email:#{[from]}:email_reject_empty:#{Date.today}"
+      $redis.expire(key, 0)
+
+      expect {
+        Email::Processor.process!(mail3)
+      }.to change { EmailLog.count }.by(1)
+    end
+  end
+
+  context "unrecognized error" do
+
+    let(:mail) { "From: #{from}\nTo: bar@foo.com\nSubject: FOO BAR\n\nFoo foo bar bar?" }
+    let(:mail2) { "From: #{from}\nTo: foo@foo.com\nSubject: BAR BAR\n\nBar bar bar bar?" }
+
+    it "sends a rejection email on an unrecognized error" do
+      Email::Processor.any_instance.stubs(:can_send_rejection_email?).returns(true)
+      Email::Receiver.any_instance.stubs(:process_internal).raises("boom")
+      Rails.logger.expects(:error)
+
+      Email::Processor.process!(mail)
+      expect(IncomingEmail.first.error).to             eq("boom")
+      expect(IncomingEmail.first.rejection_message).to be_present
+      expect(EmailLog.first.email_type).to             eq("email_reject_unrecognized_error")
+    end
+
+    it "sends more than one rejection email per day" do
+      Email::Receiver.any_instance.stubs(:process_internal).raises("boom")
+      key = "rejection_email:#{[from]}:email_reject_unrecognized_error:#{Date.today}"
+      $redis.expire(key, 0)
+
+      expect {
+        Email::Processor.process!(mail)
+      }.to change { EmailLog.count }.by(1)
+
+      expect {
+        Email::Processor.process!(mail2)
+      }.to change { EmailLog.count }.by(1)
+    end
+
+  end
+
 end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index c49c98a81e..a7911a4446 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -47,8 +47,16 @@ describe Email::Receiver do
     expect { process(:blocked_sender) }.to raise_error(Email::Receiver::BlockedUserError)
   end
 
-  skip "doesn't raise an InactiveUserError when the sender is staged" do
-    Fabricate(:user, email: "staged@bar.com", active: false, staged: true)
+  it "doesn't raise an InactiveUserError when the sender is staged" do
+    user = Fabricate(:user, email: "staged@bar.com", active: false, staged: true)
+
+    email_log = Fabricate(:email_log,
+      to_address: 'reply+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bar.com',
+      reply_key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+      user: user,
+      post: Fabricate(:post)
+    )
+
     expect { process(:staged_sender) }.not_to raise_error
   end
 
@@ -89,13 +97,13 @@ describe Email::Receiver do
       expect(email_log.bounced).to eq(true)
       expect(email_log.user.user_stat.bounce_score).to eq(2)
 
-      Timecop.freeze(2.days.from_now) do
-        expect { process(:hard_bounce_via_verp_2) }.to raise_error(Email::Receiver::BouncedEmailError)
+      freeze_time 2.days.from_now
 
-        email_log_2.reload
-        expect(email_log_2.bounced).to eq(true)
-        expect(email_log_2.user.user_stat.bounce_score).to eq(4)
-      end
+      expect { process(:hard_bounce_via_verp_2) }.to raise_error(Email::Receiver::BouncedEmailError)
+
+      email_log_2.reload
+      expect(email_log_2.user.user_stat.bounce_score).to eq(4)
+      expect(email_log_2.bounced).to eq(true)
     end
 
   end
@@ -282,7 +290,7 @@ describe Email::Receiver do
 
     it "handles inline reply" do
       expect { process(:inline_reply) }.to change { topic.posts.count }
-      expect(topic.posts.last.raw).to eq("> WAT <https://bar.com/users/wat> November 28\n>\n> This is the previous post.\n\nAnd this is *my* reply :+1:")
+      expect(topic.posts.last.raw).to eq("And this is *my* reply :+1:")
     end
 
     it "retrieves the first part of multiple replies" do
@@ -381,7 +389,7 @@ describe Email::Receiver do
 
     it "invites everyone in the chain but emails configured as 'incoming' (via reply, group or category)" do
       expect { process(:cc) }.to change(Topic, :count)
-      emails = Topic.last.allowed_users.pluck(:email)
+      emails = Topic.last.allowed_users.joins(:user_emails).pluck(:"user_emails.email")
       expect(emails.size).to eq(3)
       expect(emails).to include("someone@else.com", "discourse@bar.com", "wat@bar.com")
     end
@@ -392,7 +400,9 @@ describe Email::Receiver do
       expect(Topic.last.ordered_posts[-1].post_type).to eq(Post.types[:moderator_action])
     end
 
-    it "associates email replies using both 'In-Reply-To' and 'References' headers" do
+    it "associates email replies using both 'In-Reply-To' and 'References' headers when 'find_related_post_with_key' is disabled" do
+      SiteSetting.find_related_post_with_key = false
+
       expect { process(:email_reply_1) }.to change(Topic, :count)
 
       topic = Topic.last
@@ -498,11 +508,11 @@ describe Email::Receiver do
     it "adds the 'elided' part of the original message when always_show_trimmed_content is enabled" do
       SiteSetting.always_show_trimmed_content = true
 
-      user = Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
-      expect { process(:forwarded_email_to_category) }.to change{Topic.count}.by(1) # Topic created
+      Fabricate(:user, email: "existing@bar.com", trust_level: SiteSetting.email_in_min_trust)
+      expect { process(:forwarded_email_to_category) }.to change { Topic.count }.by(1) # Topic created
 
       new_post, = Post.last
-      expect(new_post.raw).to include("Hi everyone, can you have a look at the email below?","<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>","Discoursing much today?")
+      expect(new_post.raw).to include("Hi everyone, can you have a look at the email below?", "<summary title='Show trimmed content'>&#183;&#183;&#183;</summary>", "Discoursing much today?")
     end
 
     it "works when approving is enabled" do
diff --git a/spec/components/email/renderer_spec.rb b/spec/components/email/renderer_spec.rb
index c546b8fd11..840c4f4bc9 100644
--- a/spec/components/email/renderer_spec.rb
+++ b/spec/components/email/renderer_spec.rb
@@ -24,6 +24,3 @@ describe Email::Renderer do
   end
 
 end
-
-
-
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index bde8d4cf41..72124c6854 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -126,7 +126,7 @@ describe Email::Sender do
       let(:topic) { Fabricate(:topic) }
       let(:post) { Fabricate(:post, topic: topic) }
 
-      before do 
+      before do
         message.header['X-Discourse-Post-Id']  = post.id
         message.header['X-Discourse-Topic-Id'] = topic.id
       end
@@ -310,7 +310,6 @@ describe Email::Sender do
       end
     end
 
-
     context 'email parts' do
       it 'should contain the right message' do
         email_sender.send
diff --git a/spec/components/email/styles_spec.rb b/spec/components/email/styles_spec.rb
index 977085709b..d99440dc3e 100644
--- a/spec/components/email/styles_spec.rb
+++ b/spec/components/email/styles_spec.rb
@@ -24,9 +24,8 @@ describe Email::Styles do
       expect(style.to_html).to be_blank
     end
 
-    # Pending due to email effort @coding-horror made in d2fb2bc4c
-    skip "adds a max-width to images" do
-      frag = basic_fragment("<img src='gigantic.jpg'>")
+    it "adds a max-width to large images" do
+      frag = basic_fragment("<img height='auto' width='auto' src='gigantic.jpg'>")
       expect(frag.at("img")["style"]).to match("max-width")
     end
 
diff --git a/spec/components/email_updater_spec.rb b/spec/components/email_updater_spec.rb
index 8db0699a13..034fd163c7 100644
--- a/spec/components/email_updater_spec.rb
+++ b/spec/components/email_updater_spec.rb
@@ -132,4 +132,3 @@ describe EmailUpdater do
     end
   end
 end
-
diff --git a/spec/components/enum_spec.rb b/spec/components/enum_spec.rb
index d7977e1ee9..a722e4fcf4 100644
--- a/spec/components/enum_spec.rb
+++ b/spec/components/enum_spec.rb
@@ -31,15 +31,15 @@ describe Enum do
 
   describe ".only" do
     it "returns only the values we ask for" do
-      expect(array_enum.only(:jake, :princess_bubblegum)).to eq({ jake: 1, princess_bubblegum: 3 })
-      expect(hash_enum.only(:jake, :princess_bubblegum)).to eq({ jake: 1, princess_bubblegum: 3 })
+      expect(array_enum.only(:jake, :princess_bubblegum)).to eq(jake: 1, princess_bubblegum: 3)
+      expect(hash_enum.only(:jake, :princess_bubblegum)).to eq(jake: 1, princess_bubblegum: 3)
     end
   end
 
   describe ".except" do
     it "returns everything but the values we ask to delete" do
-      expect(array_enum.except(:jake, :princess_bubblegum)).to eq({ finn: 2, peppermint_butler: 4 })
-      expect(hash_enum.except(:jake, :princess_bubblegum)).to eq({ finn: 2, peppermint_butler: 4 })
+      expect(array_enum.except(:jake, :princess_bubblegum)).to eq(finn: 2, peppermint_butler: 4)
+      expect(hash_enum.except(:jake, :princess_bubblegum)).to eq(finn: 2, peppermint_butler: 4)
     end
   end
 
diff --git a/spec/components/file_store/s3_store_spec.rb b/spec/components/file_store/s3_store_spec.rb
index eed2ae4811..0051fdda6e 100644
--- a/spec/components/file_store/s3_store_spec.rb
+++ b/spec/components/file_store/s3_store_spec.rb
@@ -30,7 +30,7 @@ describe FileStore::S3Store do
     let(:s3_helper) { store.instance_variable_get(:@s3_helper) }
 
     before do
-      SiteSetting.s3_region ='us-west-1'
+      SiteSetting.s3_region = 'us-west-1'
     end
   end
 
diff --git a/spec/components/filter_best_posts_spec.rb b/spec/components/filter_best_posts_spec.rb
index 565e7fe6cf..f1b06dfd56 100644
--- a/spec/components/filter_best_posts_spec.rb
+++ b/spec/components/filter_best_posts_spec.rb
@@ -10,9 +10,9 @@ describe FilterBestPosts do
 
   let(:topic_view) { TopicView.new(topic.id, coding_horror) }
 
-  let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1 )}
-  let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5 )}
-  let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0 )}
+  let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) }
+  let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) }
+  let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) }
 
   let(:moderator) { Fabricate(:moderator) }
   let(:admin) { Fabricate(:admin) }
@@ -46,14 +46,12 @@ describe FilterBestPosts do
       expect(best.posts.count).to eq(0)
     end
 
-
     it "should filter out the posts with a score that is too low" do
 
       best = FilterBestPosts.new(topic, @filtered_posts, 99, min_score: 99)
       expect(best.posts.count).to eq(0)
     end
 
-
     it "should filter out everything if min replies not met" do
       best = FilterBestPosts.new(topic, @filtered_posts, 99, min_replies: 99)
       expect(best.posts.count).to eq(0)
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index e716dfcdf3..baa544fdc0 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -273,4 +273,14 @@ describe FinalDestination do
     end
   end
 
+  describe ".escape_url" do
+    it "correctly escapes url" do
+      fragment_url = "https://eviltrout.com/2016/02/25/fixing-android-performance.html#discourse-comments"
+
+      expect(fd(fragment_url).escape_url.to_s).to eq(fragment_url)
+      expect(fd("https://eviltrout.com?s=180&#038;d=mm&#038;r=g").escape_url.to_s).to eq("https://eviltrout.com?s=180&d=mm&r=g")
+      expect(fd("http://example.com/?a=\11\15").escape_url.to_s).to eq("http://example.com/?a=%09%0D")
+    end
+  end
+
 end
diff --git a/spec/components/flag_query_spec.rb b/spec/components/flag_query_spec.rb
index cb2a3b5615..e6424c74ff 100644
--- a/spec/components/flag_query_spec.rb
+++ b/spec/components/flag_query_spec.rb
@@ -53,7 +53,7 @@ describe FlagQuery do
 
       # chuck post in category a mod can not see and make sure its missing
       category = Fabricate(:category)
-      category.set_permissions(:admins => :full)
+      category.set_permissions(admins: :full)
       category.save
       post2.topic.category_id = category.id
       post2.topic.save
diff --git a/spec/components/freedom_patches/pool_drainer_spec.rb b/spec/components/freedom_patches/pool_drainer_spec.rb
index e46abe9a84..32fc98dc85 100644
--- a/spec/components/freedom_patches/pool_drainer_spec.rb
+++ b/spec/components/freedom_patches/pool_drainer_spec.rb
@@ -15,7 +15,7 @@ describe 'pool drainer' do
       pool.checkin conn
     end.join
 
-    expect(pool.connections.length).to eq(old+1)
+    expect(pool.connections.length).to eq(old + 1)
     pool.drain
     expect(pool.connections.length).to eq(old)
   end
@@ -25,15 +25,14 @@ describe 'pool drainer' do
     old = pool.connections.length
     expect(old).to eq(1)
 
-
     Thread.new do
       conn = pool.checkout
       pool.checkin conn
     end.join
 
-    expect(pool.connections.length).to eq(old+1)
+    expect(pool.connections.length).to eq(old + 1)
     pool.drain(1.minute)
-    expect(pool.connections.length).to eq(old+1)
+    expect(pool.connections.length).to eq(old + 1)
 
     # make sure we don't corrupt internal state
     20.times do
diff --git a/spec/components/freedom_patches/schema_migration_details_spec.rb b/spec/components/freedom_patches/schema_migration_details_spec.rb
index 951f5f7c4f..8f04dbc06b 100644
--- a/spec/components/freedom_patches/schema_migration_details_spec.rb
+++ b/spec/components/freedom_patches/schema_migration_details_spec.rb
@@ -14,7 +14,7 @@ describe FreedomPatches::SchemaMigrationDetails do
   end
 
   it "logs information on migration" do
-    migration = TestMigration.new("awesome_migration","20160225050318")
+    migration = TestMigration.new("awesome_migration", "20160225050318")
 
     ActiveRecord::Base.connection_pool.with_connection do |conn|
       migration.exec_migration(conn, :up)
diff --git a/spec/components/gaps_spec.rb b/spec/components/gaps_spec.rb
index 3d0943f09a..6d5e357400 100644
--- a/spec/components/gaps_spec.rb
+++ b/spec/components/gaps_spec.rb
@@ -12,11 +12,11 @@ describe Gaps do
   end
 
   it 'returns no gaps when all elements are present' do
-    expect(Gaps.new([1,2,3], [1,2,3])).to be_blank
+    expect(Gaps.new([1, 2, 3], [1, 2, 3])).to be_blank
   end
 
   context "single element gap" do
-    let(:gap) { Gaps.new([1,3], [1,2,3]) }
+    let(:gap) { Gaps.new([1, 3], [1, 2, 3]) }
 
     it 'has a gap for post 3' do
       expect(gap).not_to be_blank
@@ -26,28 +26,28 @@ describe Gaps do
   end
 
   context "larger gap" do
-    let(:gap) { Gaps.new([1,2,3,6,7], [1,2,3,4,5,6,7]) }
+    let(:gap) { Gaps.new([1, 2, 3, 6, 7], [1, 2, 3, 4, 5, 6, 7]) }
 
     it 'has a gap for post 6' do
       expect(gap).not_to be_blank
-      expect(gap.before[6]).to eq([4,5])
+      expect(gap.before[6]).to eq([4, 5])
       expect(gap.after).to be_blank
     end
   end
 
   context "multiple gaps" do
-    let(:gap) { Gaps.new([1,5,6,7,10], [1,2,3,4,5,6,7,8,9,10]) }
+    let(:gap) { Gaps.new([1, 5, 6, 7, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) }
 
     it 'has both gaps' do
       expect(gap).not_to be_blank
-      expect(gap.before[5]).to eq([2,3,4])
-      expect(gap.before[10]).to eq([8,9])
+      expect(gap.before[5]).to eq([2, 3, 4])
+      expect(gap.before[10]).to eq([8, 9])
       expect(gap.after).to be_blank
     end
   end
 
   context "a gap in the beginning" do
-    let(:gap) { Gaps.new([2,3,4], [1,2,3,4]) }
+    let(:gap) { Gaps.new([2, 3, 4], [1, 2, 3, 4]) }
 
     it 'has the gap' do
       expect(gap).not_to be_blank
@@ -57,7 +57,7 @@ describe Gaps do
   end
 
   context "a gap in the ending" do
-    let(:gap) { Gaps.new([1,2,3], [1,2,3,4]) }
+    let(:gap) { Gaps.new([1, 2, 3], [1, 2, 3, 4]) }
 
     it 'has the gap' do
       expect(gap).not_to be_blank
@@ -67,14 +67,13 @@ describe Gaps do
   end
 
   context "a large gap in the ending" do
-    let(:gap) { Gaps.new([1,2,3], [1,2,3,4,5,6]) }
+    let(:gap) { Gaps.new([1, 2, 3], [1, 2, 3, 4, 5, 6]) }
 
     it 'has the gap' do
       expect(gap).not_to be_blank
       expect(gap.before).to be_blank
-      expect(gap.after[3]).to eq([4,5,6])
+      expect(gap.after[3]).to eq([4, 5, 6])
     end
   end
 
-
 end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 8261d7c0b0..049fcf4eac 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -57,11 +57,11 @@ describe Guardian do
     end
 
     it "returns false when you've already done it" do
-      expect(Guardian.new(user).post_can_act?(post, :like, taken_actions: {PostActionType.types[:like] => 1})).to be_falsey
+      expect(Guardian.new(user).post_can_act?(post, :like, taken_actions: { PostActionType.types[:like] => 1 })).to be_falsey
     end
 
     it "returns false when you already flagged a post" do
-      expect(Guardian.new(user).post_can_act?(post, :off_topic, taken_actions: {PostActionType.types[:spam] => 1})).to be_falsey
+      expect(Guardian.new(user).post_can_act?(post, :off_topic, taken_actions: { PostActionType.types[:spam] => 1 })).to be_falsey
     end
 
     it "returns false for notify_user if private messages are disabled" do
@@ -109,7 +109,6 @@ describe Guardian do
     end
   end
 
-
   describe "can_defer_flags" do
     let(:post) { Fabricate(:post) }
     let(:user) { post.user }
@@ -244,7 +243,7 @@ describe Guardian do
 
   describe 'can_see_post_actors?' do
 
-    let(:topic) { Fabricate(:topic, user: coding_horror)}
+    let(:topic) { Fabricate(:topic, user: coding_horror) }
 
     it 'displays visibility correctly' do
       guardian = Guardian.new(user)
@@ -304,7 +303,7 @@ describe Guardian do
     end
 
     it 'returns true when the site requires approving users and is mod' do
-      SiteSetting.expects(:must_approve_users?).returns(true)
+      SiteSetting.must_approve_users = true
       expect(Guardian.new(moderator).can_invite_to_forum?).to be_truthy
     end
 
@@ -328,6 +327,29 @@ describe Guardian do
       expect(Guardian.new(moderator).can_invite_to_forum?).to be_falsey
     end
 
+    context 'with groups' do
+      let(:group) { Fabricate(:group) }
+      let(:another_group) { Fabricate(:group) }
+      let(:groups) { [group, another_group] }
+
+      before do
+        user.update!(trust_level: TrustLevel[2])
+        group.add_owner(user)
+      end
+
+      it 'returns false when user is not allowed to edit a group' do
+        expect(Guardian.new(user).can_invite_to_forum?(groups)).to eq(false)
+
+        expect(Guardian.new(Fabricate(:admin)).can_invite_to_forum?(groups))
+          .to eq(true)
+      end
+
+      it 'returns true when user is allowed to edit groups' do
+        another_group.add_owner(user)
+
+        expect(Guardian.new(user).can_invite_to_forum?(groups)).to eq(true)
+      end
+    end
   end
 
   describe 'can_invite_to?' do
@@ -396,7 +418,6 @@ describe Guardian do
     end
   end
 
-
   describe 'can_invite_via_email?' do
     it 'returns true for all (tl2 and above) users when sso is disabled, local logins are enabled, user approval is not required' do
       expect(Guardian.new(trust_level_2).can_invite_via_email?(topic)).to be_truthy
@@ -668,34 +689,34 @@ describe Guardian do
     describe 'a Topic' do
       it 'does not allow moderators to create topics in readonly categories' do
         category = Fabricate(:category)
-        category.set_permissions(:everyone => :read)
+        category.set_permissions(everyone: :read)
         category.save
 
-        expect(Guardian.new(moderator).can_create?(Topic,category)).to be_falsey
+        expect(Guardian.new(moderator).can_create?(Topic, category)).to be_falsey
       end
 
       it 'should check for full permissions' do
         category = Fabricate(:category)
-        category.set_permissions(:everyone => :create_post)
+        category.set_permissions(everyone: :create_post)
         category.save
-        expect(Guardian.new(user).can_create?(Topic,category)).to be_falsey
+        expect(Guardian.new(user).can_create?(Topic, category)).to be_falsey
       end
 
       it "is true for new users by default" do
-        expect(Guardian.new(user).can_create?(Topic,Fabricate(:category))).to be_truthy
+        expect(Guardian.new(user).can_create?(Topic, Fabricate(:category))).to be_truthy
       end
 
       it "is false if user has not met minimum trust level" do
         SiteSetting.min_trust_to_create_topic = 1
-        expect(Guardian.new(build(:user, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_falsey
+        expect(Guardian.new(build(:user, trust_level: 0)).can_create?(Topic, Fabricate(:category))).to be_falsey
       end
 
       it "is true if user has met or exceeded the minimum trust level" do
         SiteSetting.min_trust_to_create_topic = 1
-        expect(Guardian.new(build(:user, trust_level: 1)).can_create?(Topic,Fabricate(:category))).to be_truthy
-        expect(Guardian.new(build(:user, trust_level: 2)).can_create?(Topic,Fabricate(:category))).to be_truthy
-        expect(Guardian.new(build(:admin, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_truthy
-        expect(Guardian.new(build(:moderator, trust_level: 0)).can_create?(Topic,Fabricate(:category))).to be_truthy
+        expect(Guardian.new(build(:user, trust_level: 1)).can_create?(Topic, Fabricate(:category))).to be_truthy
+        expect(Guardian.new(build(:user, trust_level: 2)).can_create?(Topic, Fabricate(:category))).to be_truthy
+        expect(Guardian.new(build(:admin, trust_level: 0)).can_create?(Topic, Fabricate(:category))).to be_truthy
+        expect(Guardian.new(build(:moderator, trust_level: 0)).can_create?(Topic, Fabricate(:category))).to be_truthy
       end
     end
 
@@ -704,7 +725,7 @@ describe Guardian do
       it "is false on readonly categories" do
         category = Fabricate(:category)
         topic.category = category
-        category.set_permissions(:everyone => :readonly)
+        category.set_permissions(everyone: :readonly)
         category.save
 
         expect(Guardian.new(topic.user).can_create?(Post, topic)).to be_falsey
@@ -833,29 +854,27 @@ describe Guardian do
         Guardian.new(user)
       end
 
-
       it "isn't allowed when not logged in" do
-        expect(Guardian.new(nil).post_can_act?(post,:vote)).to be_falsey
+        expect(Guardian.new(nil).post_can_act?(post, :vote)).to be_falsey
       end
 
       it "is allowed as a regular user" do
-        expect(guardian.post_can_act?(post,:vote)).to be_truthy
+        expect(guardian.post_can_act?(post, :vote)).to be_truthy
       end
 
       it "doesn't allow voting if the user has an action from voting already" do
-        expect(guardian.post_can_act?(post,:vote,taken_actions: {PostActionType.types[:vote] => 1})).to be_falsey
+        expect(guardian.post_can_act?(post, :vote, taken_actions: { PostActionType.types[:vote] => 1 })).to be_falsey
       end
 
       it "allows voting if the user has performed a different action" do
-        expect(guardian.post_can_act?(post,:vote,taken_actions: {PostActionType.types[:like] => 1})).to be_truthy
+        expect(guardian.post_can_act?(post, :vote, taken_actions: { PostActionType.types[:like] => 1 })).to be_truthy
       end
 
       it "isn't allowed on archived topics" do
         topic.archived = true
-        expect(Guardian.new(user).post_can_act?(post,:like)).to be_falsey
+        expect(Guardian.new(user).post_can_act?(post, :like)).to be_falsey
       end
 
-
       describe 'multiple voting' do
 
         it "isn't allowed if the user voted and the topic doesn't allow multiple votes" do
@@ -1057,7 +1076,7 @@ describe Guardian do
 
       it "returns false if a wiki but the user can't create a post" do
         c = Fabricate(:category)
-        c.set_permissions(:everyone => :readonly)
+        c.set_permissions(everyone: :readonly)
         c.save
 
         topic = Fabricate(:topic, category: c)
@@ -1642,7 +1661,6 @@ describe Guardian do
       expect(Guardian.new(moderator).can_approve?(user)).to be_truthy
     end
 
-
   end
 
   context 'can_grant_admin?' do
@@ -2016,7 +2034,6 @@ describe Guardian do
     end
   end
 
-
   describe 'can_change_trust_level?' do
 
     it 'is false without a logged in user' do
diff --git a/spec/components/highlight_js/highlight_js_spec.rb b/spec/components/highlight_js/highlight_js_spec.rb
index 22010aeb98..7f1d8def89 100644
--- a/spec/components/highlight_js/highlight_js_spec.rb
+++ b/spec/components/highlight_js/highlight_js_spec.rb
@@ -13,7 +13,6 @@ describe HighlightJs do
     expect(bundle).not_to match(/applescript/)
   end
 
-
   it 'can get a version string' do
     version1 = HighlightJs.version("http|cpp")
     version2 = HighlightJs.version("rust|cpp|fake")
diff --git a/spec/components/html_normalize_spec.rb b/spec/components/html_normalize_spec.rb
index e43fe2fb12..ec6b422295 100644
--- a/spec/components/html_normalize_spec.rb
+++ b/spec/components/html_normalize_spec.rb
@@ -20,7 +20,7 @@ HTML
 
   it "Can handle aside" do
 
-      source = <<~HTML
+    source = <<~HTML
         <aside class="quote" data-topic="2" data-post="1">
           <div class="title">
           <div class="quote-controls"></div>
diff --git a/spec/components/html_to_markdown_spec.rb b/spec/components/html_to_markdown_spec.rb
index c6daa6286b..21aa1822d2 100644
--- a/spec/components/html_to_markdown_spec.rb
+++ b/spec/components/html_to_markdown_spec.rb
@@ -3,7 +3,7 @@ require 'html_to_markdown'
 
 describe HtmlToMarkdown do
 
-  def html_to_markdown(html, opts={})
+  def html_to_markdown(html, opts = {})
     HtmlToMarkdown.new(html, opts).to_markdown
   end
 
diff --git a/spec/components/import/normalize_spec.rb b/spec/components/import/normalize_spec.rb
index 3eff19f034..7f8d4498c7 100644
--- a/spec/components/import/normalize_spec.rb
+++ b/spec/components/import/normalize_spec.rb
@@ -18,4 +18,3 @@ MD
     end
   end
 end
-
diff --git a/spec/components/inline_oneboxer_spec.rb b/spec/components/inline_oneboxer_spec.rb
new file mode 100644
index 0000000000..d58a0d3a7e
--- /dev/null
+++ b/spec/components/inline_oneboxer_spec.rb
@@ -0,0 +1,86 @@
+require 'rails_helper'
+require_dependency 'inline_oneboxer'
+
+describe InlineOneboxer do
+
+  it "should return nothing with empty input" do
+    expect(InlineOneboxer.new([]).process).to be_blank
+  end
+
+  it "can onebox a topic" do
+    topic = Fabricate(:topic)
+    results = InlineOneboxer.new([topic.url], skip_cache: true).process
+    expect(results).to be_present
+    expect(results[0][:url]).to eq(topic.url)
+    expect(results[0][:title]).to eq(topic.title)
+  end
+
+  it "doesn't onebox private messages" do
+    topic = Fabricate(:private_message_topic)
+    results = InlineOneboxer.new([topic.url], skip_cache: true).process
+    expect(results).to be_blank
+  end
+
+  context "caching" do
+    let(:topic) { Fabricate(:topic) }
+
+    before do
+      InlineOneboxer.purge(topic.url)
+    end
+
+    it "puts an entry in the cache" do
+      expect(InlineOneboxer.cache_lookup(topic.url)).to be_blank
+
+      result = InlineOneboxer.lookup(topic.url)
+      expect(result).to be_present
+
+      cached = InlineOneboxer.cache_lookup(topic.url)
+      expect(cached).to be_present
+      expect(cached[:url]).to eq(topic.url)
+      expect(cached[:title]).to eq(topic.title)
+    end
+  end
+
+  context ".lookup" do
+    it "can lookup one link at a time" do
+      topic = Fabricate(:topic)
+      onebox = InlineOneboxer.lookup(topic.url, skip_cache: true)
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq(topic.url)
+      expect(onebox[:title]).to eq(topic.title)
+    end
+
+    it "returns nothing for unknown links" do
+      expect(InlineOneboxer.lookup(nil)).to be_nil
+      expect(InlineOneboxer.lookup("/test")).to be_nil
+    end
+
+    it "will return the fancy title" do
+      topic = Fabricate(:topic, title: "Hello :pizza: with an emoji")
+      onebox = InlineOneboxer.lookup(topic.url, skip_cache: true)
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq(topic.url)
+      expect(onebox[:title]).to eq("Hello 🍕 with an emoji")
+    end
+
+    it "will not crawl domains that aren't whitelisted" do
+      onebox = InlineOneboxer.lookup("https://eviltrout.com", skip_cache: true)
+      expect(onebox).to be_blank
+    end
+
+    it "will lookup whitelisted domains" do
+      SiteSetting.inline_onebox_domains_whitelist = "eviltrout.com"
+      RetrieveTitle.stubs(:crawl).returns("Evil Trout's Blog")
+
+      onebox = InlineOneboxer.lookup(
+        "https://eviltrout.com/some-path",
+        skip_cache: true
+      )
+      expect(onebox).to be_present
+      expect(onebox[:url]).to eq("https://eviltrout.com/some-path")
+      expect(onebox[:title]).to eq("Evil Trout's Blog")
+    end
+
+  end
+
+end
diff --git a/spec/components/js_locale_helper_spec.rb b/spec/components/js_locale_helper_spec.rb
index b5a658f52b..120b6b029b 100644
--- a/spec/components/js_locale_helper_spec.rb
+++ b/spec/components/js_locale_helper_spec.rb
@@ -77,14 +77,13 @@ describe JsLocaleHelper do
     end
 
     it 'can strip out message formats' do
-      hash = {"a" => "b", "c" => { "d" => {"f_MF" => "bob"} }}
-      expect(JsLocaleHelper.strip_out_message_formats!(hash)).to eq({"c.d.f_MF" => "bob"})
+      hash = { "a" => "b", "c" => { "d" => { "f_MF" => "bob" } } }
+      expect(JsLocaleHelper.strip_out_message_formats!(hash)).to eq("c.d.f_MF" => "bob")
       expect(hash["c"]["d"]).to eq({})
     end
 
     it 'handles message format special keys' do
-      JsLocaleHelper.set_translations('en', {
-        "en" => {
+      JsLocaleHelper.set_translations('en',         "en" => {
           "js" => {
             "hello" => "world",
             "test_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}",
@@ -94,8 +93,7 @@ describe JsLocaleHelper do
           "admin_js" => {
             "foo_MF" => "{HELLO} {COUNT, plural, one {1 duck} other {# ducks}}"
           }
-        }
-      })
+        })
 
       ctx = MiniRacer::Context.new
       ctx.eval("I18n = { pluralizationRules: {} };")
@@ -118,38 +116,32 @@ describe JsLocaleHelper do
   end
 
   it 'performs fallbacks to english if a translation is not available' do
-    JsLocaleHelper.set_translations('en', {
-      "en" => {
+    JsLocaleHelper.set_translations('en',       "en" => {
         "js" => {
           "only_english"      => "1-en",
           "english_and_site"  => "3-en",
           "english_and_user"  => "5-en",
           "all_three"         => "7-en",
         }
-      }
-    })
+      })
 
-    JsLocaleHelper.set_translations('ru', {
-      "ru" => {
+    JsLocaleHelper.set_translations('ru',       "ru" => {
         "js" => {
           "only_site"         => "2-ru",
           "english_and_site"  => "3-ru",
           "site_and_user"     => "6-ru",
           "all_three"         => "7-ru",
         }
-      }
-    })
+      })
 
-    JsLocaleHelper.set_translations('uk', {
-      "uk" => {
+    JsLocaleHelper.set_translations('uk',       "uk" => {
         "js" => {
           "only_user"         => "4-uk",
           "english_and_user"  => "5-uk",
           "site_and_user"     => "6-uk",
           "all_three"         => "7-uk",
         }
-      }
-    })
+      })
 
     expected = {
       "none"              => "[uk.js.none]",
diff --git a/spec/components/json_error_spec.rb b/spec/components/json_error_spec.rb
index eae021fe4c..943a0c83c6 100644
--- a/spec/components/json_error_spec.rb
+++ b/spec/components/json_error_spec.rb
@@ -37,7 +37,7 @@ describe JsonError do
 
   describe "with a string" do
     it "returns the string in the error format" do
-      expect(creator.create_errors_json("test error")).to eq({errors: ["test error"]})
+      expect(creator.create_errors_json("test error")).to eq(errors: ["test error"])
     end
   end
 
@@ -52,4 +52,3 @@ describe JsonError do
   end
 
 end
-
diff --git a/spec/components/middleware/anonymous_cache_spec.rb b/spec/components/middleware/anonymous_cache_spec.rb
index e7eedaebad..50d608c870 100644
--- a/spec/components/middleware/anonymous_cache_spec.rb
+++ b/spec/components/middleware/anonymous_cache_spec.rb
@@ -3,7 +3,7 @@ require_dependency "middleware/anonymous_cache"
 
 describe Middleware::AnonymousCache::Helper do
 
-  def env(opts={})
+  def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",
       "REQUEST_URI" => "/path?bla=1",
@@ -12,11 +12,10 @@ describe Middleware::AnonymousCache::Helper do
     }.merge(opts)
   end
 
-  def new_helper(opts={})
+  def new_helper(opts = {})
     Middleware::AnonymousCache::Helper.new(env(opts))
   end
 
-
   context "cachable?" do
     it "true by default" do
       expect(new_helper.cacheable?).to eq(true)
@@ -27,7 +26,7 @@ describe Middleware::AnonymousCache::Helper do
     end
 
     it "is false if it has an auth cookie" do
-      expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{"1"*32}; jill=2").cacheable?).to eq(false)
+      expect(new_helper("HTTP_COOKIE" => "jack=1; _t=#{"1" * 32}; jill=2").cacheable?).to eq(false)
     end
   end
 
@@ -61,10 +60,10 @@ describe Middleware::AnonymousCache::Helper do
     end
 
     it "handles brotli switching" do
-      helper.cache([200, {"HELLO" => "WORLD"}, ["hello ", "my world"]])
+      helper.cache([200, { "HELLO" => "WORLD" }, ["hello ", "my world"]])
 
       helper = new_helper("ANON_CACHE_DURATION" => 10)
-      expect(helper.cached).to eq([200, {"X-Discourse-Cached" => "true", "HELLO" => "WORLD"}, ["hello my world"]])
+      expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]])
 
       helper = new_helper("ANON_CACHE_DURATION" => 10, "HTTP_ACCEPT_ENCODING" => "gz, br")
       expect(helper.cached).to eq(nil)
@@ -73,17 +72,16 @@ describe Middleware::AnonymousCache::Helper do
     it "returns cached data for cached requests" do
       helper.is_mobile = true
       expect(helper.cached).to eq(nil)
-      helper.cache([200, {"HELLO" => "WORLD"}, ["hello ", "my world"]])
+      helper.cache([200, { "HELLO" => "WORLD" }, ["hello ", "my world"]])
 
       helper = new_helper("ANON_CACHE_DURATION" => 10)
       helper.is_mobile = true
-      expect(helper.cached).to eq([200, {"X-Discourse-Cached" => "true", "HELLO" => "WORLD"}, ["hello my world"]])
+      expect(helper.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello my world"]])
 
       expect(crawler.cached).to eq(nil)
-      crawler.cache([200, {"HELLO" => "WORLD"}, ["hello ", "world"]])
-      expect(crawler.cached).to eq([200, {"X-Discourse-Cached" => "true", "HELLO" => "WORLD"}, ["hello world"]])
+      crawler.cache([200, { "HELLO" => "WORLD" }, ["hello ", "world"]])
+      expect(crawler.cached).to eq([200, { "X-Discourse-Cached" => "true", "HELLO" => "WORLD" }, ["hello world"]])
     end
   end
 
 end
-
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index 12fd9fe551..c8c217eb44 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -3,7 +3,7 @@ require_dependency "middleware/request_tracker"
 
 describe Middleware::RequestTracker do
 
-  def env(opts={})
+  def env(opts = {})
     {
       "HTTP_HOST" => "http://test.com",
       "REQUEST_URI" => "/path?bla=1",
@@ -21,7 +21,7 @@ describe Middleware::RequestTracker do
     def log_tracked_view(val)
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_DISCOURSE_TRACK_VIEW" => val
-      ), ["200",{"Content-Type" => 'text/html'}])
+      ), ["200", { "Content-Type" => 'text/html' }])
 
       Middleware::RequestTracker.log_request(data)
     end
@@ -40,19 +40,19 @@ describe Middleware::RequestTracker do
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)"
-      ), ["200",{"Content-Type" => 'text/html'}])
+      ), ["200", { "Content-Type" => 'text/html' }])
 
       Middleware::RequestTracker.log_request(data)
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_DISCOURSE_TRACK_VIEW" => "1"
-      ), ["200",{}])
+      ), ["200", {}])
 
       Middleware::RequestTracker.log_request(data)
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4"
-      ), ["200",{"Content-Type" => 'text/html'}])
+      ), ["200", { "Content-Type" => 'text/html' }])
 
       Middleware::RequestTracker.log_request(data)
 
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index 3b38304d17..65aee5054f 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -151,16 +151,16 @@ describe NewPostManager do
     let(:default_handler) { NewPostManager.method(:default_handler) }
 
     it "adds in order by default" do
-      handler = ->{ nil }
+      handler = -> { nil }
 
       NewPostManager.add_handler(&handler)
       expect(NewPostManager.handlers).to eq([default_handler, handler])
     end
 
     it "can be added in high priority" do
-      a = ->{ nil }
-      b = ->{ nil }
-      c = ->{ nil }
+      a = -> { nil }
+      b = -> { nil }
+      c = -> { nil }
 
       NewPostManager.add_handler(100, &a)
       NewPostManager.add_handler(50, &b)
@@ -241,7 +241,6 @@ describe NewPostManager do
 
   end
 
-
   context "user needs approval?" do
 
     let :user do
@@ -251,24 +250,22 @@ describe NewPostManager do
       user
     end
 
-
-
-    it "handles user_needs_approval? correctly" do
+    it "handles post_needs_approval? correctly" do
       u = user
-      default = NewPostManager.new(u,{})
-      expect(NewPostManager.user_needs_approval?(default)).to eq(false)
+      default = NewPostManager.new(u, {})
+      expect(NewPostManager.post_needs_approval?(default)).to eq(false)
 
       with_check = NewPostManager.new(u, first_post_checks: true)
-      expect(NewPostManager.user_needs_approval?(with_check)).to eq(true)
+      expect(NewPostManager.post_needs_approval?(with_check)).to eq(true)
 
       u.user_stat.post_count = 1
       with_check_and_post = NewPostManager.new(u, first_post_checks: true)
-      expect(NewPostManager.user_needs_approval?(with_check_and_post)).to eq(false)
+      expect(NewPostManager.post_needs_approval?(with_check_and_post)).to eq(false)
 
       u.user_stat.post_count = 0
       u.trust_level = 1
       with_check_tl1 = NewPostManager.new(u, first_post_checks: true)
-      expect(NewPostManager.user_needs_approval?(with_check_tl1)).to eq(false)
+      expect(NewPostManager.post_needs_approval?(with_check_tl1)).to eq(false)
     end
   end
 
diff --git a/spec/components/onebox/engine/discourse_local_onebox_spec.rb b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
index 5b76dc521f..22907e0e06 100644
--- a/spec/components/onebox/engine/discourse_local_onebox_spec.rb
+++ b/spec/components/onebox/engine/discourse_local_onebox_spec.rb
@@ -30,7 +30,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do
     end
 
     it "returns some onebox goodness if post exists and can be seen" do
-      url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}"
+      url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}"
       html = Onebox.preview(url).to_s
       expect(html).to include(post2.excerpt)
       expect(html).to include(post2.topic.title)
@@ -108,7 +108,7 @@ describe Onebox::Engine::DiscourseLocalOnebox do
       let(:post2) { Fabricate(:post, topic: post.topic, post_number: 2) }
 
       it "returns some onebox goodness if post exists and can be seen" do
-        url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id+1}"
+        url = "#{Discourse.base_url}#{post2.url}?source_topic_id=#{post2.topic_id + 1}"
         html = Onebox.preview(url).to_s
         expect(html).to include(post2.excerpt)
         expect(html).to include(post2.topic.title)
diff --git a/spec/components/onpdiff_spec.rb b/spec/components/onpdiff_spec.rb
index 0644edaaa8..e8f3d65c13 100644
--- a/spec/components/onpdiff_spec.rb
+++ b/spec/components/onpdiff_spec.rb
@@ -32,4 +32,3 @@ describe ONPDiff do
   end
 
 end
-
diff --git a/spec/components/pbkdf2_spec.rb b/spec/components/pbkdf2_spec.rb
index 1805cd14f6..233c9d62fa 100644
--- a/spec/components/pbkdf2_spec.rb
+++ b/spec/components/pbkdf2_spec.rb
@@ -1,8 +1,8 @@
 require 'pbkdf2'
 
 describe Pbkdf2 do
-  # trivial test to ensure this does not regress during extraction 
-  it "hashes stuff correctly" do 
+  # trivial test to ensure this does not regress during extraction
+  it "hashes stuff correctly" do
     expect(Pbkdf2.hash_password('test', 'abcd', 100)).to eq("0313a6aca54dd4c5d82a699a8a0f0ffb0191b4ef62414b8d9dbc11c0c5ac04da")
     expect(Pbkdf2.hash_password('test', 'abcd', 101)).to eq("c7a7b2891bf8e6f82d08cf8d83824edcf6c7c6bacb6a741f38e21fc7977bd20f")
   end
diff --git a/spec/components/pinned_check_spec.rb b/spec/components/pinned_check_spec.rb
index 5845abcad3..edaba3218f 100644
--- a/spec/components/pinned_check_spec.rb
+++ b/spec/components/pinned_check_spec.rb
@@ -50,8 +50,6 @@ describe PinnedCheck do
       end
     end
 
-
   end
 
 end
-
diff --git a/spec/components/plugin/filter_manager_spec.rb b/spec/components/plugin/filter_manager_spec.rb
index 285a2c8df4..cd87b24000 100644
--- a/spec/components/plugin/filter_manager_spec.rb
+++ b/spec/components/plugin/filter_manager_spec.rb
@@ -2,14 +2,14 @@ require 'rails_helper'
 require_dependency 'plugin/filter_manager'
 
 describe Plugin::FilterManager do
-  let(:instance){ Plugin::FilterManager.new }
+  let(:instance) { Plugin::FilterManager.new }
 
   it "calls registered filters correctly" do
-    instance.register(:added_numbers) do |context,result|
+    instance.register(:added_numbers) do |context, result|
       context + result + 1
     end
 
-    instance.register(:added_numbers) do |context,result|
+    instance.register(:added_numbers) do |context, result|
       context + result + 2
     end
 
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index 0e9c0fd592..942647b85b 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -102,7 +102,7 @@ describe Plugin::Instance do
       junk_file = "#{plugin.auto_generated_path}/junk"
 
       plugin.ensure_directory(junk_file)
-      File.open("#{plugin.auto_generated_path}/junk", "w") {|f| f.write("junk")}
+      File.open("#{plugin.auto_generated_path}/junk", "w") { |f| f.write("junk") }
       plugin.activate!
 
       expect(plugin.auth_providers.count).to eq(1)
@@ -160,32 +160,11 @@ describe Plugin::Instance do
     end
   end
 
-  context "themes" do
-    it "can register a theme" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_theme('plugin') do |theme|
-        theme.set_color_scheme(
-          primary: 'ffff00',
-          secondary: '222222',
-          tertiary: '0f82af',
-          quaternary: 'c14924',
-          header_background: '111111',
-          header_primary: '333333',
-          highlight: 'a87137',
-          danger: 'e45735',
-          success: '1ca551',
-          love: 'fa6c8d'
-        )
-      end
-      expect(plugin.themes).to be_present
-    end
-  end
-
   context "register_color_scheme" do
     it "can add a color scheme for the first time" do
       plugin = Plugin::Instance.new nil, "/tmp/test.rb"
       expect {
-        plugin.register_color_scheme("Purple", {primary: 'EEE0E5'})
+        plugin.register_color_scheme("Purple", primary: 'EEE0E5')
         plugin.notify_after_initialize
       }.to change { ColorScheme.count }.by(1)
       expect(ColorScheme.where(name: "Purple")).to be_present
@@ -195,7 +174,7 @@ describe Plugin::Instance do
       Fabricate(:color_scheme, name: "Halloween")
       plugin = Plugin::Instance.new nil, "/tmp/test.rb"
       expect {
-        plugin.register_color_scheme("Halloween", {primary: 'EEE0E5'})
+        plugin.register_color_scheme("Halloween", primary: 'EEE0E5')
         plugin.notify_after_initialize
       }.to_not change { ColorScheme.count }
     end
diff --git a/spec/components/post_action_creator_spec.rb b/spec/components/post_action_creator_spec.rb
index 3b577fa404..4e39508167 100644
--- a/spec/components/post_action_creator_spec.rb
+++ b/spec/components/post_action_creator_spec.rb
@@ -6,7 +6,6 @@ describe PostActionCreator do
   let(:post) { Fabricate(:post) }
   let(:like_type_id) { PostActionType.types[:like] }
 
-
   describe 'perform' do
     it 'creates a post action' do
       expect { PostActionCreator.new(user, post).perform(like_type_id) }.to change { PostAction.count }.by(1)
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 5e3441784f..a2e4908dbd 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -9,12 +9,12 @@ describe PostCreator do
 
   context "new topic" do
     let(:category) { Fabricate(:category, user: user) }
-    let(:basic_topic_params) { {title: "hello world topic", raw: "my name is fred", archetype_id: 1} }
-    let(:image_sizes) { {'http://an.image.host/image.jpg' => {"width" => 111, "height" => 222}} }
+    let(:basic_topic_params) { { title: "hello world topic", raw: "my name is fred", archetype_id: 1 } }
+    let(:image_sizes) { { 'http://an.image.host/image.jpg' => { "width" => 111, "height" => 222 } } }
 
     let(:creator) { PostCreator.new(user, basic_topic_params) }
-    let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.id )) }
-    let(:creator_with_meta_data) { PostCreator.new(user, basic_topic_params.merge(meta_data: {hello: "world"} )) }
+    let(:creator_with_category) { PostCreator.new(user, basic_topic_params.merge(category: category.id)) }
+    let(:creator_with_meta_data) { PostCreator.new(user, basic_topic_params.merge(meta_data: { hello: "world" })) }
     let(:creator_with_image_sizes) { PostCreator.new(user, basic_topic_params.merge(image_sizes: image_sizes)) }
     let(:creator_with_featured_link) { PostCreator.new(user, title: "featured link topic", archetype_id: 1, featured_link: "http://www.discourse.org", raw: "http://www.discourse.org") }
 
@@ -34,12 +34,12 @@ describe PostCreator do
       cat = Fabricate(:category)
       cat.all_topics_wiki = true
       cat.save
-      post = PostCreator.create(user, basic_topic_params.merge(category: cat.id ))
+      post = PostCreator.create(user, basic_topic_params.merge(category: cat.id))
       expect(post.wiki).to eq(true)
     end
 
     it "ensures the user can create the topic" do
-      Guardian.any_instance.expects(:can_create?).with(Topic,nil).returns(false)
+      Guardian.any_instance.expects(:can_create?).with(Topic, nil).returns(false)
       expect { creator.create }.to raise_error(Discourse::InvalidAccess)
     end
 
@@ -100,8 +100,8 @@ describe PostCreator do
         end
         # don't notify on system messages they introduce too much noise
         channels = messages.map(&:channel)
-        expect(channels.find{|s| s =~ /unread/}).to eq(nil)
-        expect(channels.find{|s| s =~ /new/}).to eq(nil)
+        expect(channels.find { |s| s =~ /unread/ }).to eq(nil)
+        expect(channels.find { |s| s =~ /new/ }).to eq(nil)
       end
 
       it "generates the correct messages for a secure topic" do
@@ -111,7 +111,7 @@ describe PostCreator do
         admin = Fabricate(:admin)
 
         cat = Fabricate(:category)
-        cat.set_permissions(:admins => :full)
+        cat.set_permissions(admins: :full)
         cat.save
 
         created_post = nil
@@ -122,9 +122,8 @@ describe PostCreator do
           reply = PostCreator.new(admin, raw: "this is my test reply 123 testing", topic_id: created_post.topic_id).create
         end
 
-
         # 2 for topic, one to notify of new topic another for tracking state
-        expect(messages.map{|m| m.channel}.sort).to eq([ "/new",
+        expect(messages.map { |m| m.channel }.sort).to eq([ "/new",
                                                      "/u/#{admin.username}",
                                                      "/u/#{admin.username}",
                                                      "/unread/#{admin.id}",
@@ -136,7 +135,7 @@ describe PostCreator do
                                                    ].sort)
         admin_ids = [Group[:admins].id]
 
-        expect(messages.any?{|m| m.group_ids != admin_ids && m.user_ids != [admin.id]}).to eq(false)
+        expect(messages.any? { |m| m.group_ids != admin_ids && m.user_ids != [admin.id] }).to eq(false)
       end
 
       it 'generates the correct messages for a normal topic' do
@@ -148,16 +147,16 @@ describe PostCreator do
           p = creator.create
         end
 
-        latest = messages.find{|m| m.channel == "/latest"}
+        latest = messages.find { |m| m.channel == "/latest" }
         expect(latest).not_to eq(nil)
 
-        latest = messages.find{|m| m.channel == "/new"}
+        latest = messages.find { |m| m.channel == "/new" }
         expect(latest).not_to eq(nil)
 
-        read = messages.find{|m| m.channel == "/unread/#{p.user_id}"}
+        read = messages.find { |m| m.channel == "/unread/#{p.user_id}" }
         expect(read).not_to eq(nil)
 
-        user_action = messages.find{|m| m.channel == "/u/#{p.user.username}"}
+        user_action = messages.find { |m| m.channel == "/u/#{p.user.username}" }
         expect(user_action).not_to eq(nil)
 
         expect(messages.length).to eq(5)
@@ -191,7 +190,7 @@ describe PostCreator do
         Jobs.expects(:enqueue).with(:notify_mailing_list_subscribers, has_key(:post_id))
         Jobs.expects(:enqueue).with(:post_alert, has_key(:post_id))
         Jobs.expects(:enqueue).with(:process_post, has_key(:image_sizes))
-        creator.opts[:image_sizes] = {'http://an.image.host/image.jpg' => {'width' => 17, 'height' => 31}}
+        creator.opts[:image_sizes] = { 'http://an.image.host/image.jpg' => { 'width' => 17, 'height' => 31 } }
         creator.create
       end
 
@@ -287,36 +286,32 @@ describe PostCreator do
         end
 
         it "doesn't update topic's auto close when it's not based on last post" do
-          Timecop.freeze do
-            topic = Fabricate(:topic).set_or_create_timer(TopicTimer.types[:close], 12)
+          freeze_time
 
-            PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
-            topic.reload
+          topic = Fabricate(:topic).set_or_create_timer(TopicTimer.types[:close], 12)
+          PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
+          topic.reload
 
-            topic_status_update = TopicTimer.last
-            expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-            expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
-          end
+          topic_status_update = TopicTimer.last
+          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
+          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
         end
 
         it "updates topic's auto close date when it's based on last post" do
-          Timecop.freeze do
-            topic = Fabricate(:topic,
-              topic_timers: [Fabricate(:topic_timer,
-                based_on_last_post: true,
-                execute_at: Time.zone.now - 12.hours,
-                created_at: Time.zone.now - 24.hours
-              )]
-            )
+          freeze_time
+          topic = Fabricate(:topic_timer,
+            based_on_last_post: true,
+            execute_at: Time.zone.now - 12.hours,
+            created_at: Time.zone.now - 24.hours
+          ).topic
 
-            Fabricate(:post, topic: topic)
+          Fabricate(:post, topic: topic)
 
-            PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
+          PostCreator.new(topic.user, topic_id: topic.id, raw: "this is a second post").create
 
-            topic_status_update = TopicTimer.last
-            expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
-            expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
-          end
+          topic_status_update = TopicTimer.last
+          expect(topic_status_update.execute_at).to be_within(1.second).of(Time.zone.now + 12.hours)
+          expect(topic_status_update.created_at).to be_within(1.second).of(Time.zone.now)
         end
 
       end
@@ -348,14 +343,14 @@ describe PostCreator do
             end
 
             it "can create all tags if none exist" do
-              expect { @post = creator_with_tags.create }.to change { Tag.count }.by( tag_names.size )
+              expect { @post = creator_with_tags.create }.to change { Tag.count }.by(tag_names.size)
               expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort)
             end
 
             it "creates missing tags if some exist" do
               existing_tag1 = Fabricate(:tag, name: tag_names[0])
               existing_tag1 = Fabricate(:tag, name: tag_names[1])
-              expect { @post = creator_with_tags.create }.to change { Tag.count }.by( tag_names.size - 2 )
+              expect { @post = creator_with_tags.create }.to change { Tag.count }.by(tag_names.size - 2)
               expect(@post.topic.tags.map(&:name).sort).to eq(tag_names.sort)
             end
           end
@@ -404,7 +399,6 @@ describe PostCreator do
       expect(whisper).to be_present
       expect(whisper.post_type).to eq(Post.types[:whisper])
 
-
       whisper_reply = PostCreator.new(user,
                                       topic_id: topic.id,
                                       reply_to_post_number: whisper.post_number,
@@ -417,7 +411,6 @@ describe PostCreator do
       # date is not precise enough in db
       whisper_reply.reload
 
-
       first.reload
       # does not leak into the OP
       expect(first.reply_count).to eq(0)
@@ -430,8 +423,8 @@ describe PostCreator do
       expect(topic.posts_count).to eq(1)
       expect(topic.highest_staff_post_number).to eq(3)
 
-      topic.update_columns(highest_staff_post_number:0,
-                           highest_post_number:0,
+      topic.update_columns(highest_staff_post_number: 0,
+                           highest_post_number: 0,
                            posts_count: 0,
                            last_posted_at: 1.year.ago)
 
@@ -448,7 +441,7 @@ describe PostCreator do
   context 'uniqueness' do
 
     let!(:topic) { Fabricate(:topic, user: user) }
-    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4} }
+    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4 } }
     let(:creator) { PostCreator.new(user, basic_topic_params) }
 
     context "disabled" do
@@ -506,11 +499,10 @@ describe PostCreator do
 
   end
 
-
   context "host spam" do
 
     let!(:topic) { Fabricate(:topic, user: user) }
-    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4} }
+    let(:basic_topic_params) { { raw: 'test reply', topic_id: topic.id, reply_to_post_number: 4 } }
     let(:creator) { PostCreator.new(user, basic_topic_params) }
 
     before do
@@ -527,7 +519,7 @@ describe PostCreator do
 
     it "sends a message to moderators" do
       GroupMessage.expects(:create).with do |group_name, msg_type, params|
-        group_name == Group[:moderators].name and msg_type == :spam_post_blocked and params[:user].id == user.id
+        group_name == (Group[:moderators].name) && msg_type == (:spam_post_blocked) && params[:user].id == (user.id)
       end
       creator.create
     end
@@ -635,7 +627,7 @@ describe PostCreator do
       # if an admin replies they should be added to the allowed user list
       admin = Fabricate(:admin)
       PostCreator.create(admin, raw: 'hi there welcome topic, I am a mod',
-                         topic_id: post.topic_id)
+                                topic_id: post.topic_id)
 
       post.topic.reload
       expect(post.topic.topic_allowed_users.where(user_id: admin.id).count).to eq(1)
@@ -821,11 +813,11 @@ describe PostCreator do
     it "should give credit to creator" do
       post = create_post
       expect(PostTiming.find_by(topic_id: post.topic_id,
-                         post_number: post.post_number,
-                         user_id: post.user_id).msecs).to be > 0
+                                post_number: post.post_number,
+                                user_id: post.user_id).msecs).to be > 0
 
       expect(TopicUser.find_by(topic_id: post.topic_id,
-                        user_id: post.user_id).last_read_post_number).to eq(1)
+                               user_id: post.user_id).last_read_post_number).to eq(1)
     end
   end
 
@@ -833,14 +825,14 @@ describe PostCreator do
     it "does not allow suspended users to create topics" do
       user = Fabricate(:user, suspended_at: 1.month.ago, suspended_till: 1.month.from_now)
 
-      creator = PostCreator.new(user, {title: "my test title 123", raw: "I should not be allowed to post"} )
+      creator = PostCreator.new(user, title: "my test title 123", raw: "I should not be allowed to post")
       creator.create
       expect(creator.errors.count).to be > 0
     end
   end
 
   it "doesn't strip starting whitespaces" do
-    pc = PostCreator.new(user, { title: "testing whitespace stripping", raw: "    <-- whitespaces -->    " })
+    pc = PostCreator.new(user, title: "testing whitespace stripping", raw: "    <-- whitespaces -->    ")
     post = pc.create
     expect(post.raw).to eq("    <-- whitespaces -->")
   end
diff --git a/spec/components/post_destroyer_spec.rb b/spec/components/post_destroyer_spec.rb
index aa67187834..6b6ba44d89 100644
--- a/spec/components/post_destroyer_spec.rb
+++ b/spec/components/post_destroyer_spec.rb
@@ -213,7 +213,7 @@ describe PostDestroyer do
         expect(post2.deleted_at).to be_blank
         expect(post2.deleted_by).to be_blank
         expect(post2.user_deleted).to eq(true)
-        expect(post2.raw).to eq(I18n.t('js.post.deleted_by_author', {count: 24}))
+        expect(post2.raw).to eq(I18n.t('js.post.deleted_by_author', count: 24))
         expect(post2.version).to eq(2)
         expect(called).to eq(1)
 
@@ -360,7 +360,7 @@ describe PostDestroyer do
       it "creates a new user history entry" do
         expect {
           PostDestroyer.new(admin, post).destroy
-        }.to change { UserHistory.count}.by(1)
+        }.to change { UserHistory.count }.by(1)
       end
     end
   end
@@ -441,13 +441,11 @@ describe PostDestroyer do
     let(:second_post) { Fabricate(:post, topic_id: post.topic_id) }
 
     def create_user_action(action_type)
-      UserAction.log_action!({
-        action_type: action_type,
-        user_id: codinghorror.id,
-        acting_user_id: codinghorror.id,
-        target_topic_id: second_post.topic_id,
-        target_post_id: second_post.id
-      })
+      UserAction.log_action!(action_type: action_type,
+                             user_id: codinghorror.id,
+                             acting_user_id: codinghorror.id,
+                             target_topic_id: second_post.topic_id,
+                             target_post_id: second_post.id)
     end
 
     it "should delete the user actions" do
diff --git a/spec/components/post_merger_spec.rb b/spec/components/post_merger_spec.rb
index db866c092e..c620a8ea8b 100644
--- a/spec/components/post_merger_spec.rb
+++ b/spec/components/post_merger_spec.rb
@@ -40,14 +40,14 @@ describe PostMerger do
       reply1 = create_post(topic: topic, post_number: post.post_number, user: user)
       reply2 = create_post(topic: topic, post_number: post.post_number, user: user)
 
-      expect{ PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      expect { PostMerger.new(admin, [reply2, post, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
     end
 
     it "should only allow staff user to merge posts" do
       reply1 = create_post(topic: topic, post_number: post.post_number, user: user)
       reply2 = create_post(topic: topic, post_number: post.post_number, user: user)
 
-      expect{ PostMerger.new(user, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
+      expect { PostMerger.new(user, [reply2, reply1]).merge }.to raise_error(Discourse::InvalidAccess)
     end
 
     it "should not allow posts from different topics to be merged" do
@@ -67,4 +67,3 @@ describe PostMerger do
     end
   end
 end
-
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index eafe106c9f..c057daaf2e 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -65,7 +65,7 @@ describe PostRevisor do
     describe 'with the same body' do
       it "doesn't change version" do
         expect {
-          expect(subject.revise!(post.user, { raw: post.raw })).to eq(false)
+          expect(subject.revise!(post.user, raw: post.raw)).to eq(false)
           post.reload
         }.not_to change(post, :version)
       end
@@ -150,7 +150,7 @@ describe PostRevisor do
 
         context "after second window" do
 
-          let!(:new_revised_at) {revised_at + 2.minutes}
+          let!(:new_revised_at) { revised_at + 2.minutes }
 
           before do
             subject.revise!(post.user, { raw: 'yet another, another updated body' }, revised_at: new_revised_at)
@@ -185,7 +185,7 @@ describe PostRevisor do
 
       context "one paragraph description" do
         before do
-          subject.revise!(post.user, { raw: new_description })
+          subject.revise!(post.user, raw: new_description)
           category.reload
         end
 
@@ -200,7 +200,7 @@ describe PostRevisor do
 
       context "multiple paragraph description" do
         before do
-          subject.revise!(post.user, { raw: "#{new_description}\n\nOther content goes here." })
+          subject.revise!(post.user, raw: "#{new_description}\n\nOther content goes here.")
           category.reload
         end
 
@@ -213,10 +213,26 @@ describe PostRevisor do
         end
       end
 
+      context "invalid description without paragraphs" do
+        before do
+          subject.revise!(post.user, raw: "# This is a title")
+          category.reload
+        end
+
+        it "returns a error for the user" do
+          expect(post.errors.present?).to eq(true)
+          expect(post.errors.messages[:base].first).to be I18n.t("category.errors.description_incomplete")
+        end
+
+        it "doesn't update the description of the category" do
+          expect(category.description).to eq(nil)
+        end
+      end
+
       context 'when updating back to the original paragraph' do
         before do
           category.update_column(:description, 'this is my description')
-          subject.revise!(post.user, { raw: Category.post_template })
+          subject.revise!(post.user, raw: Category.post_template)
           category.reload
         end
 
@@ -236,7 +252,7 @@ describe PostRevisor do
 
       it "triggers a rate limiter" do
         EditRateLimiter.any_instance.expects(:performed!)
-        subject.revise!(changed_by, { raw: 'updated body' })
+        subject.revise!(changed_by, raw: 'updated body')
       end
     end
 
@@ -247,7 +263,7 @@ describe PostRevisor do
         SiteSetting.newuser_max_images = 0
         url = "http://i.imgur.com/wfn7rgU.jpg"
         Oneboxer.stubs(:onebox).with(url, anything).returns("<img src='#{url}'>")
-        subject.revise!(changed_by, { raw: "So, post them here!\n#{url}" })
+        subject.revise!(changed_by, raw: "So, post them here!\n#{url}")
       end
 
       it "allows an admin to insert images into a new user's post" do
@@ -265,7 +281,7 @@ describe PostRevisor do
         SiteSetting.newuser_max_images = 0
         url = "http://i.imgur.com/FGg7Vzu.gif"
         Oneboxer.stubs(:cached_onebox).with(url, anything).returns("<img src='#{url}'>")
-        subject.revise!(post.user, { raw: "So, post them here!\n#{url}" })
+        subject.revise!(post.user, raw: "So, post them here!\n#{url}")
       end
 
       it "doesn't allow images to be inserted" do
@@ -274,10 +290,9 @@ describe PostRevisor do
 
     end
 
-
     describe 'with a new body' do
       let(:changed_by) { Fabricate(:coding_horror) }
-      let!(:result) { subject.revise!(changed_by, { raw: "lets update the body. Здравствуйте" }) }
+      let!(:result) { subject.revise!(changed_by, raw: "lets update the body. Здравствуйте") }
 
       it 'returns true' do
         expect(result).to eq(true)
@@ -327,7 +342,7 @@ describe PostRevisor do
       context 'passing skip_revision as true' do
         before do
           SiteSetting.editing_grace_period = 1.minute
-          subject.revise!(changed_by, { raw: 'yet another updated body' }, { revised_at: post.updated_at + 10.hours, skip_revision: true })
+          subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.hours, skip_revision: true)
           post.reload
         end
 
@@ -349,14 +364,14 @@ describe PostRevisor do
         }.to change { topic.excerpt }
         second_post = Fabricate(:post, post_args.merge(post_number: 2, topic_id: topic.id))
         expect {
-          described_class.new(second_post).revise!(second_post.user, { raw: 'Edit the 2nd post' })
+          described_class.new(second_post).revise!(second_post.user, raw: 'Edit the 2nd post')
           topic.reload
         }.to_not change { topic.excerpt }
       end
     end
 
     it "doesn't strip starting whitespaces" do
-      subject.revise!(post.user, { raw: "    <-- whitespaces -->    " })
+      subject.revise!(post.user, raw: "    <-- whitespaces -->    ")
       post.reload
       expect(post.raw).to eq("    <-- whitespaces -->")
     end
@@ -368,7 +383,7 @@ describe PostRevisor do
         revisor = described_class.new(topic.ordered_posts.first, topic)
 
         messages = MessageBus.track_publish do
-          revisor.revise!(newuser, { title: 'this is a test topic' })
+          revisor.revise!(newuser, title: 'this is a test topic')
         end
 
         message = messages.find { |m| m.channel == "/topic/#{topic.id}" }
@@ -384,7 +399,7 @@ describe PostRevisor do
         end
 
         it "doesn't add the tags" do
-          result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+          result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
           expect(result).to eq(true)
           post.reload
           expect(post.topic.tags.size).to eq(0)
@@ -404,7 +419,7 @@ describe PostRevisor do
 
           it "can create all tags if none exist" do
             expect {
-              @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+              @result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
             }.to change { Tag.count }.by(2)
             expect(@result).to eq(true)
             post.reload
@@ -414,7 +429,7 @@ describe PostRevisor do
           it "creates missing tags if some exist" do
             Fabricate(:tag, name: 'totally')
             expect {
-              @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+              @result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
             }.to change { Tag.count }.by(1)
             expect(@result).to eq(true)
             post.reload
@@ -423,7 +438,7 @@ describe PostRevisor do
 
           it "can remove all tags" do
             topic.tags = [Fabricate(:tag, name: "super"), Fabricate(:tag, name: "stuff")]
-            result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: [] })
+            result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: [])
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.size).to eq(0)
@@ -431,7 +446,7 @@ describe PostRevisor do
 
           it "can remove all tags using tags_empty_array" do
             topic.tags = [Fabricate(:tag, name: "stuff")]
-            result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags_empty_array: "true" })
+            result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags_empty_array: "true")
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.size).to eq(0)
@@ -439,14 +454,14 @@ describe PostRevisor do
 
           it "can't add staff-only tags" do
             SiteSetting.staff_tags = "important"
-            result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['important', 'stuff'] })
+            result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['important', 'stuff'])
             expect(result).to eq(false)
             expect(post.topic.errors.present?).to eq(true)
           end
 
           it "staff can add staff-only tags" do
             SiteSetting.staff_tags = "important"
-            result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: ['important', 'stuff'] })
+            result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: ['important', 'stuff'])
             expect(result).to eq(true)
             post.reload
             expect(post.topic.tags.map(&:name).sort).to eq(['important', 'stuff'])
@@ -460,7 +475,7 @@ describe PostRevisor do
             end
 
             it "staff-only tags can't be removed" do
-              result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['stuff'] })
+              result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['stuff'])
               expect(result).to eq(false)
               expect(post.topic.errors.present?).to eq(true)
               post.reload
@@ -468,7 +483,7 @@ describe PostRevisor do
             end
 
             it "can't remove all tags if some are staff-only" do
-              result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: [] })
+              result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: [])
               expect(result).to eq(false)
               expect(post.topic.errors.present?).to eq(true)
               post.reload
@@ -476,14 +491,14 @@ describe PostRevisor do
             end
 
             it "staff-only tags can be removed by staff" do
-              result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: ['stuff'] })
+              result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: ['stuff'])
               expect(result).to eq(true)
               post.reload
               expect(post.topic.tags.map(&:name)).to eq(['stuff'])
             end
 
             it "staff can remove all tags" do
-              result = subject.revise!(Fabricate(:admin), { raw: "lets totally update the body", tags: [] })
+              result = subject.revise!(Fabricate(:admin), raw: "lets totally update the body", tags: [])
               expect(result).to eq(true)
               post.reload
               expect(post.topic.tags.size).to eq(0)
@@ -501,7 +516,7 @@ describe PostRevisor do
           it "only uses existing tags" do
             Fabricate(:tag, name: 'totally')
             expect {
-              @result = subject.revise!(Fabricate(:user), { raw: "lets totally update the body", tags: ['totally', 'update'] })
+              @result = subject.revise!(Fabricate(:user), raw: "lets totally update the body", tags: ['totally', 'update'])
             }.to_not change { Tag.count }
             expect(@result).to eq(true)
             post.reload
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 966ce95726..917aa56f0f 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -4,6 +4,10 @@ require 'html_normalize'
 
 describe PrettyText do
 
+  before do
+    SiteSetting.enable_markdown_typographer = false
+  end
+
   def n(html)
     HtmlNormalize.normalize(html)
   end
@@ -13,22 +17,9 @@ describe PrettyText do
   end
 
   let(:wrapped_image) { "<div class=\"lightbox-wrapper\"><a href=\"//localhost:3000/uploads/default/4399/33691397e78b4d75.png\" class=\"lightbox\" title=\"Screen Shot 2014-04-14 at 9.47.10 PM.png\"><img src=\"//localhost:3000/uploads/default/_optimized/bd9/b20/bbbcd6a0c0_655x500.png\" width=\"655\" height=\"500\"><div class=\"meta\">\n<span class=\"filename\">Screen Shot 2014-04-14 at 9.47.10 PM.png</span><span class=\"informations\">966x737 1.47 MB</span><span class=\"expand\"></span>\n</div></a></div>" }
-  let(:wrapped_image_excerpt) {  }
+  let(:wrapped_image_excerpt) {}
 
-  describe "Cooking" do
-
-    describe "off topic quoting" do
-      it "can correctly populate topic title" do
-        topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
-        expected = <<HTML
-<aside class="quote" data-post="2" data-topic="#{topic.id}"><div class="title">
-<div class="quote-controls"></div><a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
-</div>
-<blockquote><p>ddd</p></blockquote></aside>
-HTML
-        expect(PrettyText.cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]ddd\n[/quote]", topic_id: 1)).to match_html expected
-      end
-    end
+  describe "Quoting" do
 
     describe "with avatar" do
       let(:default_avatar) { "//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/{size}.png" }
@@ -38,19 +29,127 @@ HTML
         User.stubs(:default_template).returns(default_avatar)
       end
 
-      it "produces a quote even with new lines in it" do
-        expect(PrettyText.cook("[quote=\"#{user.username}, post:123, topic:456, full:true\"]ddd\n[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt='' width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">#{user.username}:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+      it "do off topic quoting with emoji unescape" do
+
+        topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
+        expected = <<~HTML
+          <aside class="quote" data-topic="#{topic.id}" data-post="2">
+          <div class="title">
+            <div class="quote-controls"></div>
+            <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
+          </div>
+          <blockquote>
+            <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1)).to eq(n(expected))
       end
 
-      it "should produce a quote" do
-        expect(PrettyText.cook("[quote=\"#{user.username}, post:123, topic:456, full:true\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt='' width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">#{user.username}:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+      it "indifferent about missing quotations" do
+        md = <<~MD
+          [quote=#{user.username}, post:123, topic:456, full:true]
+
+          ddd
+
+          [/quote]
+        MD
+        html = <<~HTML
+          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(PrettyText.cook(md)).to eq(html.strip)
+      end
+
+      it "indifferent about curlies and no curlies" do
+        md = <<~MD
+          [quote=“#{user.username}, post:123, topic:456, full:true”]
+
+          ddd
+
+          [/quote]
+        MD
+        html = <<~HTML
+          <aside class="quote" data-post="123" data-topic="456" data-full="true">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(PrettyText.cook(md)).to eq(html.strip)
       end
 
       it "trims spaces on quote params" do
-        expect(PrettyText.cook("[quote=\"#{user.username}, post:555, topic: 666\"]ddd[/quote]")).to match_html "<aside class=\"quote\" data-post=\"555\" data-topic=\"666\"><div class=\"title\">\n<div class=\"quote-controls\"></div>\n<img alt='' width=\"20\" height=\"20\" src=\"//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png\" class=\"avatar\">#{user.username}:</div>\n<blockquote><p>ddd</p></blockquote></aside>"
+        md = <<~MD
+          [quote="#{user.username}, post:555, topic: 666"]
+          ddd
+          [/quote]
+        MD
+
+        html = <<~HTML
+          <aside class="quote" data-post="555" data-topic="666">
+          <div class="title">
+          <div class="quote-controls"></div>
+          <img alt width="20" height="20" src="//test.localhost/uploads/default/avatars/42d/57c/46ce7ee487/40.png" class="avatar"> #{user.username}:</div>
+          <blockquote>
+          <p>ddd</p>
+          </blockquote>
+          </aside>
+        HTML
+
+        expect(PrettyText.cook(md)).to eq(html.strip)
       end
     end
 
+    it "can handle inline block bbcode" do
+      cooked = PrettyText.cook("[quote]te **s** t[/quote]")
+
+      html = <<~HTML
+        <aside class="quote">
+        <blockquote>
+        <p>te <strong>s</strong> t</p>
+        </blockquote>
+        </aside>
+      HTML
+
+      expect(cooked).to eq(html.strip)
+    end
+
+    it "can handle quote edge cases" do
+      expect(PrettyText.cook("[quote]abc\ntest\n[/quote]")).not_to include('aside')
+      expect(PrettyText.cook("[quote]  \ntest\n[/quote]  ")).to include('aside')
+      expect(PrettyText.cook("a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
+      expect(PrettyText.cook("- a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
+      expect(PrettyText.cook("[quote]\ntest")).not_to include('aside')
+      expect(PrettyText.cook("[quote]\ntest\n[/quote]z")).not_to include('aside')
+
+      nested = <<~QUOTE
+        [quote]
+        a
+        [quote]
+        b
+        [/quote]
+        c
+        [/quote]
+      QUOTE
+
+      cooked = PrettyText.cook(nested)
+      expect(cooked.scan('aside').length).to eq(4)
+      expect(cooked.scan('quote]').length).to eq(0)
+    end
+
     describe "with letter avatar" do
       let(:user) { Fabricate(:user) }
 
@@ -61,22 +160,51 @@ HTML
         end
 
         it "should have correct avatar url" do
-          expect(PrettyText.cook("[quote=\"#{user.username}, post:123, topic:456, full:true\"]ddd[/quote]")).to include("/forum/letter_avatar_proxy")
+          md = <<~MD
+            [quote="#{user.username}, post:123, topic:456, full:true"]
+            ddd
+            [/quote]
+          MD
+          expect(PrettyText.cook(md)).to include("/forum/letter_avatar_proxy")
         end
       end
     end
+  end
+
+  describe "Mentions" do
 
     it "should handle 3 mentions in a row" do
       expect(PrettyText.cook('@hello @hello @hello')).to match_html "<p><span class=\"mention\">@hello</span> <span class=\"mention\">@hello</span> <span class=\"mention\">@hello</span></p>"
     end
 
-    it "should handle group mentions with a hyphen and without" do
-      expect(PrettyText.cook('@hello @hello-hello')).to match_html "<p><span class=\"mention\">@hello</span> <span class=\"mention\">@hello-hello</span></p>"
+    it "can handle mention edge cases" do
+      expect(PrettyText.cook("hi\n@s")).to eq("<p>hi<br>\n<span class=\"mention\">@s</span></p>")
+      expect(PrettyText.cook("hi\n@ss")).to eq("<p>hi<br>\n<span class=\"mention\">@ss</span></p>")
+      expect(PrettyText.cook("hi\n@s.")).to eq("<p>hi<br>\n<span class=\"mention\">@s</span>.</p>")
+      expect(PrettyText.cook("hi\n@s.s")).to eq("<p>hi<br>\n<span class=\"mention\">@s.s</span></p>")
+      expect(PrettyText.cook("hi\n@.s.s")).to eq("<p>hi<br>\n@.s.s</p>")
     end
 
+    it "can handle mention with hyperlinks" do
+      Fabricate(:user, username: "sam")
+      expect(PrettyText.cook("hi @sam! hi")).to match_html '<p>hi <a class="mention" href="/u/sam">@sam</a>! hi</p>'
+      expect(PrettyText.cook("hi\n@sam.")).to eq("<p>hi<br>\n<a class=\"mention\" href=\"/u/sam\">@sam</a>.</p>")
+    end
 
-    it "should sanitize the html" do
-      expect(PrettyText.cook("<script>alert(42)</script>")).to match_html "<p></p>"
+    it "can handle mentions inside a hyperlink" do
+      expect(PrettyText.cook("<a> @inner</a> ")).to match_html '<p><a> @inner</a></p>'
+    end
+
+    it "can handle mentions inside a hyperlink" do
+      expect(PrettyText.cook("[link @inner](http://site.com)")).to match_html '<p><a href="http://site.com" rel="nofollow noopener">link @inner</a></p>'
+    end
+
+    it "can handle a list of mentions" do
+      expect(PrettyText.cook("@a,@b")).to match_html('<p><span class="mention">@a</span>,<span class="mention">@b</span></p>')
+    end
+
+    it "should handle group mentions with a hyphen and without" do
+      expect(PrettyText.cook('@hello @hello-hello')).to match_html "<p><span class=\"mention\">@hello</span> <span class=\"mention\">@hello-hello</span></p>"
     end
 
     it 'should allow for @mentions to have punctuation' do
@@ -85,13 +213,62 @@ HTML
       )
     end
 
-    # see: https://github.com/sparklemotion/nokogiri/issues/1173
-    skip 'allows html entities correctly' do
-      expect(PrettyText.cook("&aleph;&pound;&#162;")).to eq("<p>&aleph;&pound;&#162;</p>")
+    it 'should not treat a medium link as a mention' do
+      expect(PrettyText.cook(". http://test/@sam")).not_to include('mention')
     end
 
   end
 
+  describe "code fences" do
+    it 'indents code correctly' do
+      code = <<~MD
+         X
+         ```
+              #
+              x
+         ```
+      MD
+      cooked = PrettyText.cook(code)
+
+      html = <<~HTML
+        <p>X</p>
+        <pre><code class="lang-auto">     #
+             x
+        </code></pre>
+      HTML
+
+      expect(cooked).to eq(html.strip)
+    end
+
+    it "doesn't replace emoji in code blocks with our emoji sets if emoji is enabled" do
+      expect(PrettyText.cook("```\n💣`\n```\n")).not_to match(/\:bomb\:/)
+    end
+
+    it 'can include code class correctly' do
+      # keep in mind spaces should be trimmed per spec
+      expect(PrettyText.cook("```   ruby the mooby\n`````")).to eq('<pre><code class="lang-ruby"></code></pre>')
+      expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("<pre><code class='lang-cpp'>cpp\n</code></pre>")
+      expect(PrettyText.cook("```\ncpp\n```")).to match_html("<pre><code class='lang-auto'>cpp\n</code></pre>")
+      expect(PrettyText.cook("```text\ncpp\n```")).to match_html("<pre><code class='lang-nohighlight'>cpp\n</code></pre>")
+
+    end
+
+    it 'indents code correctly' do
+      code = "X\n```\n\n    #\n    x\n```"
+      cooked = PrettyText.cook(code)
+      expect(cooked).to match_html("<p>X</p>\n<pre><code class=\"lang-auto\">\n    #\n    x\n</code></pre>")
+    end
+
+    it 'does censor code fences' do
+      begin
+        ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
+        expect(PrettyText.cook("# banana")).not_to include('banana')
+      ensure
+        $redis.flushall
+      end
+    end
+  end
+
   describe "rel nofollow" do
     before do
       SiteSetting.add_rel_nofollow_to_user_content = true
@@ -144,7 +321,7 @@ HTML
     context "images" do
 
       it "should dump images" do
-        expect(PrettyText.excerpt("<img src='http://cnn.com/a.gif'>",100)).to eq("[image]")
+        expect(PrettyText.excerpt("<img src='http://cnn.com/a.gif'>", 100)).to eq("[image]")
       end
 
       context 'alt tags' do
@@ -186,32 +363,32 @@ HTML
     end
 
     it "should have an option to strip links" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",100, strip_links: true)).to eq("cnn")
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 100, strip_links: true)).to eq("cnn")
     end
 
     it "should preserve links" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",100)).to match_html "<a href='http://cnn.com'>cnn</a>"
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 100)).to match_html "<a href='http://cnn.com'>cnn</a>"
     end
 
     it "should deal with special keys properly" do
-      expect(PrettyText.excerpt("<pre><b></pre>",100)).to eq("")
+      expect(PrettyText.excerpt("<pre><b></pre>", 100)).to eq("")
     end
 
     it "should truncate stuff properly" do
-      expect(PrettyText.excerpt("hello world",5)).to eq("hello&hellip;")
-      expect(PrettyText.excerpt("<p>hello</p><p>world</p>",6)).to eq("hello w&hellip;")
+      expect(PrettyText.excerpt("hello world", 5)).to eq("hello&hellip;")
+      expect(PrettyText.excerpt("<p>hello</p><p>world</p>", 6)).to eq("hello w&hellip;")
     end
 
     it "should insert a space between to Ps" do
-      expect(PrettyText.excerpt("<p>a</p><p>b</p>",5)).to eq("a b")
+      expect(PrettyText.excerpt("<p>a</p><p>b</p>", 5)).to eq("a b")
     end
 
     it "should strip quotes" do
-      expect(PrettyText.excerpt("<aside class='quote'><p>a</p><p>b</p></aside>boom",5)).to eq("boom")
+      expect(PrettyText.excerpt("<aside class='quote'><p>a</p><p>b</p></aside>boom", 5)).to eq("boom")
     end
 
     it "should not count the surrounds of a link" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",3)).to match_html "<a href='http://cnn.com'>cnn</a>"
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 3)).to match_html "<a href='http://cnn.com'>cnn</a>"
     end
 
     it "uses an ellipsis instead of html entities if provided with the option" do
@@ -219,7 +396,7 @@ HTML
     end
 
     it "should truncate links" do
-      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>",2)).to match_html "<a href='http://cnn.com'>cn&hellip;</a>"
+      expect(PrettyText.excerpt("<a href='http://cnn.com'>cnn</a>", 2)).to match_html "<a href='http://cnn.com'>cn&hellip;</a>"
     end
 
     it "doesn't extract empty quotes as links" do
@@ -272,22 +449,22 @@ HTML
     end
 
     it "should not preserve tags in code blocks" do
-      expect(PrettyText.excerpt("<pre><code class='handlebars'>&lt;h3&gt;Hours&lt;/h3&gt;</code></pre>",100)).to eq("&lt;h3&gt;Hours&lt;/h3&gt;")
+      expect(PrettyText.excerpt("<pre><code class='handlebars'>&lt;h3&gt;Hours&lt;/h3&gt;</code></pre>", 100)).to eq("&lt;h3&gt;Hours&lt;/h3&gt;")
     end
 
     it "should handle nil" do
-      expect(PrettyText.excerpt(nil,100)).to eq('')
+      expect(PrettyText.excerpt(nil, 100)).to eq('')
     end
 
     it "handles span excerpt at the beginning of a post" do
-      expect(PrettyText.excerpt("<span class='excerpt'>hi</span> test",100)).to eq('hi')
+      expect(PrettyText.excerpt("<span class='excerpt'>hi</span> test", 100)).to eq('hi')
       post = Fabricate(:post, raw: "<span class='excerpt'>hi</span> test")
       expect(post.excerpt).to eq("hi")
     end
 
     it "ignores max excerpt length if a span excerpt is specified" do
       two_hundred = "123456789 " * 20 + "."
-      text =  two_hundred + "<span class='excerpt'>#{two_hundred}</span>" + two_hundred
+      text = two_hundred + "<span class='excerpt'>#{two_hundred}</span>" + two_hundred
       expect(PrettyText.excerpt(text, 100)).to eq(two_hundred)
       post = Fabricate(:post, raw: text)
       expect(post.excerpt).to eq(two_hundred)
@@ -299,12 +476,12 @@ HTML
 
     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'>"
-      expect(PrettyText.excerpt(emoji_image, 100, { keep_emoji_images: true })).to match_html(emoji_image)
+      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:'> "
-      expect(PrettyText.excerpt(emoji_image, 100, { remap_emoji: true })).to match_html("I ❤  you :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
@@ -330,7 +507,6 @@ HTML
         )).to eq("boom")
       end
     end
-
   end
 
   describe "strip links" do
@@ -402,19 +578,49 @@ HTML
     end
   end
 
-  it 'can escape *' do
-    expect(PrettyText.cook("***a***a")).to match_html("<p><strong><em>a</em></strong>a</p>")
-    expect(PrettyText.cook("***\\****a")).to match_html("<p><strong><em>*</em></strong>a</p>")
-  end
+  it 'Is smart about linebreaks and IMG tags' do
+    raw = <<~MD
+    a <img>
+    <img>
 
-  it 'can include code class correctly' do
-    expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("<p></p><pre><code class='lang-cpp'>cpp</code></pre>")
-  end
+    <img>
+    <img>
 
-  it 'indents code correctly' do
-    code = "X\n```\n\n    #\n    x\n```"
-    cooked = PrettyText.cook(code)
-    expect(cooked).to match_html("<p>X<br></p>\n\n<p></p><pre><code class=\"lang-auto\">    #\n    x</code></pre>")
+    <img>
+    a
+
+    <img>
+    - li
+
+    <img>
+    ```
+    test
+    ```
+
+    ```
+    test
+    ```
+    MD
+
+    html = <<~HTML
+      <p>a <img><br>
+      <img></p>
+      <p><img><br>
+      <img></p>
+      <p><img></p>
+      <p>a</p>
+      <p><img></p>
+      <ul>
+      <li>li</li>
+      </ul>
+      <p><img></p>
+      <pre><code class="lang-auto">test
+      </code></pre>
+      <pre><code class="lang-auto">test
+      </code></pre>
+    HTML
+
+    expect(PrettyText.cook(raw)).to eq(html.strip)
   end
 
   it 'can substitute s3 cdn correctly' do
@@ -425,19 +631,21 @@ HTML
     SiteSetting.s3_cdn_url = "https://awesome.cdn"
 
     # add extra img tag to ensure it does not blow up
-    raw = <<HTML
-  <img>
-  <img src='https:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
-  <img src='http:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
-  <img src='#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+    raw = <<~HTML
+      <img>
+      <img src='https:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+      <img src='http:#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+      <img src='#{Discourse.store.absolute_base_url}/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg'>
+    HTML
 
-HTML
+    html = <<~HTML
+      <p><img><br>
+      <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>
+      <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>
+      <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"></p>
+    HTML
 
-    cooked = <<HTML
-<p>  <img><br>  <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>  <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"><br>  <img src="https://awesome.cdn/original/9/9/99c9384b8b6d87f8509f8395571bc7512ca3cad1.jpg"></p>
-HTML
-
-    expect(PrettyText.cook(raw)).to match_html(cooked)
+    expect(PrettyText.cook(raw)).to eq(html.strip)
   end
 
   describe "emoji" do
@@ -449,10 +657,6 @@ HTML
       expect(PrettyText.cook("`💣`")).not_to match(/\:bomb\:/)
     end
 
-    it "doesn't replace emoji in code blocks with our emoji sets if emoji is enabled" do
-      expect(PrettyText.cook("```\n💣`\n```\n")).not_to match(/\:bomb\:/)
-    end
-
     it "replaces some glyphs that are not in the emoji range" do
       expect(PrettyText.cook("☺")).to match(/\:slight_smile\:/)
     end
@@ -470,22 +674,6 @@ HTML
     end
   end
 
-  describe "tag and category links" do
-    it "produces tag links" do
-      Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]})
-
-      cooked = PrettyText.cook(" #unknown::tag #known::tag")
-
-      html = <<~HTML
-        <p> <span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>
-      HTML
-
-      expect(cooked).to match_html(html)
-    end
-
-    # TODO does it make sense to generate hashtags for tags that are missing in action?
-  end
-
   describe "custom emoji" do
     it "replaces the custom emoji" do
       CustomEmoji.create!(name: 'trout', upload: Fabricate(:upload))
@@ -504,317 +692,330 @@ HTML
     end
   end
 
-  context "markdown it" do
+  it "replaces skin toned emoji" do
+    expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
+    expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
+    expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_student/5.png?v=5\" title=\":woman_student:t5:\" class=\"emoji\" alt=\":woman_student:t5:\"></p>")
+    expect(PrettyText.cook("hello 🤷‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_shrugging.png?v=5\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
+  end
 
-    before do
-      SiteSetting.enable_experimental_markdown_it = true
-    end
+  it "should not treat a non emoji as an emoji" do
+    expect(PrettyText.cook(':email,class_name:')).not_to include('emoji')
+  end
 
-    it "replaces skin toned emoji" do
-      expect(PrettyText.cook("hello 👱🏿‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/blonde_woman/6.png?v=5\" title=\":blonde_woman:t6:\" class=\"emoji\" alt=\":blonde_woman:t6:\"></p>")
-      expect(PrettyText.cook("hello 👩‍🎤")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_singer.png?v=5\" title=\":woman_singer:\" class=\"emoji\" alt=\":woman_singer:\"></p>")
-      expect(PrettyText.cook("hello 👩🏾‍🎓")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_student/5.png?v=5\" title=\":woman_student:t5:\" class=\"emoji\" alt=\":woman_student:t5:\"></p>")
-      expect(PrettyText.cook("hello 🤷‍♀️")).to eq("<p>hello <img src=\"/images/emoji/twitter/woman_shrugging.png?v=5\" title=\":woman_shrugging:\" class=\"emoji\" alt=\":woman_shrugging:\"></p>")
-    end
+  it "supports href schemes" do
+    SiteSetting.allowed_href_schemes = "macappstore|steam"
+    cooked = cook("[Steam URL Scheme](steam://store/452530)")
+    expected = '<p><a href="steam://store/452530" rel="nofollow noopener">Steam URL Scheme</a></p>'
+    expect(cooked).to eq(n expected)
+  end
 
+  it "supports forbidden schemes" do
+    SiteSetting.allowed_href_schemes = "macappstore|itunes"
+    cooked = cook("[Steam URL Scheme](steam://store/452530)")
+    expected = '<p><a>Steam URL Scheme</a></p>'
+    expect(cooked).to eq(n expected)
+  end
 
-    it "supports href schemes" do
-      SiteSetting.allowed_href_schemes = "macappstore|steam"
-      cooked = cook("[Steam URL Scheme](steam://store/452530)")
-      expected = '<p><a href="steam://store/452530" rel="nofollow noopener">Steam URL Scheme</a></p>'
-      expect(cooked).to eq(n expected)
-    end
+  it "produces tag links" do
+    Fabricate(:topic, tags: [Fabricate(:tag, name: 'known')])
 
-    it "supports forbidden schemes" do
-      SiteSetting.allowed_href_schemes = "macappstore|itunes"
-      cooked = cook("[Steam URL Scheme](steam://store/452530)")
-      expected = '<p><a>Steam URL Scheme</a></p>'
-      expect(cooked).to eq(n expected)
-    end
+    cooked = PrettyText.cook(" #unknown::tag #known::tag")
 
-    it "produces tag links" do
-      Fabricate(:topic, {tags: [Fabricate(:tag, name: 'known')]})
+    html = <<~HTML
+      <p><span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>
+    HTML
 
-      cooked = PrettyText.cook(" #unknown::tag #known::tag")
+    expect(cooked).to eq(html.strip)
 
-      html = <<~HTML
-        <p><span class=\"hashtag\">#unknown::tag</span> <a class=\"hashtag\" href=\"http://test.localhost/tags/known\">#<span>known</span></a></p>
-      HTML
+    cooked = PrettyText.cook("[`a` #known::tag here](http://somesite.com)")
 
-      expect(cooked).to eq(html.strip)
+    html = <<~HTML
+      <p><a href="http://somesite.com" rel="nofollow noopener"><code>a</code> #known::tag here</a></p>
+    HTML
 
-      cooked = PrettyText.cook("[`a` #known::tag here](http://somesite.com)")
+    expect(cooked).to eq(html.strip)
 
-      html = <<~HTML
-        <p><a href="http://somesite.com" rel="nofollow noopener"><code>a</code> #known::tag here</a></p>
-      HTML
+    cooked = PrettyText.cook("<a href='http://somesite.com'>`a` #known::tag here</a>")
 
-      expect(cooked).to eq(html.strip)
+    expect(cooked).to eq(html.strip)
 
-      cooked = PrettyText.cook("<a href='http://somesite.com'>`a` #known::tag here</a>")
+    cooked = PrettyText.cook("<A href='/a'>test</A> #known::tag")
+    html = <<~HTML
+      <p><a href="/a">test</a> <a class="hashtag" href="http://test.localhost/tags/known">#<span>known</span></a></p>
+    HTML
 
-      expect(cooked).to eq(html.strip)
+    expect(cooked).to eq(html.strip)
 
-      cooked = PrettyText.cook("<A href='/a'>test</A> #known::tag")
-      html = <<~HTML
-        <p><a href="/a">test</a> <a class="hashtag" href="http://test.localhost/tags/known">#<span>known</span></a></p>
-      HTML
+    # ensure it does not fight with the autolinker
+    expect(PrettyText.cook(' http://somewhere.com/#known')).not_to include('hashtag')
+    expect(PrettyText.cook(' http://somewhere.com/?#known')).not_to include('hashtag')
+    expect(PrettyText.cook(' http://somewhere.com/?abc#known')).not_to include('hashtag')
 
-      expect(cooked).to eq(html.strip)
+  end
 
-      # ensure it does not fight with the autolinker
-      expect(PrettyText.cook(' http://somewhere.com/#known')).not_to include('hashtag')
-      expect(PrettyText.cook(' http://somewhere.com/?#known')).not_to include('hashtag')
-      expect(PrettyText.cook(' http://somewhere.com/?abc#known')).not_to include('hashtag')
+  it "can handle mixed lists" do
+    # known bug in old md engine
+    cooked = PrettyText.cook("* a\n\n1. b")
+    expect(cooked).to match_html("<ul>\n<li>a</li>\n</ul><ol>\n<li>b</li>\n</ol>")
+  end
 
-    end
+  it "can handle traditional vs non traditional newlines" do
+    SiteSetting.traditional_markdown_linebreaks = true
+    expect(PrettyText.cook("1\n2")).to match_html "<p>1 2</p>"
 
-    it "can handle mixed lists" do
-      # known bug in old md engine
-      cooked = PrettyText.cook("* a\n\n1. b")
-      expect(cooked).to match_html("<ul>\n<li>a</li>\n</ul><ol>\n<li>b</li>\n</ol>")
-    end
+    SiteSetting.traditional_markdown_linebreaks = false
+    expect(PrettyText.cook("1\n2")).to match_html "<p>1<br>\n2</p>"
+  end
 
-    it "can handle traditional vs non traditional newlines" do
-      SiteSetting.traditional_markdown_linebreaks = true
-      expect(PrettyText.cook("1\n2")).to match_html "<p>1 2</p>"
+  it "can handle emoji by name" do
 
-      SiteSetting.traditional_markdown_linebreaks = false
-      expect(PrettyText.cook("1\n2")).to match_html "<p>1<br>\n2</p>"
-    end
-
-    it "can handle mentions" do
-      Fabricate(:user, username: "sam")
-      expect(PrettyText.cook("hi @sam! hi")).to match_html '<p>hi <a class="mention" href="/u/sam">@sam</a>! hi</p>'
-      expect(PrettyText.cook("hi\n@sam")).to eq("<p>hi<br>\n<a class=\"mention\" href=\"/u/sam\">@sam</a></p>")
-    end
-
-    it "can handle mentions inside a hyperlink" do
-      expect(PrettyText.cook("<a> @inner</a> ")).to match_html '<p><a> @inner</a></p>'
-    end
-
-
-    it "can handle mentions inside a hyperlink" do
-      expect(PrettyText.cook("[link @inner](http://site.com)")).to match_html '<p><a href="http://site.com" rel="nofollow noopener">link @inner</a></p>'
-    end
-
-    it "can handle a list of mentions" do
-      expect(PrettyText.cook("@a,@b")).to match_html('<p><span class="mention">@a</span>,<span class="mention">@b</span></p>')
-    end
-
-    it "can handle emoji by name" do
-
-      expected = <<HTML
+    expected = <<HTML
 <p><img src="/images/emoji/twitter/smile.png?v=5\" title=":smile:" class="emoji" alt=":smile:"><img src="/images/emoji/twitter/sunny.png?v=5" title=":sunny:" class="emoji" alt=":sunny:"></p>
 HTML
-      expect(PrettyText.cook(":smile::sunny:")).to eq(expected.strip)
-    end
+    expect(PrettyText.cook(":smile::sunny:")).to eq(expected.strip)
+  end
 
-    it "handles emoji boundaries correctly" do
-      cooked = PrettyText.cook("a,:man:t2:,b")
-      expected = '<p>a,<img src="/images/emoji/twitter/man/2.png?v=5" title=":man:t2:" class="emoji" alt=":man:t2:">,b</p>'
-      expect(cooked).to match(expected.strip)
-    end
+  it "handles emoji boundaries correctly" do
+    cooked = PrettyText.cook("a,:man:t2:,b")
+    expected = '<p>a,<img src="/images/emoji/twitter/man/2.png?v=5" title=":man:t2:" class="emoji" alt=":man:t2:">,b</p>'
+    expect(cooked).to match(expected.strip)
+  end
 
-    it "can handle emoji by translation" do
-      expected = '<p><img src="/images/emoji/twitter/wink.png?v=5" title=":wink:" class="emoji" alt=":wink:"></p>'
-      expect(PrettyText.cook(";)")).to eq(expected)
-    end
+  it "can handle emoji by translation" do
+    expected = '<p><img src="/images/emoji/twitter/wink.png?v=5" title=":wink:" class="emoji" alt=":wink:"></p>'
+    expect(PrettyText.cook(";)")).to eq(expected)
+  end
 
-    it "can handle multiple emojis by translation" do
-      cooked = PrettyText.cook(":) ;) :)")
-      expect(cooked.split("img").length-1).to eq(3)
-    end
+  it "can handle multiple emojis by translation" do
+    cooked = PrettyText.cook(":) ;) :)")
+    expect(cooked.split("img").length - 1).to eq(3)
+  end
 
-    it "handles emoji boundries correctly" do
-      expect(PrettyText.cook(",:)")).to include("emoji")
-      expect(PrettyText.cook(":-)\n")).to include("emoji")
-      expect(PrettyText.cook("a :)")).to include("emoji")
-      expect(PrettyText.cook(":),")).not_to include("emoji")
-      expect(PrettyText.cook("abcde ^:;-P")).to include("emoji")
-    end
+  it "handles emoji boundries correctly" do
+    expect(PrettyText.cook(",:)")).to include("emoji")
+    expect(PrettyText.cook(":-)\n")).to include("emoji")
+    expect(PrettyText.cook("a :)")).to include("emoji")
+    expect(PrettyText.cook(":),")).not_to include("emoji")
+    expect(PrettyText.cook("abcde ^:;-P")).to include("emoji")
+  end
 
-
-    it 'can include code class correctly' do
-      expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("<pre><code class='lang-cpp'>cpp\n</code></pre>")
-      expect(PrettyText.cook("```\ncpp\n```")).to match_html("<pre><code class='lang-auto'>cpp\n</code></pre>")
-      expect(PrettyText.cook("```text\ncpp\n```")).to match_html("<pre><code class='lang-nohighlight'>cpp\n</code></pre>")
-    end
-
-    it 'indents code correctly' do
-      code = "X\n```\n\n    #\n    x\n```"
-      cooked = PrettyText.cook(code)
-      expect(cooked).to match_html("<p>X</p>\n<pre><code class=\"lang-auto\">\n    #\n    x\n</code></pre>")
-    end
-
-    it 'can censor words correctly' do
-      SiteSetting.censored_words = 'apple|banana'
+  it 'can censor words correctly' do
+    begin
+      ['apple', 'banana'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
       expect(PrettyText.cook('yay banana yay')).not_to include('banana')
       expect(PrettyText.cook('yay `banana` yay')).not_to include('banana')
-      expect(PrettyText.cook("yay \n\n```\nbanana\n````\n yay")).not_to include('banana')
       expect(PrettyText.cook("# banana")).not_to include('banana')
       expect(PrettyText.cook("# banana")).to include("\u25a0\u25a0")
+    ensure
+      $redis.flushall
     end
+  end
 
-    it 'supports typographer' do
-      SiteSetting.enable_markdown_typographer = true
-      expect(PrettyText.cook('(tm)')).to eq('<p>™</p>')
+  it 'supports typographer' do
+    SiteSetting.enable_markdown_typographer = true
+    expect(PrettyText.cook('(tm)')).to eq('<p>™</p>')
 
-      SiteSetting.enable_markdown_typographer = false
-      expect(PrettyText.cook('(tm)')).to eq('<p>(tm)</p>')
-    end
+    SiteSetting.enable_markdown_typographer = false
+    expect(PrettyText.cook('(tm)')).to eq('<p>(tm)</p>')
+  end
 
-    it 'handles onebox correctly' do
-      expect(PrettyText.cook("http://a.com\nhttp://b.com").split("onebox").length).to eq(3)
-      expect(PrettyText.cook("http://a.com\n\nhttp://b.com").split("onebox").length).to eq(3)
-      expect(PrettyText.cook("a\nhttp://a.com")).to include('onebox')
-      expect(PrettyText.cook("> http://a.com")).not_to include('onebox')
-      expect(PrettyText.cook("a\nhttp://a.com a")).not_to include('onebox')
-      expect(PrettyText.cook("a\nhttp://a.com\na")).to include('onebox')
-      expect(PrettyText.cook("http://a.com")).to include('onebox')
-      expect(PrettyText.cook("http://a.com ")).to include('onebox')
-      expect(PrettyText.cook("http://a.com a")).not_to include('onebox')
-      expect(PrettyText.cook("- http://a.com")).not_to include('onebox')
-      expect(PrettyText.cook("<http://a.com>")).not_to include('onebox')
-      expect(PrettyText.cook(" http://a.com")).not_to include('onebox')
-      expect(PrettyText.cook("a\n http://a.com")).not_to include('onebox')
-    end
+  it 'handles onebox correctly' do
+    expect(PrettyText.cook("http://a.com\nhttp://b.com").split("onebox").length).to eq(3)
+    expect(PrettyText.cook("http://a.com\n\nhttp://b.com").split("onebox").length).to eq(3)
+    expect(PrettyText.cook("a\nhttp://a.com")).to include('onebox')
+    expect(PrettyText.cook("> http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("a\nhttp://a.com a")).not_to include('onebox')
+    expect(PrettyText.cook("a\nhttp://a.com\na")).to include('onebox')
+    expect(PrettyText.cook("http://a.com")).to include('onebox')
+    expect(PrettyText.cook("http://a.com ")).to include('onebox')
+    expect(PrettyText.cook("http://a.com a")).not_to include('onebox')
+    expect(PrettyText.cook("- http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("<http://a.com>")).not_to include('onebox')
+    expect(PrettyText.cook(" http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("a\n http://a.com")).not_to include('onebox')
+    expect(PrettyText.cook("sam@sam.com")).not_to include('onebox')
+    expect(PrettyText.cook("<img src='a'>\nhttp://a.com")).to include('onebox')
+  end
 
-    it "can handle bbcode" do
-      expect(PrettyText.cook("a[b]b[/b]c")).to eq('<p>a<span class="bbcode-b">b</span>c</p>')
-      expect(PrettyText.cook("a[i]b[/i]c")).to eq('<p>a<span class="bbcode-i">b</span>c</p>')
-    end
+  it "can handle bbcode" do
+    expect(PrettyText.cook("a[b]b[/b]c")).to eq('<p>a<span class="bbcode-b">b</span>c</p>')
+    expect(PrettyText.cook("a[i]b[/i]c")).to eq('<p>a<span class="bbcode-i">b</span>c</p>')
+  end
 
-    it "can handle quote edge cases" do
-      expect(PrettyText.cook("a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
-      expect(PrettyText.cook("- a\n[quote]\ntest\n[/quote]\n\n\na")).to include('aside')
-      expect(PrettyText.cook("[quote]\ntest")).not_to include('aside')
-      expect(PrettyText.cook("[quote]abc\ntest\n[/quote]")).not_to include('aside')
-      expect(PrettyText.cook("[quote]\ntest\n[/quote]z")).not_to include('aside')
+  it "can onebox local topics" do
+    op = Fabricate(:post)
+    reply = Fabricate(:post, topic_id: op.topic_id)
 
-      nested = <<~QUOTE
-        [quote]
-        a
-        [quote]
-        b
-        [/quote]
-        c
-        [/quote]
-      QUOTE
+    url = Discourse.base_url + reply.url
+    quote = create_post(topic_id: op.topic.id, raw: "This is a sample reply with a quote\n\n#{url}")
+    quote.reload
 
-      cooked = PrettyText.cook(nested)
-      expect(cooked.scan('aside').length).to eq(4)
-      expect(cooked.scan('quote]').length).to eq(0)
-    end
+    expect(quote.cooked).not_to include('[quote')
+  end
 
-    it "can onebox local topics" do
-      op = Fabricate(:post)
-      reply = Fabricate(:post, topic_id: op.topic_id)
+  it "supports tables" do
 
+    markdown = <<~MD
+      | Tables        | Are           | Cool  |
+      | ------------- |:-------------:| -----:|
+      | col 3 is      | right-aligned | $1600 |
+    MD
 
-      url = Discourse.base_url + reply.url
-      quote = create_post(topic_id: op.topic.id, raw: "This is a sample reply with a quote\n\n#{url}")
-      quote.reload
+    expected = <<~HTML
+      <table>
+      <thead>
+      <tr>
+      <th>Tables</th>
+      <th style="text-align:center">Are</th>
+      <th style="text-align:right">Cool</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+      <td>col 3 is</td>
+      <td style="text-align:center">right-aligned</td>
+      <td style="text-align:right">$1600</td>
+      </tr>
+      </tbody>
+      </table>
+    HTML
 
-      expect(quote.cooked).not_to include('[quote')
-    end
+    expect(PrettyText.cook(markdown)).to eq(expected.strip)
+  end
 
-    it "supports tables" do
+  it "supports img bbcode" do
+    cooked = PrettyText.cook "[img]http://www.image/test.png[/img]"
+    html = "<p><img src=\"http://www.image/test.png\" alt></p>"
+    expect(cooked).to eq(html)
+  end
 
-      markdown = <<~MD
-        | Tables        | Are           | Cool  |
-        | ------------- |:-------------:| -----:|
-        | col 3 is      | right-aligned | $1600 |
+  it "provides safety for img bbcode" do
+    cooked = PrettyText.cook "[img]http://aaa.com<script>alert(1);</script>[/img]"
+    html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports email bbcode" do
+    cooked = PrettyText.cook "[email]sam@sam.com[/email]"
+    html = '<p><a href="mailto:sam@sam.com" data-bbcode="true">sam@sam.com</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports url bbcode" do
+    cooked = PrettyText.cook "[url]http://sam.com[/url]"
+    html = '<p><a href="http://sam.com" data-bbcode="true" rel="nofollow noopener">http://sam.com</a></p>';
+    expect(cooked).to eq(html)
+  end
+
+  it "supports nesting tags in url" do
+    cooked = PrettyText.cook("[url=http://sam.com][b]I am sam[/b][/url]")
+    html = '<p><a href="http://sam.com" data-bbcode="true" rel="nofollow noopener"><span class="bbcode-b">I am sam</span></a></p>';
+    expect(cooked).to eq(html)
+  end
+
+  it "supports query params in bbcode url" do
+    cooked = PrettyText.cook("[url=https://www.amazon.com/Camcorder-Hausbell-302S-Control-Infrared/dp/B01KLOA1PI/?tag=discourse]BBcode link[/url]")
+    html = '<p><a href="https://www.amazon.com/Camcorder-Hausbell-302S-Control-Infrared/dp/B01KLOA1PI/?tag=discourse" data-bbcode="true" rel="nofollow noopener">BBcode link</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports inline code bbcode" do
+    cooked = PrettyText.cook "Testing [code]codified **stuff** and `more` stuff[/code]"
+    html = "<p>Testing <code>codified **stuff** and `more` stuff</code></p>"
+    expect(cooked).to eq(html)
+  end
+
+  it "supports block code bbcode" do
+    cooked = PrettyText.cook "[code]\ncodified\n\n\n  **stuff** and `more` stuff\n[/code]"
+    html = "<pre><code class=\"lang-auto\">codified\n\n\n  **stuff** and `more` stuff</code></pre>"
+    expect(cooked).to eq(html)
+  end
+
+  it "support special handling for space in urls" do
+    cooked = PrettyText.cook "http://testing.com?a%20b"
+    html = '<p><a href="http://testing.com?a%20b" class="onebox" target="_blank" rel="nofollow noopener">http://testing.com?a%20b</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "supports onebox for decoded urls" do
+    cooked = PrettyText.cook "http://testing.com?a%50b"
+    html = '<p><a href="http://testing.com?a%50b" class="onebox" target="_blank" rel="nofollow noopener">http://testing.com?aPb</a></p>'
+    expect(cooked).to eq(html)
+  end
+
+  it "should sanitize the html" do
+    expect(PrettyText.cook("<test>alert(42)</test>")).to eq "<p>alert(42)</p>"
+  end
+
+  it "should not onebox magically linked urls" do
+    expect(PrettyText.cook('[url]site.com[/url]')).not_to include('onebox')
+  end
+
+  it "should sanitize the html" do
+    expect(PrettyText.cook("<p class='hi'>hi</p>")).to eq "<p>hi</p>"
+  end
+
+  it "should strip SCRIPT" do
+    expect(PrettyText.cook("<script>alert(42)</script>")).to eq ""
+  end
+
+  it "should allow sanitize bypass" do
+    expect(PrettyText.cook("<test>alert(42)</test>", sanitize: false)).to eq "<p><test>alert(42)</test></p>"
+  end
+
+  # custom rule used to specify image dimensions via alt tags
+  describe "image dimensions" do
+    it "allows title plus dimensions" do
+      cooked = PrettyText.cook <<~MD
+        ![title with | title|220x100](http://png.com/my.png)
+        ![](http://png.com/my.png)
+        ![|220x100](http://png.com/my.png)
+        ![stuff](http://png.com/my.png)
+        ![|220x100,50%](http://png.com/my.png)
       MD
 
-      expected = <<~HTML
-        <table>
-        <thead>
-        <tr>
-        <th>Tables</th>
-        <th style="text-align:center">Are</th>
-        <th style="text-align:right">Cool</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-        <td>col 3 is</td>
-        <td style="text-align:center">right-aligned</td>
-        <td style="text-align:right">$1600</td>
-        </tr>
-        </tbody>
-        </table>
+      html = <<~HTML
+        <p><img src="http://png.com/my.png" alt="title with | title" width="220" height="100"><br>
+        <img src="http://png.com/my.png" alt><br>
+        <img src="http://png.com/my.png" alt width="220" height="100"><br>
+        <img src="http://png.com/my.png" alt="stuff"><br>
+        <img src="http://png.com/my.png" alt width="110" height="50"></p>
       HTML
 
-      expect(PrettyText.cook(markdown)).to eq(expected.strip)
+      expect(cooked).to eq(html.strip)
     end
 
-    it "do off topic quoting with emoji unescape" do
+    it "allows whitespace before the percent scaler" do
+      cooked = PrettyText.cook <<~MD
+        ![|220x100, 50%](http://png.com/my.png)
+        ![|220x100 , 50%](http://png.com/my.png)
+        ![|220x100 ,50%](http://png.com/my.png)
+      MD
 
-      topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
-      expected = <<~HTML
-        <aside class="quote" data-topic="#{topic.id}" data-post="2">
-        <div class="title">
-          <div class="quote-controls"></div>
-          <a href="http://test.localhost/t/this-is-a-test-topic-slight-smile/#{topic.id}/2">This is a test topic <img src="/images/emoji/twitter/slight_smile.png?v=5" title="slight_smile" alt="slight_smile" class="emoji"></a>
-        </div>
-        <blockquote>
-          <p>ddd</p>
-        </blockquote>
-        </aside>
+      html = <<~HTML
+        <p><img src="http://png.com/my.png" alt width="110" height="50"><br>
+        <img src="http://png.com/my.png" alt width="110" height="50"><br>
+        <img src="http://png.com/my.png" alt width="110" height="50"></p>
       HTML
 
-      expect(cook("[quote=\"EvilTrout, post:2, topic:#{topic.id}\"]\nddd\n[/quote]", topic_id: 1)).to eq(n(expected))
-    end
-
-    it "supports img bbcode" do
-      cooked = PrettyText.cook "[img]http://www.image/test.png[/img]"
-      html = "<p><img src=\"http://www.image/test.png\" alt></p>"
-      expect(cooked).to eq(html)
-    end
-
-    it "provides safety for img bbcode" do
-      cooked = PrettyText.cook "[img]http://aaa.com<script>alert(1);</script>[/img]"
-      html = '<p><img src="http://aaa.com&lt;script&gt;alert(1);&lt;/script&gt;" alt></p>'
-      expect(cooked).to eq(html)
-    end
-
-    it "supports email bbcode" do
-      cooked = PrettyText.cook "[email]sam@sam.com[/email]"
-      html = '<p><a href="mailto:sam@sam.com" data-bbcode="true">sam@sam.com</a></p>'
-      expect(cooked).to eq(html)
-    end
-
-    it "supports url bbcode" do
-      cooked = PrettyText.cook "[url]http://sam.com[/url]"
-      html = '<p><a href="http://sam.com" data-bbcode="true" rel="nofollow noopener">http://sam.com</a></p>'
-      expect(cooked).to eq(html)
-    end
-
-    it "supports inline code bbcode" do
-      cooked = PrettyText.cook "Testing [code]codified **stuff** and `more` stuff[/code]"
-      html = "<p>Testing <code>codified **stuff** and `more` stuff</code></p>"
-      expect(cooked).to eq(html)
-    end
-
-    it "supports block code bbcode" do
-      cooked = PrettyText.cook "[code]\ncodified\n\n\n  **stuff** and `more` stuff\n[/code]"
-      html = "<pre><code class=\"lang-auto\">codified\n\n\n  **stuff** and `more` stuff</code></pre>"
-      expect(cooked).to eq(html)
-    end
-
-    it "support special handling for space in urls" do
-      cooked = PrettyText.cook "http://testing.com?a%20b"
-      html = '<p><a href="http://testing.com?a%20b" class="onebox" rel="nofollow noopener">http://testing.com?a%20b</a></p>'
-      expect(cooked).to eq(html)
-    end
-
-    it "supports onebox for decoded urls" do
-      cooked = PrettyText.cook "http://testing.com?a%50b"
-      html = '<p><a href="http://testing.com?a%50b" class="onebox" rel="nofollow noopener">http://testing.com?aPb</a></p>'
-      expect(cooked).to eq(html)
+      expect(cooked).to eq(html.strip)
     end
 
   end
 
+  describe "inline onebox" do
+    it "includes the topic title" do
+      topic = Fabricate(:topic)
+
+      raw = "Hello #{topic.url}"
+
+      cooked = <<~HTML
+        <p>Hello <a href="#{topic.url}">#{topic.title}</a></p>
+      HTML
+
+      expect(PrettyText.cook(raw)).to eq(cooked.strip)
+    end
+  end
+
 end
diff --git a/spec/components/promotion_spec.rb b/spec/components/promotion_spec.rb
index d15ace0d4b..716e4b1684 100644
--- a/spec/components/promotion_spec.rb
+++ b/spec/components/promotion_spec.rb
@@ -15,7 +15,7 @@ describe Promotion do
 
   context "newuser" do
 
-    let(:user) { Fabricate(:user, trust_level: TrustLevel[0], created_at: 2.days.ago)}
+    let(:user) { Fabricate(:user, trust_level: TrustLevel[0], created_at: 2.days.ago) }
     let(:promotion) { Promotion.new(user) }
 
     it "doesn't raise an error with a nil user" do
@@ -70,7 +70,7 @@ describe Promotion do
 
   context "basic" do
 
-    let(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: 2.days.ago)}
+    let(:user) { Fabricate(:user, trust_level: TrustLevel[1], created_at: 2.days.ago) }
     let(:promotion) { Promotion.new(user) }
 
     context 'that has done nothing' do
@@ -131,7 +131,7 @@ describe Promotion do
   end
 
   context "regular" do
-    let(:user) { Fabricate(:user, trust_level: TrustLevel[2])}
+    let(:user) { Fabricate(:user, trust_level: TrustLevel[2]) }
     let(:promotion) { Promotion.new(user) }
 
     context "doesn't qualify for promotion" do
diff --git a/spec/components/retrieve_title_spec.rb b/spec/components/retrieve_title_spec.rb
new file mode 100644
index 0000000000..351a28acfa
--- /dev/null
+++ b/spec/components/retrieve_title_spec.rb
@@ -0,0 +1,38 @@
+require 'rails_helper'
+require_dependency 'retrieve_title'
+
+describe RetrieveTitle do
+
+  context "extract_title" do
+
+    it "will extract the value from the title tag" do
+      title = RetrieveTitle.extract_title(
+        "<html><title>My Cool Title</title></html>"
+      )
+
+      expect(title).to eq("My Cool Title")
+    end
+
+    it "will strip whitespace" do
+      title = RetrieveTitle.extract_title(
+        "<html><title>   Another Title\n\n </title></html>"
+      )
+
+      expect(title).to eq("Another Title")
+    end
+
+    it "will prefer the title from an opengraph tag" do
+      title = RetrieveTitle.extract_title(<<~HTML
+        <html>
+          <title>Bad Title</title>
+          <meta property="og:title" content="Good Title" />
+        </html>
+        HTML
+      )
+
+      expect(title).to eq("Good Title")
+    end
+
+  end
+
+end
diff --git a/spec/components/scheduler/defer_spec.rb b/spec/components/scheduler/defer_spec.rb
index 49fbde58c7..c00829b3c3 100644
--- a/spec/components/scheduler/defer_spec.rb
+++ b/spec/components/scheduler/defer_spec.rb
@@ -37,7 +37,6 @@ describe Scheduler::Defer do
 
     @defer.resume
 
-
     @defer.later do
       x = 3
     end
diff --git a/spec/components/scheduler/manager_spec.rb b/spec/components/scheduler/manager_spec.rb
index 3dc699a1f6..ac5c0c82db 100644
--- a/spec/components/scheduler/manager_spec.rb
+++ b/spec/components/scheduler/manager_spec.rb
@@ -19,7 +19,7 @@ describe Scheduler::Manager do
       every 5.minutes
 
       def perform
-        self.class.runs+=1
+        self.class.runs += 1
         sleep 0.001
       end
     end
@@ -58,20 +58,9 @@ describe Scheduler::Manager do
     Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
   }
 
-  before {
+  before do
     expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
-  }
-
-  after {
-    expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
-  }
-
-  it 'can disable stats' do
-    manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
-    expect(manager.enable_stats).to eq(false)
-
-    manager = Scheduler::Manager.new(DiscourseRedis.new)
-    expect(manager.enable_stats).to eq(true)
+    @thread_count = Thread.list.count
   end
 
   after do
@@ -80,13 +69,34 @@ describe Scheduler::Manager do
     manager.remove(Testing::SuperLongJob)
     manager.remove(Testing::PerHostJob)
     $redis.flushall
+    expect(ActiveRecord::Base.connection_pool.connections.reject { |c| !c.in_use? }.length).to eq(1)
+
+    # connections that are not in use must be removed
+    # otherwise active record gets super confused
+    ActiveRecord::Base.connection_pool.connections.reject { |c| c.in_use? }.each do |c|
+      ActiveRecord::Base.connection_pool.remove(c)
+    end
+    expect(ActiveRecord::Base.connection_pool.connections.length).to eq(1)
+    wait_for do
+      @thread_count == Thread.list.count
+    end
+  end
+
+  it 'can disable stats' do
+    manager = Scheduler::Manager.new(DiscourseRedis.new, enable_stats: false)
+    expect(manager.enable_stats).to eq(false)
+    manager.stop!
+
+    manager = Scheduler::Manager.new(DiscourseRedis.new)
+    expect(manager.enable_stats).to eq(true)
+    manager.stop!
   end
 
   describe 'per host jobs' do
     it "correctly schedules on multiple hosts" do
       Testing::PerHostJob.runs = 0
 
-      hosts = ['a','b','c']
+      hosts = ['a', 'b', 'c']
 
       hosts.map do |host|
 
@@ -105,9 +115,7 @@ describe Scheduler::Manager do
         manager.stop!
 
       end
-
       expect(Testing::PerHostJob.runs).to eq(3)
-
     end
   end
 
@@ -126,7 +134,7 @@ describe Scheduler::Manager do
       expect($redis.zcard(Scheduler::Manager.queue_key)).to eq(0)
     end
 
-    skip 'should recover from crashed manager' do
+    it 'should recover from crashed manager' do
 
       info = manager.schedule_info(Testing::SuperLongJob)
       info.next_run = Time.now.to_i - 1
@@ -142,10 +150,11 @@ describe Scheduler::Manager do
 
       info = manager.schedule_info(Testing::SuperLongJob)
       expect(info.next_run).to be <= Time.now.to_i
+
+      manager.stop!
     end
 
-    # something about logging jobs causing a leak in connection pool in test
-    skip 'should log when job finishes running' do
+    it 'should log when job finishes running' do
 
       Testing::RandomJob.runs = 0
 
diff --git a/spec/components/scheduler/schedule_info_spec.rb b/spec/components/scheduler/schedule_info_spec.rb
index 9b956c73ac..75fc3bc1bb 100644
--- a/spec/components/scheduler/schedule_info_spec.rb
+++ b/spec/components/scheduler/schedule_info_spec.rb
@@ -4,7 +4,7 @@ require 'scheduler/scheduler'
 
 describe Scheduler::ScheduleInfo do
 
-  let(:manager){ Scheduler::Manager.new }
+  let(:manager) { Scheduler::Manager.new }
 
   context "every" do
     class RandomJob
@@ -58,13 +58,15 @@ describe Scheduler::ScheduleInfo do
 
     class DailyJob
       extend ::Scheduler::Schedule
-      daily at: 2.hours
+      daily at: 11.hours
 
       def perform
       end
     end
 
     before do
+      freeze_time Time.parse("2010-01-10 10:00:00")
+
       @info = manager.schedule_info(DailyJob)
       @info.del!
     end
@@ -82,9 +84,13 @@ describe Scheduler::ScheduleInfo do
       expect(@info.valid?).to eq(false)
     end
 
-    skip "will have a due date at the appropriate time if blank" do
+    it "will have a due date at the appropriate time if blank" do
       expect(@info.next_run).to eq(nil)
       @info.schedule!
+
+      expect(JSON.parse($redis.get(@info.key))["next_run"])
+        .to eq((Time.zone.now.midnight + 11.hours).to_i)
+
       expect(@info.valid?).to eq(true)
     end
 
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index fee0c6008a..b78cec8fb1 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -166,12 +166,10 @@ describe Search do
     let(:reply) { Fabricate(:post, topic: topic,
                                    raw: 'hello from mars, we just landed') }
 
-
-
     it 'searches correctly' do
 
       expect do
-       Search.execute('mars', type_filter: 'private_messages')
+        Search.execute('mars', type_filter: 'private_messages')
       end.to raise_error(Discourse::InvalidAccess)
 
       TopicAllowedUser.create!(user_id: reply.user_id, topic_id: topic.id)
@@ -183,7 +181,6 @@ describe Search do
 
       expect(results.posts.length).to eq(1)
 
-
       results = Search.execute('mars',
                               search_context: topic,
                               guardian: Guardian.new(reply.user))
@@ -200,7 +197,6 @@ describe Search do
       Fabricate(:topic, category_id: nil, archetype: 'private_message')
       Fabricate(:post, topic: topic, raw: 'another secret pm from mars, testing')
 
-
       # admin can search everything with correct context
       results = Search.execute('mars',
                               type_filter: 'private_messages',
@@ -235,8 +231,7 @@ describe Search do
 
   context 'topics' do
     let(:post) { Fabricate(:post) }
-    let(:topic) { post.topic}
-
+    let(:topic) { post.topic }
 
     context 'search within topic' do
 
@@ -311,7 +306,7 @@ describe Search do
     end
 
     context "search for a topic by url" do
-      let(:result) { Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic')}
+      let(:result) { Search.execute(topic.relative_url, search_for_id: true, type_filter: 'topic') }
 
       it 'returns the topic' do
         expect(result.posts.length).to eq(1)
@@ -331,7 +326,7 @@ describe Search do
         topic.category_id = category.id
         topic.save
 
-        category.set_permissions(:staff => :full)
+        category.set_permissions(staff: :full)
         category.save
 
         expect(result(nil).posts).not_to be_present
@@ -345,11 +340,11 @@ describe Search do
 
   context 'cyrillic topic' do
     let!(:cyrillic_topic) { Fabricate(:topic) do
-                                                user
+                              user
                                                 title { sequence(:title) { |i| "Тестовая запись #{i}" } }
-                                              end
+                            end
     }
-    let!(:post) {Fabricate(:post, topic: cyrillic_topic, user: cyrillic_topic.user)}
+    let!(:post) { Fabricate(:post, topic: cyrillic_topic, user: cyrillic_topic.user) }
     let(:result) { Search.execute('запись') }
 
     it 'finds something when given cyrillic query' do
@@ -380,13 +375,11 @@ describe Search do
 
   end
 
-
   context 'type_filter' do
 
     let!(:user) { Fabricate(:user, username: 'amazing', email: 'amazing@amazing.com') }
     let!(:category) { Fabricate(:category, name: 'amazing category', user: user) }
 
-
     context 'user filter' do
       let(:results) { Search.execute('amazing', type_filter: 'user') }
 
@@ -435,22 +428,43 @@ describe Search do
       subcategory = Fabricate(:category, parent_category_id: category.id)
       sub_topic = Fabricate(:topic, category: subcategory)
 
-      post = Fabricate(:post, topic: topic, user: topic.user )
-      _another_post = Fabricate(:post, topic: topic_no_cat, user: topic.user )
-      sub_post = Fabricate(:post, raw: 'I am saying hello from a subcategory', topic: sub_topic, user: topic.user )
+      post = Fabricate(:post, topic: topic, user: topic.user)
+      _another_post = Fabricate(:post, topic: topic_no_cat, user: topic.user)
+      sub_post = Fabricate(:post, raw: 'I am saying hello from a subcategory', topic: sub_topic, user: topic.user)
 
       search = Search.execute('hello', search_context: category)
-      expect(search.posts.map(&:id).sort).to eq([post.id,sub_post.id].sort)
+      expect(search.posts.map(&:id).sort).to eq([post.id, sub_post.id].sort)
       expect(search.posts.length).to eq(2)
     end
 
   end
 
   describe 'Chinese search' do
-    it 'splits English / Chinese' do
+    let(:sentence) { 'Discourse中国的基础设施网络正在组装' }
+    let(:sentence_t) { 'Discourse太平山森林遊樂區' }
+
+    it 'splits English / Chinese and filter out stop words' do
       SiteSetting.default_locale = 'zh_CN'
-      data = Search.prepare_data('Discourse社区指南').split(' ')
-      expect(data).to eq(['Discourse', '社区','指南'])
+      data = Search.prepare_data(sentence).split(' ')
+      expect(data).to eq(["Discourse", "中国", "基础", "设施", "基础设施", "网络", "正在", "组装"])
+    end
+
+    it 'splits for indexing and filter out stop words' do
+      SiteSetting.default_locale = 'zh_CN'
+      data = Search.prepare_data(sentence, :index).split(' ')
+      expect(data).to eq(["Discourse", "中国", "基础设施", "网络", "正在", "组装"])
+    end
+
+    it 'splits English / Traditional Chinese and filter out stop words' do
+      SiteSetting.default_locale = 'zh_TW'
+      data = Search.prepare_data(sentence_t).split(' ')
+      expect(data).to eq(["Discourse", "太平", "平山", "太平山", "森林", "遊樂區"])
+    end
+
+    it 'splits for indexing and filter out stop words' do
+      SiteSetting.default_locale = 'zh_TW'
+      data = Search.prepare_data(sentence_t, :index).split(' ')
+      expect(data).to eq(["Discourse", "太平山", "森林", "遊樂區"])
     end
 
     it 'finds chinese topic based on title' do
@@ -639,6 +653,17 @@ describe Search do
 
     end
 
+    it 'can find posts with images' do
+      post_uploaded = Fabricate(:post_with_uploaded_image)
+      post_with_image_urls = Fabricate(:post_with_image_urls)
+      Fabricate(:post)
+
+      CookedPostProcessor.new(post_uploaded).update_post_image
+      CookedPostProcessor.new(post_with_image_urls).update_post_image
+
+      expect(Search.execute('with:images').posts.map(&:id)).to contain_exactly(post_uploaded.id, post_with_image_urls.id)
+    end
+
     it 'can find by latest' do
       topic1 = Fabricate(:topic, title: 'I do not like that Sam I am')
       post1 = Fabricate(:post, topic: topic1)
@@ -711,9 +736,9 @@ describe Search do
       let(:topic1) { Fabricate(:topic, tags: [tag2, Fabricate(:tag)]) }
       let(:topic2) { Fabricate(:topic, tags: [tag2]) }
       let(:topic3) { Fabricate(:topic, tags: [tag1, tag2]) }
-      let!(:post1) { Fabricate(:post, topic: topic1)}
-      let!(:post2) { Fabricate(:post, topic: topic2)}
-      let!(:post3) { Fabricate(:post, topic: topic3)}
+      let!(:post1) { Fabricate(:post, topic: topic1) }
+      let!(:post2) { Fabricate(:post, topic: topic2) }
+      let!(:post3) { Fabricate(:post, topic: topic3) }
 
       it 'can find posts with tag' do
         post4 = Fabricate(:post, topic: topic3, raw: "It probably doesn't help that they're green...")
@@ -734,6 +759,23 @@ describe Search do
       end
     end
 
+    it "can find posts which contains filetypes" do
+      post1 = Fabricate(:post,
+                        raw: "http://example.com/image.png")
+      post2 = Fabricate(:post,
+                         raw: "Discourse logo\n"\
+                              "http://example.com/logo.png\n"\
+                              "http://example.com/vector_image.svg")
+      post_with_upload = Fabricate(:post, uploads: [Fabricate(:upload)])
+      Fabricate(:post)
+
+      TopicLink.extract_from(post1)
+      TopicLink.extract_from(post2)
+
+      expect(Search.execute('filetype:svg').posts).to eq([post2])
+      expect(Search.execute('filetype:png').posts.map(&:id)).to contain_exactly(post1.id, post2.id, post_with_upload.id)
+      expect(Search.execute('logo filetype:png').posts.map(&:id)).to eq([post2.id])
+    end
   end
 
   it 'can parse complex strings using ts_query helper' do
@@ -757,7 +799,6 @@ describe Search do
       expect(Search.word_to_date('january')).to eq(Time.zone.parse('2001-01-01'))
       expect(Search.word_to_date('jan')).to eq(Time.zone.parse('2001-01-01'))
 
-
       expect(Search.word_to_date('100')).to eq(time.beginning_of_day.days_ago(100))
 
       expect(Search.word_to_date('invalid')).to eq(nil)
@@ -790,4 +831,51 @@ describe Search do
     end
   end
 
+  context "search_log_id" do
+    it "returns an id when the search succeeds" do
+      s = Search.new(
+        'indiana jones',
+        search_type: :header,
+        ip_address: '127.0.0.1'
+      )
+      results = s.execute
+      expect(results.search_log_id).to be_present
+    end
+  end
+
+  context 'pagination' do
+    let(:number_of_results) { 2 }
+    let!(:post1) { Fabricate(:post, raw: 'hello hello hello hello hello') }
+    let!(:post2) { Fabricate(:post, raw: 'hello hello hello hello') }
+    let!(:post3) { Fabricate(:post, raw: 'hello hello hello') }
+    let!(:post4) { Fabricate(:post, raw: 'hello hello') }
+    let!(:post5) { Fabricate(:post, raw: 'hello') }
+    before do
+      Search.stubs(:per_filter).returns(number_of_results)
+    end
+
+    it 'returns more results flag' do
+      results = Search.execute('hello', type_filter: 'topic')
+      results2 = Search.execute('hello', type_filter: 'topic', page: 2)
+
+      expect(results.posts.length).to eq(number_of_results)
+      expect(results.posts.map(&:id)).to eq([post1.id, post2.id])
+      expect(results.more_full_page_results).to eq(true)
+      expect(results2.posts.length).to eq(number_of_results)
+      expect(results2.posts.map(&:id)).to eq([post3.id, post4.id])
+      expect(results2.more_full_page_results).to eq(true)
+    end
+
+    it 'correctly search with page parameter' do
+      search = Search.new('hello', type_filter: 'topic', page: 3)
+      results = search.execute
+
+      expect(search.offset).to eq(2 * number_of_results)
+      expect(results.posts.length).to eq(1)
+      expect(results.posts).to eq([post5])
+      expect(results.more_full_page_results).to eq(nil)
+    end
+
+  end
+
 end
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 353c04bd4c..851ceec026 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -58,7 +58,7 @@ describe SiteSettingExtension do
       settings.hello = 100
       expect(settings.hello).to eq(100)
 
-      settings.provider.save(:hello, 99, SiteSetting.types[:integer] )
+      settings.provider.save(:hello, 99, SiteSetting.types[:integer])
       settings.refresh!
 
       expect(settings.hello).to eq(99)
@@ -97,7 +97,7 @@ describe SiteSettingExtension do
     end
 
     it "should have a key in all_settings" do
-      expect(settings.all_settings.detect {|s| s[:setting] == :test_setting }).to be_present
+      expect(settings.all_settings.detect { |s| s[:setting] == :test_setting }).to be_present
     end
 
     it "should have the correct desc" do
@@ -179,7 +179,6 @@ describe SiteSettingExtension do
       end
 
       it "should coerce int to string" do
-        skip "This test is not working on Rspec 2 even"
         settings.test_str = 100
         expect(settings.test_str).to eq("100")
       end
@@ -191,7 +190,6 @@ describe SiteSettingExtension do
     end
   end
 
-
   describe "string setting with regex" do
     it "Supports custom validation errors" do
       settings.setting(:test_str, "bob", regex: "hi", regex_error: "oops")
@@ -257,7 +255,7 @@ describe SiteSettingExtension do
         true
       end
       def self.values
-        [1,2,3]
+        [1, 2, 3]
       end
     end
 
@@ -298,7 +296,7 @@ describe SiteSettingExtension do
     end
 
     it 'should not hose all_settings' do
-      expect(settings.all_settings.detect {|s| s[:setting] == :test_enum }).to be_present
+      expect(settings.all_settings.detect { |s| s[:setting] == :test_enum }).to be_present
     end
 
     context 'when overridden' do
@@ -314,19 +312,19 @@ describe SiteSettingExtension do
 
       it 'rejects invalid values' do
         test_enum_class.expects(:valid_value?).with('gg').returns(false)
-        expect {settings.test_enum = 'gg' }.to raise_error(Discourse::InvalidParameters)
+        expect { settings.test_enum = 'gg' }.to raise_error(Discourse::InvalidParameters)
       end
     end
   end
 
   describe 'a setting with a category' do
     before do
-      settings.setting(:test_setting, 88, {category: :tests})
+      settings.setting(:test_setting, 88, category: :tests)
       settings.refresh!
     end
 
     it "should return the category in all_settings" do
-      expect(settings.all_settings.find {|s| s[:setting] == :test_setting }[:category]).to eq(:tests)
+      expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(:tests)
     end
 
     context "when overidden" do
@@ -341,14 +339,14 @@ describe SiteSettingExtension do
 
       it "should still have the correct category" do
         settings.test_setting = 102
-        expect(settings.all_settings.find {|s| s[:setting] == :test_setting }[:category]).to eq(:tests)
+        expect(settings.all_settings.find { |s| s[:setting] == :test_setting }[:category]).to eq(:tests)
       end
     end
   end
 
   describe "setting with a validator" do
     before do
-      settings.setting(:validated_setting, "info@example.com", {type: 'email'})
+      settings.setting(:validated_setting, "info@example.com", type: 'email')
       settings.refresh!
     end
 
@@ -418,11 +416,11 @@ describe SiteSettingExtension do
     end
 
     it "is not present in all_settings by default" do
-      expect(settings.all_settings.find {|s| s[:setting] == :superman_identity }).to be_blank
+      expect(settings.all_settings.find { |s| s[:setting] == :superman_identity }).to be_blank
     end
 
     it "is present in all_settings when we ask for hidden" do
-      expect(settings.all_settings(true).find {|s| s[:setting] == :superman_identity }).to be_present
+      expect(settings.all_settings(true).find { |s| s[:setting] == :superman_identity }).to be_present
     end
   end
 
diff --git a/spec/components/site_settings/db_provider_spec.rb b/spec/components/site_settings/db_provider_spec.rb
index 64bd7b0b70..6cfec41d32 100644
--- a/spec/components/site_settings/db_provider_spec.rb
+++ b/spec/components/site_settings/db_provider_spec.rb
@@ -22,7 +22,6 @@ describe SiteSettings::DbProvider do
     expect(provider.all.length).to eq(0)
     expect(provider.find("test")).to eq(nil)
 
-
     provider.save("test", "one", 1)
     found = provider.find("test")
 
@@ -35,7 +34,7 @@ describe SiteSettings::DbProvider do
 
     provider.save("test2", "three", 3)
 
-    all = provider.all.sort{|a,b| a.name <=> b.name}
+    all = provider.all.sort { |a, b| a.name <=> b.name }
 
     expect_same_setting(all[0], setting.new("test", "two", 2))
     expect_same_setting(all[1], setting.new("test2", "three", 3))
diff --git a/spec/components/site_settings/local_process_provider_spec.rb b/spec/components/site_settings/local_process_provider_spec.rb
index 6293216d67..4b3909d851 100644
--- a/spec/components/site_settings/local_process_provider_spec.rb
+++ b/spec/components/site_settings/local_process_provider_spec.rb
@@ -13,8 +13,7 @@ describe SiteSettings::LocalProcessProvider do
     SiteSettings::LocalProcessProvider.new
   end
 
-
-  def setting(name,value,data_type)
+  def setting(name, value, data_type)
     OpenStruct.new.tap do |setting|
       setting.name = name
       setting.value = value
@@ -29,13 +28,13 @@ describe SiteSettings::LocalProcessProvider do
 
     it "can allows additional settings" do
       provider.save("test", "bla", 2)
-      expect_same_setting(provider.all[0], setting("test","bla",2))
+      expect_same_setting(provider.all[0], setting("test", "bla", 2))
     end
 
     it "does not leak new stuff into list" do
       provider.save("test", "bla", 2)
       provider.save("test", "bla1", 2)
-      expect_same_setting(provider.all[0], setting("test","bla1",2))
+      expect_same_setting(provider.all[0], setting("test", "bla1", 2))
       expect(provider.all.length).to eq(1)
     end
   end
@@ -46,19 +45,19 @@ describe SiteSettings::LocalProcessProvider do
     end
 
     it "can find a new setting" do
-      provider.save("one","two",3)
-      expect_same_setting(provider.find("one"),setting("one", "two", 3))
+      provider.save("one", "two", 3)
+      expect_same_setting(provider.find("one"), setting("one", "two", 3))
     end
 
     it "can amend a setting" do
-      provider.save("one","three",4)
-      expect_same_setting(provider.find("one"),setting("one", "three", 4))
+      provider.save("one", "three", 4)
+      expect_same_setting(provider.find("one"), setting("one", "three", 4))
     end
   end
 
   describe "destroy" do
     it "can destroy a setting" do
-      provider.save("one","three",4)
+      provider.save("one", "three", 4)
       provider.destroy("one")
       expect(provider.find("one")).to eq(nil)
     end
diff --git a/spec/components/site_settings/yaml_loader_spec.rb b/spec/components/site_settings/yaml_loader_spec.rb
index a011817274..7354cb04fd 100644
--- a/spec/components/site_settings/yaml_loader_spec.rb
+++ b/spec/components/site_settings/yaml_loader_spec.rb
@@ -48,7 +48,7 @@ describe SiteSettings::YamlLoader do
 
   it 'can take a File argument' do
     receiver.expects(:setting).at_least_once
-    receiver.load_yaml( File.new(simple) )
+    receiver.load_yaml(File.new(simple))
   end
 
   it "maintains order of categories" do
@@ -64,13 +64,13 @@ describe SiteSettings::YamlLoader do
   end
 
   it "can load enum settings" do
-    receiver.expects(:setting).with('email', 'default_email_digest_frequency', 7, {enum: 'DigestEmailSiteSetting'})
+    receiver.expects(:setting).with('email', 'default_email_digest_frequency', 7, enum: 'DigestEmailSiteSetting')
     receiver.load_yaml(enum)
   end
 
   it "can load enum client settings" do
     receiver.expects(:client_setting).with do |category, name, default, opts|
-      category == 'basics' and name == 'default_locale' and default == 'en' and opts[:enum] == 'LocaleSiteSetting'
+      category == ('basics') && name == ('default_locale') && default == ('en') && opts[:enum] == ('LocaleSiteSetting')
     end
     receiver.load_yaml(enum_client)
   end
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index aee9c81f7a..24c7117c6b 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -143,4 +143,3 @@ describe Slug do
     end
   end
 end
-
diff --git a/spec/components/sql_builder_spec.rb b/spec/components/sql_builder_spec.rb
index 870c55a685..5fbad00228 100644
--- a/spec/components/sql_builder_spec.rb
+++ b/spec/components/sql_builder_spec.rb
@@ -64,11 +64,11 @@ describe SqlBuilder do
 
     it "should allow order by" do
       expect(@builder.order_by("A desc").limit(1)
-        .exec(a:1, b:2).values[0][0]).to eq("2")
+        .exec(a: 1, b: 2).values[0][0]).to eq("2")
     end
     it "should allow offset" do
       expect(@builder.order_by("A desc").offset(1)
-        .exec(a:1, b:2).values[0][0]).to eq("1")
+        .exec(a: 1, b: 2).values[0][0]).to eq("1")
     end
   end
 
diff --git a/spec/components/stats_socket_spec.rb b/spec/components/stats_socket_spec.rb
index cac144439e..e457bf2937 100644
--- a/spec/components/stats_socket_spec.rb
+++ b/spec/components/stats_socket_spec.rb
@@ -40,6 +40,18 @@ describe StatsSocket do
     parsed = JSON.parse(line)
 
     expect(parsed.keys.sort).to eq(GC.stat.keys.map(&:to_s).sort)
+
+    # make sure we have libv8 going
+    PrettyText.cook("x")
+
+    socket = UNIXSocket.new(socket_path)
+    socket.send "v8_stat\n", 0
+    line = socket.readline
+    socket.close
+
+    parsed = JSON.parse(line)
+
+    expect(parsed['total_physical_size']).to be > (0)
   end
 
 end
diff --git a/spec/components/stylesheet/compiler_spec.rb b/spec/components/stylesheet/compiler_spec.rb
index c19a4169bd..47420c18a1 100644
--- a/spec/components/stylesheet/compiler_spec.rb
+++ b/spec/components/stylesheet/compiler_spec.rb
@@ -2,27 +2,28 @@ require 'rails_helper'
 require 'stylesheet/compiler'
 
 describe Stylesheet::Compiler do
-  it "can compile desktop mobile and desktop css" do
-    css,_map = Stylesheet::Compiler.compile_asset("desktop")
-    expect(css.length).to be > 1000
+  describe 'compilation' do
+    Dir["#{Rails.root.join("app/assets/stylesheets")}/*.scss"].each do |path|
+      path = File.basename(path, '.scss')
 
-    css,_map = Stylesheet::Compiler.compile_asset("mobile")
-    expect(css.length).to be > 1000
+      it "can compile '#{path}' css" do
+        css, _map = Stylesheet::Compiler.compile_asset(path)
+        expect(css.length).to be > 1000
+      end
+    end
   end
 
   it "supports asset-url" do
-    css,_map = Stylesheet::Compiler.compile(".body{background-image: asset-url('foo.png');}","test.scss")
+    css, _map = Stylesheet::Compiler.compile(".body{background-image: asset-url('foo.png');}", "test.scss")
 
     expect(css).to include("url('/foo.png')")
     expect(css).not_to include('asset-url')
   end
 
   it "supports image-url" do
-    css,_map = Stylesheet::Compiler.compile(".body{background-image: image-url('foo.png');}","test.scss")
+    css, _map = Stylesheet::Compiler.compile(".body{background-image: image-url('foo.png');}", "test.scss")
 
     expect(css).to include("url('/images/foo.png')")
     expect(css).not_to include('image-url')
   end
 end
-
-
diff --git a/spec/components/stylesheet/manager_spec.rb b/spec/components/stylesheet/manager_spec.rb
index 5582eeee61..98a28e4b9e 100644
--- a/spec/components/stylesheet/manager_spec.rb
+++ b/spec/components/stylesheet/manager_spec.rb
@@ -28,7 +28,6 @@ describe Stylesheet::Manager do
 
     theme.save!
 
-
     child_theme = Theme.new(
       name: 'parent',
       user_id: -1,
@@ -55,7 +54,6 @@ describe Stylesheet::Manager do
     expect(css).to match(/\.common/)
     expect(css).to match(/\.desktop/)
 
-
     child_theme.set_field(target: :desktop, name: :scss, value: ".nothing{color: green;}")
     child_theme.save!
 
@@ -67,4 +65,3 @@ describe Stylesheet::Manager do
     expect(new_link).to include("/stylesheets/desktop_theme_#{theme.id}_")
   end
 end
-
diff --git a/spec/components/suggested_topics_builder_spec.rb b/spec/components/suggested_topics_builder_spec.rb
index 2b77b222de..7c883f757a 100644
--- a/spec/components/suggested_topics_builder_spec.rb
+++ b/spec/components/suggested_topics_builder_spec.rb
@@ -17,30 +17,30 @@ describe SuggestedTopicsBuilder do
     end
 
     let(:builder) do
-      SuggestedTopicsBuilder.new(fake_topic(1,1))
+      SuggestedTopicsBuilder.new(fake_topic(1, 1))
     end
 
     it "prioritizes category correctly" do
-      builder.splice_results([fake_topic(2,2)], :high)
-      builder.splice_results([fake_topic(3,1)], :high)
-      builder.splice_results([fake_topic(4,1)], :high)
+      builder.splice_results([fake_topic(2, 2)], :high)
+      builder.splice_results([fake_topic(3, 1)], :high)
+      builder.splice_results([fake_topic(4, 1)], :high)
 
-      expect(builder.results.map(&:id)).to eq([3,4,2])
+      expect(builder.results.map(&:id)).to eq([3, 4, 2])
 
       # we have 2 items in category 1
       expect(builder.category_results_left).to eq(3)
     end
 
     it "inserts using default approach for non high priority" do
-      builder.splice_results([fake_topic(2,2)], :high)
-      builder.splice_results([fake_topic(3,1)], :low)
+      builder.splice_results([fake_topic(2, 2)], :high)
+      builder.splice_results([fake_topic(3, 1)], :low)
 
-      expect(builder.results.map(&:id)).to eq([2,3])
+      expect(builder.results.map(&:id)).to eq([2, 3])
     end
 
     it "inserts multiple results and puts topics in the correct order" do
-      builder.splice_results([fake_topic(2,1), fake_topic(3,2), fake_topic(4,1)], :high)
-      expect(builder.results.map(&:id)).to eq([2,4,3])
+      builder.splice_results([fake_topic(2, 1), fake_topic(3, 2), fake_topic(4, 1)], :high)
+      expect(builder.results.map(&:id)).to eq([2, 4, 3])
     end
   end
 
@@ -84,9 +84,9 @@ describe SuggestedTopicsBuilder do
     end
 
     context "adding topics that are not open" do
-      let!(:archived_topic) { Fabricate(:topic, archived: true)}
-      let!(:closed_topic) { Fabricate(:topic, closed: true)}
-      let!(:invisible_topic) { Fabricate(:topic, visible: false)}
+      let!(:archived_topic) { Fabricate(:topic, archived: true) }
+      let!(:closed_topic) { Fabricate(:topic, closed: true) }
+      let!(:invisible_topic) { Fabricate(:topic, visible: false) }
 
       it "adds archived and closed, but not invisible topics" do
         builder.add_results(Topic)
@@ -108,5 +108,4 @@ describe SuggestedTopicsBuilder do
 
   end
 
-
 end
diff --git a/spec/components/system_message_spec.rb b/spec/components/system_message_spec.rb
index dbbeff71ed..c35f029a9d 100644
--- a/spec/components/system_message_spec.rb
+++ b/spec/components/system_message_spec.rb
@@ -4,7 +4,6 @@ require 'topic_subtype'
 
 describe SystemMessage do
 
-
   context 'send' do
 
     it 'should create a post correctly' do
@@ -28,5 +27,4 @@ describe SystemMessage do
     end
   end
 
-
 end
diff --git a/spec/components/table_migration_helper_spec.rb b/spec/components/table_migration_helper_spec.rb
index 12aa17614b..9f69014069 100644
--- a/spec/components/table_migration_helper_spec.rb
+++ b/spec/components/table_migration_helper_spec.rb
@@ -19,8 +19,8 @@ describe TableMigrationHelper do
       ActiveRecord::Base.exec_sql "CREATE TABLE table_with_old_name (topic_id INTEGER)"
 
       name = ActiveRecord::Base
-              .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
-              .getvalue(0,0)
+        .exec_sql("SELECT name FROM schema_migration_details LIMIT 1")
+        .getvalue(0, 0)
 
       Topic.exec_sql("UPDATE schema_migration_details SET created_at = :created_at WHERE name = :name",
                     name: name, created_at: 15.minutes.ago)
@@ -32,7 +32,7 @@ describe TableMigrationHelper do
         new_name: 'table_with_new_name',
         after_migration: name,
         delay: 20.minutes,
-        on_drop: ->(){dropped_proc_called = true}
+        on_drop: ->() { dropped_proc_called = true }
       )
 
       expect(table_exists?('table_with_old_name')).to eq(true)
@@ -43,7 +43,7 @@ describe TableMigrationHelper do
         new_name: 'table_with_new_name',
         after_migration: name,
         delay: 10.minutes,
-        on_drop: ->(){dropped_proc_called = true}
+        on_drop: ->() { dropped_proc_called = true }
       )
 
       expect(table_exists?('table_with_old_name')).to eq(true)
@@ -56,7 +56,7 @@ describe TableMigrationHelper do
         new_name: 'table_with_new_name',
         after_migration: name,
         delay: 10.minutes,
-        on_drop: ->(){dropped_proc_called = true}
+        on_drop: ->() { dropped_proc_called = true }
       )
 
       expect(table_exists?('table_with_old_name')).to eq(false)
diff --git a/spec/components/timeline_lookup_spec.rb b/spec/components/timeline_lookup_spec.rb
index 3e1a2ef02a..e7df6724ec 100644
--- a/spec/components/timeline_lookup_spec.rb
+++ b/spec/components/timeline_lookup_spec.rb
@@ -22,7 +22,7 @@ describe TimelineLookup do
   end
 
   it "respects a `max_values` setting" do
-    input = (1..100).map {|i| [1000+i, i, 100-i] }
+    input = (1..100).map { |i| [1000 + i, i, 100 - i] }
 
     result = TimelineLookup.build(input, 5)
     expect(result.size).to eq(5)
@@ -30,7 +30,7 @@ describe TimelineLookup do
   end
 
   it "respects an uneven `max_values` setting" do
-    input = (1..100).map {|i| [1000+i, i, 100-i] }
+    input = (1..100).map { |i| [1000 + i, i, 100 - i] }
 
     result = TimelineLookup.build(input, 3)
     expect(result.size).to eq(3)
diff --git a/spec/components/topic_creator_spec.rb b/spec/components/topic_creator_spec.rb
index 012f642b63..a8cf92f315 100644
--- a/spec/components/topic_creator_spec.rb
+++ b/spec/components/topic_creator_spec.rb
@@ -7,7 +7,7 @@ describe TopicCreator do
   let(:admin)     { Fabricate(:admin) }
 
   let(:valid_attrs) { Fabricate.attributes_for(:topic) }
-  let(:pm_valid_attrs)  { {raw: 'this is a new post', title: 'this is a new title', archetype: Archetype.private_message, target_usernames: moderator.username} }
+  let(:pm_valid_attrs)  { { raw: 'this is a new post', title: 'this is a new title', archetype: Archetype.private_message, target_usernames: moderator.username } }
 
   describe '#create' do
     context 'topic success cases' do
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index 4d542032e4..9a8014ff4c 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -49,7 +49,7 @@ describe TopicQuery do
         results = results.where('topics.id = ?', topic_query.options[:only_topic_id])
       end
 
-      expect(TopicQuery.new(nil, {only_topic_id: topic1.id}).list_latest.topics.map(&:id)).to eq([topic1.id])
+      expect(TopicQuery.new(nil, only_topic_id: topic1.id).list_latest.topics.map(&:id)).to eq([topic1.id])
 
       TopicQuery.remove_custom_filter(:only_topic_id)
     end
@@ -67,6 +67,31 @@ describe TopicQuery do
 
   end
 
+  context "prioritize_pinned_topics" do
+
+    it "does the pagination correctly" do
+
+      num_topics = 15
+      per_page = 3
+
+      topics = []
+      (num_topics - 1).downto(0).each do |i|
+        topics[i] = Fabricate(:topic)
+      end
+
+      topic_query = TopicQuery.new(user)
+      results = topic_query.send(:default_results)
+
+      expect(topic_query.prioritize_pinned_topics(results,         per_page: per_page,
+                                                                   page: 0)).to eq(topics[0...per_page])
+
+      expect(topic_query.prioritize_pinned_topics(results,         per_page: per_page,
+                                                                   page: 1)).to eq(topics[per_page...num_topics])
+
+    end
+
+  end
+
   context 'bookmarks' do
     it "filters and returns bookmarks correctly" do
       post = Fabricate(:post)
@@ -82,7 +107,7 @@ describe TopicQuery do
       query = TopicQuery.new(user, filter: 'bookmarked').list_latest
 
       expect(query.topics.length).to eq(1)
-      expect(query.topics.first.user_data.post_action_data).to eq({PostActionType.types[:bookmark] => [1,2]})
+      expect(query.topics.first.user_data.post_action_data).to eq(PostActionType.types[:bookmark] => [1, 2])
     end
   end
 
@@ -118,7 +143,7 @@ describe TopicQuery do
     end
 
     context 'subcategories' do
-      let!(:subcategory) { Fabricate(:category, parent_category_id: category.id)}
+      let!(:subcategory) { Fabricate(:category, parent_category_id: category.id) }
 
       it "works with subcategories" do
         expect(TopicQuery.new(moderator, category: category.id).list_latest.topics.size).to eq(1)
@@ -139,9 +164,9 @@ describe TopicQuery do
 
     context "no category filter" do
       # create some topics before each test:
-      let!(:tagged_topic1) { Fabricate(:topic, {tags: [tag]}) }
-      let!(:tagged_topic2) { Fabricate(:topic, {tags: [other_tag]}) }
-      let!(:tagged_topic3) { Fabricate(:topic, {tags: [tag, other_tag]}) }
+      let!(:tagged_topic1) { Fabricate(:topic, tags: [tag]) }
+      let!(:tagged_topic2) { Fabricate(:topic, tags: [other_tag]) }
+      let!(:tagged_topic3) { Fabricate(:topic, tags: [tag, other_tag]) }
       let!(:no_tags_topic) { Fabricate(:topic) }
 
       it "returns topics with the tag when filtered to it" do
@@ -178,10 +203,10 @@ describe TopicQuery do
       let(:category2) { Fabricate(:category) }
 
       it "returns topics in the given category with the given tag" do
-        tagged_topic1 = Fabricate(:topic, {category: category1, tags: [tag]})
-        tagged_topic2 = Fabricate(:topic, {category: category2, tags: [tag]})
-        tagged_topic3 = Fabricate(:topic, {category: category1, tags: [tag, other_tag]})
-        no_tags_topic = Fabricate(:topic, {category: category1})
+        tagged_topic1 = Fabricate(:topic, category: category1, tags: [tag])
+        tagged_topic2 = Fabricate(:topic, category: category2, tags: [tag])
+        tagged_topic3 = Fabricate(:topic, category: category1, tags: [tag, other_tag])
+        no_tags_topic = Fabricate(:topic, category: category1)
 
         expect(TopicQuery.new(moderator, category: category1.id, tags: [tag.name]).list_latest.topics.map(&:id).sort).to eq([tagged_topic1.id, tagged_topic3.id].sort)
         expect(TopicQuery.new(moderator, category: category2.id, tags: [other_tag.name]).list_latest.topics.size).to eq(0)
@@ -304,7 +329,7 @@ describe TopicQuery do
 
       context 'sort_order' do
 
-        def ids_in_order(order, descending=true)
+        def ids_in_order(order, descending = true)
           TopicQuery.new(admin, order: order, ascending: descending ? 'false' : 'true').list_latest.topics.map(&:id)
         end
 
@@ -358,14 +383,12 @@ describe TopicQuery do
           # returns the topics in reverse sheep order if requested" do
           expect(ids_in_order('sheep', false)).to eq([invisible_topic, regular_topic, closed_topic, pinned_topic, future_topic, archived_topic].map(&:id))
 
-
         end
 
       end
 
     end
 
-
     context 'after clearring a pinned topic' do
       before do
         pinned_topic.clear_pin_for(user)
@@ -431,8 +454,8 @@ describe TopicQuery do
         first = create_post(raw: 'this is the first post', title: 'super amazing title')
 
         _whisper = create_post(topic_id: first.topic.id,
-                              post_type: Post.types[:whisper],
-                              raw: 'this is a whispered reply')
+                               post_type: Post.types[:whisper],
+                               raw: 'this is a whispered reply')
 
         topic_id = first.topic.id
 
@@ -489,7 +512,7 @@ describe TopicQuery do
     end
 
     context 'preload api' do
-      let(:topics) { }
+      let(:topics) {}
 
       it "preloads data correctly" do
         TopicList.preloaded_custom_fields << "tag"
@@ -497,13 +520,13 @@ describe TopicQuery do
         TopicList.preloaded_custom_fields << "foo"
 
         topic = Fabricate.build(:topic, user: creator, bumped_at: 10.minutes.ago)
-        topic.custom_fields["tag"] = ["a","b","c"]
+        topic.custom_fields["tag"] = ["a", "b", "c"]
         topic.custom_fields["age"] = 22
         topic.save
 
         new_topic = topic_query.list_new.topics.first
 
-        expect(new_topic.custom_fields["tag"].sort).to eq(["a","b","c"])
+        expect(new_topic.custom_fields["tag"].sort).to eq(["a", "b", "c"])
         expect(new_topic.custom_fields["age"]).to eq("22")
 
         expect(new_topic.custom_field_preloaded?("tag")).to eq(true)
@@ -514,7 +537,7 @@ describe TopicQuery do
         TopicList.preloaded_custom_fields.clear
 
         # if we attempt to access non preloaded fields explode
-        expect{new_topic.custom_fields["boom"]}.to raise_error(StandardError)
+        expect { new_topic.custom_fields["boom"] }.to raise_error(StandardError)
 
       end
     end
@@ -523,7 +546,6 @@ describe TopicQuery do
       let!(:new_topic) { Fabricate(:topic, user: creator, bumped_at: 10.minutes.ago) }
       let(:topics) { topic_query.list_new.topics }
 
-
       it "contains no new topics for a user that has missed the window" do
 
         expect(topic_query.list_new.topics).to eq([new_topic])
@@ -577,7 +599,7 @@ describe TopicQuery do
 
     context "topic you've posted in" do
       let(:other_users_topic) { create_post(user: creator).topic }
-      let!(:your_post) { create_post(user: user, topic: other_users_topic )}
+      let!(:your_post) { create_post(user: user, topic: other_users_topic) }
 
       it "includes the posted topic" do
         expect(topics.include?(other_users_topic)).to eq(true)
@@ -631,7 +653,7 @@ describe TopicQuery do
       group
     end
 
-    def create_pm(user, opts=nil)
+    def create_pm(user, opts = nil)
       unless opts
         opts = user
         user = nil
@@ -640,30 +662,27 @@ describe TopicQuery do
       create_post(opts.merge(user: user, archetype: Archetype.private_message)).topic
     end
 
-    def read(user,topic,post_number)
+    def read(user, topic, post_number)
       TopicUser.update_last_read(user, topic, post_number, 10000)
     end
 
     it 'returns the correct suggestions' do
 
-
-      pm_to_group  = create_pm(sender, target_group_names: [group_with_user.name])
+      pm_to_group = create_pm(sender, target_group_names: [group_with_user.name])
       pm_to_user = create_pm(sender, target_usernames: [user.username])
 
-      new_pm  = create_pm(target_usernames: [user.username])
+      new_pm = create_pm(target_usernames: [user.username])
 
-      unread_pm  = create_pm(target_usernames: [user.username])
-      read(user,unread_pm, 0)
+      unread_pm = create_pm(target_usernames: [user.username])
+      read(user, unread_pm, 0)
 
       old_unrelated_pm = create_pm(target_usernames: [user.username])
       read(user, old_unrelated_pm, 1)
 
-
       related_by_user_pm = create_pm(sender, target_usernames: [user.username])
       read(user, related_by_user_pm, 1)
 
-
-      related_by_group_pm  = create_pm(sender, target_group_names: [group_with_user.name])
+      related_by_group_pm = create_pm(sender, target_group_names: [group_with_user.name])
       read(user, related_by_group_pm, 1)
 
       expect(TopicQuery.new(user).list_suggested_for(pm_to_group).topics.map(&:id)).to(
@@ -678,7 +697,7 @@ describe TopicQuery do
 
   context 'suggested_for' do
     def clear_cache!
-      $redis.keys('random_topic_cache*').each{|k| $redis.del k}
+      $redis.keys('random_topic_cache*').each { |k| $redis.del k }
     end
 
     before do
@@ -713,7 +732,7 @@ describe TopicQuery do
         tt = topic
         # lets clear cache once category is created - working around caching is hard
         clear_cache!
-        topic_query.list_suggested_for(tt).topics.map{|t| t.id}
+        topic_query.list_suggested_for(tt).topics.map { |t| t.id }
       }
 
       it "should return empty results when there is nothing to find" do
@@ -763,13 +782,12 @@ describe TopicQuery do
           fully_read_archived.save
         end
 
-
         it "returns unread, then new, then random" do
           SiteSetting.suggested_topics = 7
           expect(suggested_topics[0]).to eq(partially_read.id)
-          expect(suggested_topics[1,3]).to include(new_topic.id)
-          expect(suggested_topics[1,3]).to include(closed_topic.id)
-          expect(suggested_topics[1,3]).to include(archived_topic.id)
+          expect(suggested_topics[1, 3]).to include(new_topic.id)
+          expect(suggested_topics[1, 3]).to include(closed_topic.id)
+          expect(suggested_topics[1, 3]).to include(archived_topic.id)
 
           # The line below appears to randomly fail, no idea why need to restructure test
           #expect(suggested_topics[4]).to eq(fully_read.id)
@@ -784,9 +802,9 @@ describe TopicQuery do
         it "won't return fully read if there are enough partially read topics and new topics" do
           SiteSetting.suggested_topics = 4
           expect(suggested_topics[0]).to eq(partially_read.id)
-          expect(suggested_topics[1,3]).to include(new_topic.id)
-          expect(suggested_topics[1,3]).to include(closed_topic.id)
-          expect(suggested_topics[1,3]).to include(archived_topic.id)
+          expect(suggested_topics[1, 3]).to include(new_topic.id)
+          expect(suggested_topics[1, 3]).to include(closed_topic.id)
+          expect(suggested_topics[1, 3]).to include(archived_topic.id)
         end
 
       end
diff --git a/spec/components/topic_retriever_spec.rb b/spec/components/topic_retriever_spec.rb
index a5180b8c32..5362448195 100644
--- a/spec/components/topic_retriever_spec.rb
+++ b/spec/components/topic_retriever_spec.rb
@@ -31,9 +31,9 @@ describe TopicRetriever do
     end
 
     context "when host is not invalid" do
-        before do
-          topic_retriever.stubs(:invalid_url?).returns(false)
-        end
+      before do
+        topic_retriever.stubs(:invalid_url?).returns(false)
+      end
 
       context "when topics have been retrieived recently" do
         before do
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index c041d4e4fe..6e5f8149c9 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -43,9 +43,9 @@ describe TopicView do
   end
 
   context "with a few sample posts" do
-    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1 )}
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5 )}
-    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0 )}
+    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) }
+    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) }
 
     let(:moderator) { Fabricate(:moderator) }
     let(:admin) { Fabricate(:admin) }
@@ -70,7 +70,6 @@ describe TopicView do
       best = TopicView.new(topic.id, nil, best: 99, min_trust_level: coding_horror.trust_level + 1)
       expect(best.posts.count).to eq(0)
 
-
       # should filter out the posts with a score that is too low
       best = TopicView.new(topic.id, nil, best: 99, min_score: 99)
       expect(best.posts.count).to eq(0)
@@ -134,7 +133,7 @@ describe TopicView do
       end
 
       it "generates a canonical correctly for paged results" do
-        expect(TopicView.new(1234, user, post_number: 10 * TopicView.chunk_size )
+        expect(TopicView.new(1234, user, post_number: 10 * TopicView.chunk_size)
           .canonical_path).to eql("/1234?page=10")
       end
     end
@@ -211,7 +210,6 @@ describe TopicView do
       end
     end
 
-
     context '.read?' do
       it 'tracks correctly' do
         # anon is assumed to have read everything
@@ -223,7 +221,7 @@ describe TopicView do
         coding_horror.created_at = 2.days.ago
 
         # a real user that just read it should have it marked
-        PostTiming.process_timings(coding_horror, topic.id, 1, [[1,1000]])
+        PostTiming.process_timings(coding_horror, topic.id, 1, [[1, 1000]])
         expect(TopicView.new(topic.id, coding_horror).read?(1)).to eq(true)
         expect(TopicView.new(topic.id, coding_horror).topic_user).to be_present
       end
@@ -277,13 +275,13 @@ describe TopicView do
   context '.posts' do
 
     # Create the posts in a different order than the sort_order
-    let!(:p5) { Fabricate(:post, topic: topic, user: coding_horror)}
-    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror)}
-    let!(:p6) { Fabricate(:post, topic: topic, user: Fabricate(:user), deleted_at: Time.now)}
-    let!(:p4) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now)}
-    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster)}
-    let!(:p7) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now)}
-    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster)}
+    let!(:p5) { Fabricate(:post, topic: topic, user: coding_horror) }
+    let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror) }
+    let!(:p6) { Fabricate(:post, topic: topic, user: Fabricate(:user), deleted_at: Time.now) }
+    let!(:p4) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p1) { Fabricate(:post, topic: topic, user: first_poster) }
+    let!(:p7) { Fabricate(:post, topic: topic, user: coding_horror, deleted_at: Time.now) }
+    let!(:p3) { Fabricate(:post, topic: topic, user: first_poster) }
 
     before do
       TopicView.stubs(:chunk_size).returns(3)
@@ -320,15 +318,14 @@ describe TopicView do
       topic.category_id = category.id
       topic.save!
 
-      expect{
+      expect {
         TopicView.new(topic.id, coding_horror).posts.count
       }.to raise_error(Discourse::InvalidAccess)
 
-      expect(TopicView.new(t2.id, coding_horror, post_ids: [p1.id,p2.id]).posts.count).to eq(0)
+      expect(TopicView.new(t2.id, coding_horror, post_ids: [p1.id, p2.id]).posts.count).to eq(0)
 
     end
 
-
     describe '#filter_posts_paged' do
       before { TopicView.stubs(:chunk_size).returns(2) }
 
@@ -342,7 +339,7 @@ describe TopicView do
 
     describe "filter_posts_near" do
 
-      def topic_view_near(post, show_deleted=false)
+      def topic_view_near(post, show_deleted = false)
         TopicView.new(topic.id, coding_horror, post_number: post.post_number, show_deleted: show_deleted)
       end
 
@@ -372,8 +369,8 @@ describe TopicView do
         near_view = topic_view_near(p3)
         expect(near_view.desired_post).to eq(p3)
         expect(near_view.posts).to eq([p2, p3, p5])
-        expect(near_view.gaps.before).to eq({p5.id => [p4.id]})
-        expect(near_view.gaps.after).to eq({p5.id => [p6.id, p7.id]})
+        expect(near_view.gaps.before).to eq(p5.id => [p4.id])
+        expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
       end
 
       it "returns deleted posts to an admin with show_deleted" do
@@ -390,8 +387,8 @@ describe TopicView do
         expect(near_view.desired_post).to eq(p5)
         # note: both p4 and p6 get skipped
         expect(near_view.posts).to eq([p2, p3, p5])
-        expect(near_view.gaps.before).to eq({p5.id => [p4.id]})
-        expect(near_view.gaps.after).to eq({p5.id => [p6.id, p7.id]})
+        expect(near_view.gaps.before).to eq(p5.id => [p4.id])
+        expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
       end
 
       it "returns deleted posts by nuked users to an admin with show_deleted" do
@@ -415,8 +412,8 @@ describe TopicView do
           coding_horror.admin = true
           near_view = topic_view_near(p5)
           expect(near_view.posts).to eq([p1, p2, p3, p5])
-          expect(near_view.gaps.before).to eq({p5.id => [p4.id]})
-          expect(near_view.gaps.after).to eq({p5.id => [p6.id, p7.id]})
+          expect(near_view.gaps.before).to eq(p5.id => [p4.id])
+          expect(near_view.gaps.after).to eq(p5.id => [p6.id, p7.id])
         end
 
         it 'returns deleted posts to admins' do
@@ -497,4 +494,3 @@ describe TopicView do
     end
   end
 end
-
diff --git a/spec/components/trashable_spec.rb b/spec/components/trashable_spec.rb
index 6cebdc50b4..89d8b5ba7a 100644
--- a/spec/components/trashable_spec.rb
+++ b/spec/components/trashable_spec.rb
@@ -7,8 +7,7 @@ describe Trashable do
     p1 = Fabricate(:post)
     p2 = Fabricate(:post)
 
-    expect { p1.trash! }.to change{Post.count}.by(-1)
+    expect { p1.trash! }.to change { Post.count }.by(-1)
     expect(Post.with_deleted.count).to eq(Post.count + 1)
   end
 end
-
diff --git a/spec/components/unread_spec.rb b/spec/components/unread_spec.rb
index 21e4b28b59..c7789d94eb 100644
--- a/spec/components/unread_spec.rb
+++ b/spec/components/unread_spec.rb
@@ -36,7 +36,6 @@ describe Unread do
     end
   end
 
-
   describe 'unread_posts' do
     it 'should have 0 unread posts if the user has seen all posts' do
       topic_user.last_read_post_number = 13
diff --git a/spec/components/validators/allowed_ip_address_validator_spec.rb b/spec/components/validators/allowed_ip_address_validator_spec.rb
index b2af99f5b7..aa5c074fd4 100644
--- a/spec/components/validators/allowed_ip_address_validator_spec.rb
+++ b/spec/components/validators/allowed_ip_address_validator_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe AllowedIpAddressValidator do
 
   let(:record) { Fabricate.build(:user, trust_level: TrustLevel[0], ip_address: '99.232.23.123') }
-  let(:validator) { described_class.new({attributes: :ip_address}) }
+  let(:validator) { described_class.new(attributes: :ip_address) }
   subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
 
   context "ip address should be blocked" do
diff --git a/spec/components/validators/email_validator_spec.rb b/spec/components/validators/email_validator_spec.rb
index bb7d6cb6ec..5b06cafe57 100644
--- a/spec/components/validators/email_validator_spec.rb
+++ b/spec/components/validators/email_validator_spec.rb
@@ -2,9 +2,9 @@ require 'rails_helper'
 
 describe EmailValidator do
 
-  let(:record) { }
-  let(:validator) { described_class.new({attributes: :email}) }
-  subject(:validate) { validator.validate_each(record,:email,record.email) }
+  let(:record) {}
+  let(:validator) { described_class.new(attributes: :email) }
+  subject(:validate) { validator.validate_each(record, :email, record.email) }
 
   def blocks?(email)
     user = Fabricate.build(:user, email: email)
diff --git a/spec/components/validators/ip_address_format_validator_spec.rb b/spec/components/validators/ip_address_format_validator_spec.rb
index a91c2d85cd..77d0800986 100644
--- a/spec/components/validators/ip_address_format_validator_spec.rb
+++ b/spec/components/validators/ip_address_format_validator_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe IpAddressFormatValidator do
 
   let(:record) { Fabricate.build(:screened_ip_address, ip_address: '99.232.23.123') }
-  let(:validator) { described_class.new({attributes: :ip_address}) }
+  let(:validator) { described_class.new(attributes: :ip_address) }
   subject(:validate) { validator.validate_each(record, :ip_address, record.ip_address) }
 
   ['99.232.23.123', '99.232.0.0/16', 'fd12:db8::ff00:42:8329', 'fc00::/7'].each do |arg|
diff --git a/spec/components/validators/password_validator_spec.rb b/spec/components/validators/password_validator_spec.rb
index 7166b9e4b9..803bce9b92 100644
--- a/spec/components/validators/password_validator_spec.rb
+++ b/spec/components/validators/password_validator_spec.rb
@@ -7,8 +7,8 @@ describe PasswordValidator do
     I18n.t("activerecord.errors.models.user.attributes.password.#{key.to_s}")
   end
 
-  let(:validator) { described_class.new({attributes: :password}) }
-  subject(:validate) { validator.validate_each(record,:password,@password) }
+  let(:validator) { described_class.new(attributes: :password) }
+  subject(:validate) { validator.validate_each(record, :password, @password) }
 
   context "password required" do
     let(:record) { u = Fabricate.build(:user, password: @password); u.password_required!; u }
diff --git a/spec/components/validators/quality_title_validator_spec.rb b/spec/components/validators/quality_title_validator_spec.rb
index b6bf864a80..10e53a1066 100644
--- a/spec/components/validators/quality_title_validator_spec.rb
+++ b/spec/components/validators/quality_title_validator_spec.rb
@@ -7,20 +7,20 @@ require 'ostruct'
 module QualityTitleValidatorSpec
   class Validatable < OpenStruct
     include ActiveModel::Validations
-    validates :title, :quality_title => { :unless => :private_message? }
+    validates :title, quality_title: { unless: :private_message? }
   end
 end
 
 describe "A record validated with QualityTitleValidator" do
-  let(:valid_title){ "hello this is my cool topic! welcome: all;" }
-  let(:short_title){ valid_title.slice(0, SiteSetting.min_topic_title_length - 1) }
-  let(:long_title ){ valid_title.center(SiteSetting.max_topic_title_length + 1, 'x') }
-  let(:xxxxx_title){ valid_title.gsub(/./,'x')}
+  let(:valid_title) { "hello this is my cool topic! welcome: all;" }
+  let(:short_title) { valid_title.slice(0, SiteSetting.min_topic_title_length - 1) }
+  let(:long_title) { valid_title.center(SiteSetting.max_topic_title_length + 1, 'x') }
+  let(:xxxxx_title) { valid_title.gsub(/./, 'x') }
 
-  subject(:topic){ QualityTitleValidatorSpec::Validatable.new }
+  subject(:topic) { QualityTitleValidatorSpec::Validatable.new }
 
   before(:each) do
-    topic.stubs(:private_message? => false)
+    topic.stubs(private_message?: false)
   end
 
   it "allows a regular title with a few ascii characters" do
@@ -39,7 +39,7 @@ describe "A record validated with QualityTitleValidator" do
   end
 
   it "allows anything in a private message" do
-    topic.stubs(:private_message? => true)
+    topic.stubs(private_message?: true)
     [short_title, long_title, xxxxx_title].each do |bad_title|
       topic.title = bad_title
       expect(topic).to be_valid
@@ -75,4 +75,3 @@ describe "A record validated with QualityTitleValidator" do
   #   end
   # end
 end
-
diff --git a/spec/components/validators/topic_title_length_validator_spec.rb b/spec/components/validators/topic_title_length_validator_spec.rb
index c95fa21e6b..58068ae7f2 100644
--- a/spec/components/validators/topic_title_length_validator_spec.rb
+++ b/spec/components/validators/topic_title_length_validator_spec.rb
@@ -7,8 +7,8 @@ describe TopicTitleLengthValidator do
 
   # simulate Rails behavior (singleton)
   def validate
-    @validator ||= TopicTitleLengthValidator.new({ attributes: :title })
-    @validator.validate_each(record,:title,record.title)
+    @validator ||= TopicTitleLengthValidator.new(attributes: :title)
+    @validator.validate_each(record, :title, record.title)
   end
 
   shared_examples "validating any topic title" do
diff --git a/spec/components/validators/user_full_name_validator_spec.rb b/spec/components/validators/user_full_name_validator_spec.rb
index d72797a6c6..b6b6829347 100644
--- a/spec/components/validators/user_full_name_validator_spec.rb
+++ b/spec/components/validators/user_full_name_validator_spec.rb
@@ -1,8 +1,8 @@
 require "rails_helper"
 
 describe UserFullNameValidator do
-  let(:validator) { described_class.new({attributes: :name}) }
-  subject(:validate) { validator.validate_each(record,:name,@name) }
+  let(:validator) { described_class.new(attributes: :name) }
+  subject(:validate) { validator.validate_each(record, :name, @name) }
   let(:record) { Fabricate.build(:user, name: @name) }
 
   context "name not required" do
diff --git a/spec/components/version_spec.rb b/spec/components/version_spec.rb
index 26c24337bc..6844205d71 100644
--- a/spec/components/version_spec.rb
+++ b/spec/components/version_spec.rb
@@ -37,4 +37,3 @@ describe Discourse::VERSION do
 
   end
 end
-
diff --git a/spec/components/wizard/step_updater_spec.rb b/spec/components/wizard/step_updater_spec.rb
index 5307b3779d..ddc3513508 100644
--- a/spec/components/wizard/step_updater_spec.rb
+++ b/spec/components/wizard/step_updater_spec.rb
@@ -268,8 +268,8 @@ describe Wizard::StepUpdater do
 
   context "invites step" do
     let(:invites) {
-      return [{ email: 'regular@example.com', role: 'regular'},
-              { email: 'moderator@example.com', role: 'moderator'}]
+      return [{ email: 'regular@example.com', role: 'regular' },
+              { email: 'moderator@example.com', role: 'moderator' }]
     }
 
     it "updates the fields correctly" do
diff --git a/spec/components/wizard/wizard_spec.rb b/spec/components/wizard/wizard_spec.rb
index f9266f83e5..46c68a38b4 100644
--- a/spec/components/wizard/wizard_spec.rb
+++ b/spec/components/wizard/wizard_spec.rb
@@ -131,7 +131,7 @@ describe Wizard do
       admin = Fabricate(:admin)
       wizard = build_simple(admin)
 
-      wizard.max_topics_to_require_completion = Topic.count-1
+      wizard.max_topics_to_require_completion = Topic.count - 1
 
       expect(wizard.requires_completion?).to eq(false)
       expect(SiteSetting.bypass_wizard_check).to eq(true)
@@ -148,7 +148,7 @@ describe Wizard do
 
     it "is false for staff when complete" do
       wizard = build_simple(Fabricate(:admin))
-      updater =  wizard.create_updater('simple', name: 'Evil Trout')
+      updater = wizard.create_updater('simple', name: 'Evil Trout')
       updater.update
 
       expect(wizard.requires_completion?).to eq(false)
diff --git a/spec/components/wizard/wizard_step_spec.rb b/spec/components/wizard/wizard_step_spec.rb
index 45005b89fa..7df0dc809f 100644
--- a/spec/components/wizard/wizard_step_spec.rb
+++ b/spec/components/wizard/wizard_step_spec.rb
@@ -13,7 +13,7 @@ describe Wizard::Step do
 
     dropdown = step.add_field(id: 'snacks', type: 'dropdown')
     dropdown.add_choice('candy')
-    dropdown.add_choice('nachos', data: {color: 'yellow'})
+    dropdown.add_choice('nachos', data: { color: 'yellow' })
     dropdown.add_choice('pizza', label: 'Pizza!')
 
     expect(step.fields).to eq([text, dropdown])
@@ -21,4 +21,3 @@ describe Wizard::Step do
   end
 
 end
-
diff --git a/spec/controllers/admin/admin_controller_spec.rb b/spec/controllers/admin/admin_controller_spec.rb
index f0e29511dd..8cf851b51a 100644
--- a/spec/controllers/admin/admin_controller_spec.rb
+++ b/spec/controllers/admin/admin_controller_spec.rb
@@ -16,5 +16,4 @@ describe Admin::AdminController do
 
   end
 
-
 end
diff --git a/spec/controllers/admin/backups_controller_spec.rb b/spec/controllers/admin/backups_controller_spec.rb
index 5da9c9023a..14014d5c72 100644
--- a/spec/controllers/admin/backups_controller_spec.rb
+++ b/spec/controllers/admin/backups_controller_spec.rb
@@ -89,7 +89,6 @@ describe Admin::BackupsController do
 
           get :show, id: backup_filename, token: token
 
-
           expect(response.headers['Content-Length']).to eq("5")
           expect(response.headers['Content-Disposition']).to match(/attachment; filename/)
         ensure
diff --git a/spec/controllers/admin/badges_controller_spec.rb b/spec/controllers/admin/badges_controller_spec.rb
index 95bb08377a..dad6e6b570 100644
--- a/spec/controllers/admin/badges_controller_spec.rb
+++ b/spec/controllers/admin/badges_controller_spec.rb
@@ -48,16 +48,15 @@ describe Admin::BadgesController do
 
         groupings.shuffle!
 
-        names = groupings.map{|g| g.name}
-        ids = groupings.map{|g| g.id.to_s}
-
+        names = groupings.map { |g| g.name }
+        ids = groupings.map { |g| g.id.to_s }
 
         xhr :post, :save_badge_groupings, ids: ids, names: names
 
         groupings2 = BadgeGrouping.all.order(:position).to_a
 
-        expect(groupings2.map{|g| g.name}).to eq(names)
-        expect((groupings.map(&:id) - groupings2.map{|g| g.id}).compact).to be_blank
+        expect(groupings2.map { |g| g.name }).to eq(names)
+        expect((groupings.map(&:id) - groupings2.map { |g| g.id }).compact).to be_blank
 
         expect(::JSON.parse(response.body)["badge_groupings"].length).to eq(groupings2.length)
       end
diff --git a/spec/controllers/admin/color_schemes_controller_spec.rb b/spec/controllers/admin/color_schemes_controller_spec.rb
index c1eb2c9abb..7bc1941e8b 100644
--- a/spec/controllers/admin/color_schemes_controller_spec.rb
+++ b/spec/controllers/admin/color_schemes_controller_spec.rb
@@ -10,8 +10,8 @@ describe Admin::ColorSchemesController do
     let(:valid_params) { { color_scheme: {
         name: 'Such Design',
         colors: [
-          {name: 'primary', hex: 'FFBB00'},
-          {name: 'secondary', hex: '888888'}
+          { name: 'primary', hex: 'FFBB00' },
+          { name: 'secondary', hex: '888888' }
         ]
       }
     } }
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
index ed56759746..6d862eecc1 100644
--- a/spec/controllers/admin/dashboard_controller_spec.rb
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -3,7 +3,7 @@ require_dependency 'discourse_version_check'
 
 describe Admin::DashboardController do
   before do
-    AdminDashboardData.stubs(:fetch_cached_stats).returns({reports:[]})
+    AdminDashboardData.stubs(:fetch_cached_stats).returns(reports: [])
     Jobs::VersionCheck.any_instance.stubs(:execute).returns(true)
   end
 
diff --git a/spec/controllers/admin/email_controller_spec.rb b/spec/controllers/admin/email_controller_spec.rb
index b14b6ae979..092eaad575 100644
--- a/spec/controllers/admin/email_controller_spec.rb
+++ b/spec/controllers/admin/email_controller_spec.rb
@@ -10,10 +10,8 @@ describe Admin::EmailController do
 
   context '.index' do
     before do
-      subject.expects(:action_mailer_settings).returns({
-        username: 'username',
-        password: 'secret'
-      })
+      subject.expects(:action_mailer_settings).returns(username: 'username',
+                                                       password: 'secret')
 
       xhr :get, :index
     end
diff --git a/spec/controllers/admin/flags_controller_spec.rb b/spec/controllers/admin/flags_controller_spec.rb
index 76599d2df7..fba4dfb61b 100644
--- a/spec/controllers/admin/flags_controller_spec.rb
+++ b/spec/controllers/admin/flags_controller_spec.rb
@@ -34,4 +34,3 @@ describe Admin::FlagsController do
     end
   end
 end
-
diff --git a/spec/controllers/admin/groups_controller_spec.rb b/spec/controllers/admin/groups_controller_spec.rb
index 27c95cb78f..7f02fe769e 100644
--- a/spec/controllers/admin/groups_controller_spec.rb
+++ b/spec/controllers/admin/groups_controller_spec.rb
@@ -12,46 +12,6 @@ describe Admin::GroupsController do
     expect(Admin::GroupsController < Admin::AdminController).to eq(true)
   end
 
-  context ".index" do
-
-    it "produces valid json for groups" do
-      group = Fabricate.build(:group, name: "test")
-      group.add(@admin)
-      group.save
-
-      xhr :get, :index
-      expect(response.status).to eq(200)
-      json = ::JSON.parse(response.body)
-      expect(json.select { |r| r["id"] == Group::AUTO_GROUPS[:everyone] }).to be_empty
-      expect(json.select { |r| r["id"] == group.id }).to eq([{
-        "id"=>group.id,
-        "name"=>group.name,
-        "user_count"=>1,
-        "automatic"=>false,
-        "alias_level"=>0,
-        "visibility_level"=>0,
-        "automatic_membership_email_domains"=>nil,
-        "automatic_membership_retroactive"=>false,
-        "title"=>nil,
-        "primary_group"=>false,
-        "grant_trust_level"=>nil,
-        "incoming_email"=>nil,
-        "has_messages"=>false,
-        "flair_url"=>nil,
-        "flair_bg_color"=>nil,
-        "flair_color"=>nil,
-        "bio_raw"=>nil,
-        "bio_cooked"=>nil,
-        "public"=>false,
-        "allow_membership_requests"=>false,
-        "full_name"=>group.full_name,
-        "default_notification_level"=>3
-      }])
-
-    end
-
-  end
-
   context ".bulk" do
     it "can assign users to a group by email or username" do
       group = Fabricate(:group, name: "test", primary_group: true, title: 'WAT', grant_trust_level: 3)
@@ -79,30 +39,15 @@ describe Admin::GroupsController do
     end
   end
 
-  context "#create" do
-
-    it "strip spaces on the group name" do
-      xhr :post, :create, { group: { name: " bob " } }
-
-      expect(response.status).to eq(200)
-
-      groups = Group.where(name: "bob").to_a
-
-      expect(groups.count).to eq(1)
-      expect(groups[0].name).to eq("bob")
-    end
-
-  end
-
   context "#update" do
     it 'should update a group' do
       group.add_owner(user)
 
       expect do
-        xhr :put, :update, { id: group.id, group: {
+        xhr :put, :update, id: group.id, group: {
           visibility_level: Group.visibility_levels[:owners],
           allow_membership_requests: "true"
-        } }
+        }
 
       end.to change { GroupHistory.count }.by(2)
 
@@ -110,12 +55,12 @@ describe Admin::GroupsController do
 
       group.reload
 
-      expect(group.visibility_level).to eq( Group.visibility_levels[:owners])
+      expect(group.visibility_level).to eq(Group.visibility_levels[:owners])
       expect(group.allow_membership_requests).to eq(true)
     end
 
     it "ignore name change on automatic group" do
-      xhr :put, :update, { id: 1, group: { name: "WAT" } }
+      xhr :put, :update, id: 1, group: { name: "WAT" }
       expect(response).to be_success
 
       group = Group.find(1)
@@ -125,14 +70,14 @@ describe Admin::GroupsController do
     it "doesn't launch the 'automatic group membership' job when it's not retroactive" do
       Jobs.expects(:enqueue).never
       group = Fabricate(:group)
-      xhr :put, :update, { id: group.id, group: { automatic_membership_retroactive: "false" } }
+      xhr :put, :update, id: group.id, group: { automatic_membership_retroactive: "false" }
       expect(response).to be_success
     end
 
     it "launches the 'automatic group membership' job when it's retroactive" do
       group = Fabricate(:group)
       Jobs.expects(:enqueue).with(:automatic_group_membership, group_id: group.id)
-      xhr :put, :update, { id: group.id, group: { automatic_membership_retroactive: "true" } }
+      xhr :put, :update, id: group.id, group: { automatic_membership_retroactive: "true" }
       expect(response).to be_success
     end
 
diff --git a/spec/controllers/admin/plugins_controller_spec.rb b/spec/controllers/admin/plugins_controller_spec.rb
index 2873523e32..42a385e3c9 100644
--- a/spec/controllers/admin/plugins_controller_spec.rb
+++ b/spec/controllers/admin/plugins_controller_spec.rb
@@ -17,4 +17,3 @@ describe Admin::PluginsController do
   end
 
 end
-
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index 9d34ebbe1c..7c34ee0e25 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -9,7 +9,6 @@ describe Admin::ReportsController do
     let!(:admin) { log_in(:admin) }
     let(:user) { Fabricate(:user) }
 
-
     context '.show' do
 
       context "invalid id form" do
diff --git a/spec/controllers/admin/staff_action_logs_controller_spec.rb b/spec/controllers/admin/staff_action_logs_controller_spec.rb
index 2712d2f813..45d6f14eee 100644
--- a/spec/controllers/admin/staff_action_logs_controller_spec.rb
+++ b/spec/controllers/admin/staff_action_logs_controller_spec.rb
@@ -22,7 +22,7 @@ describe Admin::StaffActionLogsController do
       expect(json["staff_action_logs"].length).to eq(1)
       expect(json["staff_action_logs"][0]["action_name"]).to eq("delete_topic")
 
-      expect(json["user_history_actions"]).to include({"id" => UserHistory.actions[:delete_topic], "name" => 'delete_topic'})
+      expect(json["user_history_actions"]).to include("id" => UserHistory.actions[:delete_topic], "name" => 'delete_topic')
 
     end
   end
diff --git a/spec/controllers/admin/themes_controller_spec.rb b/spec/controllers/admin/themes_controller_spec.rb
index b2c1bf7e54..f8f661ce9b 100644
--- a/spec/controllers/admin/themes_controller_spec.rb
+++ b/spec/controllers/admin/themes_controller_spec.rb
@@ -15,10 +15,8 @@ describe Admin::ThemesController do
       render_views
 
       let(:upload) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'test.woff2',
-          tempfile: file_from_fixtures("fake.woff2", "woff2")
-        })
+        ActionDispatch::Http::UploadedFile.new(filename: 'test.woff2',
+                                               tempfile: file_from_fixtures("fake.woff2", "woff2"))
       end
 
       it 'can create a theme upload' do
@@ -32,10 +30,8 @@ describe Admin::ThemesController do
 
     context '.import' do
       let(:theme_file) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'sam-s-simple-theme.dcstyle.json',
-          tempfile: file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json")
-        })
+        ActionDispatch::Http::UploadedFile.new(filename: 'sam-s-simple-theme.dcstyle.json',
+                                               tempfile: file_from_fixtures("sam-s-simple-theme.dcstyle.json", "json"))
       end
 
       it 'imports a theme' do
@@ -79,7 +75,7 @@ describe Admin::ThemesController do
         json = ::JSON.parse(response.body)
 
         expect(json["extras"]["color_schemes"].length).to eq(2)
-        theme_json = json["themes"].find{|t| t["id"] == theme.id}
+        theme_json = json["themes"].find { |t| t["id"] == theme.id }
         expect(theme_json["theme_fields"].length).to eq(2)
         expect(theme_json["remote_theme"]["remote_version"]).to eq("7")
       end
@@ -87,7 +83,7 @@ describe Admin::ThemesController do
 
     context ' .create' do
       it 'creates a theme' do
-        xhr :post, :create, theme: {name: 'my test name', theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}']}
+        xhr :post, :create, theme: { name: 'my test name', theme_fields: [name: 'scss', target: 'common', value: 'body{color: red;}'] }
         expect(response).to be_success
 
         json = ::JSON.parse(response.body)
@@ -107,7 +103,7 @@ describe Admin::ThemesController do
       it 'can unset default theme' do
         theme = Theme.create(name: 'my name', user_id: -1)
         SiteSetting.default_theme_key = theme.key
-        xhr :put, :update, id: theme.id, theme: { default: false}
+        xhr :put, :update, id: theme.id, theme: { default: false }
         expect(SiteSetting.default_theme_key).to be_blank
       end
 
@@ -121,7 +117,7 @@ describe Admin::ThemesController do
         upload = Fabricate(:upload)
 
         xhr :put, :update, id: theme.id,
-            theme: {
+                           theme: {
           child_theme_ids: [child_theme.id],
           name: 'my test name',
           theme_fields: [
@@ -134,7 +130,7 @@ describe Admin::ThemesController do
 
         json = ::JSON.parse(response.body)
 
-        fields = json["theme"]["theme_fields"].sort{|a,b| a["value"] <=> b["value"]}
+        fields = json["theme"]["theme_fields"].sort { |a, b| a["value"] <=> b["value"] }
 
         expect(fields[0]["value"]).to eq('')
         expect(fields[0]["upload_id"]).to eq(upload.id)
diff --git a/spec/controllers/admin/user_fields_controller_spec.rb b/spec/controllers/admin/user_fields_controller_spec.rb
index cb0c95c930..cc5d06be13 100644
--- a/spec/controllers/admin/user_fields_controller_spec.rb
+++ b/spec/controllers/admin/user_fields_controller_spec.rb
@@ -12,17 +12,17 @@ describe Admin::UserFieldsController do
     context '.create' do
       it "creates a user field" do
         expect {
-          xhr :post, :create, {user_field: {name: 'hello', description: 'hello desc', field_type: 'text'} }
+          xhr :post, :create, user_field: { name: 'hello', description: 'hello desc', field_type: 'text' }
           expect(response).to be_success
         }.to change(UserField, :count).by(1)
       end
 
       it "creates a user field with options" do
         expect {
-          xhr :post, :create, {user_field: {name: 'hello',
+          xhr :post, :create, user_field: { name: 'hello',
                                             description: 'hello desc',
                                             field_type: 'dropdown',
-                                            options: ['a', 'b', 'c']} }
+                                            options: ['a', 'b', 'c'] }
           expect(response).to be_success
         }.to change(UserField, :count).by(1)
 
@@ -56,7 +56,7 @@ describe Admin::UserFieldsController do
       let!(:user_field) { Fabricate(:user_field) }
 
       it "updates the user field" do
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle', field_type: 'confirm', description: 'muppet'}
+        xhr :put, :update, id: user_field.id, user_field: { name: 'fraggle', field_type: 'confirm', description: 'muppet' }
         expect(response).to be_success
         user_field.reload
         expect(user_field.name).to eq('fraggle')
@@ -64,10 +64,10 @@ describe Admin::UserFieldsController do
       end
 
       it "updates the user field options" do
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle',
-                                                           field_type: 'dropdown',
-                                                           description: 'muppet',
-                                                           options: ['hello', 'hello', 'world']}
+        xhr :put, :update, id: user_field.id, user_field: { name: 'fraggle',
+                                                            field_type: 'dropdown',
+                                                            description: 'muppet',
+                                                            options: ['hello', 'hello', 'world'] }
         expect(response).to be_success
         user_field.reload
         expect(user_field.name).to eq('fraggle')
@@ -76,19 +76,19 @@ describe Admin::UserFieldsController do
       end
 
       it "keeps options when updating the user field" do
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle',
-                                                           field_type: 'dropdown',
-                                                           description: 'muppet',
-                                                           options: ['hello', 'hello', 'world'],
-                                                           position: 1}
+        xhr :put, :update, id: user_field.id, user_field: { name: 'fraggle',
+                                                            field_type: 'dropdown',
+                                                            description: 'muppet',
+                                                            options: ['hello', 'hello', 'world'],
+                                                            position: 1 }
         expect(response).to be_success
         user_field.reload
         expect(user_field.user_field_options.size).to eq(2)
 
-        xhr :put, :update, id: user_field.id, user_field: {name: 'fraggle',
-                                                           field_type: 'dropdown',
-                                                           description: 'muppet',
-                                                           position: 2}
+        xhr :put, :update, id: user_field.id, user_field: { name: 'fraggle',
+                                                            field_type: 'dropdown',
+                                                            description: 'muppet',
+                                                            position: 2 }
         expect(response).to be_success
         user_field.reload
         expect(user_field.user_field_options.size).to eq(2)
@@ -97,4 +97,3 @@ describe Admin::UserFieldsController do
   end
 
 end
-
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 35e17ec0b4..f5dae281c9 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -154,6 +154,10 @@ describe Admin::UsersController do
         @another_user = Fabricate(:coding_horror)
       end
 
+      after do
+        $redis.flushall
+      end
+
       it "raises an error when the user doesn't have permission" do
         Guardian.any_instance.expects(:can_grant_admin?).with(@another_user).returns(false)
         xhr :put, :grant_admin, user_id: @another_user.id
@@ -412,6 +416,19 @@ describe Admin::UsersController do
         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)
+
+        xhr :put, :activate, user_id: @reg_user.id
+        expect(response).to be_success
+
+        @reg_user.reload
+        expect(@reg_user.email_confirmed?).to eq(true)
+      end
     end
 
     context 'log_out' do
@@ -512,7 +529,7 @@ describe Admin::UsersController do
         xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com'
         expect(response).to be_success
 
-        u = User.find_by(email: 'bill@bill.com')
+        u = User.find_by_email('bill@bill.com')
         expect(u.name).to eq("Bill")
         expect(u.username).to eq("bill22")
         expect(u.admin).to eq(true)
@@ -539,7 +556,6 @@ describe Admin::UsersController do
 
   end
 
-
   context '#sync_sso' do
     let(:sso) { SingleSignOn.new }
     let(:sso_secret) { "sso secret" }
@@ -556,7 +572,6 @@ describe Admin::UsersController do
       sso.sso_secret = sso_secret
     end
 
-
     it 'can sync up with the sso' do
       sso.name = "Bob The Bob"
       sso.username = "bob"
@@ -564,7 +579,7 @@ describe Admin::UsersController do
       sso.external_id = "1"
 
       user = DiscourseSingleSignOn.parse(sso.payload)
-                                  .lookup_or_create_user
+        .lookup_or_create_user
 
       sso.name = "Bill"
       sso.username = "Hokli$$!!"
@@ -587,7 +602,7 @@ describe Admin::UsersController do
       xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
       expect(response).to be_success
 
-      user = User.where(email: 'dr@claw.com').first
+      user = User.find_by_email('dr@claw.com')
       expect(user).to be_present
       expect(user.ip_address).to be_blank
     end
@@ -599,7 +614,7 @@ describe Admin::UsersController do
 
       xhr :post, :sync_sso, Rack::Utils.parse_query(sso.payload)
       expect(response.status).to eq(403)
-      expect(JSON.parse(response.body)["message"]).to include("Email can't be blank")
+      expect(JSON.parse(response.body)["message"]).to include("Primary email is invalid")
     end
   end
 end
diff --git a/spec/controllers/admin/web_hooks_controller_spec.rb b/spec/controllers/admin/web_hooks_controller_spec.rb
index bf6b894c44..bcd05a32f5 100644
--- a/spec/controllers/admin/web_hooks_controller_spec.rb
+++ b/spec/controllers/admin/web_hooks_controller_spec.rb
@@ -52,7 +52,7 @@ 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')
+          .with(:emit_web_hook_event, web_hook_id: web_hook.id, event_type: 'ping', event_name: 'ping')
         xhr :post, :ping, id: web_hook.id
 
         expect(response).to be_success
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 178f26ba13..fdae7c579c 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -53,7 +53,7 @@ describe TopicsController do
     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}"
+      cookies['theme_key'] = "#{theme2.key},#{user.user_option.theme_key_seq - 1}"
 
       get :show, id: 666
       expect(controller.theme_key).to eq(theme.key)
@@ -68,7 +68,7 @@ describe TopicsController do
 
   it "doesn't raise an error on a very long link" do
     set_referer("http://#{'a' * 2000}.com")
-    expect { get :show, {id: topic.id} }.not_to raise_error
+    expect { get :show, id: topic.id }.not_to raise_error
   end
 
   describe "has_escaped_fragment?" do
@@ -78,7 +78,7 @@ describe TopicsController do
 
       it "uses the application layout even with an escaped fragment param" do
         SiteSetting.enable_escaped_fragments = false
-        get :show, {'topic_id' => topic.id, 'slug' => topic.slug, '_escaped_fragment_' => 'true'}
+        get :show, 'topic_id' => topic.id, 'slug' => topic.slug, '_escaped_fragment_' => 'true'
         expect(response).to render_template(layout: 'application')
         assert_select "meta[name=fragment]", false, "it doesn't have the meta tag"
       end
@@ -151,7 +151,7 @@ describe TopicsController do
 
       request.cookies['cn'] = "2828,100,#{notification.id}"
 
-      get :show, {topic_id: 100}
+      get :show, topic_id: 100
 
       expect(response.cookies['cn']).to eq nil
 
@@ -166,7 +166,7 @@ describe TopicsController do
 
       request.headers['Discourse-Clear-Notifications'] = "2828,100,#{notification.id}"
 
-      get :show, {topic_id: 100}
+      get :show, topic_id: 100
 
       notification.reload
       expect(notification.read).to eq true
@@ -184,7 +184,7 @@ describe TopicsController do
 
         context "with an anonymous user" do
           it "uses the default locale" do
-            get :show, {topic_id: topic.id}
+            get :show, topic_id: topic.id
 
             expect(I18n.locale).to eq(:en)
           end
@@ -195,7 +195,7 @@ describe TopicsController do
             user = Fabricate(:user, locale: :fr)
             log_in_user(user)
 
-            get :show, {topic_id: topic.id}
+            get :show, topic_id: topic.id
 
             expect(I18n.locale).to eq(:en)
           end
@@ -214,7 +214,7 @@ describe TopicsController do
 
         context "with an anonymous user" do
           it "uses the locale from the headers" do
-            get :show, {topic_id: topic.id}
+            get :show, topic_id: topic.id
 
             expect(I18n.locale).to eq(:fr)
           end
@@ -225,7 +225,7 @@ describe TopicsController do
             user = Fabricate(:user, locale: :fr)
             log_in_user(user)
 
-            get :show, {topic_id: topic.id}
+            get :show, topic_id: topic.id
 
             expect(I18n.locale).to eq(:fr)
           end
@@ -239,7 +239,7 @@ describe TopicsController do
           SiteSetting.default_locale = "en"
           set_accept_language("zh-CN")
 
-          get :show, {topic_id: topic.id}
+          get :show, topic_id: topic.id
 
           expect(I18n.locale).to eq(:zh_CN)
         end
@@ -251,7 +251,7 @@ describe TopicsController do
           SiteSetting.default_locale = 'en'
           set_accept_language('')
 
-          get :show, {topic_id: topic.id}
+          get :show, topic_id: topic.id
 
           expect(I18n.locale).to eq(:en)
         end
@@ -261,13 +261,13 @@ describe TopicsController do
 
   describe "read only header" do
     it "returns no read only header by default" do
-      get :show, {topic_id: topic.id}
+      get :show, topic_id: topic.id
       expect(response.headers['Discourse-Readonly']).to eq(nil)
     end
 
     it "returns a readonly header if the site is read only" do
       Discourse.received_readonly!
-      get :show, {topic_id: topic.id}
+      get :show, topic_id: topic.id
       expect(response.headers['Discourse-Readonly']).to eq('true')
     end
   end
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index 4850d5f36a..b60f8d3441 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -57,8 +57,8 @@ describe CategoriesController do
 
           expect(response.status).to eq(200)
           category = Category.find_by(name: "hello")
-          expect(category.category_groups.map{|g| [g.group_id, g.permission_type]}.sort).to eq([
-            [Group[:everyone].id, readonly],[Group[:staff].id,create_post]
+          expect(category.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq([
+            [Group[:everyone].id, readonly], [Group[:staff].id, create_post]
           ])
           expect(category.name).to eq("hello")
           expect(category.slug).to eq("hello-cat")
@@ -73,7 +73,7 @@ describe CategoriesController do
   describe "destroy" do
 
     it "requires the user to be logged in" do
-      expect { xhr :delete, :destroy, id: "category"}.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :delete, :destroy, id: "category" }.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe "logged in" do
@@ -90,7 +90,7 @@ describe CategoriesController do
 
       it "deletes the record" do
         Guardian.any_instance.expects(:can_delete_category?).returns(true)
-        expect { xhr :delete, :destroy, id: @category.slug}.to change(Category, :count).by(-1)
+        expect { xhr :delete, :destroy, id: @category.slug }.to change(Category, :count).by(-1)
         expect(UserHistory.count).to eq(1)
       end
     end
@@ -136,12 +136,11 @@ describe CategoriesController do
   describe "update" do
 
     it "requires the user to be logged in" do
-      expect { xhr :put, :update, id: 'category'}.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :put, :update, id: 'category' }.to raise_error(Discourse::NotLoggedIn)
     end
 
-
     describe "logged in" do
-      let(:valid_attrs) { {id: @category.id, name: "hello", color: "ff0", text_color: "fff"} }
+      let(:valid_attrs) { { id: @category.id, name: "hello", color: "ff0", text_color: "fff" } }
 
       before do
         @user = log_in(:admin)
@@ -168,7 +167,7 @@ describe CategoriesController do
 
       describe "failure" do
         before do
-          @other_category = Fabricate(:category, name: "Other", user: @user )
+          @other_category = Fabricate(:category, name: "Other", user: @user)
           xhr :put, :update, id: @category.id, name: @other_category.name, color: "ff0", text_color: "fff"
         end
 
@@ -182,7 +181,7 @@ describe CategoriesController do
       end
 
       it "returns 422 if email_in address is already in use for other category" do
-        @other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com" )
+        @other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com")
         xhr :put, :update, id: @category.id, name: "Email", email_in: "mail@examle.com", color: "ff0", text_color: "fff"
 
         expect(response).not_to be_success
@@ -196,35 +195,34 @@ describe CategoriesController do
           create_post = CategoryGroup.permission_types[:create_post]
 
           xhr :put, :update, id: @category.id, name: "hello", color: "ff0", text_color: "fff", slug: "hello-category",
-                              auto_close_hours: 72,
-                              permissions: {
+                             auto_close_hours: 72,
+                             permissions: {
                                 "everyone" => readonly,
                                 "staff" => create_post
                               },
-                              custom_fields: {
+                             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.category_groups.map { |g| [g.group_id, g.permission_type] }.sort).to eq([
+            [Group[:everyone].id, readonly], [Group[:staff].id, create_post]
           ])
           expect(@category.name).to eq("hello")
           expect(@category.slug).to eq("hello-category")
           expect(@category.color).to eq("ff0")
           expect(@category.auto_close_hours).to eq(72)
-          expect(@category.custom_fields).to eq({"dancing" => "frogs"})
+          expect(@category.custom_fields).to eq("dancing" => "frogs")
         end
 
         it 'logs the changes correctly' do
           @category.update!(permissions: { "admins" => CategoryGroup.permission_types[:create_post] })
 
           xhr :put , :update, id: @category.id, name: 'new name',
-            color: @category.color, text_color: @category.text_color,
-            slug: @category.slug,
-            permissions: {
+                              color: @category.color, text_color: @category.text_color,
+                              slug: @category.slug,
+                              permissions: {
               "everyone" => CategoryGroup.permission_types[:create_post]
             }
 
@@ -233,16 +231,15 @@ describe CategoriesController do
       end
     end
 
-
   end
 
   describe 'update_slug' do
     it 'requires the user to be logged in' do
-      expect { xhr :put, :update_slug, category_id: 'category'}.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :put, :update_slug, category_id: 'category' }.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'logged in' do
-      let(:valid_attrs) { {id: @category.id, slug: 'fff'} }
+      let(:valid_attrs) { { id: @category.id, slug: 'fff' } }
 
       before do
         @user = log_in(:admin)
diff --git a/spec/controllers/category_hashtags_controller_spec.rb b/spec/controllers/category_hashtags_controller_spec.rb
index e5f1515614..43d8b3b4fd 100644
--- a/spec/controllers/category_hashtags_controller_spec.rb
+++ b/spec/controllers/category_hashtags_controller_spec.rb
@@ -12,7 +12,7 @@ describe CategoryHashtagsController do
         xhr :get, :check, category_slugs: [category.slug, 'none']
 
         expect(JSON.parse(response.body)).to eq(
-          { "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }] }
+          "valid" => [{ "slug" => category.hashtag_slug, "url" => category.url_with_id }]
         )
       end
 
@@ -21,7 +21,7 @@ describe CategoryHashtagsController do
         private_category = Fabricate(:private_category, group: group)
         xhr :get, :check, category_slugs: [private_category.slug]
 
-        expect(JSON.parse(response.body)).to eq({ "valid" => [] })
+        expect(JSON.parse(response.body)).to eq("valid" => [])
       end
 
       it 'returns restricted categories for an admin' do
@@ -32,7 +32,7 @@ describe CategoryHashtagsController do
         xhr :get, :check, category_slugs: [private_category.slug]
 
         expect(JSON.parse(response.body)).to eq(
-          { "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }] }
+          "valid" => [{ "slug" => private_category.hashtag_slug, "url" => private_category.url_with_id }]
         )
       end
     end
diff --git a/spec/controllers/composer_messages_controller_spec.rb b/spec/controllers/composer_messages_controller_spec.rb
index 39c39dc2e0..6552767a2a 100644
--- a/spec/controllers/composer_messages_controller_spec.rb
+++ b/spec/controllers/composer_messages_controller_spec.rb
@@ -10,7 +10,7 @@ describe ComposerMessagesController do
 
     context 'when logged in' do
       let!(:user) { log_in }
-      let(:args) { {'topic_id' => '123', 'post_id' => '333', 'composer_action' => 'reply'} }
+      let(:args) { { 'topic_id' => '123', 'post_id' => '333', 'composer_action' => 'reply' } }
 
       it 'redirects to your user preferences' do
         xhr :get, :index
diff --git a/spec/controllers/directory_items_controller_spec.rb b/spec/controllers/directory_items_controller_spec.rb
index fa33e8af9a..7f9612b1c4 100644
--- a/spec/controllers/directory_items_controller_spec.rb
+++ b/spec/controllers/directory_items_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe DirectoryItemsController do
 
   it "requires a `period` param" do
-    expect{ xhr :get, :index }.to raise_error(ActionController::ParameterMissing)
+    expect { xhr :get, :index }.to raise_error(ActionController::ParameterMissing)
   end
 
   it "requires a proper `period` param" do
@@ -11,7 +11,6 @@ describe DirectoryItemsController do
     expect(response).not_to be_success
   end
 
-
   context "without data" do
 
     context "and a logged in user" do
@@ -26,7 +25,6 @@ describe DirectoryItemsController do
 
   end
 
-
   context "with data" do
     before do
       Fabricate(:user)
diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb
index 996d88cf3e..ef0882336b 100644
--- a/spec/controllers/email_controller_spec.rb
+++ b/spec/controllers/email_controller_spec.rb
@@ -30,9 +30,9 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(user, "all")
 
       user.user_option.update_columns(email_always: true,
-                                     email_digests: true,
-                                     email_direct: true,
-                                     email_private_messages: true)
+                                      email_digests: true,
+                                      email_direct: true,
+                                      email_private_messages: true)
 
       post :perform_unsubscribe, key: key, unsubscribe_all: "1"
       expect(response.status).to eq(302)
@@ -101,8 +101,8 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(p.user, p)
 
       cu = CategoryUser.create!(user_id: p.user.id,
-                          category_id: p.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching])
+                                category_id: p.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching])
 
       post :perform_unsubscribe, key: key, unwatch_category: "1"
       expect(response.status).to eq(302)
@@ -115,8 +115,8 @@ describe EmailController do
       key = UnsubscribeKey.create_key_for(p.user, p)
 
       cu = CategoryUser.create!(user_id: p.user.id,
-                          category_id: p.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching_first_post])
+                                category_id: p.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching_first_post])
 
       post :perform_unsubscribe, key: key, unwatch_category: "1"
       expect(response.status).to eq(302)
@@ -197,9 +197,8 @@ describe EmailController do
       post = Fabricate(:post)
       user = post.user
       cu = CategoryUser.create!(user_id: user.id,
-                          category_id: post.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching])
-
+                                category_id: post.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching])
 
       key = UnsubscribeKey.create_key_for(user, post)
       get :unsubscribe, key: key
@@ -216,9 +215,8 @@ describe EmailController do
       post = Fabricate(:post)
       user = post.user
       cu = CategoryUser.create!(user_id: user.id,
-                          category_id: post.topic.category_id,
-                          notification_level: CategoryUser.notification_levels[:watching_first_post])
-
+                                category_id: post.topic.category_id,
+                                notification_level: CategoryUser.notification_levels[:watching_first_post])
 
       key = UnsubscribeKey.create_key_for(user, post)
       get :unsubscribe, key: key
diff --git a/spec/controllers/embed_controller_spec.rb b/spec/controllers/embed_controller_spec.rb
index e81faa0371..69dfc83683 100644
--- a/spec/controllers/embed_controller_spec.rb
+++ b/spec/controllers/embed_controller_spec.rb
@@ -92,12 +92,12 @@ describe EmbedController do
 
       it "creates a topic view when a topic_id is found" do
         TopicEmbed.expects(:topic_id_for_embed).returns(123)
-        TopicView.expects(:new).with(123, nil, {limit: 100, exclude_first: true, exclude_deleted_users: true, exclude_hidden: true})
+        TopicView.expects(:new).with(123, nil, limit: 100, exclude_first: true, exclude_deleted_users: true, exclude_hidden: true)
         get :comments, embed_url: embed_url
       end
 
       it "provides the topic retriever with the discourse username when provided" do
-        TopicRetriever.expects(:new).with(embed_url, has_entry({author_username: discourse_username}))
+        TopicRetriever.expects(:new).with(embed_url, has_entry(author_username: discourse_username))
         get :comments, embed_url: embed_url, discourse_username: discourse_username
       end
 
diff --git a/spec/controllers/export_csv_controller_spec.rb b/spec/controllers/export_csv_controller_spec.rb
index 261ff03d9f..bf4b5a0fa6 100644
--- a/spec/controllers/export_csv_controller_spec.rb
+++ b/spec/controllers/export_csv_controller_spec.rb
@@ -60,7 +60,6 @@ describe ExportCsvController do
     end
   end
 
-
   context "while logged in as an admin" do
     before { @admin = log_in(:admin) }
 
diff --git a/spec/controllers/extra_locales_controller_spec.rb b/spec/controllers/extra_locales_controller_spec.rb
index b848f95399..38d128965c 100644
--- a/spec/controllers/extra_locales_controller_spec.rb
+++ b/spec/controllers/extra_locales_controller_spec.rb
@@ -20,9 +20,8 @@ describe ExtraLocalesController do
       I18n.reload!
 
       JsLocaleHelper.expects(:plugin_translations)
-                    .with(I18n.locale.to_s)
-                    .returns({
-                      "admin_js" => {
+        .with(I18n.locale.to_s)
+        .returns("admin_js" => {
                         "admin" => {
                           "site_settings" => {
                             "categories" => {
@@ -30,8 +29,7 @@ describe ExtraLocalesController do
                             }
                           }
                         }
-                      }
-                    }).at_least_once
+                      }).at_least_once
 
       get :show, bundle: "admin"
 
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index aeaa1c61f3..7488dff66d 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -55,7 +55,7 @@ describe GroupsController do
 
     it "ensures that membership can be paginated" do
       5.times { group.add(Fabricate(:user)) }
-      usernames = group.users.map{ |m| m.username }.sort
+      usernames = group.users.map { |m| m.username }.sort
 
       xhr :get, :members, group_id: group.name, limit: 3
       expect(response).to be_success
diff --git a/spec/controllers/inline_onebox_controller_spec.rb b/spec/controllers/inline_onebox_controller_spec.rb
new file mode 100644
index 0000000000..d9a18a4ab8
--- /dev/null
+++ b/spec/controllers/inline_onebox_controller_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe InlineOneboxController do
+
+  it "requires the user to be logged in" do
+    expect { xhr :get, :show, urls: [] }.to raise_error(Discourse::NotLoggedIn)
+  end
+
+  context "logged in" do
+    let!(:user) { log_in(:user) }
+
+    it "returns empty JSON for empty input" do
+      xhr :get, :show, urls: []
+      expect(response).to be_success
+      json = JSON.parse(response.body)
+      expect(json['inline-oneboxes']).to eq([])
+    end
+
+    context "topic link" do
+      let(:topic) { Fabricate(:topic) }
+
+      it "returns information for a valid link" do
+        xhr :get, :show, urls: [ topic.url ]
+        expect(response).to be_success
+        json = JSON.parse(response.body)
+        onebox = json['inline-oneboxes'][0]
+
+        expect(onebox).to be_present
+        expect(onebox['url']).to eq(topic.url)
+        expect(onebox['title']).to eq(topic.title)
+      end
+    end
+
+  end
+
+end
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 786eec7969..f17f86bb8c 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -30,7 +30,6 @@ describe InvitesController do
       let!(:invite) { Fabricate(:invite, invited_by: user) }
       let(:another_invite) { Fabricate(:invite, email: 'anotheremail@address.com') }
 
-
       it 'raises an error when the email is missing' do
         expect { delete :destroy }.to raise_error(ActionController::ParameterMissing)
       end
@@ -52,11 +51,11 @@ describe InvitesController do
 
   end
 
-  context '.create' do
+  context '#create' do
     it 'requires you to be logged in' do
-      expect {
+      expect do
         post :create, email: 'jake@adventuretime.ooo'
-      }.to raise_error(Discourse::NotLoggedIn)
+      end.to raise_error(Discourse::NotLoggedIn)
     end
 
     context 'while logged in' do
@@ -86,6 +85,18 @@ describe InvitesController do
         expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
       end
 
+      it 'allows group owners to invite to groups' do
+        group = Fabricate(:group)
+        user = log_in
+        user.update!(trust_level: TrustLevel[2])
+        group.add_owner(user)
+
+        post :create, email: email, group_names: group.name
+
+        expect(response).to be_success
+        expect(Invite.find_by(email: email).invited_groups.count).to eq(1)
+      end
+
       it "allows admin to send multiple invites to same email" do
         user = log_in(:admin)
         invite = Invite.invite_by_email("invite@example.com", user)
@@ -347,7 +358,7 @@ describe InvitesController do
     context 'while logged in' do
       let(:csv_file) { File.new("#{Rails.root}/spec/fixtures/csv/discourse.csv") }
       let(:file) do
-        ActionDispatch::Http::UploadedFile.new({ filename: 'discourse.csv', tempfile: csv_file })
+        ActionDispatch::Http::UploadedFile.new(filename: 'discourse.csv', tempfile: csv_file)
       end
       let(:filename) { 'discourse.csv' }
 
diff --git a/spec/controllers/list_controller_spec.rb b/spec/controllers/list_controller_spec.rb
index ad390120d4..2117193f4b 100644
--- a/spec/controllers/list_controller_spec.rb
+++ b/spec/controllers/list_controller_spec.rb
@@ -41,7 +41,6 @@ describe ListController do
       expect(parsed["topic_list"]["topics"].length).to eq(1)
     end
 
-
     it "doesn't throw an error with a negative page" do
       xhr :get, :top, page: -1024
       expect(response).to be_success
diff --git a/spec/controllers/onebox_controller_spec.rb b/spec/controllers/onebox_controller_spec.rb
index adec21d4f8..dcb9354ee8 100644
--- a/spec/controllers/onebox_controller_spec.rb
+++ b/spec/controllers/onebox_controller_spec.rb
@@ -49,7 +49,7 @@ describe OneboxController do
 
     describe "found onebox" do
 
-      let(:body) { "this is the onebox body"}
+      let(:body) { "this is the onebox body" }
 
       before do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(body)
diff --git a/spec/controllers/post_actions_controller_spec.rb b/spec/controllers/post_actions_controller_spec.rb
index 141e99ca9f..01259e72f9 100644
--- a/spec/controllers/post_actions_controller_spec.rb
+++ b/spec/controllers/post_actions_controller_spec.rb
@@ -53,28 +53,28 @@ describe PostActionsController do
 
       it "passes a list of taken actions through" do
         PostAction.create(post_id: @post.id, user_id: @user.id, post_action_type_id: PostActionType.types[:inappropriate])
-        Guardian.any_instance.expects(:post_can_act?).with(@post, :off_topic, has_entry({:taken_actions => has_key(PostActionType.types[:inappropriate])}))
+        Guardian.any_instance.expects(:post_can_act?).with(@post, :off_topic, has_entry(taken_actions: has_key(PostActionType.types[:inappropriate])))
         xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:off_topic]
       end
 
       it 'passes the message through' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here'})
+        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], message: 'action message goes here')
         xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here'
       end
 
       it 'passes the message through as warning' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here', is_warning: true})
+        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], message: 'action message goes here', is_warning: true)
         xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here', is_warning: true
       end
 
       it "doesn't create message as a warning if the user isn't staff" do
         Guardian.any_instance.stubs(:is_staff?).returns(false)
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {message: 'action message goes here'})
+        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], message: 'action message goes here')
         xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], message: 'action message goes here', is_warning: true
       end
 
       it 'passes take_action through' do
-        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], {take_action: true})
+        PostAction.expects(:act).once.with(@user, @post, PostActionType.types[:like], take_action: true)
         xhr :post, :create, id: @post.id, post_action_type_id: PostActionType.types[:like], take_action: 'true'
       end
 
@@ -109,7 +109,7 @@ describe PostActionsController do
       end
 
       context 'with a post_action record ' do
-        let!(:post_action) { PostAction.create(user_id: user.id, post_id: post.id, post_action_type_id: 1)}
+        let!(:post_action) { PostAction.create(user_id: user.id, post_id: post.id, post_action_type_id: 1) }
 
         it 'returns success' do
           xhr :delete, :destroy, id: post.id, post_action_type_id: 1
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index d2f819a044..c5ffb51252 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -173,13 +173,13 @@ describe PostsController do
   describe 'show' do
     include_examples 'finding and showing post' do
       let(:action) { :show }
-      let(:params) { {id: post.id} }
+      let(:params) { { id: post.id } }
     end
 
     it 'gets all the expected fields' do
       # non fabricated test
       new_post = create_post
-      xhr :get, :show, {id: new_post.id}
+      xhr :get, :show, id: new_post.id
       parsed = JSON.parse(response.body)
       expect(parsed["topic_slug"]).to eq(new_post.topic.slug)
       expect(parsed["moderator"]).to eq(false)
@@ -191,14 +191,14 @@ describe PostsController do
   describe 'by_number' do
     include_examples 'finding and showing post' do
       let(:action) { :by_number }
-      let(:params) { {topic_id: post.topic_id, post_number: post.post_number} }
+      let(:params) { { topic_id: post.topic_id, post_number: post.post_number } }
     end
   end
 
   describe 'reply_history' do
     include_examples 'finding and showing post' do
       let(:action) { :reply_history }
-      let(:params) { {id: post.id} }
+      let(:params) { { id: post.id } }
     end
 
     it 'asks post for reply history' do
@@ -210,7 +210,7 @@ describe PostsController do
   describe 'replies' do
     include_examples 'finding and showing post' do
       let(:action) { :replies }
-      let(:params) { {post_id: post.id} }
+      let(:params) { { post_id: post.id } }
     end
 
     it 'asks post for replies' do
@@ -340,7 +340,7 @@ describe PostsController do
       {
         id: post.id,
         post: { raw: 'edited body', edit_reason: 'typo' },
-        image_sizes: { 'http://image.com/image.jpg' => {'width' => 123, 'height' => 456} },
+        image_sizes: { 'http://image.com/image.jpg' => { 'width' => 123, 'height' => 456 } },
       }
     end
     let(:moderator) { Fabricate(:moderator) }
@@ -388,7 +388,7 @@ describe PostsController do
 
       it "extracts links from the new body" do
         param = update_params
-        param[:post][:raw] =  'I just visited this https://google.com so many cool links'
+        param[:post][:raw] = 'I just visited this https://google.com so many cool links'
 
         xhr :put, :update, param
         expect(response).to be_success
@@ -439,7 +439,7 @@ describe PostsController do
       it 'creates a bookmark' do
         xhr :put, :bookmark, post_id: post.id, bookmarked: 'true'
 
-        post_action = PostAction.find_by(user:user, post: post)
+        post_action = PostAction.find_by(user: user, post: post)
 
         expect(post_action.post_action_type_id).to eq(PostActionType.types[:bookmark])
       end
@@ -498,8 +498,8 @@ describe PostsController do
     include_examples "action requires login", :put, :wiki, post_id: 2
 
     describe "when logged in" do
-      let(:user) {log_in}
-      let(:post) {Fabricate(:post, user: user)}
+      let(:user) { log_in }
+      let(:post) { Fabricate(:post, user: user) }
 
       it "raises an error if the user doesn't have permission to wiki the post" do
         Guardian.any_instance.expects(:can_wiki?).with(post).returns(false)
@@ -554,8 +554,8 @@ describe PostsController do
     include_examples "action requires login", :put, :post_type, post_id: 2
 
     describe "when logged in" do
-      let(:user) {log_in}
-      let(:post) {Fabricate(:post, user: user)}
+      let(:user) { log_in }
+      let(:post) { Fabricate(:post, user: user) }
 
       it "raises an error if the user doesn't have permission to change the post type" do
         Guardian.any_instance.expects(:can_change_post_type?).returns(false)
@@ -583,8 +583,8 @@ describe PostsController do
     include_examples "action requires login", :put, :rebake, post_id: 2
 
     describe "when logged in" do
-      let(:user) {log_in}
-      let(:post) {Fabricate(:post, user: user)}
+      let(:user) { log_in }
+      let(:post) { Fabricate(:post, user: user) }
 
       it "raises an error if the user doesn't have permission to rebake the post" do
         Guardian.any_instance.expects(:can_rebake?).returns(false)
@@ -622,11 +622,11 @@ describe PostsController do
         user = Fabricate(:user)
         master_key = ApiKey.create_master_key.key
 
-        xhr :post, :create, {api_username: user.username, api_key: master_key, raw: raw, title: title, wpid: 1}
+        xhr :post, :create, api_username: user.username, api_key: master_key, raw: raw, title: title, wpid: 1
         expect(response).to be_success
         original = response.body
 
-        xhr :post, :create, {api_username: user.username_lower, api_key: master_key, raw: raw, title: title, wpid: 2}
+        xhr :post, :create, api_username: user.username_lower, api_key: master_key, raw: raw, title: title, wpid: 2
         expect(response).to be_success
 
         expect(response.body).to eq(original)
@@ -646,7 +646,7 @@ describe PostsController do
         end
 
         it 'queues the post if min_first_post_typing_time is not met' do
-          xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'}
+          xhr :post, :create, raw: 'this is the test content', title: 'this is the test title for the topic'
 
           expect(response).to be_success
           parsed = ::JSON.parse(response.body)
@@ -668,11 +668,9 @@ describe PostsController do
         it "doesn't enqueue replies when the topic is closed" do
           topic = Fabricate(:closed_topic)
 
-          xhr :post, :create, {
-            raw: 'this is the test content',
-            title: 'this is the test title for the topic',
-            topic_id: topic.id
-          }
+          xhr :post, :create,             raw: 'this is the test content',
+                                          title: 'this is the test title for the topic',
+                                          topic_id: topic.id
 
           expect(response).not_to be_success
           parsed = ::JSON.parse(response.body)
@@ -681,10 +679,8 @@ describe PostsController do
 
         it "doesn't enqueue replies when the post is too long" do
           SiteSetting.max_post_length = 10
-          xhr :post, :create, {
-            raw: 'this is the test content',
-            title: 'this is the test title for the topic',
-          }
+          xhr :post, :create,             raw: 'this is the test content',
+                                          title: 'this is the test title for the topic'
 
           expect(response).not_to be_success
           parsed = ::JSON.parse(response.body)
@@ -695,7 +691,7 @@ describe PostsController do
       it 'blocks correctly based on auto_block_first_post_regex' do
         SiteSetting.auto_block_first_post_regex = "I love candy|i eat s[1-5]"
 
-        xhr :post, :create, {raw: 'this is the test content', title: 'when I eat s3 sometimes when not looking'}
+        xhr :post, :create, raw: 'this is the test content', title: 'when I eat s3 sometimes when not looking'
 
         expect(response).to be_success
         parsed = ::JSON.parse(response.body)
@@ -707,7 +703,7 @@ describe PostsController do
       end
 
       it 'creates the post' do
-        xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'}
+        xhr :post, :create, raw: 'this is the test content', title: 'this is the test title for the topic'
 
         expect(response).to be_success
         parsed = ::JSON.parse(response.body)
@@ -723,24 +719,20 @@ describe PostsController do
         user1 = Fabricate(:user)
         group.add(user1)
 
-        xhr :post, :create, {
-          raw: 'I can haz a test',
-          title: 'I loves my test',
-          target_usernames: group.name,
-          archetype: Archetype.private_message
-        }
+        xhr :post, :create,           raw: 'I can haz a test',
+                                      title: 'I loves my test',
+                                      target_usernames: group.name,
+                                      archetype: Archetype.private_message
 
         expect(response).not_to be_success
 
         # allow pm to this group
         group.update_columns(alias_level: Group::ALIAS_LEVELS[:everyone])
 
-        xhr :post, :create, {
-          raw: 'I can haz a test',
-          title: 'I loves my test',
-          target_usernames: group.name,
-          archetype: Archetype.private_message
-        }
+        xhr :post, :create,           raw: 'I can haz a test',
+                                      title: 'I loves my test',
+                                      target_usernames: group.name,
+                                      archetype: Archetype.private_message
 
         expect(response).to be_success
 
@@ -752,9 +744,9 @@ describe PostsController do
       end
 
       it "returns the nested post with a param" do
-        xhr :post, :create, {raw: 'this is the test content',
-                             title: 'this is the test title for the topic',
-                             nested_post: true}
+        xhr :post, :create, raw: 'this is the test content',
+                            title: 'this is the test title for the topic',
+                            nested_post: true
 
         expect(response).to be_success
         parsed = ::JSON.parse(response.body)
@@ -766,16 +758,16 @@ describe PostsController do
         raw = "this is a test post 123 #{SecureRandom.hash}"
         title = "this is a title #{SecureRandom.hash}"
 
-        xhr :post, :create, {raw: raw, title: title, wpid: 1}
+        xhr :post, :create, raw: raw, title: title, wpid: 1
         expect(response).to be_success
 
-        xhr :post, :create, {raw: raw, title: title, wpid: 2}
+        xhr :post, :create, raw: raw, title: title, wpid: 2
         expect(response).not_to be_success
       end
 
       context "errors" do
 
-        let(:post_with_errors) { Fabricate.build(:post, user: user)}
+        let(:post_with_errors) { Fabricate.build(:post, user: user) }
 
         before do
           post_with_errors.errors.add(:base, I18n.t(:spamming_host))
@@ -784,7 +776,7 @@ describe PostsController do
         end
 
         it "does not succeed" do
-          xhr :post, :create, {raw: 'test'}
+          xhr :post, :create, raw: 'test'
           User.any_instance.expects(:flag_linked_posts_as_spam).never
           expect(response).not_to be_success
         end
@@ -792,12 +784,11 @@ describe PostsController do
         it "it triggers flag_linked_posts_as_spam when the post creator returns spam" do
           PostCreator.any_instance.expects(:spam?).returns(true)
           User.any_instance.expects(:flag_linked_posts_as_spam)
-          xhr :post, :create, {raw: 'test'}
+          xhr :post, :create, raw: 'test'
         end
 
       end
 
-
       context "parameters" do
 
         before do
@@ -807,65 +798,65 @@ describe PostsController do
         end
 
         it "passes raw through" do
-          xhr :post, :create, {raw: 'hello'}
+          xhr :post, :create, raw: 'hello'
           expect(assigns(:manager_params)['raw']).to eq('hello')
         end
 
         it "passes title through" do
-          xhr :post, :create, {raw: 'hello', title: 'new topic title'}
+          xhr :post, :create, raw: 'hello', title: 'new topic title'
           expect(assigns(:manager_params)['title']).to eq('new topic title')
         end
 
         it "passes topic_id through" do
-          xhr :post, :create, {raw: 'hello', topic_id: 1234}
+          xhr :post, :create, raw: 'hello', topic_id: 1234
           expect(assigns(:manager_params)['topic_id']).to eq('1234')
         end
 
         it "passes archetype through" do
-          xhr :post, :create, {raw: 'hello', archetype: 'private_message'}
+          xhr :post, :create, raw: 'hello', archetype: 'private_message'
           expect(assigns(:manager_params)['archetype']).to eq('private_message')
         end
 
         it "passes category through" do
-          xhr :post, :create, {raw: 'hello', category: 1}
+          xhr :post, :create, raw: 'hello', category: 1
           expect(assigns(:manager_params)['category']).to eq('1')
         end
 
         it "passes target_usernames through" do
-          xhr :post, :create, {raw: 'hello', target_usernames: 'evil,trout'}
+          xhr :post, :create, raw: 'hello', target_usernames: 'evil,trout'
           expect(assigns(:manager_params)['target_usernames']).to eq('evil,trout')
         end
 
         it "passes reply_to_post_number through" do
-          xhr :post, :create, {raw: 'hello', reply_to_post_number: 6789, topic_id: 1234}
+          xhr :post, :create, raw: 'hello', reply_to_post_number: 6789, topic_id: 1234
           expect(assigns(:manager_params)['reply_to_post_number']).to eq('6789')
         end
 
         it "passes image_sizes through" do
-          xhr :post, :create, {raw: 'hello', image_sizes: {width: '100', height: '200'}}
+          xhr :post, :create, raw: 'hello', image_sizes: { width: '100', height: '200' }
           expect(assigns(:manager_params)['image_sizes']['width']).to eq('100')
           expect(assigns(:manager_params)['image_sizes']['height']).to eq('200')
         end
 
         it "passes meta_data through" do
-          xhr :post, :create, {raw: 'hello', meta_data: {xyz: 'abc'}}
+          xhr :post, :create, raw: 'hello', meta_data: { xyz: 'abc' }
           expect(assigns(:manager_params)['meta_data']['xyz']).to eq('abc')
         end
 
         context "is_warning" do
           it "doesn't pass `is_warning` through if you're not staff" do
-            xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'true'}
+            xhr :post, :create, raw: 'hello', archetype: 'private_message', is_warning: 'true'
             expect(assigns(:manager_params)['is_warning']).to eq(false)
           end
 
           it "passes `is_warning` through if you're staff" do
             log_in(:moderator)
-            xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'true'}
+            xhr :post, :create, raw: 'hello', archetype: 'private_message', is_warning: 'true'
             expect(assigns(:manager_params)['is_warning']).to eq(true)
           end
 
           it "passes `is_warning` as false through if you're staff" do
-            xhr :post, :create, {raw: 'hello', archetype: 'private_message', is_warning: 'false'}
+            xhr :post, :create, raw: 'hello', archetype: 'private_message', is_warning: 'false'
             expect(assigns(:manager_params)['is_warning']).to eq(false)
           end
 
@@ -968,9 +959,9 @@ describe PostsController do
     include_examples 'action requires login', :put, :revert, post_id: 123, revision: 2
 
     let(:post) { Fabricate(:post, user: logged_in_as, raw: "Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex") }
-    let(:post_revision) { Fabricate(:post_revision, post: post, modifications: {"raw" => ["this is original post body.", "this is edited post body."]}) }
-    let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: {"edit_reason" => ["edit reason #1", "edit reason #2"]}) }
-    let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: {"raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."]}) }
+    let(:post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["this is original post body.", "this is edited post body."] }) }
+    let(:blank_post_revision) { Fabricate(:post_revision, post: post, modifications: { "edit_reason" => ["edit reason #1", "edit reason #2"] }) }
+    let(:same_post_revision) { Fabricate(:post_revision, post: post, modifications: { "raw" => ["Lorem ipsum dolor sit amet, cu nam libris tractatos, ancillae senserit ius ex", "this is edited post body."] }) }
 
     let(:revert_params) do
       {
diff --git a/spec/controllers/queued_posts_controller_spec.rb b/spec/controllers/queued_posts_controller_spec.rb
index f6c4b4a62c..ed4782ebda 100644
--- a/spec/controllers/queued_posts_controller_spec.rb
+++ b/spec/controllers/queued_posts_controller_spec.rb
@@ -27,7 +27,6 @@ describe QueuedPostsController do
     end
   end
 
-
   context 'update' do
     let!(:user) { log_in(:moderator) }
     let(:qp) { Fabricate(:queued_post) }
@@ -56,4 +55,3 @@ describe QueuedPostsController do
 
   end
 end
-
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 7e967f0b7d..4aa3eddb49 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -3,7 +3,6 @@ require 'rails_helper'
 describe SearchController do
 
   context "integration" do
-
     before do
       SearchIndexer.enable
     end
@@ -18,90 +17,211 @@ describe SearchController do
       expect(data['posts'][0]['blurb']).to eq('this is my really awesome post')
       expect(data['topics'][0]['id']).to eq(my_post.topic_id)
     end
-  end
 
+    it 'performs the query with a type filter' do
+      user = Fabricate(:user)
+      my_post = Fabricate(:post, raw: "#{user.username} is a cool person")
+      xhr :get, :query, term: user.username, type_filter: 'topic'
 
-  let(:search_context) { {type: 'user', id: 'eviltrout'} }
+      expect(response).to be_success
+      data = JSON.parse(response.body)
 
-  context "basics" do
-    let(:guardian) { Guardian.new }
-    let(:search) { mock() }
+      expect(data['posts'][0]['id']).to eq(my_post.id)
+      expect(data['users']).to be_blank
 
-    before do
-      Guardian.stubs(:new).returns(guardian)
+      xhr :get, :query, term: user.username, type_filter: 'user'
+      expect(response).to be_success
+      data = JSON.parse(response.body)
+
+      expect(data['posts']).to be_blank
+      expect(data['users'][0]['id']).to eq(user.id)
     end
 
-    it 'performs the query' do
-      Search.expects(:new).with('test', guardian: guardian).returns(search)
-      search.expects(:execute)
+    context 'searching by topic id' do
+      it 'should not be restricted by minimum search term length' do
+        SiteSetting.min_search_term_length = 20000
 
-      xhr :get, :query, term: 'test'
-    end
+        post = Fabricate(:post)
 
-    it 'performs the query with a filter' do
-      Search.expects(:new).with('test', guardian: guardian, type_filter: 'topic').returns(search)
-      search.expects(:execute)
+        xhr(
+          :get,
+          :query,
+          term: post.topic_id,
+          type_filter: 'topic',
+          search_for_id: true
+        )
 
-      xhr :get, :query, term: 'test', type_filter: 'topic'
-    end
+        expect(response).to be_success
+        data = JSON.parse(response.body)
 
-    it "performs the query and returns results including blurbs" do
-      Search.expects(:new).with('test', guardian: guardian, include_blurbs: true).returns(search)
-      search.expects(:execute)
+        expect(data['topics'][0]['id']).to eq(post.topic_id)
+      end
 
-      xhr :get, :query, term: 'test', include_blurbs: 'true'
-    end
+      it "should return the right result" do
+        user = Fabricate(:user)
+        my_post = Fabricate(:post, raw: "#{user.username} is a cool person")
 
-    it 'performs the query with a filter and passes through search_for_id' do
-      Search.expects(:new).with('test', guardian: guardian, search_for_id: true, type_filter: 'topic').returns(search)
-      search.expects(:execute)
+        xhr(
+          :get,
+          :query,
+          term: my_post.topic_id,
+          type_filter: 'topic',
+          search_for_id: true
+        )
 
-      xhr :get, :query, term: 'test', type_filter: 'topic', search_for_id: true
+        expect(response).to be_success
+        data = JSON.parse(response.body)
+
+        expect(data['topics'][0]['id']).to eq(my_post.topic_id)
+      end
     end
   end
 
+  context "#query" do
+    it "logs the search term" do
+      SiteSetting.log_search_queries = true
+      xhr :get, :query, term: 'wookie'
+
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'wookie')).to be_present
+
+      json = JSON.parse(response.body)
+      search_log_id = json['grouped_search_result']['search_log_id']
+      expect(search_log_id).to be_present
+
+      log = SearchLog.where(id: search_log_id).first
+      expect(log).to be_present
+      expect(log.term).to eq('wookie')
+    end
+
+    it "doesn't log when disabled" do
+      SiteSetting.log_search_queries = false
+      xhr :get, :query, term: 'wookie'
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'wookie')).to be_blank
+    end
+  end
+
+  context "#show" do
+    it "logs the search term" do
+      SiteSetting.log_search_queries = true
+      xhr :get, :show, q: 'bantha'
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'bantha')).to be_present
+    end
+
+    it "doesn't log when disabled" do
+      SiteSetting.log_search_queries = false
+      xhr :get, :show, q: 'bantha'
+      expect(response).to be_success
+      expect(SearchLog.where(term: 'bantha')).to be_blank
+    end
+  end
 
   context "search context" do
-
     it "raises an error with an invalid context type" do
       expect {
-        xhr :get, :query, term: 'test', search_context: {type: 'security', id: 'hole'}
+        xhr :get, :query, term: 'test', search_context: { type: 'security', id: 'hole' }
       }.to raise_error(Discourse::InvalidParameters)
     end
 
     it "raises an error with a missing id" do
       expect {
-        xhr :get, :query, term: 'test', search_context: {type: 'user'}
+        xhr :get, :query, term: 'test', search_context: { type: 'user' }
       }.to raise_error(Discourse::InvalidParameters)
     end
 
     context "with a user" do
-
       let(:user) { Fabricate(:user) }
-
       it "raises an error if the user can't see the context" do
         Guardian.any_instance.expects(:can_see?).with(user).returns(false)
-        xhr :get, :query, term: 'test', search_context: {type: 'user', id: user.username}
+        xhr :get, :query, term: 'test', search_context: { type: 'user', id: user.username }
         expect(response).not_to be_success
       end
 
-
       it 'performs the query with a search context' do
-        guardian = Guardian.new
-        Guardian.stubs(:new).returns(guardian)
-
-        search = mock()
-        Search.expects(:new).with('test', guardian: guardian, search_context: user).returns(search)
-        search.expects(:execute)
-
-        xhr :get, :query, term: 'test', search_context: {type: 'user', id: user.username}
+        xhr :get, :query, term: 'test', search_context: { type: 'user', id: user.username }
+        expect(response).to be_success
       end
-
     end
 
-
   end
 
+  context "#click" do
+    it "doesn't work wthout the necessary parameters" do
+      expect(-> {
+        xhr :post, :click
+      }).to raise_error(ActionController::ParameterMissing)
+    end
 
+    it "doesn't record the click for a different user" do
+      log_in(:user)
 
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        user_id: -10,
+        ip_address: '127.0.0.1'
+      )
+
+      xhr :post, :click,         search_log_id: search_log_id,
+                                 search_result_id: 12345,
+                                 search_result_type: 'topic'
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to be_blank
+    end
+
+    it "records the click for a logged in user" do
+      user = log_in(:user)
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        user_id: user.id,
+        ip_address: '127.0.0.1'
+      )
+
+      xhr :post, :click,         search_log_id: search_log_id,
+                                 search_result_id: 12345,
+                                 search_result_type: 'topic'
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to eq(12345)
+    end
+
+    it "records the click for an anonymous user" do
+      request.stubs(:remote_ip).returns('192.168.0.1')
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      xhr :post, :click,         search_log_id: search_log_id,
+                                 search_result_id: 22222,
+                                 search_result_type: 'topic'
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to eq(22222)
+    end
+
+    it "doesn't record the click for a different IP" do
+      request.stubs(:remote_ip).returns('192.168.0.2')
+
+      _, search_log_id = SearchLog.log(
+        term: 'kitty',
+        search_type: :header,
+        ip_address: '192.168.0.1'
+      )
+
+      xhr :post, :click,         search_log_id: search_log_id,
+                                 search_result_id: 22222,
+                                 search_result_type: 'topic'
+      expect(response).to be_success
+
+      expect(SearchLog.find(search_log_id).clicked_topic_id).to be_blank
+    end
+  end
 end
diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb
index bcf81c32c7..8dc4464e77 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/controllers/session_controller_spec.rb
@@ -702,7 +702,6 @@ describe SessionController do
       expect(session[:current_user_id]).to be_blank
     end
 
-
     it 'removes the auth token cookie' do
       expect(cookies[:_t]).to be_blank
     end
@@ -716,7 +715,7 @@ describe SessionController do
 
     context 'for a non existant username' do
       it "doesn't generate a new token for a made up username" do
-        expect { xhr :post, :forgot_password, login: 'made_up'}.not_to change(EmailToken, :count)
+        expect { xhr :post, :forgot_password, login: 'made_up' }.not_to change(EmailToken, :count)
       end
 
       it "doesn't enqueue an email" do
@@ -735,7 +734,7 @@ describe SessionController do
       end
 
       it "generates a new token for a made up username" do
-        expect { xhr :post, :forgot_password, login: user.username}.to change(EmailToken, :count)
+        expect { xhr :post, :forgot_password, login: user.username }.to change(EmailToken, :count)
       end
 
       it "enqueues an email" do
@@ -748,7 +747,7 @@ describe SessionController do
       let(:system) { Discourse.system_user }
 
       it 'generates no token for system username' do
-        expect { xhr :post, :forgot_password, login: system.username}.not_to change(EmailToken, :count)
+        expect { xhr :post, :forgot_password, login: system.username }.not_to change(EmailToken, :count)
       end
 
       it 'enqueues no email' do
@@ -761,7 +760,7 @@ describe SessionController do
       let!(:staged) { Fabricate(:staged) }
 
       it 'generates no token for staged username' do
-        expect { xhr :post, :forgot_password, login: staged.username}.not_to change(EmailToken, :count)
+        expect { xhr :post, :forgot_password, login: staged.username }.not_to change(EmailToken, :count)
       end
 
       it 'enqueues no email' do
diff --git a/spec/controllers/site_controller_spec.rb b/spec/controllers/site_controller_spec.rb
index 1dccba86ad..e46f280a25 100644
--- a/spec/controllers/site_controller_spec.rb
+++ b/spec/controllers/site_controller_spec.rb
@@ -7,7 +7,7 @@ describe SiteController do
       SiteSetting.login_required = true
 
       SiteSetting.title = "Hammer Time"
-      SiteSetting.site_description= "A time for Hammer"
+      SiteSetting.site_description = "A time for Hammer"
       SiteSetting.logo_url = "/uploads/logo.png"
       SiteSetting.logo_small_url = "http://boom.com/uploads/logo_small.png"
       SiteSetting.apple_touch_icon_url = "https://boom.com/apple/logo.png"
diff --git a/spec/controllers/static_controller_spec.rb b/spec/controllers/static_controller_spec.rb
index 0f7bf73ca1..1e1fbbd963 100644
--- a/spec/controllers/static_controller_spec.rb
+++ b/spec/controllers/static_controller_spec.rb
@@ -5,7 +5,7 @@ describe StaticController do
   context 'brotli_asset' do
     it 'returns a non brotli encoded 404 if asset is missing' do
 
-        get :brotli_asset, path: 'missing.js'
+      get :brotli_asset, path: 'missing.js'
 
         expect(response.status).to eq(404)
         expect(response.headers['Content-Encoding']).not_to eq('br')
diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb
index 50bafc95fb..7380852467 100644
--- a/spec/controllers/steps_controller_spec.rb
+++ b/spec/controllers/steps_controller_spec.rb
@@ -42,4 +42,3 @@ describe StepsController do
   end
 
 end
-
diff --git a/spec/controllers/stylesheets_controller_spec.rb b/spec/controllers/stylesheets_controller_spec.rb
index 8f18d2b2d5..6ebf29f7f2 100644
--- a/spec/controllers/stylesheets_controller_spec.rb
+++ b/spec/controllers/stylesheets_controller_spec.rb
@@ -29,7 +29,7 @@ describe StylesheetsController do
   end
 
   it 'can lookup theme specific css' do
-    scheme = ColorScheme.create_from_base({name: "testing", colors: []})
+    scheme = ColorScheme.create_from_base(name: "testing", colors: [])
     theme = Theme.create!(name: "test", color_scheme_id: scheme.id, user_id: -1)
 
     builder = Stylesheet::Manager.new(:desktop, theme.key)
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index 909bb1126e..02690123c0 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -109,7 +109,7 @@ describe TagsController do
         xhr :get, :search, q: 'stu'
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}.sort).to eq(['stuff', 'stumped'])
+        expect(json["results"].map { |j| j["id"] }.sort).to eq(['stuff', 'stumped'])
       end
 
       it "can say if given tag is not allowed" do
@@ -118,7 +118,7 @@ describe TagsController do
         xhr :get, :search, q: 'nope', categoryId: category.id
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}.sort).to eq([])
+        expect(json["results"].map { |j| j["id"] }.sort).to eq([])
         expect(json["forbidden"]).to be_present
       end
 
@@ -128,7 +128,7 @@ describe TagsController do
         xhr :get, :search, q: "cool"
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}).to eq(['cooltag'])
+        expect(json["results"].map { |j| j["id"] }).to eq(['cooltag'])
       end
 
       it "supports Chinese and Russian" do
@@ -138,12 +138,12 @@ describe TagsController do
         xhr :get, :search, q: '房'
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}).to eq(['房地产'])
+        expect(json["results"].map { |j| j["id"] }).to eq(['房地产'])
 
         xhr :get, :search, q: 'тема'
         expect(response).to be_success
         json = ::JSON.parse(response.body)
-        expect(json["results"].map{|j| j["id"]}).to eq(['тема-в-разработке'])
+        expect(json["results"].map { |j| j["id"] }).to eq(['тема-в-разработке'])
       end
     end
   end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 163dc86993..11a28ed94e 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -24,7 +24,7 @@ describe TopicsController do
     let!(:user) { log_in(:moderator) }
     let(:p1) { Fabricate(:post, user: user) }
     let(:topic) { p1.topic }
-    let!(:p2) { Fabricate(:post, topic: topic, user:user )}
+    let!(:p2) { Fabricate(:post, topic: topic, user: user) }
 
     it "returns the JSON in the format our wordpress plugin needs" do
       SiteSetting.external_system_avatars_enabled = false
@@ -60,7 +60,7 @@ describe TopicsController do
 
   context 'move_posts' do
     it 'needs you to be logged in' do
-      expect { xhr :post, :move_posts, topic_id: 111, title: 'blah', post_ids: [1,2,3] }.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :post, :move_posts, topic_id: 111, title: 'blah', post_ids: [1, 2, 3] }.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'moving to a new topic' do
@@ -74,7 +74,7 @@ describe TopicsController do
 
       it "raises an error when the user doesn't have permission to move the posts" do
         Guardian.any_instance.expects(:can_move_posts?).returns(false)
-        xhr :post, :move_posts, topic_id: topic.id, title: 'blah', post_ids: [1,2,3]
+        xhr :post, :move_posts, topic_id: topic.id, title: 'blah', post_ids: [1, 2, 3]
         expect(response).to be_forbidden
       end
 
@@ -146,7 +146,7 @@ describe TopicsController do
       let!(:user) { log_in(:moderator) }
       let!(:p1) { Fabricate(:post, user: user) }
       let!(:topic) { p1.topic }
-      let!(:p2) { Fabricate(:post, topic: topic, user: user, reply_to_post_number: p1.post_number ) }
+      let!(:p2) { Fabricate(:post, topic: topic, user: user, reply_to_post_number: p1.post_number) }
 
       context 'success' do
 
@@ -240,20 +240,19 @@ describe TopicsController do
         end
       end
 
-
     end
 
   end
 
   context 'change_post_owners' do
     it 'needs you to be logged in' do
-      expect { xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1,2,3] }.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1, 2, 3] }.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'forbidden to moderators' do
       let!(:moderator) { log_in(:moderator) }
       it 'correctly denies' do
-        xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1,2,3]
+        xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
         expect(response).to be_forbidden
       end
     end
@@ -262,7 +261,7 @@ describe TopicsController do
       let!(:trust_level_4) { log_in(:trust_level_4) }
 
       it 'correctly denies' do
-        xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1,2,3]
+        xhr :post, :change_post_owners, topic_id: 111, username: 'user_a', post_ids: [1, 2, 3]
         expect(response).to be_forbidden
       end
     end
@@ -275,7 +274,7 @@ describe TopicsController do
       let(:p2) { Fabricate(:post, topic_id: topic.id) }
 
       it "raises an error with a parameter missing" do
-        expect { xhr :post, :change_post_owners, topic_id: 111, post_ids: [1,2,3] }.to raise_error(ActionController::ParameterMissing)
+        expect { xhr :post, :change_post_owners, topic_id: 111, post_ids: [1, 2, 3] }.to raise_error(ActionController::ParameterMissing)
         expect { xhr :post, :change_post_owners, topic_id: 111, username: 'user_a' }.to raise_error(ActionController::ParameterMissing)
       end
 
@@ -301,7 +300,7 @@ describe TopicsController do
         t2.save
         p3.save
 
-        UserDestroyer.new(editor).destroy(deleted_user, { delete_posts: true, context: 'test', delete_as_spammer: true })
+        UserDestroyer.new(editor).destroy(deleted_user, delete_posts: true, context: 'test', delete_as_spammer: true)
 
         xhr :post, :change_post_owners, topic_id: t2.id, username: user_a.username_lower, post_ids: [p3.id]
         expect(response).to be_success
@@ -453,15 +452,14 @@ describe TopicsController do
 
   end
 
-
   describe 'mute/unmute' do
 
     it 'needs you to be logged in' do
-      expect { xhr :put, :mute, topic_id: 99}.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :put, :mute, topic_id: 99 }.to raise_error(Discourse::NotLoggedIn)
     end
 
     it 'needs you to be logged in' do
-      expect { xhr :put, :unmute, topic_id: 99}.to raise_error(Discourse::NotLoggedIn)
+      expect { xhr :put, :unmute, topic_id: 99 }.to raise_error(Discourse::NotLoggedIn)
     end
 
     describe 'when logged in' do
@@ -676,13 +674,13 @@ describe TopicsController do
 
       context 'anonymous' do
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 403,
-          :private_topic => 302,
-          :deleted_topic => 410,
-          :deleted_secure_topic => 403,
-          :deleted_private_topic => 302,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 302,
+          deleted_topic: 410,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 302,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -692,13 +690,13 @@ describe TopicsController do
           SiteSetting.login_required = true
         end
         expected = {
-          :normal_topic => 302,
-          :secure_topic => 302,
-          :private_topic => 302,
-          :deleted_topic => 302,
-          :deleted_secure_topic => 302,
-          :deleted_private_topic => 302,
-          :nonexist => 302
+          normal_topic: 302,
+          secure_topic: 302,
+          private_topic: 302,
+          deleted_topic: 302,
+          deleted_secure_topic: 302,
+          deleted_private_topic: 302,
+          nonexist: 302
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -709,13 +707,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 403,
-          :private_topic => 403,
-          :deleted_topic => 410,
-          :deleted_secure_topic => 403,
-          :deleted_private_topic => 403,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 410,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -726,13 +724,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 200,
-          :private_topic => 200,
-          :deleted_topic => 410,
-          :deleted_secure_topic => 410,
-          :deleted_private_topic => 410,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 200,
+          private_topic: 200,
+          deleted_topic: 410,
+          deleted_secure_topic: 410,
+          deleted_private_topic: 410,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -743,13 +741,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 403,
-          :private_topic => 403,
-          :deleted_topic => 200,
-          :deleted_secure_topic => 403,
-          :deleted_private_topic => 403,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 403,
+          private_topic: 403,
+          deleted_topic: 200,
+          deleted_secure_topic: 403,
+          deleted_private_topic: 403,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -760,13 +758,13 @@ describe TopicsController do
         end
 
         expected = {
-          :normal_topic => 200,
-          :secure_topic => 200,
-          :private_topic => 200,
-          :deleted_topic => 200,
-          :deleted_secure_topic => 200,
-          :deleted_private_topic => 200,
-          :nonexist => 404
+          normal_topic: 200,
+          secure_topic: 200,
+          private_topic: 200,
+          deleted_topic: 200,
+          deleted_secure_topic: 200,
+          deleted_private_topic: 200,
+          nonexist: 404
         }
         topics_controller_show_gen_perm_tests(expected, self)
       end
@@ -800,7 +798,7 @@ describe TopicsController do
 
     it 'records redirects' do
       @request.env['HTTP_REFERER'] = 'http://twitter.com'
-      get :show, { id: topic.id }
+      get :show, id: topic.id
 
       @request.env['HTTP_REFERER'] = nil
       get :show, topic_id: topic.id, slug: topic.slug
@@ -1101,14 +1099,14 @@ describe TopicsController do
         it 'should work as expected' do
           xhr :post, :invite, topic_id: @topic.id, user: 'jake@adventuretime.ooo'
           expect(response).to be_success
-          expect(::JSON.parse(response.body)).to eq({'success' => 'OK'})
+          expect(::JSON.parse(response.body)).to eq('success' => 'OK')
           expect(Invite.where(invited_by_id: admin.id).count).to eq(1)
         end
 
         it 'should fail on shoddy email' do
           xhr :post, :invite, topic_id: @topic.id, user: 'i_am_not_an_email'
           expect(response).not_to be_success
-          expect(::JSON.parse(response.body)).to eq({'failed' => 'FAILED'})
+          expect(::JSON.parse(response.body)).to eq('failed' => 'FAILED')
         end
 
       end
@@ -1180,24 +1178,24 @@ describe TopicsController do
 
     describe "when logged in" do
       let!(:user) { log_in }
-      let(:operation) { {type: 'change_category', category_id: '1'} }
-      let(:topic_ids) { [1,2,3] }
+      let(:operation) { { type: 'change_category', category_id: '1' } }
+      let(:topic_ids) { [1, 2, 3] }
 
       it "requires a list of topic_ids or filter" do
         expect { xhr :put, :bulk, operation: operation }.to raise_error(ActionController::ParameterMissing)
       end
 
       it "requires an operation param" do
-        expect { xhr :put, :bulk, topic_ids: topic_ids}.to raise_error(ActionController::ParameterMissing)
+        expect { xhr :put, :bulk, topic_ids: topic_ids }.to raise_error(ActionController::ParameterMissing)
       end
 
       it "requires a type field for the operation param" do
-        expect { xhr :put, :bulk, topic_ids: topic_ids, operation: {}}.to raise_error(ActionController::ParameterMissing)
+        expect { xhr :put, :bulk, topic_ids: topic_ids, operation: {} }.to raise_error(ActionController::ParameterMissing)
       end
 
       it "can find unread" do
         # mark all unread muted
-        xhr :put, :bulk, filter: 'unread', operation: {type: :change_notification_level, notification_level_id: 0}
+        xhr :put, :bulk, filter: 'unread', operation: { type: :change_notification_level, notification_level_id: 0 }
         expect(response.status).to eq(200)
       end
 
@@ -1237,7 +1235,6 @@ describe TopicsController do
     end
   end
 
-
   describe 'reset_new' do
     it 'needs you to be logged in' do
       expect { xhr :put, :reset_new }.to raise_error(Discourse::NotLoggedIn)
@@ -1301,11 +1298,10 @@ describe TopicsController do
 
       random_post = Fabricate(:post)
 
-
       xhr :get, :excerpts, topic_id: first_post.topic_id, post_ids: [first_post.id, second_post.id, random_post.id]
 
       json = JSON.parse(response.body)
-      json.sort!{|a,b| a["post_id"] <=> b["post_id"]}
+      json.sort! { |a, b| a["post_id"] <=> b["post_id"] }
 
       # no random post
       expect(json.length).to eq(2)
@@ -1317,7 +1313,6 @@ describe TopicsController do
 
       expect(json[1]["excerpt"]).to match(/second post/)
 
-
     end
 
   end
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb
index 63255e4bf2..1f2ff234bd 100644
--- a/spec/controllers/uploads_controller_spec.rb
+++ b/spec/controllers/uploads_controller_spec.rb
@@ -13,24 +13,18 @@ describe UploadsController do
       before { @user = log_in :user }
 
       let(:logo) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'logo.png',
-          tempfile: file_from_fixtures("logo.png")
-        })
+        ActionDispatch::Http::UploadedFile.new(filename: 'logo.png',
+                                               tempfile: file_from_fixtures("logo.png"))
       end
 
       let(:fake_jpg) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'fake.jpg',
-          tempfile: file_from_fixtures("fake.jpg")
-        })
+        ActionDispatch::Http::UploadedFile.new(filename: 'fake.jpg',
+                                               tempfile: file_from_fixtures("fake.jpg"))
       end
 
       let(:text_file) do
-        ActionDispatch::Http::UploadedFile.new({
-          filename: 'LICENSE.TXT',
-          tempfile: File.new("#{Rails.root}/LICENSE.txt")
-        })
+        ActionDispatch::Http::UploadedFile.new(filename: 'LICENSE.TXT',
+                                               tempfile: File.new("#{Rails.root}/LICENSE.txt"))
       end
 
       it 'expects a type' do
diff --git a/spec/controllers/user_api_keys_controller_spec.rb b/spec/controllers/user_api_keys_controller_spec.rb
index 18dccdc8c7..4f5a1cfa91 100644
--- a/spec/controllers/user_api_keys_controller_spec.rb
+++ b/spec/controllers/user_api_keys_controller_spec.rb
@@ -36,7 +36,7 @@ TXT
   let :args do
     {
       scopes: 'read',
-      client_id: "x"*32,
+      client_id: "x" * 32,
       auth_redirect: 'http://over.the/rainbow',
       application_name: 'foo',
       public_key: public_key,
@@ -206,7 +206,6 @@ TXT
       expect(api_key.scopes.sort).to eq(["push", "message_bus", "notifications", "session_info"].sort)
       expect(api_key.push_url).to eq("https://push.it/here")
 
-
       uri.query = ""
       expect(uri.to_s).to eq(args[:auth_redirect] + "?")
 
diff --git a/spec/controllers/user_avatars_controller_spec.rb b/spec/controllers/user_avatars_controller_spec.rb
index e558c1a8c2..4023fb0f94 100644
--- a/spec/controllers/user_avatars_controller_spec.rb
+++ b/spec/controllers/user_avatars_controller_spec.rb
@@ -29,10 +29,9 @@ describe UserAvatarsController do
 
       GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
 
-
       upload = Fabricate(:upload, url: "//test.s3.amazonaws.com/something")
       Fabricate(:optimized_image,
-                              sha1: SecureRandom.hex << "A"*8,
+                              sha1: SecureRandom.hex << "A" * 8,
                               upload: upload,
                               width: 98,
                               height: 98,
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 44aac166d1..1597f4b7e6 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -70,7 +70,7 @@ describe UsersController do
 
         it "skips tracking" do
           UserProfileView.expects(:add).never
-          xhr :get, :show, { username: user.username, skip_track_visit: true }
+          xhr :get, :show, username: user.username, skip_track_visit: true
         end
       end
 
@@ -723,7 +723,7 @@ describe UsersController do
       before do
         UsersController.any_instance.stubs(:honeypot_value).returns('abc')
       end
-      let(:create_params) { {name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong'} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, password_confirmation: 'wrong' } }
       include_examples 'honeypot fails'
     end
 
@@ -731,14 +731,14 @@ describe UsersController do
       before do
         UsersController.any_instance.stubs(:challenge_value).returns('abc')
       end
-      let(:create_params) { {name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc'} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "strongpassword", email: @user.email, challenge: 'abc' } }
       include_examples 'honeypot fails'
     end
 
     context "when 'invite only' setting is enabled" do
       before { SiteSetting.invite_only = true }
 
-      let(:create_params) {{
+      let(:create_params) { {
         name: @user.name,
         username: @user.username,
         password: 'strongpassword',
@@ -765,22 +765,22 @@ describe UsersController do
     end
 
     context 'when password is blank' do
-      let(:create_params) { {name: @user.name, username: @user.username, password: "", email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "", email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'when password is too long' do
-      let(:create_params) { {name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, password: "x" * (User.max_password_length + 1), email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'when password param is missing' do
-      let(:create_params) { {name: @user.name, username: @user.username, email: @user.email} }
+      let(:create_params) { { name: @user.name, username: @user.username, email: @user.email } }
       include_examples 'failed signup'
     end
 
     context 'with a reserved username' do
-      let(:create_params) { {name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20} }
+      let(:create_params) { { name: @user.name, username: 'Reserved', email: @user.email, password: "x" * 20 } }
       before { SiteSetting.reserved_usernames = 'a|reserved|b' }
       after { SiteSetting.reserved_usernames = nil }
       include_examples 'failed signup'
@@ -791,7 +791,7 @@ describe UsersController do
 
       let(:create_params) {
         { name: @user.name, username: @user.username,
-          password: "strongpassword", email: @user.email}
+          password: "strongpassword", email: @user.email }
       }
 
       include_examples 'failed signup'
@@ -803,7 +803,7 @@ describe UsersController do
       let!(:optional_field) { Fabricate(:user_field, required: false) }
 
       context "without a value for the fields" do
-        let(:create_params) { {name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email} }
+        let(:create_params) { { name: @user.name, password: 'watwatwat', username: @user.username, email: @user.email } }
         include_examples 'failed signup'
       end
 
@@ -822,7 +822,7 @@ describe UsersController do
         it "should succeed without the optional field" do
           xhr :post, :create, create_params
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).to be_present
           expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
@@ -834,7 +834,7 @@ describe UsersController do
           create_params[:user_fields][optional_field.id.to_s] = 'value3'
           xhr :post, :create, create_params.merge(create_params)
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).to be_present
           expect(inserted.custom_fields["user_field_#{user_field.id}"]).to eq('value1')
@@ -846,7 +846,7 @@ describe UsersController do
           create_params[:user_fields][optional_field.id.to_s] = ('x' * 3000)
           xhr :post, :create, create_params.merge(create_params)
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
 
           val = inserted.custom_fields["user_field_#{optional_field.id}"]
           expect(val.length).to eq(UserField.max_length)
@@ -868,7 +868,7 @@ describe UsersController do
         it "should succeed" do
           xhr :post, :create, create_params
           expect(response).to be_success
-          inserted = User.where(email: @user.email).first
+          inserted = User.find_by_email(@user.email)
           expect(inserted).to be_present
           expect(inserted.custom_fields).not_to be_present
           expect(inserted.custom_fields["user_field_#{user_field.id}"]).to be_blank
@@ -883,7 +883,7 @@ describe UsersController do
         xhr :post, :create, email: staged.email, username: "zogstrip", password: "P4ssw0rd$$"
         result = ::JSON.parse(response.body)
         expect(result["success"]).to eq(true)
-        expect(User.find_by(email: staged.email).staged).to eq(false)
+        expect(User.find_by_email(staged.email).staged).to eq(false)
       end
     end
 
@@ -936,11 +936,13 @@ describe UsersController do
         expect(user.reload.username).to eq(new_username)
       end
 
-      skip 'should fail if the user is old', 'ensure_can_edit_username! is not throwing' do
+      it 'should fail if the user is old' do
         # Older than the change period and >1 post
         user.created_at = Time.now - (SiteSetting.username_change_period + 1).days
-        user.stubs(:post_count).returns(200)
-        expect(Guardian.new(user).can_edit_username?(user)).to eq(false)
+        PostCreator.new(user,
+          title: 'This is a test topic',
+          raw: 'This is a test this is a test'
+        ).create
 
         xhr :put, :username, username: user.username, new_username: new_username
 
@@ -1254,7 +1256,7 @@ describe UsersController do
           put :update,
                 username: user.username,
                 name: 'Jim Tom',
-                custom_fields: {test: :it},
+                custom_fields: { test: :it },
                 muted_usernames: "#{user2.username},#{user3.username}"
 
           expect(response).to be_success
@@ -1263,7 +1265,7 @@ describe UsersController do
 
           expect(user.name).to eq 'Jim Tom'
           expect(user.custom_fields['test']).to eq 'it'
-          expect(user.muted_users.pluck(:username).sort).to eq [user2.username,user3.username].sort
+          expect(user.muted_users.pluck(:username).sort).to eq [user2.username, user3.username].sort
 
           theme = Theme.create(name: "test", user_selectable: true, user_id: -1)
 
@@ -1295,7 +1297,7 @@ describe UsersController do
         context "with user fields" do
           context "an editable field" do
             let!(:user_field) { Fabricate(:user_field) }
-            let!(:optional_field) { Fabricate(:user_field, required: false ) }
+            let!(:optional_field) { Fabricate(:user_field, required: false) }
 
             it "should update the user field" do
               put :update, username: user.username, name: 'Jim Tom', user_fields: { user_field.id.to_s => 'happy' }
@@ -1496,7 +1498,7 @@ describe UsersController do
           unconfirmed_email_user = Fabricate(:user, active: true)
           unconfirmed_email_user.email_tokens.create(email: unconfirmed_email_user.email)
           session[SessionController::ACTIVATE_USER_KEY] = unconfirmed_email_user.id
-          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
+          Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup, to_address: unconfirmed_email_user.email))
           xhr :post, :send_activation_email, username: unconfirmed_email_user.username
 
           expect(response.status).to eq(200)
@@ -1546,7 +1548,7 @@ describe UsersController do
 
       context 'without an existing email_token' do
         before do
-          user.email_tokens.each {|t| t.destroy}
+          user.email_tokens.each { |t| t.destroy }
           user.reload
         end
 
@@ -1554,7 +1556,7 @@ describe UsersController do
           expect {
             session[SessionController::ACTIVATE_USER_KEY] = user.id
             xhr :post, :send_activation_email, username: user.username
-          }.to change{ user.email_tokens(true).count }.by(1)
+          }.to change { user.email_tokens(true).count }.by(1)
         end
 
         it 'should send an email' do
@@ -1831,11 +1833,11 @@ describe UsersController do
   end
 
   describe '.topic_tracking_state' do
-    let(:user){Fabricate(:user)}
+    let(:user) { Fabricate(:user) }
 
     context 'anon' do
       it "raises an error on anon for topic_tracking_state" do
-        expect{
+        expect {
           xhr :get, :topic_tracking_state, username: user.username, format: :json
         }.to raise_error(Discourse::NotLoggedIn)
       end
@@ -1870,7 +1872,6 @@ describe UsersController do
     end
   end
 
-
   describe ".confirm_admin" do
     it "fails without a valid token" do
       expect {
@@ -1935,28 +1936,27 @@ describe UsersController do
 
   end
 
-
   describe '.update_activation_email' do
 
     context "with a session variable" do
 
       it "raises an error with an invalid session value" do
         session[SessionController::ACTIVATE_USER_KEY] = 1234
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error for an active user" do
         user = Fabricate(:walter_white)
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error when logged in" do
         moderator = log_in(:moderator)
         session[SessionController::ACTIVATE_USER_KEY] = moderator.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
@@ -1964,7 +1964,7 @@ describe UsersController do
         active_user = Fabricate(:user)
         user = Fabricate(:inactive_user)
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: active_user.email }
+        xhr :put, :update_activation_email, email: active_user.email
         expect(response).to_not be_success
       end
 
@@ -1973,7 +1973,7 @@ describe UsersController do
         token = user.email_tokens.first
 
         session[SessionController::ACTIVATE_USER_KEY] = user.id
-        xhr :put, :update_activation_email, { email: 'updatedemail@example.com' }
+        xhr :put, :update_activation_email, email: 'updatedemail@example.com'
 
         expect(response).to be_success
 
@@ -1988,51 +1988,42 @@ describe UsersController do
 
     context "with a username and password" do
       it "raises an error with an invalid username" do
-        xhr :put, :update_activation_email, {
-          username: 'eviltrout',
-          password: 'invalid-password',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: 'eviltrout',
+                                                      password: 'invalid-password',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error with an invalid password" do
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:inactive_user).username,
-          password: 'invalid-password',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:inactive_user).username,
+                                                      password: 'invalid-password',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error for an active user" do
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:walter_white).username,
-          password: 'letscook',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:walter_white).username,
+                                                      password: 'letscook',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error when logged in" do
         log_in(:moderator)
 
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:inactive_user).username,
-          password: 'qwerqwer123',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:inactive_user).username,
+                                                      password: 'qwerqwer123',
+                                                      email: 'updatedemail@example.com'
         expect(response).to_not be_success
       end
 
       it "raises an error when the new email is taken" do
         user = Fabricate(:user)
 
-        xhr :put, :update_activation_email, {
-          username: Fabricate(:inactive_user).username,
-          password: 'qwerqwer123',
-          email: user.email
-        }
+        xhr :put, :update_activation_email,           username: Fabricate(:inactive_user).username,
+                                                      password: 'qwerqwer123',
+                                                      email: user.email
+
         expect(response).to_not be_success
       end
 
@@ -2040,11 +2031,9 @@ describe UsersController do
         user = Fabricate(:inactive_user)
         token = user.email_tokens.first
 
-        xhr :put, :update_activation_email, {
-          username: user.username,
-          password: 'qwerqwer123',
-          email: 'updatedemail@example.com'
-        }
+        xhr :put, :update_activation_email,           username: user.username,
+                                                      password: 'qwerqwer123',
+                                                      email: 'updatedemail@example.com'
 
         expect(response).to be_success
 
diff --git a/spec/controllers/users_email_controller_spec.rb b/spec/controllers/users_email_controller_spec.rb
index c10aad9aa0..5afa3e319a 100644
--- a/spec/controllers/users_email_controller_spec.rb
+++ b/spec/controllers/users_email_controller_spec.rb
@@ -88,7 +88,7 @@ describe UsersEmailController do
       end
 
       context 'when new email is different case of existing email' do
-        let!(:other_user) { Fabricate(:user, email: 'case.insensitive@gmail.com')}
+        let!(:other_user) { Fabricate(:user, email: 'case.insensitive@gmail.com') }
 
         it 'raises an error' do
           xhr :put, :update, username: user.username, email: other_user.email.upcase
diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/controllers/webhooks_controller_spec.rb
index ff329bf839..955f4c0a26 100644
--- a/spec/controllers/webhooks_controller_spec.rb
+++ b/spec/controllers/webhooks_controller_spec.rb
@@ -61,12 +61,10 @@ describe WebhooksController do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post :mailjet, {
-        "event"       => "bounce",
-        "email"       => email,
-        "hard_bounce" => true,
-        "CustomID"    => message_id
-      }
+      post :mailjet,         "event" => "bounce",
+                             "email"       => email,
+                             "hard_bounce" => true,
+                             "CustomID"    => message_id
 
       expect(response).to be_success
 
diff --git a/spec/fabricators/badge_fabricator.rb b/spec/fabricators/badge_fabricator.rb
index d3a5f78d7f..e535919d3a 100644
--- a/spec/fabricators/badge_fabricator.rb
+++ b/spec/fabricators/badge_fabricator.rb
@@ -1,8 +1,8 @@
 Fabricator(:badge_type) do
-  name { sequence(:name) {|i| "Silver #{i}" } }
+  name { sequence(:name) { |i| "Silver #{i}" } }
 end
 
 Fabricator(:badge) do
-  name { sequence(:name) {|i| "Badge #{i}" } }
+  name { sequence(:name) { |i| "Badge #{i}" } }
   badge_type
 end
diff --git a/spec/fabricators/color_scheme_color_fabricator.rb b/spec/fabricators/color_scheme_color_fabricator.rb
index 6cac52df72..ae8ec72425 100644
--- a/spec/fabricators/color_scheme_color_fabricator.rb
+++ b/spec/fabricators/color_scheme_color_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:color_scheme_color) do
   color_scheme
-  name { sequence(:name) {|i| "color_#{i}" } }
+  name { sequence(:name) { |i| "color_#{i}" } }
   hex "333333"
 end
diff --git a/spec/fabricators/color_scheme_fabricator.rb b/spec/fabricators/color_scheme_fabricator.rb
index 111964527a..67ee8becda 100644
--- a/spec/fabricators/color_scheme_fabricator.rb
+++ b/spec/fabricators/color_scheme_fabricator.rb
@@ -1,4 +1,4 @@
 Fabricator(:color_scheme) do
-  name { sequence(:name) {|i| "Palette #{i}" } }
+  name { sequence(:name) { |i| "Palette #{i}" } }
   color_scheme_colors(count: 2) { |attrs, i| Fabricate.build(:color_scheme_color, color_scheme: nil) }
 end
diff --git a/spec/fabricators/group_fabricator.rb b/spec/fabricators/group_fabricator.rb
index d190d520e6..a4c80237c8 100644
--- a/spec/fabricators/group_fabricator.rb
+++ b/spec/fabricators/group_fabricator.rb
@@ -1,3 +1,8 @@
 Fabricator(:group) do
   name { sequence(:name) { |n| "my_group_#{n}" } }
 end
+
+Fabricator(:public_group, from: :group) do
+  public_admission true
+  public_exit true
+end
diff --git a/spec/fabricators/incoming_link_fabricator.rb b/spec/fabricators/incoming_link_fabricator.rb
index 82e5245ddb..704099a4fb 100644
--- a/spec/fabricators/incoming_link_fabricator.rb
+++ b/spec/fabricators/incoming_link_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:incoming_link) do
   user
   post
-  ip_address { sequence(:ip_address) { |n| "123.#{(n*3)%255}.#{(n*2)%255}.#{n%255}" } }
+  ip_address { sequence(:ip_address) { |n| "123.#{(n * 3) % 255}.#{(n * 2) % 255}.#{n % 255}" } }
 end
diff --git a/spec/fabricators/notification_fabricator.rb b/spec/fabricators/notification_fabricator.rb
index c6e2b7d44d..6c6993c0a9 100644
--- a/spec/fabricators/notification_fabricator.rb
+++ b/spec/fabricators/notification_fabricator.rb
@@ -2,17 +2,17 @@ Fabricator(:notification) do
   notification_type Notification.types[:mentioned]
   data '{"poison":"ivy","killer":"croc"}'
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
 end
 
 Fabricator(:quote_notification, from: :notification) do
   notification_type Notification.types[:quoted]
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
 end
 
 Fabricator(:private_message_notification, from: :notification) do
   notification_type Notification.types[:private_message]
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
 end
diff --git a/spec/fabricators/permalink_fabricator.rb b/spec/fabricators/permalink_fabricator.rb
index 8de32e478d..51a38ac902 100644
--- a/spec/fabricators/permalink_fabricator.rb
+++ b/spec/fabricators/permalink_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:permalink) do
-  url { sequence(:url) {|i| "my/#{i}/url" } }
+  url { sequence(:url) { |i| "my/#{i}/url" } }
 end
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index 4a28dac1c0..0854ba0db1 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -1,6 +1,6 @@
 Fabricator(:post) do
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
   raw "Hello world"
   post_type Post.types[:regular]
 end
@@ -17,13 +17,13 @@ Fabricator(:post_with_youtube, from: :post) do
 end
 
 Fabricator(:old_post, from: :post) do
-  topic {|attrs| Fabricate(:topic, user: attrs[:user], created_at: (DateTime.now - 100) ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user], created_at: (DateTime.now - 100)) }
   created_at (DateTime.now - 100)
 end
 
 Fabricator(:moderator_post, from: :post) do
   user
-  topic {|attrs| Fabricate(:topic, user: attrs[:user] ) }
+  topic { |attrs| Fabricate(:topic, user: attrs[:user]) }
   post_type Post.types[:moderator_action]
   raw "Hello world"
 end
@@ -121,7 +121,7 @@ end
 Fabricator(:private_message_post, from: :post) do
   user
   topic do |attrs|
-    Fabricate( :private_message_topic,
+    Fabricate(:private_message_topic,
       user: attrs[:user],
       created_at: attrs[:created_at],
       subtype: TopicSubtype.user_to_user,
diff --git a/spec/fabricators/queued_post_fabricator.rb b/spec/fabricators/queued_post_fabricator.rb
index e838ef0ada..acfea91792 100644
--- a/spec/fabricators/queued_post_fabricator.rb
+++ b/spec/fabricators/queued_post_fabricator.rb
@@ -12,7 +12,6 @@ Fabricator(:queued_post) do
       custom_fields: { hello: 'world' },
       cooking_options: { cat: 'hat' },
       cook_method: Post.cook_methods[:raw_html],
-      image_sizes: {"http://foo.bar/image.png" => {"width" => 0, "height" => 222}} }
+      image_sizes: { "http://foo.bar/image.png" => { "width" => 0, "height" => 222 } } }
   end
 end
-
diff --git a/spec/fabricators/screened_ip_address_fabricator.rb b/spec/fabricators/screened_ip_address_fabricator.rb
index a7dcb5ae4a..4a4cc36343 100644
--- a/spec/fabricators/screened_ip_address_fabricator.rb
+++ b/spec/fabricators/screened_ip_address_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:screened_ip_address) do
-  ip_address { sequence(:ip_address) { |n| "123.#{(n*3)%255}.#{(n*2)%255}.#{n%255}" } }
+  ip_address { sequence(:ip_address) { |n| "123.#{(n * 3) % 255}.#{(n * 2) % 255}.#{n % 255}" } }
 end
diff --git a/spec/fabricators/single_sign_on_record_fabricator.rb b/spec/fabricators/single_sign_on_record_fabricator.rb
index fcd4102a17..ef2cb0b764 100644
--- a/spec/fabricators/single_sign_on_record_fabricator.rb
+++ b/spec/fabricators/single_sign_on_record_fabricator.rb
@@ -5,5 +5,3 @@ Fabricator(:single_sign_on_record) do
   external_email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
   last_payload { sequence(:last_payload) { |i| "nonce=#{i}1870a940bbcbb46f06880ed338d58a07&name=" } }
 end
-
-
diff --git a/spec/fabricators/tag_fabricator.rb b/spec/fabricators/tag_fabricator.rb
index 5c61060c83..4c4d3d3eb4 100644
--- a/spec/fabricators/tag_fabricator.rb
+++ b/spec/fabricators/tag_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:tag) do
-  name { sequence(:name) { |i| "tag#{i+1}" } }
+  name { sequence(:name) { |i| "tag#{i + 1}" } }
 end
diff --git a/spec/fabricators/topic_embed_fabricator.rb b/spec/fabricators/topic_embed_fabricator.rb
index 407df3db9a..d457f1e209 100644
--- a/spec/fabricators/topic_embed_fabricator.rb
+++ b/spec/fabricators/topic_embed_fabricator.rb
@@ -1,4 +1,4 @@
 Fabricator(:topic_embed) do
   post
-  topic {|te| te[:post].topic }
+  topic { |te| te[:post].topic }
 end
diff --git a/spec/fabricators/topic_fabricator.rb b/spec/fabricators/topic_fabricator.rb
index e603a1244f..1fd06233cd 100644
--- a/spec/fabricators/topic_fabricator.rb
+++ b/spec/fabricators/topic_fabricator.rb
@@ -21,7 +21,7 @@ Fabricator(:private_message_topic, from: :topic) do
   category_id { nil }
   title { sequence(:title) { |i| "This is a private message #{i}" } }
   archetype "private_message"
-  topic_allowed_users{|t| [
+  topic_allowed_users { |t| [
     Fabricate.build(:topic_allowed_user, user: t[:user]),
     Fabricate.build(:topic_allowed_user, user: Fabricate(:coding_horror))
   ]}
diff --git a/spec/fabricators/upload_fabricator.rb b/spec/fabricators/upload_fabricator.rb
index a2afdf7af0..d9df6633ce 100644
--- a/spec/fabricators/upload_fabricator.rb
+++ b/spec/fabricators/upload_fabricator.rb
@@ -6,6 +6,7 @@ Fabricator(:upload) do
   width 100
   height 200
   url { sequence(:url) { |n| "/uploads/default/#{n}/1234567890123456.png" } }
+  extension "png"
 end
 
 Fabricator(:upload_s3, from: :upload) do
@@ -17,5 +18,5 @@ Fabricator(:attachment, from: :upload) do
   user
   original_filename "archive.zip"
   filesize 1234
-  url  "/uploads/default/42/66b3ed1503efc936.zip"
+  url "/uploads/default/42/66b3ed1503efc936.zip"
 end
diff --git a/spec/fabricators/user_email_fabricator.rb b/spec/fabricators/user_email_fabricator.rb
new file mode 100644
index 0000000000..3d0d0cc8b0
--- /dev/null
+++ b/spec/fabricators/user_email_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:user_email) do
+  email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
+  primary true
+end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 5385b4f97a..067f335ac8 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -7,7 +7,7 @@ Fabricator(:user) do
   email { sequence(:email) { |i| "bruce#{i}@wayne.com" } }
   password 'myawesomepassword'
   trust_level TrustLevel[1]
-  ip_address { sequence(:ip_address) { |i| "99.232.23.#{i%254}"} }
+  ip_address { sequence(:ip_address) { |i| "99.232.23.#{i % 254}" } }
   active true
 end
 
@@ -41,16 +41,16 @@ Fabricator(:inactive_user, from: :user) do
 end
 
 Fabricator(:moderator, from: :user) do
-  name { sequence(:name) {|i| "A#{i} Moderator"} }
-  username { sequence(:username) {|i| "moderator#{i}"} }
-  email { sequence(:email) {|i| "moderator#{i}@discourse.org"} }
+  name { sequence(:name) { |i| "A#{i} Moderator" } }
+  username { sequence(:username) { |i| "moderator#{i}" } }
+  email { sequence(:email) { |i| "moderator#{i}@discourse.org" } }
   moderator true
 end
 
 Fabricator(:admin, from: :user) do
   name 'Anne Admin'
-  username { sequence(:username) {|i| "anne#{i}"} }
-  email { sequence(:email) {|i| "anne#{i}@discourse.org"} }
+  username { sequence(:username) { |i| "anne#{i}" } }
+  email { sequence(:email) { |i| "anne#{i}@discourse.org" } }
   admin true
 end
 
diff --git a/spec/fabricators/user_field_fabricator.rb b/spec/fabricators/user_field_fabricator.rb
index 41b1dff07a..2e37eb3df4 100644
--- a/spec/fabricators/user_field_fabricator.rb
+++ b/spec/fabricators/user_field_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:user_field) do
-  name { sequence(:name) {|i| "field_#{i}" } }
+  name { sequence(:name) { |i| "field_#{i}" } }
   description "user field description"
   field_type 'text'
   editable true
diff --git a/spec/fabricators/watched_word_fabricator.rb b/spec/fabricators/watched_word_fabricator.rb
new file mode 100644
index 0000000000..28838e1a94
--- /dev/null
+++ b/spec/fabricators/watched_word_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:watched_word) do
+  word { sequence(:word) { |i| "word#{i}" } }
+  action { WatchedWord.actions[:block] }
+end
diff --git a/spec/fixtures/emails/staged_sender.eml b/spec/fixtures/emails/staged_sender.eml
index e7828e9146..efc9f533fd 100644
--- a/spec/fixtures/emails/staged_sender.eml
+++ b/spec/fixtures/emails/staged_sender.eml
@@ -1,5 +1,6 @@
 Return-Path: <staged@bar.com>
 From: Foo Bar <staged@bar.com>
+To: reply+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bar.com
 Date: Fri, 15 Jan 2016 00:12:43 +0100
 Message-ID: <39@foo.bar.mail>
 Mime-Version: 1.0
diff --git a/spec/fixtures/md/spec.txt b/spec/fixtures/md/spec.txt
new file mode 100644
index 0000000000..c66f93b77f
--- /dev/null
+++ b/spec/fixtures/md/spec.txt
@@ -0,0 +1,9360 @@
+---
+title: CommonMark Spec
+author: John MacFarlane
+version: 0.27
+date: '2016-11-18'
+license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
+...
+
+# Introduction
+
+## What is Markdown?
+
+Markdown is a plain text format for writing structured documents,
+based on conventions used for indicating formatting in email and
+usenet posts.  It was developed in 2004 by John Gruber, who wrote
+the first Markdown-to-HTML converter in Perl, and it soon became
+ubiquitous.  In the next decade, dozens of implementations were
+developed in many languages.  Some extended the original
+Markdown syntax with conventions for footnotes, tables, and
+other document elements.  Some allowed Markdown documents to be
+rendered in formats other than HTML.  Websites like Reddit,
+StackOverflow, and GitHub had millions of people using Markdown.
+And Markdown started to be used beyond the web, to author books,
+articles, slide shows, letters, and lecture notes.
+
+What distinguishes Markdown from many other lightweight markup
+syntaxes, which are often easier to write, is its readability.
+As Gruber writes:
+
+> The overriding design goal for Markdown's formatting syntax is
+> to make it as readable as possible. The idea is that a
+> Markdown-formatted document should be publishable as-is, as
+> plain text, without looking like it's been marked up with tags
+> or formatting instructions.
+> (<http://daringfireball.net/projects/markdown/>)
+
+The point can be illustrated by comparing a sample of
+[AsciiDoc](http://www.methods.co.nz/asciidoc/) with
+an equivalent sample of Markdown.  Here is a sample of
+AsciiDoc from the AsciiDoc manual:
+
+```
+1. List item one.
++
+List item one continued with a second paragraph followed by an
+Indented block.
++
+.................
+$ ls *.sh
+$ mv *.sh ~/tmp
+.................
++
+List item continued with a third paragraph.
+
+2. List item two continued with an open block.
++
+--
+This paragraph is part of the preceding list item.
+
+a. This list is nested and does not require explicit item
+continuation.
++
+This paragraph is part of the preceding list item.
+
+b. List item b.
+
+This paragraph belongs to item two of the outer list.
+--
+```
+
+And here is the equivalent in Markdown:
+```
+1.  List item one.
+
+    List item one continued with a second paragraph followed by an
+    Indented block.
+
+        $ ls *.sh
+        $ mv *.sh ~/tmp
+
+    List item continued with a third paragraph.
+
+2.  List item two continued with an open block.
+
+    This paragraph is part of the preceding list item.
+
+    1. This list is nested and does not require explicit item continuation.
+
+       This paragraph is part of the preceding list item.
+
+    2. List item b.
+
+    This paragraph belongs to item two of the outer list.
+```
+
+The AsciiDoc version is, arguably, easier to write. You don't need
+to worry about indentation.  But the Markdown version is much easier
+to read.  The nesting of list items is apparent to the eye in the
+source, not just in the processed document.
+
+## Why is a spec needed?
+
+John Gruber's [canonical description of Markdown's
+syntax](http://daringfireball.net/projects/markdown/syntax)
+does not specify the syntax unambiguously.  Here are some examples of
+questions it does not answer:
+
+1.  How much indentation is needed for a sublist?  The spec says that
+    continuation paragraphs need to be indented four spaces, but is
+    not fully explicit about sublists.  It is natural to think that
+    they, too, must be indented four spaces, but `Markdown.pl` does
+    not require that.  This is hardly a "corner case," and divergences
+    between implementations on this issue often lead to surprises for
+    users in real documents. (See [this comment by John
+    Gruber](http://article.gmane.org/gmane.text.markdown.general/1997).)
+
+2.  Is a blank line needed before a block quote or heading?
+    Most implementations do not require the blank line.  However,
+    this can lead to unexpected results in hard-wrapped text, and
+    also to ambiguities in parsing (note that some implementations
+    put the heading inside the blockquote, while others do not).
+    (John Gruber has also spoken [in favor of requiring the blank
+    lines](http://article.gmane.org/gmane.text.markdown.general/2146).)
+
+3.  Is a blank line needed before an indented code block?
+    (`Markdown.pl` requires it, but this is not mentioned in the
+    documentation, and some implementations do not require it.)
+
+    ``` markdown
+    paragraph
+        code?
+    ```
+
+4.  What is the exact rule for determining when list items get
+    wrapped in `<p>` tags?  Can a list be partially "loose" and partially
+    "tight"?  What should we do with a list like this?
+
+    ``` markdown
+    1. one
+
+    2. two
+    3. three
+    ```
+
+    Or this?
+
+    ``` markdown
+    1.  one
+        - a
+
+        - b
+    2.  two
+    ```
+
+    (There are some relevant comments by John Gruber
+    [here](http://article.gmane.org/gmane.text.markdown.general/2554).)
+
+5.  Can list markers be indented?  Can ordered list markers be right-aligned?
+
+    ``` markdown
+     8. item 1
+     9. item 2
+    10. item 2a
+    ```
+
+6.  Is this one list with a thematic break in its second item,
+    or two lists separated by a thematic break?
+
+    ``` markdown
+    * a
+    * * * * *
+    * b
+    ```
+
+7.  When list markers change from numbers to bullets, do we have
+    two lists or one?  (The Markdown syntax description suggests two,
+    but the perl scripts and many other implementations produce one.)
+
+    ``` markdown
+    1. fee
+    2. fie
+    -  foe
+    -  fum
+    ```
+
+8.  What are the precedence rules for the markers of inline structure?
+    For example, is the following a valid link, or does the code span
+    take precedence ?
+
+    ``` markdown
+    [a backtick (`)](/url) and [another backtick (`)](/url).
+    ```
+
+9.  What are the precedence rules for markers of emphasis and strong
+    emphasis?  For example, how should the following be parsed?
+
+    ``` markdown
+    *foo *bar* baz*
+    ```
+
+10. What are the precedence rules between block-level and inline-level
+    structure?  For example, how should the following be parsed?
+
+    ``` markdown
+    - `a long code span can contain a hyphen like this
+      - and it can screw things up`
+    ```
+
+11. Can list items include section headings?  (`Markdown.pl` does not
+    allow this, but does allow blockquotes to include headings.)
+
+    ``` markdown
+    - # Heading
+    ```
+
+12. Can list items be empty?
+
+    ``` markdown
+    * a
+    *
+    * b
+    ```
+
+13. Can link references be defined inside block quotes or list items?
+
+    ``` markdown
+    > Blockquote [foo].
+    >
+    > [foo]: /url
+    ```
+
+14. If there are multiple definitions for the same reference, which takes
+    precedence?
+
+    ``` markdown
+    [foo]: /url1
+    [foo]: /url2
+
+    [foo][]
+    ```
+
+In the absence of a spec, early implementers consulted `Markdown.pl`
+to resolve these ambiguities.  But `Markdown.pl` was quite buggy, and
+gave manifestly bad results in many cases, so it was not a
+satisfactory replacement for a spec.
+
+Because there is no unambiguous spec, implementations have diverged
+considerably.  As a result, users are often surprised to find that
+a document that renders one way on one system (say, a github wiki)
+renders differently on another (say, converting to docbook using
+pandoc).  To make matters worse, because nothing in Markdown counts
+as a "syntax error," the divergence often isn't discovered right away.
+
+## About this document
+
+This document attempts to specify Markdown syntax unambiguously.
+It contains many examples with side-by-side Markdown and
+HTML.  These are intended to double as conformance tests.  An
+accompanying script `spec_tests.py` can be used to run the tests
+against any Markdown program:
+
+    python test/spec_tests.py --spec spec.txt --program PROGRAM
+
+Since this document describes how Markdown is to be parsed into
+an abstract syntax tree, it would have made sense to use an abstract
+representation of the syntax tree instead of HTML.  But HTML is capable
+of representing the structural distinctions we need to make, and the
+choice of HTML for the tests makes it possible to run the tests against
+an implementation without writing an abstract syntax tree renderer.
+
+This document is generated from a text file, `spec.txt`, written
+in Markdown with a small extension for the side-by-side tests.
+The script `tools/makespec.py` can be used to convert `spec.txt` into
+HTML or CommonMark (which can then be converted into other formats).
+
+In the examples, the `→` character is used to represent tabs.
+
+# Preliminaries
+
+## Characters and lines
+
+Any sequence of [characters] is a valid CommonMark
+document.
+
+A [character](@) is a Unicode code point.  Although some
+code points (for example, combining accents) do not correspond to
+characters in an intuitive sense, all code points count as characters
+for purposes of this spec.
+
+This spec does not specify an encoding; it thinks of lines as composed
+of [characters] rather than bytes.  A conforming parser may be limited
+to a certain encoding.
+
+A [line](@) is a sequence of zero or more [characters]
+other than newline (`U+000A`) or carriage return (`U+000D`),
+followed by a [line ending] or by the end of file.
+
+A [line ending](@) is a newline (`U+000A`), a carriage return
+(`U+000D`) not followed by a newline, or a carriage return and a
+following newline.
+
+A line containing no characters, or a line containing only spaces
+(`U+0020`) or tabs (`U+0009`), is called a [blank line](@).
+
+The following definitions of character classes will be used in this spec:
+
+A [whitespace character](@) is a space
+(`U+0020`), tab (`U+0009`), newline (`U+000A`), line tabulation (`U+000B`),
+form feed (`U+000C`), or carriage return (`U+000D`).
+
+[Whitespace](@) is a sequence of one or more [whitespace
+characters].
+
+A [Unicode whitespace character](@) is
+any code point in the Unicode `Zs` class, or a tab (`U+0009`),
+carriage return (`U+000D`), newline (`U+000A`), or form feed
+(`U+000C`).
+
+[Unicode whitespace](@) is a sequence of one
+or more [Unicode whitespace characters].
+
+A [space](@) is `U+0020`.
+
+A [non-whitespace character](@) is any character
+that is not a [whitespace character].
+
+An [ASCII punctuation character](@)
+is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
+`*`, `+`, `,`, `-`, `.`, `/`, `:`, `;`, `<`, `=`, `>`, `?`, `@`,
+`[`, `\`, `]`, `^`, `_`, `` ` ``, `{`, `|`, `}`, or `~`.
+
+A [punctuation character](@) is an [ASCII
+punctuation character] or anything in
+the Unicode classes `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
+
+## Tabs
+
+Tabs in lines are not expanded to [spaces].  However,
+in contexts where whitespace helps to define block structure,
+tabs behave as if they were replaced by spaces with a tab stop
+of 4 characters.
+
+Thus, for example, a tab can be used instead of four spaces
+in an indented code block.  (Note, however, that internal
+tabs are passed through as literal tabs, not expanded to
+spaces.)
+
+```````````````````````````````` example
+→foo→baz→→bim
+.
+<pre><code>foo→baz→→bim
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+  →foo→baz→→bim
+.
+<pre><code>foo→baz→→bim
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+    a→a
+    ὐ→a
+.
+<pre><code>a→a
+ὐ→a
+</code></pre>
+````````````````````````````````
+
+In the following example, a continuation paragraph of a list
+item is indented with a tab; this has exactly the same effect
+as indentation with four spaces would:
+
+```````````````````````````````` example
+  - foo
+
+→bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+- foo
+
+→→bar
+.
+<ul>
+<li>
+<p>foo</p>
+<pre><code>  bar
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+Normally the `>` that begins a block quote may be followed
+optionally by a space, which is not considered part of the
+content.  In the following case `>` is followed by a tab,
+which is treated as if it were expanded into spaces.
+Since one of theses spaces is considered part of the
+delimiter, `foo` is considered to be indented six spaces
+inside the block quote context, so we get an indented
+code block starting with two spaces.
+
+```````````````````````````````` example
+>→→foo
+.
+<blockquote>
+<pre><code>  foo
+</code></pre>
+</blockquote>
+````````````````````````````````
+
+```````````````````````````````` example
+-→→foo
+.
+<ul>
+<li>
+<pre><code>  foo
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    foo
+→bar
+.
+<pre><code>foo
+bar
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+ - foo
+   - bar
+→ - baz
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>baz</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+#→Foo
+.
+<h1>Foo</h1>
+````````````````````````````````
+
+```````````````````````````````` example
+*→*→*→
+.
+<hr />
+````````````````````````````````
+
+
+## Insecure characters
+
+For security reasons, the Unicode character `U+0000` must be replaced
+with the REPLACEMENT CHARACTER (`U+FFFD`).
+
+# Blocks and inlines
+
+We can think of a document as a sequence of
+[blocks](@)---structural elements like paragraphs, block
+quotations, lists, headings, rules, and code blocks.  Some blocks (like
+block quotes and list items) contain other blocks; others (like
+headings and paragraphs) contain [inline](@) content---text,
+links, emphasized text, images, code, and so on.
+
+## Precedence
+
+Indicators of block structure always take precedence over indicators
+of inline structure.  So, for example, the following is a list with
+two items, not a list with one item containing a code span:
+
+```````````````````````````````` example
+- `one
+- two`
+.
+<ul>
+<li>`one</li>
+<li>two`</li>
+</ul>
+````````````````````````````````
+
+
+This means that parsing can proceed in two steps:  first, the block
+structure of the document can be discerned; second, text lines inside
+paragraphs, headings, and other block constructs can be parsed for inline
+structure.  The second step requires information about link reference
+definitions that will be available only at the end of the first
+step.  Note that the first step requires processing lines in sequence,
+but the second can be parallelized, since the inline parsing of
+one block element does not affect the inline parsing of any other.
+
+## Container blocks and leaf blocks
+
+We can divide blocks into two types:
+[container block](@)s,
+which can contain other blocks, and [leaf block](@)s,
+which cannot.
+
+# Leaf blocks
+
+This section describes the different kinds of leaf block that make up a
+Markdown document.
+
+## Thematic breaks
+
+A line consisting of 0-3 spaces of indentation, followed by a sequence
+of three or more matching `-`, `_`, or `*` characters, each followed
+optionally by any number of spaces, forms a
+[thematic break](@).
+
+```````````````````````````````` example
+***
+---
+___
+.
+<hr />
+<hr />
+<hr />
+````````````````````````````````
+
+
+Wrong characters:
+
+```````````````````````````````` example
++++
+.
+<p>+++</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+===
+.
+<p>===</p>
+````````````````````````````````
+
+
+Not enough characters:
+
+```````````````````````````````` example
+--
+**
+__
+.
+<p>--
+**
+__</p>
+````````````````````````````````
+
+
+One to three spaces indent are allowed:
+
+```````````````````````````````` example
+ ***
+  ***
+   ***
+.
+<hr />
+<hr />
+<hr />
+````````````````````````````````
+
+
+Four spaces is too many:
+
+```````````````````````````````` example
+    ***
+.
+<pre><code>***
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo
+    ***
+.
+<p>Foo
+***</p>
+````````````````````````````````
+
+
+More than three characters may be used:
+
+```````````````````````````````` example
+_____________________________________
+.
+<hr />
+````````````````````````````````
+
+
+Spaces are allowed between the characters:
+
+```````````````````````````````` example
+ - - -
+.
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+ **  * ** * ** * **
+.
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+-     -      -      -
+.
+<hr />
+````````````````````````````````
+
+
+Spaces are allowed at the end:
+
+```````````````````````````````` example
+- - - -    
+.
+<hr />
+````````````````````````````````
+
+
+However, no other characters may occur in the line:
+
+```````````````````````````````` example
+_ _ _ _ a
+
+a------
+
+---a---
+.
+<p>_ _ _ _ a</p>
+<p>a------</p>
+<p>---a---</p>
+````````````````````````````````
+
+
+It is required that all of the [non-whitespace characters] be the same.
+So, this is not a thematic break:
+
+```````````````````````````````` example
+ *-*
+.
+<p><em>-</em></p>
+````````````````````````````````
+
+
+Thematic breaks do not need blank lines before or after:
+
+```````````````````````````````` example
+- foo
+***
+- bar
+.
+<ul>
+<li>foo</li>
+</ul>
+<hr />
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+Thematic breaks can interrupt a paragraph:
+
+```````````````````````````````` example
+Foo
+***
+bar
+.
+<p>Foo</p>
+<hr />
+<p>bar</p>
+````````````````````````````````
+
+
+If a line of dashes that meets the above conditions for being a
+thematic break could also be interpreted as the underline of a [setext
+heading], the interpretation as a
+[setext heading] takes precedence. Thus, for example,
+this is a setext heading, not a paragraph followed by a thematic break:
+
+```````````````````````````````` example
+Foo
+---
+bar
+.
+<h2>Foo</h2>
+<p>bar</p>
+````````````````````````````````
+
+
+When both a thematic break and a list item are possible
+interpretations of a line, the thematic break takes precedence:
+
+```````````````````````````````` example
+* Foo
+* * *
+* Bar
+.
+<ul>
+<li>Foo</li>
+</ul>
+<hr />
+<ul>
+<li>Bar</li>
+</ul>
+````````````````````````````````
+
+
+If you want a thematic break in a list item, use a different bullet:
+
+```````````````````````````````` example
+- Foo
+- * * *
+.
+<ul>
+<li>Foo</li>
+<li>
+<hr />
+</li>
+</ul>
+````````````````````````````````
+
+
+## ATX headings
+
+An [ATX heading](@)
+consists of a string of characters, parsed as inline content, between an
+opening sequence of 1--6 unescaped `#` characters and an optional
+closing sequence of any number of unescaped `#` characters.
+The opening sequence of `#` characters must be followed by a
+[space] or by the end of line. The optional closing sequence of `#`s must be
+preceded by a [space] and may be followed by spaces only.  The opening
+`#` character may be indented 0-3 spaces.  The raw contents of the
+heading are stripped of leading and trailing spaces before being parsed
+as inline content.  The heading level is equal to the number of `#`
+characters in the opening sequence.
+
+Simple headings:
+
+```````````````````````````````` example
+# foo
+## foo
+### foo
+#### foo
+##### foo
+###### foo
+.
+<h1>foo</h1>
+<h2>foo</h2>
+<h3>foo</h3>
+<h4>foo</h4>
+<h5>foo</h5>
+<h6>foo</h6>
+````````````````````````````````
+
+
+More than six `#` characters is not a heading:
+
+```````````````````````````````` example
+####### foo
+.
+<p>####### foo</p>
+````````````````````````````````
+
+
+At least one space is required between the `#` characters and the
+heading's contents, unless the heading is empty.  Note that many
+implementations currently do not require the space.  However, the
+space was required by the
+[original ATX implementation](http://www.aaronsw.com/2002/atx/atx.py),
+and it helps prevent things like the following from being parsed as
+headings:
+
+```````````````````````````````` example
+#5 bolt
+
+#hashtag
+.
+<p>#5 bolt</p>
+<p>#hashtag</p>
+````````````````````````````````
+
+
+This is not a heading, because the first `#` is escaped:
+
+```````````````````````````````` example
+\## foo
+.
+<p>## foo</p>
+````````````````````````````````
+
+
+Contents are parsed as inlines:
+
+```````````````````````````````` example
+# foo *bar* \*baz\*
+.
+<h1>foo <em>bar</em> *baz*</h1>
+````````````````````````````````
+
+
+Leading and trailing blanks are ignored in parsing inline content:
+
+```````````````````````````````` example
+#                  foo                     
+.
+<h1>foo</h1>
+````````````````````````````````
+
+
+One to three spaces indentation are allowed:
+
+```````````````````````````````` example
+ ### foo
+  ## foo
+   # foo
+.
+<h3>foo</h3>
+<h2>foo</h2>
+<h1>foo</h1>
+````````````````````````````````
+
+
+Four spaces are too much:
+
+```````````````````````````````` example
+    # foo
+.
+<pre><code># foo
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo
+    # bar
+.
+<p>foo
+# bar</p>
+````````````````````````````````
+
+
+A closing sequence of `#` characters is optional:
+
+```````````````````````````````` example
+## foo ##
+  ###   bar    ###
+.
+<h2>foo</h2>
+<h3>bar</h3>
+````````````````````````````````
+
+
+It need not be the same length as the opening sequence:
+
+```````````````````````````````` example
+# foo ##################################
+##### foo ##
+.
+<h1>foo</h1>
+<h5>foo</h5>
+````````````````````````````````
+
+
+Spaces are allowed after the closing sequence:
+
+```````````````````````````````` example
+### foo ###     
+.
+<h3>foo</h3>
+````````````````````````````````
+
+
+A sequence of `#` characters with anything but [spaces] following it
+is not a closing sequence, but counts as part of the contents of the
+heading:
+
+```````````````````````````````` example
+### foo ### b
+.
+<h3>foo ### b</h3>
+````````````````````````````````
+
+
+The closing sequence must be preceded by a space:
+
+```````````````````````````````` example
+# foo#
+.
+<h1>foo#</h1>
+````````````````````````````````
+
+
+Backslash-escaped `#` characters do not count as part
+of the closing sequence:
+
+```````````````````````````````` example
+### foo \###
+## foo #\##
+# foo \#
+.
+<h3>foo ###</h3>
+<h2>foo ###</h2>
+<h1>foo #</h1>
+````````````````````````````````
+
+
+ATX headings need not be separated from surrounding content by blank
+lines, and they can interrupt paragraphs:
+
+```````````````````````````````` example
+****
+## foo
+****
+.
+<hr />
+<h2>foo</h2>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo bar
+# baz
+Bar foo
+.
+<p>Foo bar</p>
+<h1>baz</h1>
+<p>Bar foo</p>
+````````````````````````````````
+
+
+ATX headings can be empty:
+
+```````````````````````````````` example
+## 
+#
+### ###
+.
+<h2></h2>
+<h1></h1>
+<h3></h3>
+````````````````````````````````
+
+
+## Setext headings
+
+A [setext heading](@) consists of one or more
+lines of text, each containing at least one [non-whitespace
+character], with no more than 3 spaces indentation, followed by
+a [setext heading underline].  The lines of text must be such
+that, were they not followed by the setext heading underline,
+they would be interpreted as a paragraph:  they cannot be
+interpretable as a [code fence], [ATX heading][ATX headings],
+[block quote][block quotes], [thematic break][thematic breaks],
+[list item][list items], or [HTML block][HTML blocks].
+
+A [setext heading underline](@) is a sequence of
+`=` characters or a sequence of `-` characters, with no more than 3
+spaces indentation and any number of trailing spaces.  If a line
+containing a single `-` can be interpreted as an
+empty [list items], it should be interpreted this way
+and not as a [setext heading underline].
+
+The heading is a level 1 heading if `=` characters are used in
+the [setext heading underline], and a level 2 heading if `-`
+characters are used.  The contents of the heading are the result
+of parsing the preceding lines of text as CommonMark inline
+content.
+
+In general, a setext heading need not be preceded or followed by a
+blank line.  However, it cannot interrupt a paragraph, so when a
+setext heading comes after a paragraph, a blank line is needed between
+them.
+
+Simple examples:
+
+```````````````````````````````` example
+Foo *bar*
+=========
+
+Foo *bar*
+---------
+.
+<h1>Foo <em>bar</em></h1>
+<h2>Foo <em>bar</em></h2>
+````````````````````````````````
+
+
+The content of the header may span more than one line:
+
+```````````````````````````````` example
+Foo *bar
+baz*
+====
+.
+<h1>Foo <em>bar
+baz</em></h1>
+````````````````````````````````
+
+
+The underlining can be any length:
+
+```````````````````````````````` example
+Foo
+-------------------------
+
+Foo
+=
+.
+<h2>Foo</h2>
+<h1>Foo</h1>
+````````````````````````````````
+
+
+The heading content can be indented up to three spaces, and need
+not line up with the underlining:
+
+```````````````````````````````` example
+   Foo
+---
+
+  Foo
+-----
+
+  Foo
+  ===
+.
+<h2>Foo</h2>
+<h2>Foo</h2>
+<h1>Foo</h1>
+````````````````````````````````
+
+
+Four spaces indent is too much:
+
+```````````````````````````````` example
+    Foo
+    ---
+
+    Foo
+---
+.
+<pre><code>Foo
+---
+
+Foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+The setext heading underline can be indented up to three spaces, and
+may have trailing spaces:
+
+```````````````````````````````` example
+Foo
+   ----      
+.
+<h2>Foo</h2>
+````````````````````````````````
+
+
+Four spaces is too much:
+
+```````````````````````````````` example
+Foo
+    ---
+.
+<p>Foo
+---</p>
+````````````````````````````````
+
+
+The setext heading underline cannot contain internal spaces:
+
+```````````````````````````````` example
+Foo
+= =
+
+Foo
+--- -
+.
+<p>Foo
+= =</p>
+<p>Foo</p>
+<hr />
+````````````````````````````````
+
+
+Trailing spaces in the content line do not cause a line break:
+
+```````````````````````````````` example
+Foo  
+-----
+.
+<h2>Foo</h2>
+````````````````````````````````
+
+
+Nor does a backslash at the end:
+
+```````````````````````````````` example
+Foo\
+----
+.
+<h2>Foo\</h2>
+````````````````````````````````
+
+
+Since indicators of block structure take precedence over
+indicators of inline structure, the following are setext headings:
+
+```````````````````````````````` example
+`Foo
+----
+`
+
+<a title="a lot
+---
+of dashes"/>
+.
+<h2>`Foo</h2>
+<p>`</p>
+<h2>&lt;a title=&quot;a lot</h2>
+<p>of dashes&quot;/&gt;</p>
+````````````````````````````````
+
+
+The setext heading underline cannot be a [lazy continuation
+line] in a list item or block quote:
+
+```````````````````````````````` example
+> Foo
+---
+.
+<blockquote>
+<p>Foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+> foo
+bar
+===
+.
+<blockquote>
+<p>foo
+bar
+===</p>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- Foo
+---
+.
+<ul>
+<li>Foo</li>
+</ul>
+<hr />
+````````````````````````````````
+
+
+A blank line is needed between a paragraph and a following
+setext heading, since otherwise the paragraph becomes part
+of the heading's content:
+
+```````````````````````````````` example
+Foo
+Bar
+---
+.
+<h2>Foo
+Bar</h2>
+````````````````````````````````
+
+
+But in general a blank line is not required before or after
+setext headings:
+
+```````````````````````````````` example
+---
+Foo
+---
+Bar
+---
+Baz
+.
+<hr />
+<h2>Foo</h2>
+<h2>Bar</h2>
+<p>Baz</p>
+````````````````````````````````
+
+
+Setext headings cannot be empty:
+
+```````````````````````````````` example
+
+====
+.
+<p>====</p>
+````````````````````````````````
+
+
+Setext heading text lines must not be interpretable as block
+constructs other than paragraphs.  So, the line of dashes
+in these examples gets interpreted as a thematic break:
+
+```````````````````````````````` example
+---
+---
+.
+<hr />
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+- foo
+-----
+.
+<ul>
+<li>foo</li>
+</ul>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+    foo
+---
+.
+<pre><code>foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+> foo
+-----
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+If you want a heading with `> foo` as its literal text, you can
+use backslash escapes:
+
+```````````````````````````````` example
+\> foo
+------
+.
+<h2>&gt; foo</h2>
+````````````````````````````````
+
+
+**Compatibility note:**  Most existing Markdown implementations
+do not allow the text of setext headings to span multiple lines.
+But there is no consensus about how to interpret
+
+``` markdown
+Foo
+bar
+---
+baz
+```
+
+One can find four different interpretations:
+
+1. paragraph "Foo", heading "bar", paragraph "baz"
+2. paragraph "Foo bar", thematic break, paragraph "baz"
+3. paragraph "Foo bar --- baz"
+4. heading "Foo bar", paragraph "baz"
+
+We find interpretation 4 most natural, and interpretation 4
+increases the expressive power of CommonMark, by allowing
+multiline headings.  Authors who want interpretation 1 can
+put a blank line after the first paragraph:
+
+```````````````````````````````` example
+Foo
+
+bar
+---
+baz
+.
+<p>Foo</p>
+<h2>bar</h2>
+<p>baz</p>
+````````````````````````````````
+
+
+Authors who want interpretation 2 can put blank lines around
+the thematic break,
+
+```````````````````````````````` example
+Foo
+bar
+
+---
+
+baz
+.
+<p>Foo
+bar</p>
+<hr />
+<p>baz</p>
+````````````````````````````````
+
+
+or use a thematic break that cannot count as a [setext heading
+underline], such as
+
+```````````````````````````````` example
+Foo
+bar
+* * *
+baz
+.
+<p>Foo
+bar</p>
+<hr />
+<p>baz</p>
+````````````````````````````````
+
+
+Authors who want interpretation 3 can use backslash escapes:
+
+```````````````````````````````` example
+Foo
+bar
+\---
+baz
+.
+<p>Foo
+bar
+---
+baz</p>
+````````````````````````````````
+
+
+## Indented code blocks
+
+An [indented code block](@) is composed of one or more
+[indented chunks] separated by blank lines.
+An [indented chunk](@) is a sequence of non-blank lines,
+each indented four or more spaces. The contents of the code block are
+the literal contents of the lines, including trailing
+[line endings], minus four spaces of indentation.
+An indented code block has no [info string].
+
+An indented code block cannot interrupt a paragraph, so there must be
+a blank line between a paragraph and a following indented code block.
+(A blank line is not needed, however, between a code block and a following
+paragraph.)
+
+```````````````````````````````` example
+    a simple
+      indented code block
+.
+<pre><code>a simple
+  indented code block
+</code></pre>
+````````````````````````````````
+
+
+If there is any ambiguity between an interpretation of indentation
+as a code block and as indicating that material belongs to a [list
+item][list items], the list item interpretation takes precedence:
+
+```````````````````````````````` example
+  - foo
+
+    bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1.  foo
+
+    - bar
+.
+<ol>
+<li>
+<p>foo</p>
+<ul>
+<li>bar</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+
+The contents of a code block are literal text, and do not get parsed
+as Markdown:
+
+```````````````````````````````` example
+    <a/>
+    *hi*
+
+    - one
+.
+<pre><code>&lt;a/&gt;
+*hi*
+
+- one
+</code></pre>
+````````````````````````````````
+
+
+Here we have three chunks separated by blank lines:
+
+```````````````````````````````` example
+    chunk1
+
+    chunk2
+  
+ 
+ 
+    chunk3
+.
+<pre><code>chunk1
+
+chunk2
+
+
+
+chunk3
+</code></pre>
+````````````````````````````````
+
+
+Any initial spaces beyond four will be included in the content, even
+in interior blank lines:
+
+```````````````````````````````` example
+    chunk1
+      
+      chunk2
+.
+<pre><code>chunk1
+  
+  chunk2
+</code></pre>
+````````````````````````````````
+
+
+An indented code block cannot interrupt a paragraph.  (This
+allows hanging indents and the like.)
+
+```````````````````````````````` example
+Foo
+    bar
+
+.
+<p>Foo
+bar</p>
+````````````````````````````````
+
+
+However, any non-blank line with fewer than four leading spaces ends
+the code block immediately.  So a paragraph may occur immediately
+after indented code:
+
+```````````````````````````````` example
+    foo
+bar
+.
+<pre><code>foo
+</code></pre>
+<p>bar</p>
+````````````````````````````````
+
+
+And indented code can occur immediately before and after other kinds of
+blocks:
+
+```````````````````````````````` example
+# Heading
+    foo
+Heading
+------
+    foo
+----
+.
+<h1>Heading</h1>
+<pre><code>foo
+</code></pre>
+<h2>Heading</h2>
+<pre><code>foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+The first line can be indented more than four spaces:
+
+```````````````````````````````` example
+        foo
+    bar
+.
+<pre><code>    foo
+bar
+</code></pre>
+````````````````````````````````
+
+
+Blank lines preceding or following an indented code block
+are not included in it:
+
+```````````````````````````````` example
+
+    
+    foo
+    
+
+.
+<pre><code>foo
+</code></pre>
+````````````````````````````````
+
+
+Trailing spaces are included in the code block's content:
+
+```````````````````````````````` example
+    foo  
+.
+<pre><code>foo  
+</code></pre>
+````````````````````````````````
+
+
+
+## Fenced code blocks
+
+A [code fence](@) is a sequence
+of at least three consecutive backtick characters (`` ` ``) or
+tildes (`~`).  (Tildes and backticks cannot be mixed.)
+A [fenced code block](@)
+begins with a code fence, indented no more than three spaces.
+
+The line with the opening code fence may optionally contain some text
+following the code fence; this is trimmed of leading and trailing
+spaces and called the [info string](@).
+The [info string] may not contain any backtick
+characters.  (The reason for this restriction is that otherwise
+some inline code would be incorrectly interpreted as the
+beginning of a fenced code block.)
+
+The content of the code block consists of all subsequent lines, until
+a closing [code fence] of the same type as the code block
+began with (backticks or tildes), and with at least as many backticks
+or tildes as the opening code fence.  If the leading code fence is
+indented N spaces, then up to N spaces of indentation are removed from
+each line of the content (if present).  (If a content line is not
+indented, it is preserved unchanged.  If it is indented less than N
+spaces, all of the indentation is removed.)
+
+The closing code fence may be indented up to three spaces, and may be
+followed only by spaces, which are ignored.  If the end of the
+containing block (or document) is reached and no closing code fence
+has been found, the code block contains all of the lines after the
+opening code fence until the end of the containing block (or
+document).  (An alternative spec would require backtracking in the
+event that a closing code fence is not found.  But this makes parsing
+much less efficient, and there seems to be no real down side to the
+behavior described here.)
+
+A fenced code block may interrupt a paragraph, and does not require
+a blank line either before or after.
+
+The content of a code fence is treated as literal text, not parsed
+as inlines.  The first word of the [info string] is typically used to
+specify the language of the code sample, and rendered in the `class`
+attribute of the `code` tag.  However, this spec does not mandate any
+particular treatment of the [info string].
+
+Here is a simple example with backticks:
+
+```````````````````````````````` example
+```
+<
+ >
+```
+.
+<pre><code>&lt;
+ &gt;
+</code></pre>
+````````````````````````````````
+
+
+With tildes:
+
+```````````````````````````````` example
+~~~
+<
+ >
+~~~
+.
+<pre><code>&lt;
+ &gt;
+</code></pre>
+````````````````````````````````
+
+
+The closing code fence must use the same character as the opening
+fence:
+
+```````````````````````````````` example
+```
+aaa
+~~~
+```
+.
+<pre><code>aaa
+~~~
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~
+aaa
+```
+~~~
+.
+<pre><code>aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+The closing code fence must be at least as long as the opening fence:
+
+```````````````````````````````` example
+````
+aaa
+```
+``````
+.
+<pre><code>aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~
+aaa
+~~~
+~~~~
+.
+<pre><code>aaa
+~~~
+</code></pre>
+````````````````````````````````
+
+
+Unclosed code blocks are closed by the end of the document
+(or the enclosing [block quote][block quotes] or [list item][list items]):
+
+```````````````````````````````` example
+```
+.
+<pre><code></code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`````
+
+```
+aaa
+.
+<pre><code>
+```
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> ```
+> aaa
+
+bbb
+.
+<blockquote>
+<pre><code>aaa
+</code></pre>
+</blockquote>
+<p>bbb</p>
+````````````````````````````````
+
+
+A code block can have all empty lines as its content:
+
+```````````````````````````````` example
+```
+
+  
+```
+.
+<pre><code>
+  
+</code></pre>
+````````````````````````````````
+
+
+A code block can be empty:
+
+```````````````````````````````` example
+```
+```
+.
+<pre><code></code></pre>
+````````````````````````````````
+
+
+Fences can be indented.  If the opening fence is indented,
+content lines will have equivalent opening indentation removed,
+if present:
+
+```````````````````````````````` example
+ ```
+ aaa
+aaa
+```
+.
+<pre><code>aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+  ```
+aaa
+  aaa
+aaa
+  ```
+.
+<pre><code>aaa
+aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   ```
+   aaa
+    aaa
+  aaa
+   ```
+.
+<pre><code>aaa
+ aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+Four spaces indentation produces an indented code block:
+
+```````````````````````````````` example
+    ```
+    aaa
+    ```
+.
+<pre><code>```
+aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+Closing fences may be indented by 0-3 spaces, and their indentation
+need not match that of the opening fence:
+
+```````````````````````````````` example
+```
+aaa
+  ```
+.
+<pre><code>aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   ```
+aaa
+  ```
+.
+<pre><code>aaa
+</code></pre>
+````````````````````````````````
+
+
+This is not a closing fence, because it is indented 4 spaces:
+
+```````````````````````````````` example
+```
+aaa
+    ```
+.
+<pre><code>aaa
+    ```
+</code></pre>
+````````````````````````````````
+
+
+
+Code fences (opening and closing) cannot contain internal spaces:
+
+```````````````````````````````` example
+``` ```
+aaa
+.
+<p><code></code>
+aaa</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~~~
+aaa
+~~~ ~~
+.
+<pre><code>aaa
+~~~ ~~
+</code></pre>
+````````````````````````````````
+
+
+Fenced code blocks can interrupt paragraphs, and can be followed
+directly by paragraphs, without a blank line between:
+
+```````````````````````````````` example
+foo
+```
+bar
+```
+baz
+.
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+<p>baz</p>
+````````````````````````````````
+
+
+Other blocks can also occur before and after fenced code blocks
+without an intervening blank line:
+
+```````````````````````````````` example
+foo
+---
+~~~
+bar
+~~~
+# baz
+.
+<h2>foo</h2>
+<pre><code>bar
+</code></pre>
+<h1>baz</h1>
+````````````````````````````````
+
+
+An [info string] can be provided after the opening code fence.
+Opening and closing spaces will be stripped, and the first word, prefixed
+with `language-`, is used as the value for the `class` attribute of the
+`code` element within the enclosing `pre` element.
+
+```````````````````````````````` example
+```ruby
+def foo(x)
+  return 3
+end
+```
+.
+<pre><code class="language-ruby">def foo(x)
+  return 3
+end
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~    ruby startline=3 $%@#$
+def foo(x)
+  return 3
+end
+~~~~~~~
+.
+<pre><code class="language-ruby">def foo(x)
+  return 3
+end
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+````;
+````
+.
+<pre><code class="language-;"></code></pre>
+````````````````````````````````
+
+
+[Info strings] for backtick code blocks cannot contain backticks:
+
+```````````````````````````````` example
+``` aa ```
+foo
+.
+<p><code>aa</code>
+foo</p>
+````````````````````````````````
+
+
+Closing code fences cannot have [info strings]:
+
+```````````````````````````````` example
+```
+``` aaa
+```
+.
+<pre><code>``` aaa
+</code></pre>
+````````````````````````````````
+
+
+
+## HTML blocks
+
+An [HTML block](@) is a group of lines that is treated
+as raw HTML (and will not be escaped in HTML output).
+
+There are seven kinds of [HTML block], which can be defined
+by their start and end conditions.  The block begins with a line that
+meets a [start condition](@) (after up to three spaces
+optional indentation).  It ends with the first subsequent line that
+meets a matching [end condition](@), or the last line of
+the document or other [container block]), if no line is encountered that meets the
+[end condition].  If the first line meets both the [start condition]
+and the [end condition], the block will contain just that line.
+
+1.  **Start condition:**  line begins with the string `<script`,
+`<pre`, or `<style` (case-insensitive), followed by whitespace,
+the string `>`, or the end of the line.\
+**End condition:**  line contains an end tag
+`</script>`, `</pre>`, or `</style>` (case-insensitive; it
+need not match the start tag).
+
+2.  **Start condition:** line begins with the string `<!--`.\
+**End condition:**  line contains the string `-->`.
+
+3.  **Start condition:** line begins with the string `<?`.\
+**End condition:** line contains the string `?>`.
+
+4.  **Start condition:** line begins with the string `<!`
+followed by an uppercase ASCII letter.\
+**End condition:** line contains the character `>`.
+
+5.  **Start condition:**  line begins with the string
+`<![CDATA[`.\
+**End condition:** line contains the string `]]>`.
+
+6.  **Start condition:** line begins the string `<` or `</`
+followed by one of the strings (case-insensitive) `address`,
+`article`, `aside`, `base`, `basefont`, `blockquote`, `body`,
+`caption`, `center`, `col`, `colgroup`, `dd`, `details`, `dialog`,
+`dir`, `div`, `dl`, `dt`, `fieldset`, `figcaption`, `figure`,
+`footer`, `form`, `frame`, `frameset`,
+`h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `head`, `header`, `hr`,
+`html`, `iframe`, `legend`, `li`, `link`, `main`, `menu`, `menuitem`,
+`meta`, `nav`, `noframes`, `ol`, `optgroup`, `option`, `p`, `param`,
+`section`, `source`, `summary`, `table`, `tbody`, `td`,
+`tfoot`, `th`, `thead`, `title`, `tr`, `track`, `ul`, followed
+by [whitespace], the end of the line, the string `>`, or
+the string `/>`.\
+**End condition:** line is followed by a [blank line].
+
+7.  **Start condition:**  line begins with a complete [open tag]
+or [closing tag] (with any [tag name] other than `script`,
+`style`, or `pre`) followed only by [whitespace]
+or the end of the line.\
+**End condition:** line is followed by a [blank line].
+
+All types of [HTML blocks] except type 7 may interrupt
+a paragraph.  Blocks of type 7 may not interrupt a paragraph.
+(This restriction is intended to prevent unwanted interpretation
+of long tags inside a wrapped paragraph as starting HTML blocks.)
+
+Some simple examples follow.  Here are some basic HTML blocks
+of type 6:
+
+```````````````````````````````` example
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+
+okay.
+.
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+<p>okay.</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ <div>
+  *hello*
+         <foo><a>
+.
+ <div>
+  *hello*
+         <foo><a>
+````````````````````````````````
+
+
+A block can also start with a closing tag:
+
+```````````````````````````````` example
+</div>
+*foo*
+.
+</div>
+*foo*
+````````````````````````````````
+
+
+Here we have two HTML blocks with a Markdown paragraph between them:
+
+```````````````````````````````` example
+<DIV CLASS="foo">
+
+*Markdown*
+
+</DIV>
+.
+<DIV CLASS="foo">
+<p><em>Markdown</em></p>
+</DIV>
+````````````````````````````````
+
+
+The tag on the first line can be partial, as long
+as it is split where there would be whitespace:
+
+```````````````````````````````` example
+<div id="foo"
+  class="bar">
+</div>
+.
+<div id="foo"
+  class="bar">
+</div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div id="foo" class="bar
+  baz">
+</div>
+.
+<div id="foo" class="bar
+  baz">
+</div>
+````````````````````````````````
+
+
+An open tag need not be closed:
+```````````````````````````````` example
+<div>
+*foo*
+
+*bar*
+.
+<div>
+*foo*
+<p><em>bar</em></p>
+````````````````````````````````
+
+
+
+A partial tag need not even be completed (garbage
+in, garbage out):
+
+```````````````````````````````` example
+<div id="foo"
+*hi*
+.
+<div id="foo"
+*hi*
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div class
+foo
+.
+<div class
+foo
+````````````````````````````````
+
+
+The initial tag doesn't even need to be a valid
+tag, as long as it starts like one:
+
+```````````````````````````````` example
+<div *???-&&&-<---
+*foo*
+.
+<div *???-&&&-<---
+*foo*
+````````````````````````````````
+
+
+In type 6 blocks, the initial tag need not be on a line by
+itself:
+
+```````````````````````````````` example
+<div><a href="bar">*foo*</a></div>
+.
+<div><a href="bar">*foo*</a></div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<table><tr><td>
+foo
+</td></tr></table>
+.
+<table><tr><td>
+foo
+</td></tr></table>
+````````````````````````````````
+
+
+Everything until the next blank line or end of document
+gets included in the HTML block.  So, in the following
+example, what looks like a Markdown code block
+is actually part of the HTML block, which continues until a blank
+line or the end of the document is reached:
+
+```````````````````````````````` example
+<div></div>
+``` c
+int x = 33;
+```
+.
+<div></div>
+``` c
+int x = 33;
+```
+````````````````````````````````
+
+
+To start an [HTML block] with a tag that is *not* in the
+list of block-level tags in (6), you must put the tag by
+itself on the first line (and it must be complete):
+
+```````````````````````````````` example
+<a href="foo">
+*bar*
+</a>
+.
+<a href="foo">
+*bar*
+</a>
+````````````````````````````````
+
+
+In type 7 blocks, the [tag name] can be anything:
+
+```````````````````````````````` example
+<Warning>
+*bar*
+</Warning>
+.
+<Warning>
+*bar*
+</Warning>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<i class="foo">
+*bar*
+</i>
+.
+<i class="foo">
+*bar*
+</i>
+````````````````````````````````
+
+
+```````````````````````````````` example
+</ins>
+*bar*
+.
+</ins>
+*bar*
+````````````````````````````````
+
+
+These rules are designed to allow us to work with tags that
+can function as either block-level or inline-level tags.
+The `<del>` tag is a nice example.  We can surround content with
+`<del>` tags in three different ways.  In this case, we get a raw
+HTML block, because the `<del>` tag is on a line by itself:
+
+```````````````````````````````` example
+<del>
+*foo*
+</del>
+.
+<del>
+*foo*
+</del>
+````````````````````````````````
+
+
+In this case, we get a raw HTML block that just includes
+the `<del>` tag (because it ends with the following blank
+line).  So the contents get interpreted as CommonMark:
+
+```````````````````````````````` example
+<del>
+
+*foo*
+
+</del>
+.
+<del>
+<p><em>foo</em></p>
+</del>
+````````````````````````````````
+
+
+Finally, in this case, the `<del>` tags are interpreted
+as [raw HTML] *inside* the CommonMark paragraph.  (Because
+the tag is not on a line by itself, we get inline HTML
+rather than an [HTML block].)
+
+```````````````````````````````` example
+<del>*foo*</del>
+.
+<p><del><em>foo</em></del></p>
+````````````````````````````````
+
+
+HTML tags designed to contain literal content
+(`script`, `style`, `pre`), comments, processing instructions,
+and declarations are treated somewhat differently.
+Instead of ending at the first blank line, these blocks
+end at the first line containing a corresponding end tag.
+As a result, these blocks can contain blank lines:
+
+A pre tag (type 1):
+
+```````````````````````````````` example
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+okay
+.
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+<p>okay</p>
+````````````````````````````````
+
+
+A script tag (type 1):
+
+```````````````````````````````` example
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+okay
+.
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+<p>okay</p>
+````````````````````````````````
+
+
+A style tag (type 1):
+
+```````````````````````````````` example
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+okay
+.
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+<p>okay</p>
+````````````````````````````````
+
+
+If there is no matching end tag, the block will end at the
+end of the document (or the enclosing [block quote][block quotes]
+or [list item][list items]):
+
+```````````````````````````````` example
+<style
+  type="text/css">
+
+foo
+.
+<style
+  type="text/css">
+
+foo
+````````````````````````````````
+
+
+```````````````````````````````` example
+> <div>
+> foo
+
+bar
+.
+<blockquote>
+<div>
+foo
+</blockquote>
+<p>bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- <div>
+- foo
+.
+<ul>
+<li>
+<div>
+</li>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+
+The end tag can occur on the same line as the start tag:
+
+```````````````````````````````` example
+<style>p{color:red;}</style>
+*foo*
+.
+<style>p{color:red;}</style>
+<p><em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<!-- foo -->*bar*
+*baz*
+.
+<!-- foo -->*bar*
+<p><em>baz</em></p>
+````````````````````````````````
+
+
+Note that anything on the last line after the
+end tag will be included in the [HTML block]:
+
+```````````````````````````````` example
+<script>
+foo
+</script>1. *bar*
+.
+<script>
+foo
+</script>1. *bar*
+````````````````````````````````
+
+
+A comment (type 2):
+
+```````````````````````````````` example
+<!-- Foo
+
+bar
+   baz -->
+okay
+.
+<!-- Foo
+
+bar
+   baz -->
+<p>okay</p>
+````````````````````````````````
+
+
+
+A processing instruction (type 3):
+
+```````````````````````````````` example
+<?php
+
+  echo '>';
+
+?>
+okay
+.
+<?php
+
+  echo '>';
+
+?>
+<p>okay</p>
+````````````````````````````````
+
+
+A declaration (type 4):
+
+```````````````````````````````` example
+<!DOCTYPE html>
+.
+<!DOCTYPE html>
+````````````````````````````````
+
+
+CDATA (type 5):
+
+```````````````````````````````` example
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+okay
+.
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+<p>okay</p>
+````````````````````````````````
+
+
+The opening tag can be indented 1-3 spaces, but not 4:
+
+```````````````````````````````` example
+  <!-- foo -->
+
+    <!-- foo -->
+.
+  <!-- foo -->
+<pre><code>&lt;!-- foo --&gt;
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+  <div>
+
+    <div>
+.
+  <div>
+<pre><code>&lt;div&gt;
+</code></pre>
+````````````````````````````````
+
+
+An HTML block of types 1--6 can interrupt a paragraph, and need not be
+preceded by a blank line.
+
+```````````````````````````````` example
+Foo
+<div>
+bar
+</div>
+.
+<p>Foo</p>
+<div>
+bar
+</div>
+````````````````````````````````
+
+
+However, a following blank line is needed, except at the end of
+a document, and except for blocks of types 1--5, above:
+
+```````````````````````````````` example
+<div>
+bar
+</div>
+*foo*
+.
+<div>
+bar
+</div>
+*foo*
+````````````````````````````````
+
+
+HTML blocks of type 7 cannot interrupt a paragraph:
+
+```````````````````````````````` example
+Foo
+<a href="bar">
+baz
+.
+<p>Foo
+<a href="bar">
+baz</p>
+````````````````````````````````
+
+
+This rule differs from John Gruber's original Markdown syntax
+specification, which says:
+
+> The only restrictions are that block-level HTML elements —
+> e.g. `<div>`, `<table>`, `<pre>`, `<p>`, etc. — must be separated from
+> surrounding content by blank lines, and the start and end tags of the
+> block should not be indented with tabs or spaces.
+
+In some ways Gruber's rule is more restrictive than the one given
+here:
+
+- It requires that an HTML block be preceded by a blank line.
+- It does not allow the start tag to be indented.
+- It requires a matching end tag, which it also does not allow to
+  be indented.
+
+Most Markdown implementations (including some of Gruber's own) do not
+respect all of these restrictions.
+
+There is one respect, however, in which Gruber's rule is more liberal
+than the one given here, since it allows blank lines to occur inside
+an HTML block.  There are two reasons for disallowing them here.
+First, it removes the need to parse balanced tags, which is
+expensive and can require backtracking from the end of the document
+if no matching end tag is found. Second, it provides a very simple
+and flexible way of including Markdown content inside HTML tags:
+simply separate the Markdown from the HTML using blank lines:
+
+Compare:
+
+```````````````````````````````` example
+<div>
+
+*Emphasized* text.
+
+</div>
+.
+<div>
+<p><em>Emphasized</em> text.</p>
+</div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div>
+*Emphasized* text.
+</div>
+.
+<div>
+*Emphasized* text.
+</div>
+````````````````````````````````
+
+
+Some Markdown implementations have adopted a convention of
+interpreting content inside tags as text if the open tag has
+the attribute `markdown=1`.  The rule given above seems a simpler and
+more elegant way of achieving the same expressive power, which is also
+much simpler to parse.
+
+The main potential drawback is that one can no longer paste HTML
+blocks into Markdown documents with 100% reliability.  However,
+*in most cases* this will work fine, because the blank lines in
+HTML are usually followed by HTML block tags.  For example:
+
+```````````````````````````````` example
+<table>
+
+<tr>
+
+<td>
+Hi
+</td>
+
+</tr>
+
+</table>
+.
+<table>
+<tr>
+<td>
+Hi
+</td>
+</tr>
+</table>
+````````````````````````````````
+
+
+There are problems, however, if the inner tags are indented
+*and* separated by spaces, as then they will be interpreted as
+an indented code block:
+
+```````````````````````````````` example
+<table>
+
+  <tr>
+
+    <td>
+      Hi
+    </td>
+
+  </tr>
+
+</table>
+.
+<table>
+  <tr>
+<pre><code>&lt;td&gt;
+  Hi
+&lt;/td&gt;
+</code></pre>
+  </tr>
+</table>
+````````````````````````````````
+
+
+Fortunately, blank lines are usually not necessary and can be
+deleted.  The exception is inside `<pre>` tags, but as described
+above, raw HTML blocks starting with `<pre>` *can* contain blank
+lines.
+
+## Link reference definitions
+
+A [link reference definition](@)
+consists of a [link label], indented up to three spaces, followed
+by a colon (`:`), optional [whitespace] (including up to one
+[line ending]), a [link destination],
+optional [whitespace] (including up to one
+[line ending]), and an optional [link
+title], which if it is present must be separated
+from the [link destination] by [whitespace].
+No further [non-whitespace characters] may occur on the line.
+
+A [link reference definition]
+does not correspond to a structural element of a document.  Instead, it
+defines a label which can be used in [reference links]
+and reference-style [images] elsewhere in the document.  [Link
+reference definitions] can come either before or after the links that use
+them.
+
+```````````````````````````````` example
+[foo]: /url "title"
+
+[foo]
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   [foo]: 
+      /url  
+           'the title'  
+
+[foo]
+.
+<p><a href="/url" title="the title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[Foo*bar\]]:my_(url) 'title (with parens)'
+
+[Foo*bar\]]
+.
+<p><a href="my_(url)" title="title (with parens)">Foo*bar]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[Foo bar]:
+<my%20url>
+'title'
+
+[Foo bar]
+.
+<p><a href="my%20url" title="title">Foo bar</a></p>
+````````````````````````````````
+
+
+The title may extend over multiple lines:
+
+```````````````````````````````` example
+[foo]: /url '
+title
+line1
+line2
+'
+
+[foo]
+.
+<p><a href="/url" title="
+title
+line1
+line2
+">foo</a></p>
+````````````````````````````````
+
+
+However, it may not contain a [blank line]:
+
+```````````````````````````````` example
+[foo]: /url 'title
+
+with blank line'
+
+[foo]
+.
+<p>[foo]: /url 'title</p>
+<p>with blank line'</p>
+<p>[foo]</p>
+````````````````````````````````
+
+
+The title may be omitted:
+
+```````````````````````````````` example
+[foo]:
+/url
+
+[foo]
+.
+<p><a href="/url">foo</a></p>
+````````````````````````````````
+
+
+The link destination may not be omitted:
+
+```````````````````````````````` example
+[foo]:
+
+[foo]
+.
+<p>[foo]:</p>
+<p>[foo]</p>
+````````````````````````````````
+
+
+Both title and destination can contain backslash escapes
+and literal backslashes:
+
+```````````````````````````````` example
+[foo]: /url\bar\*baz "foo\"bar\baz"
+
+[foo]
+.
+<p><a href="/url%5Cbar*baz" title="foo&quot;bar\baz">foo</a></p>
+````````````````````````````````
+
+
+A link can come before its corresponding definition:
+
+```````````````````````````````` example
+[foo]
+
+[foo]: url
+.
+<p><a href="url">foo</a></p>
+````````````````````````````````
+
+
+If there are several matching definitions, the first one takes
+precedence:
+
+```````````````````````````````` example
+[foo]
+
+[foo]: first
+[foo]: second
+.
+<p><a href="first">foo</a></p>
+````````````````````````````````
+
+
+As noted in the section on [Links], matching of labels is
+case-insensitive (see [matches]).
+
+```````````````````````````````` example
+[FOO]: /url
+
+[Foo]
+.
+<p><a href="/url">Foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[ΑΓΩ]: /φου
+
+[αγω]
+.
+<p><a href="/%CF%86%CE%BF%CF%85">αγω</a></p>
+````````````````````````````````
+
+
+Here is a link reference definition with no corresponding link.
+It contributes nothing to the document.
+
+```````````````````````````````` example
+[foo]: /url
+.
+````````````````````````````````
+
+
+Here is another one:
+
+```````````````````````````````` example
+[
+foo
+]: /url
+bar
+.
+<p>bar</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because there are
+[non-whitespace characters] after the title:
+
+```````````````````````````````` example
+[foo]: /url "title" ok
+.
+<p>[foo]: /url &quot;title&quot; ok</p>
+````````````````````````````````
+
+
+This is a link reference definition, but it has no title:
+
+```````````````````````````````` example
+[foo]: /url
+"title" ok
+.
+<p>&quot;title&quot; ok</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because it is indented
+four spaces:
+
+```````````````````````````````` example
+    [foo]: /url "title"
+
+[foo]
+.
+<pre><code>[foo]: /url &quot;title&quot;
+</code></pre>
+<p>[foo]</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because it occurs inside
+a code block:
+
+```````````````````````````````` example
+```
+[foo]: /url
+```
+
+[foo]
+.
+<pre><code>[foo]: /url
+</code></pre>
+<p>[foo]</p>
+````````````````````````````````
+
+
+A [link reference definition] cannot interrupt a paragraph.
+
+```````````````````````````````` example
+Foo
+[bar]: /baz
+
+[bar]
+.
+<p>Foo
+[bar]: /baz</p>
+<p>[bar]</p>
+````````````````````````````````
+
+
+However, it can directly follow other block elements, such as headings
+and thematic breaks, and it need not be followed by a blank line.
+
+```````````````````````````````` example
+# [Foo]
+[foo]: /url
+> bar
+.
+<h1><a href="/url">Foo</a></h1>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+Several [link reference definitions]
+can occur one after another, without intervening blank lines.
+
+```````````````````````````````` example
+[foo]: /foo-url "foo"
+[bar]: /bar-url
+  "bar"
+[baz]: /baz-url
+
+[foo],
+[bar],
+[baz]
+.
+<p><a href="/foo-url" title="foo">foo</a>,
+<a href="/bar-url" title="bar">bar</a>,
+<a href="/baz-url">baz</a></p>
+````````````````````````````````
+
+
+[Link reference definitions] can occur
+inside block containers, like lists and block quotations.  They
+affect the entire document, not just the container in which they
+are defined:
+
+```````````````````````````````` example
+[foo]
+
+> [foo]: /url
+.
+<p><a href="/url">foo</a></p>
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+
+## Paragraphs
+
+A sequence of non-blank lines that cannot be interpreted as other
+kinds of blocks forms a [paragraph](@).
+The contents of the paragraph are the result of parsing the
+paragraph's raw content as inlines.  The paragraph's raw content
+is formed by concatenating the lines and removing initial and final
+[whitespace].
+
+A simple example with two paragraphs:
+
+```````````````````````````````` example
+aaa
+
+bbb
+.
+<p>aaa</p>
+<p>bbb</p>
+````````````````````````````````
+
+
+Paragraphs can contain multiple lines, but no blank lines:
+
+```````````````````````````````` example
+aaa
+bbb
+
+ccc
+ddd
+.
+<p>aaa
+bbb</p>
+<p>ccc
+ddd</p>
+````````````````````````````````
+
+
+Multiple blank lines between paragraph have no effect:
+
+```````````````````````````````` example
+aaa
+
+
+bbb
+.
+<p>aaa</p>
+<p>bbb</p>
+````````````````````````````````
+
+
+Leading spaces are skipped:
+
+```````````````````````````````` example
+  aaa
+ bbb
+.
+<p>aaa
+bbb</p>
+````````````````````````````````
+
+
+Lines after the first may be indented any amount, since indented
+code blocks cannot interrupt paragraphs.
+
+```````````````````````````````` example
+aaa
+             bbb
+                                       ccc
+.
+<p>aaa
+bbb
+ccc</p>
+````````````````````````````````
+
+
+However, the first line may be indented at most three spaces,
+or an indented code block will be triggered:
+
+```````````````````````````````` example
+   aaa
+bbb
+.
+<p>aaa
+bbb</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    aaa
+bbb
+.
+<pre><code>aaa
+</code></pre>
+<p>bbb</p>
+````````````````````````````````
+
+
+Final spaces are stripped before inline parsing, so a paragraph
+that ends with two or more spaces will not end with a [hard line
+break]:
+
+```````````````````````````````` example
+aaa     
+bbb     
+.
+<p>aaa<br />
+bbb</p>
+````````````````````````````````
+
+
+## Blank lines
+
+[Blank lines] between block-level elements are ignored,
+except for the role they play in determining whether a [list]
+is [tight] or [loose].
+
+Blank lines at the beginning and end of the document are also ignored.
+
+```````````````````````````````` example
+  
+
+aaa
+  
+
+# aaa
+
+  
+.
+<p>aaa</p>
+<h1>aaa</h1>
+````````````````````````````````
+
+
+
+# Container blocks
+
+A [container block] is a block that has other
+blocks as its contents.  There are two basic kinds of container blocks:
+[block quotes] and [list items].
+[Lists] are meta-containers for [list items].
+
+We define the syntax for container blocks recursively.  The general
+form of the definition is:
+
+> If X is a sequence of blocks, then the result of
+> transforming X in such-and-such a way is a container of type Y
+> with these blocks as its content.
+
+So, we explain what counts as a block quote or list item by explaining
+how these can be *generated* from their contents. This should suffice
+to define the syntax, although it does not give a recipe for *parsing*
+these constructions.  (A recipe is provided below in the section entitled
+[A parsing strategy](#appendix-a-parsing-strategy).)
+
+## Block quotes
+
+A [block quote marker](@)
+consists of 0-3 spaces of initial indent, plus (a) the character `>` together
+with a following space, or (b) a single character `>` not followed by a space.
+
+The following rules define [block quotes]:
+
+1.  **Basic case.**  If a string of lines *Ls* constitute a sequence
+    of blocks *Bs*, then the result of prepending a [block quote
+    marker] to the beginning of each line in *Ls*
+    is a [block quote](#block-quotes) containing *Bs*.
+
+2.  **Laziness.**  If a string of lines *Ls* constitute a [block
+    quote](#block-quotes) with contents *Bs*, then the result of deleting
+    the initial [block quote marker] from one or
+    more lines in which the next [non-whitespace character] after the [block
+    quote marker] is [paragraph continuation
+    text] is a block quote with *Bs* as its content.
+    [Paragraph continuation text](@) is text
+    that will be parsed as part of the content of a paragraph, but does
+    not occur at the beginning of the paragraph.
+
+3.  **Consecutiveness.**  A document cannot contain two [block
+    quotes] in a row unless there is a [blank line] between them.
+
+Nothing else counts as a [block quote](#block-quotes).
+
+Here is a simple example:
+
+```````````````````````````````` example
+> # Foo
+> bar
+> baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+The spaces after the `>` characters can be omitted:
+
+```````````````````````````````` example
+># Foo
+>bar
+> baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+The `>` characters can be indented 1-3 spaces:
+
+```````````````````````````````` example
+   > # Foo
+   > bar
+ > baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+Four spaces gives us a code block:
+
+```````````````````````````````` example
+    > # Foo
+    > bar
+    > baz
+.
+<pre><code>&gt; # Foo
+&gt; bar
+&gt; baz
+</code></pre>
+````````````````````````````````
+
+
+The Laziness clause allows us to omit the `>` before
+[paragraph continuation text]:
+
+```````````````````````````````` example
+> # Foo
+> bar
+baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+A block quote can contain some lazy and some non-lazy
+continuation lines:
+
+```````````````````````````````` example
+> bar
+baz
+> foo
+.
+<blockquote>
+<p>bar
+baz
+foo</p>
+</blockquote>
+````````````````````````````````
+
+
+Laziness only applies to lines that would have been continuations of
+paragraphs had they been prepended with [block quote markers].
+For example, the `> ` cannot be omitted in the second line of
+
+``` markdown
+> foo
+> ---
+```
+
+without changing the meaning:
+
+```````````````````````````````` example
+> foo
+---
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+Similarly, if we omit the `> ` in the second line of
+
+``` markdown
+> - foo
+> - bar
+```
+
+then the block quote ends after the first line:
+
+```````````````````````````````` example
+> - foo
+- bar
+.
+<blockquote>
+<ul>
+<li>foo</li>
+</ul>
+</blockquote>
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+For the same reason, we can't omit the `> ` in front of
+subsequent lines of an indented or fenced code block:
+
+```````````````````````````````` example
+>     foo
+    bar
+.
+<blockquote>
+<pre><code>foo
+</code></pre>
+</blockquote>
+<pre><code>bar
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> ```
+foo
+```
+.
+<blockquote>
+<pre><code></code></pre>
+</blockquote>
+<p>foo</p>
+<pre><code></code></pre>
+````````````````````````````````
+
+
+Note that in the following case, we have a [lazy
+continuation line]:
+
+```````````````````````````````` example
+> foo
+    - bar
+.
+<blockquote>
+<p>foo
+- bar</p>
+</blockquote>
+````````````````````````````````
+
+
+To see why, note that in
+
+```markdown
+> foo
+>     - bar
+```
+
+the `- bar` is indented too far to start a list, and can't
+be an indented code block because indented code blocks cannot
+interrupt paragraphs, so it is [paragraph continuation text].
+
+A block quote can be empty:
+
+```````````````````````````````` example
+>
+.
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+>
+>  
+> 
+.
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+A block quote can have initial or final blank lines:
+
+```````````````````````````````` example
+>
+> foo
+>  
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+````````````````````````````````
+
+
+A blank line always separates block quotes:
+
+```````````````````````````````` example
+> foo
+
+> bar
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+(Most current Markdown implementations, including John Gruber's
+original `Markdown.pl`, will parse this example as a single block quote
+with two paragraphs.  But it seems better to allow the author to decide
+whether two block quotes or one are wanted.)
+
+Consecutiveness means that if we put these block quotes together,
+we get a single block quote:
+
+```````````````````````````````` example
+> foo
+> bar
+.
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+````````````````````````````````
+
+
+To get a block quote with two paragraphs, use:
+
+```````````````````````````````` example
+> foo
+>
+> bar
+.
+<blockquote>
+<p>foo</p>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+Block quotes can interrupt paragraphs:
+
+```````````````````````````````` example
+foo
+> bar
+.
+<p>foo</p>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+In general, blank lines are not needed before or after block
+quotes:
+
+```````````````````````````````` example
+> aaa
+***
+> bbb
+.
+<blockquote>
+<p>aaa</p>
+</blockquote>
+<hr />
+<blockquote>
+<p>bbb</p>
+</blockquote>
+````````````````````````````````
+
+
+However, because of laziness, a blank line is needed between
+a block quote and a following paragraph:
+
+```````````````````````````````` example
+> bar
+baz
+.
+<blockquote>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> bar
+
+baz
+.
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> bar
+>
+baz
+.
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+````````````````````````````````
+
+
+It is a consequence of the Laziness rule that any number
+of initial `>`s may be omitted on a continuation line of a
+nested block quote:
+
+```````````````````````````````` example
+> > > foo
+bar
+.
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+>>> foo
+> bar
+>>baz
+.
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar
+baz</p>
+</blockquote>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+When including an indented code block in a block quote,
+remember that the [block quote marker] includes
+both the `>` and a following space.  So *five spaces* are needed after
+the `>`:
+
+```````````````````````````````` example
+>     code
+
+>    not code
+.
+<blockquote>
+<pre><code>code
+</code></pre>
+</blockquote>
+<blockquote>
+<p>not code</p>
+</blockquote>
+````````````````````````````````
+
+
+
+## List items
+
+A [list marker](@) is a
+[bullet list marker] or an [ordered list marker].
+
+A [bullet list marker](@)
+is a `-`, `+`, or `*` character.
+
+An [ordered list marker](@)
+is a sequence of 1--9 arabic digits (`0-9`), followed by either a
+`.` character or a `)` character.  (The reason for the length
+limit is that with 10 digits we start seeing integer overflows
+in some browsers.)
+
+The following rules define [list items]:
+
+1.  **Basic case.**  If a sequence of lines *Ls* constitute a sequence of
+    blocks *Bs* starting with a [non-whitespace character] and not separated
+    from each other by more than one blank line, and *M* is a list
+    marker of width *W* followed by 1 ≤ *N* ≤ 4 spaces, then the result
+    of prepending *M* and the following spaces to the first line of
+    *Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a
+    list item with *Bs* as its contents.  The type of the list item
+    (bullet or ordered) is determined by the type of its list marker.
+    If the list item is ordered, then it is also assigned a start
+    number, based on the ordered list marker.
+
+    Exceptions: When the first list item in a [list] interrupts
+    a paragraph---that is, when it starts on a line that would
+    otherwise count as [paragraph continuation text]---then (a)
+    the lines *Ls* must not begin with a blank line, and (b) if
+    the list item is ordered, the start number must be 1.
+
+For example, let *Ls* be the lines
+
+```````````````````````````````` example
+A paragraph
+with two lines.
+
+    indented code
+
+> A block quote.
+.
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+````````````````````````````````
+
+
+And let *M* be the marker `1.`, and *N* = 2.  Then rule #1 says
+that the following is an ordered list item with start number 1,
+and the same contents as *Ls*:
+
+```````````````````````````````` example
+1.  A paragraph
+    with two lines.
+
+        indented code
+
+    > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+The most important thing to notice is that the position of
+the text after the list marker determines how much indentation
+is needed in subsequent blocks in the list item.  If the list
+marker takes up two spaces, and there are three spaces between
+the list marker and the next [non-whitespace character], then blocks
+must be indented five spaces in order to fall under the list
+item.
+
+Here are some examples showing how far content must be indented to be
+put under the list item:
+
+```````````````````````````````` example
+- one
+
+ two
+.
+<ul>
+<li>one</li>
+</ul>
+<p>two</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- one
+
+  two
+.
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ -    one
+
+     two
+.
+<ul>
+<li>one</li>
+</ul>
+<pre><code> two
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ -    one
+
+      two
+.
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+It is tempting to think of this in terms of columns:  the continuation
+blocks must be indented at least to the column of the first
+[non-whitespace character] after the list marker. However, that is not quite right.
+The spaces after the list marker determine how much relative indentation
+is needed.  Which column this indentation reaches will depend on
+how the list item is embedded in other constructions, as shown by
+this example:
+
+```````````````````````````````` example
+   > > 1.  one
+>>
+>>     two
+.
+<blockquote>
+<blockquote>
+<ol>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ol>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+Here `two` occurs in the same column as the list marker `1.`,
+but is actually contained in the list item, because there is
+sufficient indentation after the last containing blockquote marker.
+
+The converse is also possible.  In the following example, the word `two`
+occurs far to the right of the initial text of the list item, `one`, but
+it is not considered part of the list item, because it is not indented
+far enough past the blockquote marker:
+
+```````````````````````````````` example
+>>- one
+>>
+  >  > two
+.
+<blockquote>
+<blockquote>
+<ul>
+<li>one</li>
+</ul>
+<p>two</p>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+Note that at least one space is needed between the list marker and
+any following content, so these are not list items:
+
+```````````````````````````````` example
+-one
+
+2.two
+.
+<p>-one</p>
+<p>2.two</p>
+````````````````````````````````
+
+
+A list item may contain blocks that are separated by more than
+one blank line.
+
+```````````````````````````````` example
+- foo
+
+
+  bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+A list item may contain any kind of block:
+
+```````````````````````````````` example
+1.  foo
+
+    ```
+    bar
+    ```
+
+    baz
+
+    > bam
+.
+<ol>
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+<p>baz</p>
+<blockquote>
+<p>bam</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+A list item that contains an indented code block will preserve
+empty lines within the code block verbatim.
+
+```````````````````````````````` example
+- Foo
+
+      bar
+
+
+      baz
+.
+<ul>
+<li>
+<p>Foo</p>
+<pre><code>bar
+
+
+baz
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+Note that ordered list start numbers must be nine digits or less:
+
+```````````````````````````````` example
+123456789. ok
+.
+<ol start="123456789">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1234567890. not ok
+.
+<p>1234567890. not ok</p>
+````````````````````````````````
+
+
+A start number may begin with 0s:
+
+```````````````````````````````` example
+0. ok
+.
+<ol start="0">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+```````````````````````````````` example
+003. ok
+.
+<ol start="3">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+A start number may not be negative:
+
+```````````````````````````````` example
+-1. not ok
+.
+<p>-1. not ok</p>
+````````````````````````````````
+
+
+
+2.  **Item starting with indented code.**  If a sequence of lines *Ls*
+    constitute a sequence of blocks *Bs* starting with an indented code
+    block and not separated from each other by more than one blank line,
+    and *M* is a list marker of width *W* followed by
+    one space, then the result of prepending *M* and the following
+    space to the first line of *Ls*, and indenting subsequent lines of
+    *Ls* by *W + 1* spaces, is a list item with *Bs* as its contents.
+    If a line is empty, then it need not be indented.  The type of the
+    list item (bullet or ordered) is determined by the type of its list
+    marker.  If the list item is ordered, then it is also assigned a
+    start number, based on the ordered list marker.
+
+An indented code block will have to be indented four spaces beyond
+the edge of the region where text will be included in the list item.
+In the following case that is 6 spaces:
+
+```````````````````````````````` example
+- foo
+
+      bar
+.
+<ul>
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+
+And in this case it is 11 spaces:
+
+```````````````````````````````` example
+  10.  foo
+
+           bar
+.
+<ol start="10">
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+If the *first* block in the list item is an indented code block,
+then by rule #2, the contents must be indented *one* space after the
+list marker:
+
+```````````````````````````````` example
+    indented code
+
+paragraph
+
+    more code
+.
+<pre><code>indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1.     indented code
+
+   paragraph
+
+       more code
+.
+<ol>
+<li>
+<pre><code>indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+Note that an additional space indent is interpreted as space
+inside the code block:
+
+```````````````````````````````` example
+1.      indented code
+
+   paragraph
+
+       more code
+.
+<ol>
+<li>
+<pre><code> indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+Note that rules #1 and #2 only apply to two cases:  (a) cases
+in which the lines to be included in a list item begin with a
+[non-whitespace character], and (b) cases in which
+they begin with an indented code
+block.  In a case like the following, where the first block begins with
+a three-space indent, the rules do not allow us to form a list item by
+indenting the whole thing and prepending a list marker:
+
+```````````````````````````````` example
+   foo
+
+bar
+.
+<p>foo</p>
+<p>bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+-    foo
+
+  bar
+.
+<ul>
+<li>foo</li>
+</ul>
+<p>bar</p>
+````````````````````````````````
+
+
+This is not a significant restriction, because when a block begins
+with 1-3 spaces indent, the indentation can always be removed without
+a change in interpretation, allowing rule #1 to be applied.  So, in
+the above case:
+
+```````````````````````````````` example
+-  foo
+
+   bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+3.  **Item starting with a blank line.**  If a sequence of lines *Ls*
+    starting with a single [blank line] constitute a (possibly empty)
+    sequence of blocks *Bs*, not separated from each other by more than
+    one blank line, and *M* is a list marker of width *W*,
+    then the result of prepending *M* to the first line of *Ls*, and
+    indenting subsequent lines of *Ls* by *W + 1* spaces, is a list
+    item with *Bs* as its contents.
+    If a line is empty, then it need not be indented.  The type of the
+    list item (bullet or ordered) is determined by the type of its list
+    marker.  If the list item is ordered, then it is also assigned a
+    start number, based on the ordered list marker.
+
+Here are some list items that start with a blank line but are not empty:
+
+```````````````````````````````` example
+-
+  foo
+-
+  ```
+  bar
+  ```
+-
+      baz
+.
+<ul>
+<li>foo</li>
+<li>
+<pre><code>bar
+</code></pre>
+</li>
+<li>
+<pre><code>baz
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+When the list item starts with a blank line, the number of spaces
+following the list marker doesn't change the required indentation:
+
+```````````````````````````````` example
+-   
+  foo
+.
+<ul>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+
+A list item can begin with at most one blank line.
+In the following example, `foo` is not part of the list
+item:
+
+```````````````````````````````` example
+-
+
+  foo
+.
+<ul>
+<li></li>
+</ul>
+<p>foo</p>
+````````````````````````````````
+
+
+Here is an empty bullet list item:
+
+```````````````````````````````` example
+- foo
+-
+- bar
+.
+<ul>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+It does not matter whether there are spaces following the [list marker]:
+
+```````````````````````````````` example
+- foo
+-   
+- bar
+.
+<ul>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+Here is an empty ordered list item:
+
+```````````````````````````````` example
+1. foo
+2.
+3. bar
+.
+<ol>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ol>
+````````````````````````````````
+
+
+A list may start or end with an empty list item:
+
+```````````````````````````````` example
+*
+.
+<ul>
+<li></li>
+</ul>
+````````````````````````````````
+
+However, an empty list item cannot interrupt a paragraph:
+
+```````````````````````````````` example
+foo
+*
+
+foo
+1.
+.
+<p>foo
+*</p>
+<p>foo
+1.</p>
+````````````````````````````````
+
+
+4.  **Indentation.**  If a sequence of lines *Ls* constitutes a list item
+    according to rule #1, #2, or #3, then the result of indenting each line
+    of *Ls* by 1-3 spaces (the same for each line) also constitutes a
+    list item with the same contents and attributes.  If a line is
+    empty, then it need not be indented.
+
+Indented one space:
+
+```````````````````````````````` example
+ 1.  A paragraph
+     with two lines.
+
+         indented code
+
+     > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indented two spaces:
+
+```````````````````````````````` example
+  1.  A paragraph
+      with two lines.
+
+          indented code
+
+      > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indented three spaces:
+
+```````````````````````````````` example
+   1.  A paragraph
+       with two lines.
+
+           indented code
+
+       > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Four spaces indent gives a code block:
+
+```````````````````````````````` example
+    1.  A paragraph
+        with two lines.
+
+            indented code
+
+        > A block quote.
+.
+<pre><code>1.  A paragraph
+    with two lines.
+
+        indented code
+
+    &gt; A block quote.
+</code></pre>
+````````````````````````````````
+
+
+
+5.  **Laziness.**  If a string of lines *Ls* constitute a [list
+    item](#list-items) with contents *Bs*, then the result of deleting
+    some or all of the indentation from one or more lines in which the
+    next [non-whitespace character] after the indentation is
+    [paragraph continuation text] is a
+    list item with the same contents and attributes.  The unindented
+    lines are called
+    [lazy continuation line](@)s.
+
+Here is an example with [lazy continuation lines]:
+
+```````````````````````````````` example
+  1.  A paragraph
+with two lines.
+
+          indented code
+
+      > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indentation can be partially deleted:
+
+```````````````````````````````` example
+  1.  A paragraph
+    with two lines.
+.
+<ol>
+<li>A paragraph
+with two lines.</li>
+</ol>
+````````````````````````````````
+
+
+These examples show how laziness can work in nested structures:
+
+```````````````````````````````` example
+> 1. > Blockquote
+continued here.
+.
+<blockquote>
+<ol>
+<li>
+<blockquote>
+<p>Blockquote
+continued here.</p>
+</blockquote>
+</li>
+</ol>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> 1. > Blockquote
+> continued here.
+.
+<blockquote>
+<ol>
+<li>
+<blockquote>
+<p>Blockquote
+continued here.</p>
+</blockquote>
+</li>
+</ol>
+</blockquote>
+````````````````````````````````
+
+
+
+6.  **That's all.** Nothing that is not counted as a list item by rules
+    #1--5 counts as a [list item](#list-items).
+
+The rules for sublists follow from the general rules above.  A sublist
+must be indented the same number of spaces a paragraph would need to be
+in order to be included in the list item.
+
+So, in this case we need two spaces indent:
+
+```````````````````````````````` example
+- foo
+  - bar
+    - baz
+      - boo
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>baz
+<ul>
+<li>boo</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+One is not enough:
+
+```````````````````````````````` example
+- foo
+ - bar
+  - baz
+   - boo
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+<li>baz</li>
+<li>boo</li>
+</ul>
+````````````````````````````````
+
+
+Here we need four, because the list marker is wider:
+
+```````````````````````````````` example
+10) foo
+    - bar
+.
+<ol start="10">
+<li>foo
+<ul>
+<li>bar</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+Three is not enough:
+
+```````````````````````````````` example
+10) foo
+   - bar
+.
+<ol start="10">
+<li>foo</li>
+</ol>
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+A list may be the first block in a list item:
+
+```````````````````````````````` example
+- - foo
+.
+<ul>
+<li>
+<ul>
+<li>foo</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. - 2. foo
+.
+<ol>
+<li>
+<ul>
+<li>
+<ol start="2">
+<li>foo</li>
+</ol>
+</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+A list item can contain a heading:
+
+```````````````````````````````` example
+- # Foo
+- Bar
+  ---
+  baz
+.
+<ul>
+<li>
+<h1>Foo</h1>
+</li>
+<li>
+<h2>Bar</h2>
+baz</li>
+</ul>
+````````````````````````````````
+
+
+### Motivation
+
+John Gruber's Markdown spec says the following about list items:
+
+1. "List markers typically start at the left margin, but may be indented
+   by up to three spaces. List markers must be followed by one or more
+   spaces or a tab."
+
+2. "To make lists look nice, you can wrap items with hanging indents....
+   But if you don't want to, you don't have to."
+
+3. "List items may consist of multiple paragraphs. Each subsequent
+   paragraph in a list item must be indented by either 4 spaces or one
+   tab."
+
+4. "It looks nice if you indent every line of the subsequent paragraphs,
+   but here again, Markdown will allow you to be lazy."
+
+5. "To put a blockquote within a list item, the blockquote's `>`
+   delimiters need to be indented."
+
+6. "To put a code block within a list item, the code block needs to be
+   indented twice — 8 spaces or two tabs."
+
+These rules specify that a paragraph under a list item must be indented
+four spaces (presumably, from the left margin, rather than the start of
+the list marker, but this is not said), and that code under a list item
+must be indented eight spaces instead of the usual four.  They also say
+that a block quote must be indented, but not by how much; however, the
+example given has four spaces indentation.  Although nothing is said
+about other kinds of block-level content, it is certainly reasonable to
+infer that *all* block elements under a list item, including other
+lists, must be indented four spaces.  This principle has been called the
+*four-space rule*.
+
+The four-space rule is clear and principled, and if the reference
+implementation `Markdown.pl` had followed it, it probably would have
+become the standard.  However, `Markdown.pl` allowed paragraphs and
+sublists to start with only two spaces indentation, at least on the
+outer level.  Worse, its behavior was inconsistent: a sublist of an
+outer-level list needed two spaces indentation, but a sublist of this
+sublist needed three spaces.  It is not surprising, then, that different
+implementations of Markdown have developed very different rules for
+determining what comes under a list item.  (Pandoc and python-Markdown,
+for example, stuck with Gruber's syntax description and the four-space
+rule, while discount, redcarpet, marked, PHP Markdown, and others
+followed `Markdown.pl`'s behavior more closely.)
+
+Unfortunately, given the divergences between implementations, there
+is no way to give a spec for list items that will be guaranteed not
+to break any existing documents.  However, the spec given here should
+correctly handle lists formatted with either the four-space rule or
+the more forgiving `Markdown.pl` behavior, provided they are laid out
+in a way that is natural for a human to read.
+
+The strategy here is to let the width and indentation of the list marker
+determine the indentation necessary for blocks to fall under the list
+item, rather than having a fixed and arbitrary number.  The writer can
+think of the body of the list item as a unit which gets indented to the
+right enough to fit the list marker (and any indentation on the list
+marker).  (The laziness rule, #5, then allows continuation lines to be
+unindented if needed.)
+
+This rule is superior, we claim, to any rule requiring a fixed level of
+indentation from the margin.  The four-space rule is clear but
+unnatural. It is quite unintuitive that
+
+``` markdown
+- foo
+
+  bar
+
+  - baz
+```
+
+should be parsed as two lists with an intervening paragraph,
+
+``` html
+<ul>
+<li>foo</li>
+</ul>
+<p>bar</p>
+<ul>
+<li>baz</li>
+</ul>
+```
+
+as the four-space rule demands, rather than a single list,
+
+``` html
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+<ul>
+<li>baz</li>
+</ul>
+</li>
+</ul>
+```
+
+The choice of four spaces is arbitrary.  It can be learned, but it is
+not likely to be guessed, and it trips up beginners regularly.
+
+Would it help to adopt a two-space rule?  The problem is that such
+a rule, together with the rule allowing 1--3 spaces indentation of the
+initial list marker, allows text that is indented *less than* the
+original list marker to be included in the list item. For example,
+`Markdown.pl` parses
+
+``` markdown
+   - one
+
+  two
+```
+
+as a single list item, with `two` a continuation paragraph:
+
+``` html
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+```
+
+and similarly
+
+``` markdown
+>   - one
+>
+>  two
+```
+
+as
+
+``` html
+<blockquote>
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+</blockquote>
+```
+
+This is extremely unintuitive.
+
+Rather than requiring a fixed indent from the margin, we could require
+a fixed indent (say, two spaces, or even one space) from the list marker (which
+may itself be indented).  This proposal would remove the last anomaly
+discussed.  Unlike the spec presented above, it would count the following
+as a list item with a subparagraph, even though the paragraph `bar`
+is not indented as far as the first paragraph `foo`:
+
+``` markdown
+ 10. foo
+
+   bar  
+```
+
+Arguably this text does read like a list item with `bar` as a subparagraph,
+which may count in favor of the proposal.  However, on this proposal indented
+code would have to be indented six spaces after the list marker.  And this
+would break a lot of existing Markdown, which has the pattern:
+
+``` markdown
+1.  foo
+
+        indented code
+```
+
+where the code is indented eight spaces.  The spec above, by contrast, will
+parse this text as expected, since the code block's indentation is measured
+from the beginning of `foo`.
+
+The one case that needs special treatment is a list item that *starts*
+with indented code.  How much indentation is required in that case, since
+we don't have a "first paragraph" to measure from?  Rule #2 simply stipulates
+that in such cases, we require one space indentation from the list marker
+(and then the normal four spaces for the indented code).  This will match the
+four-space rule in cases where the list marker plus its initial indentation
+takes four spaces (a common case), but diverge in other cases.
+
+## Lists
+
+A [list](@) is a sequence of one or more
+list items [of the same type].  The list items
+may be separated by any number of blank lines.
+
+Two list items are [of the same type](@)
+if they begin with a [list marker] of the same type.
+Two list markers are of the
+same type if (a) they are bullet list markers using the same character
+(`-`, `+`, or `*`) or (b) they are ordered list numbers with the same
+delimiter (either `.` or `)`).
+
+A list is an [ordered list](@)
+if its constituent list items begin with
+[ordered list markers], and a
+[bullet list](@) if its constituent list
+items begin with [bullet list markers].
+
+The [start number](@)
+of an [ordered list] is determined by the list number of
+its initial list item.  The numbers of subsequent list items are
+disregarded.
+
+A list is [loose](@) if any of its constituent
+list items are separated by blank lines, or if any of its constituent
+list items directly contain two block-level elements with a blank line
+between them.  Otherwise a list is [tight](@).
+(The difference in HTML output is that paragraphs in a loose list are
+wrapped in `<p>` tags, while paragraphs in a tight list are not.)
+
+Changing the bullet or ordered list delimiter starts a new list:
+
+```````````````````````````````` example
+- foo
+- bar
++ baz
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+</ul>
+<ul>
+<li>baz</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. foo
+2. bar
+3) baz
+.
+<ol>
+<li>foo</li>
+<li>bar</li>
+</ol>
+<ol start="3">
+<li>baz</li>
+</ol>
+````````````````````````````````
+
+
+In CommonMark, a list can interrupt a paragraph. That is,
+no blank line is needed to separate a paragraph from a following
+list:
+
+```````````````````````````````` example
+Foo
+- bar
+- baz
+.
+<p>Foo</p>
+<ul>
+<li>bar</li>
+<li>baz</li>
+</ul>
+````````````````````````````````
+
+`Markdown.pl` does not allow this, through fear of triggering a list
+via a numeral in a hard-wrapped line:
+
+``` markdown
+The number of windows in my house is
+14.  The number of doors is 6.
+```
+
+Oddly, though, `Markdown.pl` *does* allow a blockquote to
+interrupt a paragraph, even though the same considerations might
+apply.
+
+In CommonMark, we do allow lists to interrupt paragraphs, for
+two reasons.  First, it is natural and not uncommon for people
+to start lists without blank lines:
+
+``` markdown
+I need to buy
+- new shoes
+- a coat
+- a plane ticket
+```
+
+Second, we are attracted to a
+
+> [principle of uniformity](@):
+> if a chunk of text has a certain
+> meaning, it will continue to have the same meaning when put into a
+> container block (such as a list item or blockquote).
+
+(Indeed, the spec for [list items] and [block quotes] presupposes
+this principle.) This principle implies that if
+
+``` markdown
+  * I need to buy
+    - new shoes
+    - a coat
+    - a plane ticket
+```
+
+is a list item containing a paragraph followed by a nested sublist,
+as all Markdown implementations agree it is (though the paragraph
+may be rendered without `<p>` tags, since the list is "tight"),
+then
+
+``` markdown
+I need to buy
+- new shoes
+- a coat
+- a plane ticket
+```
+
+by itself should be a paragraph followed by a nested sublist.
+
+Since it is well established Markdown practice to allow lists to
+interrupt paragraphs inside list items, the [principle of
+uniformity] requires us to allow this outside list items as
+well.  ([reStructuredText](http://docutils.sourceforge.net/rst.html)
+takes a different approach, requiring blank lines before lists
+even inside other list items.)
+
+In order to solve of unwanted lists in paragraphs with
+hard-wrapped numerals, we allow only lists starting with `1` to
+interrupt paragraphs.  Thus,
+
+```````````````````````````````` example
+The number of windows in my house is
+14.  The number of doors is 6.
+.
+<p>The number of windows in my house is
+14.  The number of doors is 6.</p>
+````````````````````````````````
+
+We may still get an unintended result in cases like
+
+```````````````````````````````` example
+The number of windows in my house is
+1.  The number of doors is 6.
+.
+<p>The number of windows in my house is</p>
+<ol>
+<li>The number of doors is 6.</li>
+</ol>
+````````````````````````````````
+
+but this rule should prevent most spurious list captures.
+
+There can be any number of blank lines between items:
+
+```````````````````````````````` example
+- foo
+
+- bar
+
+
+- baz
+.
+<ul>
+<li>
+<p>foo</p>
+</li>
+<li>
+<p>bar</p>
+</li>
+<li>
+<p>baz</p>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+- foo
+  - bar
+    - baz
+
+
+      bim
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>
+<p>baz</p>
+<p>bim</p>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+To separate consecutive lists of the same type, or to separate a
+list from an indented code block that would otherwise be parsed
+as a subparagraph of the final list item, you can insert a blank HTML
+comment:
+
+```````````````````````````````` example
+- foo
+- bar
+
+<!-- -->
+
+- baz
+- bim
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+</ul>
+<!-- -->
+<ul>
+<li>baz</li>
+<li>bim</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+-   foo
+
+    notcode
+
+-   foo
+
+<!-- -->
+
+    code
+.
+<ul>
+<li>
+<p>foo</p>
+<p>notcode</p>
+</li>
+<li>
+<p>foo</p>
+</li>
+</ul>
+<!-- -->
+<pre><code>code
+</code></pre>
+````````````````````````````````
+
+
+List items need not be indented to the same level.  The following
+list items will be treated as items at the same list level,
+since none is indented enough to belong to the previous list
+item:
+
+```````````````````````````````` example
+- a
+ - b
+  - c
+   - d
+    - e
+   - f
+  - g
+ - h
+- i
+.
+<ul>
+<li>a</li>
+<li>b</li>
+<li>c</li>
+<li>d</li>
+<li>e</li>
+<li>f</li>
+<li>g</li>
+<li>h</li>
+<li>i</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. a
+
+  2. b
+
+    3. c
+.
+<ol>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>c</p>
+</li>
+</ol>
+````````````````````````````````
+
+
+This is a loose list, because there is a blank line between
+two of the list items:
+
+```````````````````````````````` example
+- a
+- b
+
+- c
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>c</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+So is this, with a empty second item:
+
+```````````````````````````````` example
+* a
+*
+
+* c
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li></li>
+<li>
+<p>c</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+These are loose lists, even though there is no space between the items,
+because one of the items directly contains two block-level elements
+with a blank line between them:
+
+```````````````````````````````` example
+- a
+- b
+
+  c
+- d
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+<p>c</p>
+</li>
+<li>
+<p>d</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+- b
+
+  [ref]: /url
+- d
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>d</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank lines are in a code block:
+
+```````````````````````````````` example
+- a
+- ```
+  b
+
+
+  ```
+- c
+.
+<ul>
+<li>a</li>
+<li>
+<pre><code>b
+
+
+</code></pre>
+</li>
+<li>c</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank line is between two
+paragraphs of a sublist.  So the sublist is loose while
+the outer list is tight:
+
+```````````````````````````````` example
+- a
+  - b
+
+    c
+- d
+.
+<ul>
+<li>a
+<ul>
+<li>
+<p>b</p>
+<p>c</p>
+</li>
+</ul>
+</li>
+<li>d</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank line is inside the
+block quote:
+
+```````````````````````````````` example
+* a
+  > b
+  >
+* c
+.
+<ul>
+<li>a
+<blockquote>
+<p>b</p>
+</blockquote>
+</li>
+<li>c</li>
+</ul>
+````````````````````````````````
+
+
+This list is tight, because the consecutive block elements
+are not separated by blank lines:
+
+```````````````````````````````` example
+- a
+  > b
+  ```
+  c
+  ```
+- d
+.
+<ul>
+<li>a
+<blockquote>
+<p>b</p>
+</blockquote>
+<pre><code>c
+</code></pre>
+</li>
+<li>d</li>
+</ul>
+````````````````````````````````
+
+
+A single-paragraph list is tight:
+
+```````````````````````````````` example
+- a
+.
+<ul>
+<li>a</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+  - b
+.
+<ul>
+<li>a
+<ul>
+<li>b</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+This list is loose, because of the blank line between the
+two block elements in the list item:
+
+```````````````````````````````` example
+1. ```
+   foo
+   ```
+
+   bar
+.
+<ol>
+<li>
+<pre><code>foo
+</code></pre>
+<p>bar</p>
+</li>
+</ol>
+````````````````````````````````
+
+
+Here the outer list is loose, the inner list tight:
+
+```````````````````````````````` example
+* foo
+  * bar
+
+  baz
+.
+<ul>
+<li>
+<p>foo</p>
+<ul>
+<li>bar</li>
+</ul>
+<p>baz</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+  - b
+  - c
+
+- d
+  - e
+  - f
+.
+<ul>
+<li>
+<p>a</p>
+<ul>
+<li>b</li>
+<li>c</li>
+</ul>
+</li>
+<li>
+<p>d</p>
+<ul>
+<li>e</li>
+<li>f</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+# Inlines
+
+Inlines are parsed sequentially from the beginning of the character
+stream to the end (left to right, in left-to-right languages).
+Thus, for example, in
+
+```````````````````````````````` example
+`hi`lo`
+.
+<p><code>hi</code>lo`</p>
+````````````````````````````````
+
+
+`hi` is parsed as code, leaving the backtick at the end as a literal
+backtick.
+
+## Backslash escapes
+
+Any ASCII punctuation character may be backslash-escaped:
+
+```````````````````````````````` example
+\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~
+.
+<p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
+````````````````````````````````
+
+
+Backslashes before other characters are treated as literal
+backslashes:
+
+```````````````````````````````` example
+\→\A\a\ \3\φ\«
+.
+<p>\→\A\a\ \3\φ\«</p>
+````````````````````````````````
+
+
+Escaped characters are treated as regular characters and do
+not have their usual Markdown meanings:
+
+```````````````````````````````` example
+\*not emphasized*
+\<br/> not a tag
+\[not a link](/foo)
+\`not code`
+1\. not a list
+\* not a list
+\# not a heading
+\[foo]: /url "not a reference"
+.
+<p>*not emphasized*
+&lt;br/&gt; not a tag
+[not a link](/foo)
+`not code`
+1. not a list
+* not a list
+# not a heading
+[foo]: /url &quot;not a reference&quot;</p>
+````````````````````````````````
+
+
+If a backslash is itself escaped, the following character is not:
+
+```````````````````````````````` example
+\\*emphasis*
+.
+<p>\<em>emphasis</em></p>
+````````````````````````````````
+
+
+A backslash at the end of the line is a [hard line break]:
+
+```````````````````````````````` example
+foo\
+bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+Backslash escapes do not work in code blocks, code spans, autolinks, or
+raw HTML:
+
+```````````````````````````````` example
+`` \[\` ``
+.
+<p><code>\[\`</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    \[\]
+.
+<pre><code>\[\]
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~
+\[\]
+~~~
+.
+<pre><code>\[\]
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://example.com?find=\*>
+.
+<p><a href="http://example.com?find=%5C*">http://example.com?find=\*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="/bar\/)">
+.
+<a href="/bar\/)">
+````````````````````````````````
+
+
+But they work in all other contexts, including URLs and link titles,
+link references, and [info strings] in [fenced code blocks]:
+
+```````````````````````````````` example
+[foo](/bar\* "ti\*tle")
+.
+<p><a href="/bar*" title="ti*tle">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /bar\* "ti\*tle"
+.
+<p><a href="/bar*" title="ti*tle">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+``` foo\+bar
+foo
+```
+.
+<pre><code class="language-foo+bar">foo
+</code></pre>
+````````````````````````````````
+
+
+
+## Entity and numeric character references
+
+All valid HTML entity references and numeric character
+references, except those occuring in code blocks and code spans,
+are recognized as such and treated as equivalent to the
+corresponding Unicode characters.  Conforming CommonMark parsers
+need not store information about whether a particular character
+was represented in the source using a Unicode character or
+an entity reference.
+
+[Entity references](@) consist of `&` + any of the valid
+HTML5 entity names + `;`. The
+document <https://html.spec.whatwg.org/multipage/entities.json>
+is used as an authoritative source for the valid entity
+references and their corresponding code points.
+
+```````````````````````````````` example
+&nbsp; &amp; &copy; &AElig; &Dcaron;
+&frac34; &HilbertSpace; &DifferentialD;
+&ClockwiseContourIntegral; &ngE;
+.
+<p>  &amp; © Æ Ď
+¾ ℋ ⅆ
+∲ ≧̸</p>
+````````````````````````````````
+
+
+[Decimal numeric character
+references](@)
+consist of `&#` + a string of 1--8 arabic digits + `;`. A
+numeric character reference is parsed as the corresponding
+Unicode character. Invalid Unicode code points will be replaced by
+the REPLACEMENT CHARACTER (`U+FFFD`).  For security reasons,
+the code point `U+0000` will also be replaced by `U+FFFD`.
+
+```````````````````````````````` example
+&#35; &#1234; &#992; &#98765432; &#0;
+.
+<p># Ӓ Ϡ � �</p>
+````````````````````````````````
+
+
+[Hexadecimal numeric character
+references](@) consist of `&#` +
+either `X` or `x` + a string of 1-8 hexadecimal digits + `;`.
+They too are parsed as the corresponding Unicode character (this
+time specified with a hexadecimal numeral instead of decimal).
+
+```````````````````````````````` example
+&#X22; &#XD06; &#xcab;
+.
+<p>&quot; ആ ಫ</p>
+````````````````````````````````
+
+
+Here are some nonentities:
+
+```````````````````````````````` example
+&nbsp &x; &#; &#x;
+&ThisIsNotDefined; &hi?;
+.
+<p>&amp;nbsp &amp;x; &amp;#; &amp;#x;
+&amp;ThisIsNotDefined; &amp;hi?;</p>
+````````````````````````````````
+
+
+Although HTML5 does accept some entity references
+without a trailing semicolon (such as `&copy`), these are not
+recognized here, because it makes the grammar too ambiguous:
+
+```````````````````````````````` example
+&copy
+.
+<p>&amp;copy</p>
+````````````````````````````````
+
+
+Strings that are not on the list of HTML5 named entities are not
+recognized as entity references either:
+
+```````````````````````````````` example
+&MadeUpEntity;
+.
+<p>&amp;MadeUpEntity;</p>
+````````````````````````````````
+
+
+Entity and numeric character references are recognized in any
+context besides code spans or code blocks, including
+URLs, [link titles], and [fenced code block][] [info strings]:
+
+```````````````````````````````` example
+<a href="&ouml;&ouml;.html">
+.
+<a href="&ouml;&ouml;.html">
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo](/f&ouml;&ouml; "f&ouml;&ouml;")
+.
+<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /f&ouml;&ouml; "f&ouml;&ouml;"
+.
+<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+``` f&ouml;&ouml;
+foo
+```
+.
+<pre><code class="language-föö">foo
+</code></pre>
+````````````````````````````````
+
+
+Entity and numeric character references are treated as literal
+text in code spans and code blocks:
+
+```````````````````````````````` example
+`f&ouml;&ouml;`
+.
+<p><code>f&amp;ouml;&amp;ouml;</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    f&ouml;f&ouml;
+.
+<pre><code>f&amp;ouml;f&amp;ouml;
+</code></pre>
+````````````````````````````````
+
+
+## Code spans
+
+A [backtick string](@)
+is a string of one or more backtick characters (`` ` ``) that is neither
+preceded nor followed by a backtick.
+
+A [code span](@) begins with a backtick string and ends with
+a backtick string of equal length.  The contents of the code span are
+the characters between the two backtick strings, with leading and
+trailing spaces and [line endings] removed, and
+[whitespace] collapsed to single spaces.
+
+This is a simple code span:
+
+```````````````````````````````` example
+`foo`
+.
+<p><code>foo</code></p>
+````````````````````````````````
+
+
+Here two backticks are used, because the code contains a backtick.
+This example also illustrates stripping of leading and trailing spaces:
+
+```````````````````````````````` example
+`` foo ` bar  ``
+.
+<p><code>foo ` bar</code></p>
+````````````````````````````````
+
+
+This example shows the motivation for stripping leading and trailing
+spaces:
+
+```````````````````````````````` example
+` `` `
+.
+<p><code>``</code></p>
+````````````````````````````````
+
+
+[Line endings] are treated like spaces:
+
+```````````````````````````````` example
+``
+foo
+``
+.
+<p><code>foo</code></p>
+````````````````````````````````
+
+
+Interior spaces and [line endings] are collapsed into
+single spaces, just as they would be by a browser:
+
+```````````````````````````````` example
+`foo   bar
+  baz`
+.
+<p><code>foo bar baz</code></p>
+````````````````````````````````
+
+
+Not all [Unicode whitespace] (for instance, non-breaking space) is
+collapsed, however:
+
+```````````````````````````````` example
+`a  b`
+.
+<p><code>a  b</code></p>
+````````````````````````````````
+
+
+Q: Why not just leave the spaces, since browsers will collapse them
+anyway?  A:  Because we might be targeting a non-HTML format, and we
+shouldn't rely on HTML-specific rendering assumptions.
+
+(Existing implementations differ in their treatment of internal
+spaces and [line endings].  Some, including `Markdown.pl` and
+`showdown`, convert an internal [line ending] into a
+`<br />` tag.  But this makes things difficult for those who like to
+hard-wrap their paragraphs, since a line break in the midst of a code
+span will cause an unintended line break in the output.  Others just
+leave internal spaces as they are, which is fine if only HTML is being
+targeted.)
+
+```````````````````````````````` example
+`foo `` bar`
+.
+<p><code>foo `` bar</code></p>
+````````````````````````````````
+
+
+Note that backslash escapes do not work in code spans. All backslashes
+are treated literally:
+
+```````````````````````````````` example
+`foo\`bar`
+.
+<p><code>foo\</code>bar`</p>
+````````````````````````````````
+
+
+Backslash escapes are never needed, because one can always choose a
+string of *n* backtick characters as delimiters, where the code does
+not contain any strings of exactly *n* backtick characters.
+
+Code span backticks have higher precedence than any other inline
+constructs except HTML tags and autolinks.  Thus, for example, this is
+not parsed as emphasized text, since the second `*` is part of a code
+span:
+
+```````````````````````````````` example
+*foo`*`
+.
+<p>*foo<code>*</code></p>
+````````````````````````````````
+
+
+And this is not parsed as a link:
+
+```````````````````````````````` example
+[not a `link](/foo`)
+.
+<p>[not a <code>link](/foo</code>)</p>
+````````````````````````````````
+
+
+Code spans, HTML tags, and autolinks have the same precedence.
+Thus, this is code:
+
+```````````````````````````````` example
+`<a href="`">`
+.
+<p><code>&lt;a href=&quot;</code>&quot;&gt;`</p>
+````````````````````````````````
+
+
+But this is an HTML tag:
+
+```````````````````````````````` example
+<a href="`">`
+.
+<p><a href="`">`</p>
+````````````````````````````````
+
+
+And this is code:
+
+```````````````````````````````` example
+`<http://foo.bar.`baz>`
+.
+<p><code>&lt;http://foo.bar.</code>baz&gt;`</p>
+````````````````````````````````
+
+
+But this is an autolink:
+
+```````````````````````````````` example
+<http://foo.bar.`baz>`
+.
+<p><a href="http://foo.bar.%60baz">http://foo.bar.`baz</a>`</p>
+````````````````````````````````
+
+
+When a backtick string is not closed by a matching backtick string,
+we just have literal backticks:
+
+```````````````````````````````` example
+```foo``
+.
+<p>```foo``</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`foo
+.
+<p>`foo</p>
+````````````````````````````````
+
+
+## Emphasis and strong emphasis
+
+John Gruber's original [Markdown syntax
+description](http://daringfireball.net/projects/markdown/syntax#em) says:
+
+> Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
+> emphasis. Text wrapped with one `*` or `_` will be wrapped with an HTML
+> `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML `<strong>`
+> tag.
+
+This is enough for most users, but these rules leave much undecided,
+especially when it comes to nested emphasis.  The original
+`Markdown.pl` test suite makes it clear that triple `***` and
+`___` delimiters can be used for strong emphasis, and most
+implementations have also allowed the following patterns:
+
+``` markdown
+***strong emph***
+***strong** in emph*
+***emph* in strong**
+**in strong *emph***
+*in emph **strong***
+```
+
+The following patterns are less widely supported, but the intent
+is clear and they are useful (especially in contexts like bibliography
+entries):
+
+``` markdown
+*emph *with emph* in it*
+**strong **with strong** in it**
+```
+
+Many implementations have also restricted intraword emphasis to
+the `*` forms, to avoid unwanted emphasis in words containing
+internal underscores.  (It is best practice to put these in code
+spans, but users often do not.)
+
+``` markdown
+internal emphasis: foo*bar*baz
+no emphasis: foo_bar_baz
+```
+
+The rules given below capture all of these patterns, while allowing
+for efficient parsing strategies that do not backtrack.
+
+First, some definitions.  A [delimiter run](@) is either
+a sequence of one or more `*` characters that is not preceded or
+followed by a `*` character, or a sequence of one or more `_`
+characters that is not preceded or followed by a `_` character.
+
+A [left-flanking delimiter run](@) is
+a [delimiter run] that is (a) not followed by [Unicode whitespace],
+and (b) either not followed by a [punctuation character], or
+preceded by [Unicode whitespace] or a [punctuation character].
+For purposes of this definition, the beginning and the end of
+the line count as Unicode whitespace.
+
+A [right-flanking delimiter run](@) is
+a [delimiter run] that is (a) not preceded by [Unicode whitespace],
+and (b) either not preceded by a [punctuation character], or
+followed by [Unicode whitespace] or a [punctuation character].
+For purposes of this definition, the beginning and the end of
+the line count as Unicode whitespace.
+
+Here are some examples of delimiter runs.
+
+  - left-flanking but not right-flanking:
+
+    ```
+    ***abc
+      _abc
+    **"abc"
+     _"abc"
+    ```
+
+  - right-flanking but not left-flanking:
+
+    ```
+     abc***
+     abc_
+    "abc"**
+    "abc"_
+    ```
+
+  - Both left and right-flanking:
+
+    ```
+     abc***def
+    "abc"_"def"
+    ```
+
+  - Neither left nor right-flanking:
+
+    ```
+    abc *** def
+    a _ b
+    ```
+
+(The idea of distinguishing left-flanking and right-flanking
+delimiter runs based on the character before and the character
+after comes from Roopesh Chander's
+[vfmd](http://www.vfmd.org/vfmd-spec/specification/#procedure-for-identifying-emphasis-tags).
+vfmd uses the terminology "emphasis indicator string" instead of "delimiter
+run," and its rules for distinguishing left- and right-flanking runs
+are a bit more complex than the ones given here.)
+
+The following rules define emphasis and strong emphasis:
+
+1.  A single `*` character [can open emphasis](@)
+    iff (if and only if) it is part of a [left-flanking delimiter run].
+
+2.  A single `_` character [can open emphasis] iff
+    it is part of a [left-flanking delimiter run]
+    and either (a) not part of a [right-flanking delimiter run]
+    or (b) part of a [right-flanking delimiter run]
+    preceded by punctuation.
+
+3.  A single `*` character [can close emphasis](@)
+    iff it is part of a [right-flanking delimiter run].
+
+4.  A single `_` character [can close emphasis] iff
+    it is part of a [right-flanking delimiter run]
+    and either (a) not part of a [left-flanking delimiter run]
+    or (b) part of a [left-flanking delimiter run]
+    followed by punctuation.
+
+5.  A double `**` [can open strong emphasis](@)
+    iff it is part of a [left-flanking delimiter run].
+
+6.  A double `__` [can open strong emphasis] iff
+    it is part of a [left-flanking delimiter run]
+    and either (a) not part of a [right-flanking delimiter run]
+    or (b) part of a [right-flanking delimiter run]
+    preceded by punctuation.
+
+7.  A double `**` [can close strong emphasis](@)
+    iff it is part of a [right-flanking delimiter run].
+
+8.  A double `__` [can close strong emphasis]
+    it is part of a [right-flanking delimiter run]
+    and either (a) not part of a [left-flanking delimiter run]
+    or (b) part of a [left-flanking delimiter run]
+    followed by punctuation.
+
+9.  Emphasis begins with a delimiter that [can open emphasis] and ends
+    with a delimiter that [can close emphasis], and that uses the same
+    character (`_` or `*`) as the opening delimiter.  The
+    opening and closing delimiters must belong to separate
+    [delimiter runs].  If one of the delimiters can both
+    open and close emphasis, then the sum of the lengths of the
+    delimiter runs containing the opening and closing delimiters
+    must not be a multiple of 3.
+
+10. Strong emphasis begins with a delimiter that
+    [can open strong emphasis] and ends with a delimiter that
+    [can close strong emphasis], and that uses the same character
+    (`_` or `*`) as the opening delimiter.  The
+    opening and closing delimiters must belong to separate
+    [delimiter runs].  If one of the delimiters can both open
+    and close strong emphasis, then the sum of the lengths of
+    the delimiter runs containing the opening and closing
+    delimiters must not be a multiple of 3.
+
+11. A literal `*` character cannot occur at the beginning or end of
+    `*`-delimited emphasis or `**`-delimited strong emphasis, unless it
+    is backslash-escaped.
+
+12. A literal `_` character cannot occur at the beginning or end of
+    `_`-delimited emphasis or `__`-delimited strong emphasis, unless it
+    is backslash-escaped.
+
+Where rules 1--12 above are compatible with multiple parsings,
+the following principles resolve ambiguity:
+
+13. The number of nestings should be minimized. Thus, for example,
+    an interpretation `<strong>...</strong>` is always preferred to
+    `<em><em>...</em></em>`.
+
+14. An interpretation `<strong><em>...</em></strong>` is always
+    preferred to `<em><strong>..</strong></em>`.
+
+15. When two potential emphasis or strong emphasis spans overlap,
+    so that the second begins before the first ends and ends after
+    the first ends, the first takes precedence. Thus, for example,
+    `*foo _bar* baz_` is parsed as `<em>foo _bar</em> baz_` rather
+    than `*foo <em>bar* baz</em>`.
+
+16. When there are two potential emphasis or strong emphasis spans
+    with the same closing delimiter, the shorter one (the one that
+    opens later) takes precedence. Thus, for example,
+    `**foo **bar baz**` is parsed as `**foo <strong>bar baz</strong>`
+    rather than `<strong>foo **bar baz</strong>`.
+
+17. Inline code spans, links, images, and HTML tags group more tightly
+    than emphasis.  So, when there is a choice between an interpretation
+    that contains one of these elements and one that does not, the
+    former always wins.  Thus, for example, `*[foo*](bar)` is
+    parsed as `*<a href="bar">foo*</a>` rather than as
+    `<em>[foo</em>](bar)`.
+
+These rules can be illustrated through a series of examples.
+
+Rule 1:
+
+```````````````````````````````` example
+*foo bar*
+.
+<p><em>foo bar</em></p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `*` is followed by
+whitespace, and hence not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a * foo bar*
+.
+<p>a * foo bar*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `*` is preceded
+by an alphanumeric and followed by punctuation, and hence
+not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a*"foo"*
+.
+<p>a*&quot;foo&quot;*</p>
+````````````````````````````````
+
+
+Unicode nonbreaking spaces count as whitespace, too:
+
+```````````````````````````````` example
+* a *
+.
+<p>* a *</p>
+````````````````````````````````
+
+
+Intraword emphasis with `*` is permitted:
+
+```````````````````````````````` example
+foo*bar*
+.
+<p>foo<em>bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5*6*78
+.
+<p>5<em>6</em>78</p>
+````````````````````````````````
+
+
+Rule 2:
+
+```````````````````````````````` example
+_foo bar_
+.
+<p><em>foo bar</em></p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `_` is followed by
+whitespace:
+
+```````````````````````````````` example
+_ foo bar_
+.
+<p>_ foo bar_</p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `_` is preceded
+by an alphanumeric and followed by punctuation:
+
+```````````````````````````````` example
+a_"foo"_
+.
+<p>a_&quot;foo&quot;_</p>
+````````````````````````````````
+
+
+Emphasis with `_` is not allowed inside words:
+
+```````````````````````````````` example
+foo_bar_
+.
+<p>foo_bar_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5_6_78
+.
+<p>5_6_78</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+пристаням_стремятся_
+.
+<p>пристаням_стремятся_</p>
+````````````````````````````````
+
+
+Here `_` does not generate emphasis, because the first delimiter run
+is right-flanking and the second left-flanking:
+
+```````````````````````````````` example
+aa_"bb"_cc
+.
+<p>aa_&quot;bb&quot;_cc</p>
+````````````````````````````````
+
+
+This is emphasis, even though the opening delimiter is
+both left- and right-flanking, because it is preceded by
+punctuation:
+
+```````````````````````````````` example
+foo-_(bar)_
+.
+<p>foo-<em>(bar)</em></p>
+````````````````````````````````
+
+
+Rule 3:
+
+This is not emphasis, because the closing delimiter does
+not match the opening delimiter:
+
+```````````````````````````````` example
+_foo*
+.
+<p>_foo*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the closing `*` is preceded by
+whitespace:
+
+```````````````````````````````` example
+*foo bar *
+.
+<p>*foo bar *</p>
+````````````````````````````````
+
+
+A newline also counts as whitespace:
+
+```````````````````````````````` example
+*foo bar
+*
+.
+<p>*foo bar
+*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the second `*` is
+preceded by punctuation and followed by an alphanumeric
+(hence it is not part of a [right-flanking delimiter run]:
+
+```````````````````````````````` example
+*(*foo)
+.
+<p>*(*foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with this example:
+
+```````````````````````````````` example
+*(*foo*)*
+.
+<p><em>(<em>foo</em>)</em></p>
+````````````````````````````````
+
+
+Intraword emphasis with `*` is allowed:
+
+```````````````````````````````` example
+*foo*bar
+.
+<p><em>foo</em>bar</p>
+````````````````````````````````
+
+
+
+Rule 4:
+
+This is not emphasis, because the closing `_` is preceded by
+whitespace:
+
+```````````````````````````````` example
+_foo bar _
+.
+<p>_foo bar _</p>
+````````````````````````````````
+
+
+This is not emphasis, because the second `_` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+_(_foo)
+.
+<p>_(_foo)</p>
+````````````````````````````````
+
+
+This is emphasis within emphasis:
+
+```````````````````````````````` example
+_(_foo_)_
+.
+<p><em>(<em>foo</em>)</em></p>
+````````````````````````````````
+
+
+Intraword emphasis is disallowed for `_`:
+
+```````````````````````````````` example
+_foo_bar
+.
+<p>_foo_bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_пристаням_стремятся
+.
+<p>_пристаням_стремятся</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo_bar_baz_
+.
+<p><em>foo_bar_baz</em></p>
+````````````````````````````````
+
+
+This is emphasis, even though the closing delimiter is
+both left- and right-flanking, because it is followed by
+punctuation:
+
+```````````````````````````````` example
+_(bar)_.
+.
+<p><em>(bar)</em>.</p>
+````````````````````````````````
+
+
+Rule 5:
+
+```````````````````````````````` example
+**foo bar**
+.
+<p><strong>foo bar</strong></p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening delimiter is
+followed by whitespace:
+
+```````````````````````````````` example
+** foo bar**
+.
+<p>** foo bar**</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening `**` is preceded
+by an alphanumeric and followed by punctuation, and hence
+not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a**"foo"**
+.
+<p>a**&quot;foo&quot;**</p>
+````````````````````````````````
+
+
+Intraword strong emphasis with `**` is permitted:
+
+```````````````````````````````` example
+foo**bar**
+.
+<p>foo<strong>bar</strong></p>
+````````````````````````````````
+
+
+Rule 6:
+
+```````````````````````````````` example
+__foo bar__
+.
+<p><strong>foo bar</strong></p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening delimiter is
+followed by whitespace:
+
+```````````````````````````````` example
+__ foo bar__
+.
+<p>__ foo bar__</p>
+````````````````````````````````
+
+
+A newline counts as whitespace:
+```````````````````````````````` example
+__
+foo bar__
+.
+<p>__
+foo bar__</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening `__` is preceded
+by an alphanumeric and followed by punctuation:
+
+```````````````````````````````` example
+a__"foo"__
+.
+<p>a__&quot;foo&quot;__</p>
+````````````````````````````````
+
+
+Intraword strong emphasis is forbidden with `__`:
+
+```````````````````````````````` example
+foo__bar__
+.
+<p>foo__bar__</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5__6__78
+.
+<p>5__6__78</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+пристаням__стремятся__
+.
+<p>пристаням__стремятся__</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo, __bar__, baz__
+.
+<p><strong>foo, <strong>bar</strong>, baz</strong></p>
+````````````````````````````````
+
+
+This is strong emphasis, even though the opening delimiter is
+both left- and right-flanking, because it is preceded by
+punctuation:
+
+```````````````````````````````` example
+foo-__(bar)__
+.
+<p>foo-<strong>(bar)</strong></p>
+````````````````````````````````
+
+
+
+Rule 7:
+
+This is not strong emphasis, because the closing delimiter is preceded
+by whitespace:
+
+```````````````````````````````` example
+**foo bar **
+.
+<p>**foo bar **</p>
+````````````````````````````````
+
+
+(Nor can it be interpreted as an emphasized `*foo bar *`, because of
+Rule 11.)
+
+This is not strong emphasis, because the second `**` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+**(**foo)
+.
+<p>**(**foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with these examples:
+
+```````````````````````````````` example
+*(**foo**)*
+.
+<p><em>(<strong>foo</strong>)</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**Gomphocarpus (*Gomphocarpus physocarpus*, syn.
+*Asclepias physocarpa*)**
+.
+<p><strong>Gomphocarpus (<em>Gomphocarpus physocarpus</em>, syn.
+<em>Asclepias physocarpa</em>)</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo "*bar*" foo**
+.
+<p><strong>foo &quot;<em>bar</em>&quot; foo</strong></p>
+````````````````````````````````
+
+
+Intraword emphasis:
+
+```````````````````````````````` example
+**foo**bar
+.
+<p><strong>foo</strong>bar</p>
+````````````````````````````````
+
+
+Rule 8:
+
+This is not strong emphasis, because the closing delimiter is
+preceded by whitespace:
+
+```````````````````````````````` example
+__foo bar __
+.
+<p>__foo bar __</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the second `__` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+__(__foo)
+.
+<p>__(__foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with this example:
+
+```````````````````````````````` example
+_(__foo__)_
+.
+<p><em>(<strong>foo</strong>)</em></p>
+````````````````````````````````
+
+
+Intraword strong emphasis is forbidden with `__`:
+
+```````````````````````````````` example
+__foo__bar
+.
+<p>__foo__bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__пристаням__стремятся
+.
+<p>__пристаням__стремятся</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo__bar__baz__
+.
+<p><strong>foo__bar__baz</strong></p>
+````````````````````````````````
+
+
+This is strong emphasis, even though the closing delimiter is
+both left- and right-flanking, because it is followed by
+punctuation:
+
+```````````````````````````````` example
+__(bar)__.
+.
+<p><strong>(bar)</strong>.</p>
+````````````````````````````````
+
+
+Rule 9:
+
+Any nonempty sequence of inline elements can be the contents of an
+emphasized span.
+
+```````````````````````````````` example
+*foo [bar](/url)*
+.
+<p><em>foo <a href="/url">bar</a></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo
+bar*
+.
+<p><em>foo
+bar</em></p>
+````````````````````````````````
+
+
+In particular, emphasis and strong emphasis can be nested
+inside emphasis:
+
+```````````````````````````````` example
+_foo __bar__ baz_
+.
+<p><em>foo <strong>bar</strong> baz</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo _bar_ baz_
+.
+<p><em>foo <em>bar</em> baz</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo_ bar_
+.
+<p><em><em>foo</em> bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo *bar**
+.
+<p><em>foo <em>bar</em></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo **bar** baz*
+.
+<p><em>foo <strong>bar</strong> baz</em></p>
+````````````````````````````````
+
+```````````````````````````````` example
+*foo**bar**baz*
+.
+<p><em>foo<strong>bar</strong>baz</em></p>
+````````````````````````````````
+
+Note that in the preceding case, the interpretation
+
+``` markdown
+<p><em>foo</em><em>bar<em></em>baz</em></p>
+```
+
+
+is precluded by the condition that a delimiter that
+can both open and close (like the `*` after `foo`)
+cannot form emphasis if the sum of the lengths of
+the delimiter runs containing the opening and
+closing delimiters is a multiple of 3.
+
+The same condition ensures that the following
+cases are all strong emphasis nested inside
+emphasis, even when the interior spaces are
+omitted:
+
+
+```````````````````````````````` example
+***foo** bar*
+.
+<p><em><strong>foo</strong> bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo **bar***
+.
+<p><em>foo <strong>bar</strong></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo**bar***
+.
+<p><em>foo<strong>bar</strong></em></p>
+````````````````````````````````
+
+
+Indefinite levels of nesting are possible:
+
+```````````````````````````````` example
+*foo **bar *baz* bim** bop*
+.
+<p><em>foo <strong>bar <em>baz</em> bim</strong> bop</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo [*bar*](/url)*
+.
+<p><em>foo <a href="/url"><em>bar</em></a></em></p>
+````````````````````````````````
+
+
+There can be no empty emphasis or strong emphasis:
+
+```````````````````````````````` example
+** is not an empty emphasis
+.
+<p>** is not an empty emphasis</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**** is not an empty strong emphasis
+.
+<p>**** is not an empty strong emphasis</p>
+````````````````````````````````
+
+
+
+Rule 10:
+
+Any nonempty sequence of inline elements can be the contents of an
+strongly emphasized span.
+
+```````````````````````````````` example
+**foo [bar](/url)**
+.
+<p><strong>foo <a href="/url">bar</a></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo
+bar**
+.
+<p><strong>foo
+bar</strong></p>
+````````````````````````````````
+
+
+In particular, emphasis and strong emphasis can be nested
+inside strong emphasis:
+
+```````````````````````````````` example
+__foo _bar_ baz__
+.
+<p><strong>foo <em>bar</em> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo __bar__ baz__
+.
+<p><strong>foo <strong>bar</strong> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo__ bar__
+.
+<p><strong><strong>foo</strong> bar</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo **bar****
+.
+<p><strong>foo <strong>bar</strong></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo *bar* baz**
+.
+<p><strong>foo <em>bar</em> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo*bar*baz**
+.
+<p><strong>foo<em>bar</em>baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+***foo* bar**
+.
+<p><strong><em>foo</em> bar</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo *bar***
+.
+<p><strong>foo <em>bar</em></strong></p>
+````````````````````````````````
+
+
+Indefinite levels of nesting are possible:
+
+```````````````````````````````` example
+**foo *bar **baz**
+bim* bop**
+.
+<p><strong>foo <em>bar <strong>baz</strong>
+bim</em> bop</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo [*bar*](/url)**
+.
+<p><strong>foo <a href="/url"><em>bar</em></a></strong></p>
+````````````````````````````````
+
+
+There can be no empty emphasis or strong emphasis:
+
+```````````````````````````````` example
+__ is not an empty emphasis
+.
+<p>__ is not an empty emphasis</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____ is not an empty strong emphasis
+.
+<p>____ is not an empty strong emphasis</p>
+````````````````````````````````
+
+
+
+Rule 11:
+
+```````````````````````````````` example
+foo ***
+.
+<p>foo ***</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *\**
+.
+<p>foo <em>*</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *_*
+.
+<p>foo <em>_</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *****
+.
+<p>foo *****</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo **\***
+.
+<p>foo <strong>*</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo **_**
+.
+<p>foo <strong>_</strong></p>
+````````````````````````````````
+
+
+Note that when delimiters do not match evenly, Rule 11 determines
+that the excess literal `*` characters will appear outside of the
+emphasis, rather than inside it:
+
+```````````````````````````````` example
+**foo*
+.
+<p>*<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo**
+.
+<p><em>foo</em>*</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+***foo**
+.
+<p>*<strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+****foo*
+.
+<p>***<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo***
+.
+<p><strong>foo</strong>*</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo****
+.
+<p><em>foo</em>***</p>
+````````````````````````````````
+
+
+
+Rule 12:
+
+```````````````````````````````` example
+foo ___
+.
+<p>foo ___</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _\__
+.
+<p>foo <em>_</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _*_
+.
+<p>foo <em>*</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _____
+.
+<p>foo _____</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo __\___
+.
+<p>foo <strong>_</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo __*__
+.
+<p>foo <strong>*</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo_
+.
+<p>_<em>foo</em></p>
+````````````````````````````````
+
+
+Note that when delimiters do not match evenly, Rule 12 determines
+that the excess literal `_` characters will appear outside of the
+emphasis, rather than inside it:
+
+```````````````````````````````` example
+_foo__
+.
+<p><em>foo</em>_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+___foo__
+.
+<p>_<strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo_
+.
+<p>___<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo___
+.
+<p><strong>foo</strong>_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo____
+.
+<p><em>foo</em>___</p>
+````````````````````````````````
+
+
+Rule 13 implies that if you want emphasis nested directly inside
+emphasis, you must use different delimiters:
+
+```````````````````````````````` example
+**foo**
+.
+<p><strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*_foo_*
+.
+<p><em><em>foo</em></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo__
+.
+<p><strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_*foo*_
+.
+<p><em><em>foo</em></em></p>
+````````````````````````````````
+
+
+However, strong emphasis within strong emphasis is possible without
+switching delimiters:
+
+```````````````````````````````` example
+****foo****
+.
+<p><strong><strong>foo</strong></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo____
+.
+<p><strong><strong>foo</strong></strong></p>
+````````````````````````````````
+
+
+
+Rule 13 can be applied to arbitrarily long sequences of
+delimiters:
+
+```````````````````````````````` example
+******foo******
+.
+<p><strong><strong><strong>foo</strong></strong></strong></p>
+````````````````````````````````
+
+
+Rule 14:
+
+```````````````````````````````` example
+***foo***
+.
+<p><strong><em>foo</em></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_____foo_____
+.
+<p><strong><strong><em>foo</em></strong></strong></p>
+````````````````````````````````
+
+
+Rule 15:
+
+```````````````````````````````` example
+*foo _bar* baz_
+.
+<p><em>foo _bar</em> baz_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo __bar *baz bim__ bam*
+.
+<p><em>foo <strong>bar *baz bim</strong> bam</em></p>
+````````````````````````````````
+
+
+Rule 16:
+
+```````````````````````````````` example
+**foo **bar baz**
+.
+<p>**foo <strong>bar baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo *bar baz*
+.
+<p>*foo <em>bar baz</em></p>
+````````````````````````````````
+
+
+Rule 17:
+
+```````````````````````````````` example
+*[bar*](/url)
+.
+<p>*<a href="/url">bar*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo [bar_](/url)
+.
+<p>_foo <a href="/url">bar_</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*<img src="foo" title="*"/>
+.
+<p>*<img src="foo" title="*"/></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**<a href="**">
+.
+<p>**<a href="**"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__<a href="__">
+.
+<p>__<a href="__"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*a `*`*
+.
+<p><em>a <code>*</code></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_a `_`_
+.
+<p><em>a <code>_</code></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**a<http://foo.bar/?q=**>
+.
+<p>**a<a href="http://foo.bar/?q=**">http://foo.bar/?q=**</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__a<http://foo.bar/?q=__>
+.
+<p>__a<a href="http://foo.bar/?q=__">http://foo.bar/?q=__</a></p>
+````````````````````````````````
+
+
+
+## Links
+
+A link contains [link text] (the visible text), a [link destination]
+(the URI that is the link destination), and optionally a [link title].
+There are two basic kinds of links in Markdown.  In [inline links] the
+destination and title are given immediately after the link text.  In
+[reference links] the destination and title are defined elsewhere in
+the document.
+
+A [link text](@) consists of a sequence of zero or more
+inline elements enclosed by square brackets (`[` and `]`).  The
+following rules apply:
+
+- Links may not contain other links, at any level of nesting. If
+  multiple otherwise valid link definitions appear nested inside each
+  other, the inner-most definition is used.
+
+- Brackets are allowed in the [link text] only if (a) they
+  are backslash-escaped or (b) they appear as a matched pair of brackets,
+  with an open bracket `[`, a sequence of zero or more inlines, and
+  a close bracket `]`.
+
+- Backtick [code spans], [autolinks], and raw [HTML tags] bind more tightly
+  than the brackets in link text.  Thus, for example,
+  `` [foo`]` `` could not be a link text, since the second `]`
+  is part of a code span.
+
+- The brackets in link text bind more tightly than markers for
+  [emphasis and strong emphasis]. Thus, for example, `*[foo*](url)` is a link.
+
+A [link destination](@) consists of either
+
+- a sequence of zero or more characters between an opening `<` and a
+  closing `>` that contains no spaces, line breaks, or unescaped
+  `<` or `>` characters, or
+
+- a nonempty sequence of characters that does not include
+  ASCII space or control characters, and includes parentheses
+  only if (a) they are backslash-escaped or (b) they are part of
+  a balanced pair of unescaped parentheses that is not itself
+  inside a balanced pair of unescaped parentheses.
+
+A [link title](@)  consists of either
+
+- a sequence of zero or more characters between straight double-quote
+  characters (`"`), including a `"` character only if it is
+  backslash-escaped, or
+
+- a sequence of zero or more characters between straight single-quote
+  characters (`'`), including a `'` character only if it is
+  backslash-escaped, or
+
+- a sequence of zero or more characters between matching parentheses
+  (`(...)`), including a `)` character only if it is backslash-escaped.
+
+Although [link titles] may span multiple lines, they may not contain
+a [blank line].
+
+An [inline link](@) consists of a [link text] followed immediately
+by a left parenthesis `(`, optional [whitespace], an optional
+[link destination], an optional [link title] separated from the link
+destination by [whitespace], optional [whitespace], and a right
+parenthesis `)`. The link's text consists of the inlines contained
+in the [link text] (excluding the enclosing square brackets).
+The link's URI consists of the link destination, excluding enclosing
+`<...>` if present, with backslash-escapes in effect as described
+above.  The link's title consists of the link title, excluding its
+enclosing delimiters, with backslash-escapes in effect as described
+above.
+
+Here is a simple inline link:
+
+```````````````````````````````` example
+[link](/uri "title")
+.
+<p><a href="/uri" title="title">link</a></p>
+````````````````````````````````
+
+
+The title may be omitted:
+
+```````````````````````````````` example
+[link](/uri)
+.
+<p><a href="/uri">link</a></p>
+````````````````````````````````
+
+
+Both the title and the destination may be omitted:
+
+```````````````````````````````` example
+[link]()
+.
+<p><a href="">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<>)
+.
+<p><a href="">link</a></p>
+````````````````````````````````
+
+
+The destination cannot contain spaces or line breaks,
+even if enclosed in pointy brackets:
+
+```````````````````````````````` example
+[link](/my uri)
+.
+<p>[link](/my uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](</my uri>)
+.
+<p>[link](&lt;/my uri&gt;)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](foo
+bar)
+.
+<p>[link](foo
+bar)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<foo
+bar>)
+.
+<p>[link](<foo
+bar>)</p>
+````````````````````````````````
+
+Parentheses inside the link destination may be escaped:
+
+```````````````````````````````` example
+[link](\(foo\))
+.
+<p><a href="(foo)">link</a></p>
+````````````````````````````````
+
+One level of balanced parentheses is allowed without escaping:
+
+```````````````````````````````` example
+[link]((foo)and(bar))
+.
+<p><a href="(foo)and(bar)">link</a></p>
+````````````````````````````````
+
+However, if you have parentheses within parentheses, you need to escape
+or use the `<...>` form:
+
+```````````````````````````````` example
+[link](foo(and(bar)))
+.
+<p>[link](foo(and(bar)))</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](foo(and\(bar\)))
+.
+<p><a href="foo(and(bar))">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<foo(and(bar))>)
+.
+<p><a href="foo(and(bar))">link</a></p>
+````````````````````````````````
+
+
+Parentheses and other symbols can also be escaped, as usual
+in Markdown:
+
+```````````````````````````````` example
+[link](foo\)\:)
+.
+<p><a href="foo):">link</a></p>
+````````````````````````````````
+
+
+A link can contain fragment identifiers and queries:
+
+```````````````````````````````` example
+[link](#fragment)
+
+[link](http://example.com#fragment)
+
+[link](http://example.com?foo=3#frag)
+.
+<p><a href="#fragment">link</a></p>
+<p><a href="http://example.com#fragment">link</a></p>
+<p><a href="http://example.com?foo=3#frag">link</a></p>
+````````````````````````````````
+
+
+Note that a backslash before a non-escapable character is
+just a backslash:
+
+```````````````````````````````` example
+[link](foo\bar)
+.
+<p><a href="foo%5Cbar">link</a></p>
+````````````````````````````````
+
+
+URL-escaping should be left alone inside the destination, as all
+URL-escaped characters are also valid URL characters. Entity and
+numerical character references in the destination will be parsed
+into the corresponding Unicode code points, as usual.  These may
+be optionally URL-escaped when written as HTML, but this spec
+does not enforce any particular policy for rendering URLs in
+HTML or other formats.  Renderers may make different decisions
+about how to escape or normalize URLs in the output.
+
+```````````````````````````````` example
+[link](foo%20b&auml;)
+.
+<p><a href="foo%20b%C3%A4">link</a></p>
+````````````````````````````````
+
+
+Note that, because titles can often be parsed as destinations,
+if you try to omit the destination and keep the title, you'll
+get unexpected results:
+
+```````````````````````````````` example
+[link]("title")
+.
+<p><a href="%22title%22">link</a></p>
+````````````````````````````````
+
+
+Titles may be in single quotes, double quotes, or parentheses:
+
+```````````````````````````````` example
+[link](/url "title")
+[link](/url 'title')
+[link](/url (title))
+.
+<p><a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a></p>
+````````````````````````````````
+
+
+Backslash escapes and entity and numeric character references
+may be used in titles:
+
+```````````````````````````````` example
+[link](/url "title \"&quot;")
+.
+<p><a href="/url" title="title &quot;&quot;">link</a></p>
+````````````````````````````````
+
+
+Titles must be separated from the link using a [whitespace].
+Other [Unicode whitespace] like non-breaking space doesn't work.
+
+```````````````````````````````` example
+[link](/url "title")
+.
+<p><a href="/url%C2%A0%22title%22">link</a></p>
+````````````````````````````````
+
+
+Nested balanced quotes are not allowed without escaping:
+
+```````````````````````````````` example
+[link](/url "title "and" title")
+.
+<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>
+````````````````````````````````
+
+
+But it is easy to work around this by using a different quote type:
+
+```````````````````````````````` example
+[link](/url 'title "and" title')
+.
+<p><a href="/url" title="title &quot;and&quot; title">link</a></p>
+````````````````````````````````
+
+
+(Note:  `Markdown.pl` did allow double quotes inside a double-quoted
+title, and its test suite included a test demonstrating this.
+But it is hard to see a good rationale for the extra complexity this
+brings, since there are already many ways---backslash escaping,
+entity and numeric character references, or using a different
+quote type for the enclosing title---to write titles containing
+double quotes.  `Markdown.pl`'s handling of titles has a number
+of other strange features.  For example, it allows single-quoted
+titles in inline links, but not reference links.  And, in
+reference links but not inline links, it allows a title to begin
+with `"` and end with `)`.  `Markdown.pl` 1.0.1 even allows
+titles with no closing quotation mark, though 1.0.2b8 does not.
+It seems preferable to adopt a simple, rational rule that works
+the same way in inline links and link reference definitions.)
+
+[Whitespace] is allowed around the destination and title:
+
+```````````````````````````````` example
+[link](   /uri
+  "title"  )
+.
+<p><a href="/uri" title="title">link</a></p>
+````````````````````````````````
+
+
+But it is not allowed between the link text and the
+following parenthesis:
+
+```````````````````````````````` example
+[link] (/uri)
+.
+<p>[link] (/uri)</p>
+````````````````````````````````
+
+
+The link text may contain balanced brackets, but not unbalanced ones,
+unless they are escaped:
+
+```````````````````````````````` example
+[link [foo [bar]]](/uri)
+.
+<p><a href="/uri">link [foo [bar]]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link] bar](/uri)
+.
+<p>[link] bar](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link [bar](/uri)
+.
+<p>[link <a href="/uri">bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link \[bar](/uri)
+.
+<p><a href="/uri">link [bar</a></p>
+````````````````````````````````
+
+
+The link text may contain inline content:
+
+```````````````````````````````` example
+[link *foo **bar** `#`*](/uri)
+.
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[![moon](moon.jpg)](/uri)
+.
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+````````````````````````````````
+
+
+However, links may not contain other links, at any level of nesting.
+
+```````````````````````````````` example
+[foo [bar](/uri)](/uri)
+.
+<p>[foo <a href="/uri">bar</a>](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *[bar [baz](/uri)](/uri)*](/uri)
+.
+<p>[foo <em>[bar <a href="/uri">baz</a>](/uri)</em>](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![[[foo](uri1)](uri2)](uri3)
+.
+<p><img src="uri3" alt="[foo](uri2)" /></p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of link text grouping over
+emphasis grouping:
+
+```````````````````````````````` example
+*[foo*](/uri)
+.
+<p>*<a href="/uri">foo*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar](baz*)
+.
+<p><a href="baz*">foo *bar</a></p>
+````````````````````````````````
+
+
+Note that brackets that *aren't* part of links do not take
+precedence:
+
+```````````````````````````````` example
+*foo [bar* baz]
+.
+<p><em>foo [bar</em> baz]</p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of HTML tags, code spans,
+and autolinks over link grouping:
+
+```````````````````````````````` example
+[foo <bar attr="](baz)">
+.
+<p>[foo <bar attr="](baz)"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo`](/uri)`
+.
+<p>[foo<code>](/uri)</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo<http://example.com/?search=](uri)>
+.
+<p>[foo<a href="http://example.com/?search=%5D(uri)">http://example.com/?search=](uri)</a></p>
+````````````````````````````````
+
+
+There are three kinds of [reference link](@)s:
+[full](#full-reference-link), [collapsed](#collapsed-reference-link),
+and [shortcut](#shortcut-reference-link).
+
+A [full reference link](@)
+consists of a [link text] immediately followed by a [link label]
+that [matches] a [link reference definition] elsewhere in the document.
+
+A [link label](@)  begins with a left bracket (`[`) and ends
+with the first right bracket (`]`) that is not backslash-escaped.
+Between these brackets there must be at least one [non-whitespace character].
+Unescaped square bracket characters are not allowed in
+[link labels].  A link label can have at most 999
+characters inside the square brackets.
+
+One label [matches](@)
+another just in case their normalized forms are equal.  To normalize a
+label, perform the *Unicode case fold* and collapse consecutive internal
+[whitespace] to a single space.  If there are multiple
+matching reference link definitions, the one that comes first in the
+document is used.  (It is desirable in such cases to emit a warning.)
+
+The contents of the first link label are parsed as inlines, which are
+used as the link's text.  The link's URI and title are provided by the
+matching [link reference definition].
+
+Here is a simple example:
+
+```````````````````````````````` example
+[foo][bar]
+
+[bar]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+The rules for the [link text] are the same as with
+[inline links].  Thus:
+
+The link text may contain balanced brackets, but not unbalanced ones,
+unless they are escaped:
+
+```````````````````````````````` example
+[link [foo [bar]]][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link [foo [bar]]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link \[bar][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link [bar</a></p>
+````````````````````````````````
+
+
+The link text may contain inline content:
+
+```````````````````````````````` example
+[link *foo **bar** `#`*][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[![moon](moon.jpg)][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+````````````````````````````````
+
+
+However, links may not contain other links, at any level of nesting.
+
+```````````````````````````````` example
+[foo [bar](/uri)][ref]
+
+[ref]: /uri
+.
+<p>[foo <a href="/uri">bar</a>]<a href="/uri">ref</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar [baz][ref]*][ref]
+
+[ref]: /uri
+.
+<p>[foo <em>bar <a href="/uri">baz</a></em>]<a href="/uri">ref</a></p>
+````````````````````````````````
+
+
+(In the examples above, we have two [shortcut reference links]
+instead of one [full reference link].)
+
+The following cases illustrate the precedence of link text grouping over
+emphasis grouping:
+
+```````````````````````````````` example
+*[foo*][ref]
+
+[ref]: /uri
+.
+<p>*<a href="/uri">foo*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">foo *bar</a></p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of HTML tags, code spans,
+and autolinks over link grouping:
+
+```````````````````````````````` example
+[foo <bar attr="][ref]">
+
+[ref]: /uri
+.
+<p>[foo <bar attr="][ref]"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo`][ref]`
+
+[ref]: /uri
+.
+<p>[foo<code>][ref]</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo<http://example.com/?search=][ref]>
+
+[ref]: /uri
+.
+<p>[foo<a href="http://example.com/?search=%5D%5Bref%5D">http://example.com/?search=][ref]</a></p>
+````````````````````````````````
+
+
+Matching is case-insensitive:
+
+```````````````````````````````` example
+[foo][BaR]
+
+[bar]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+Unicode case fold is used:
+
+```````````````````````````````` example
+[Толпой][Толпой] is a Russian word.
+
+[ТОЛПОЙ]: /url
+.
+<p><a href="/url">Толпой</a> is a Russian word.</p>
+````````````````````````````````
+
+
+Consecutive internal [whitespace] is treated as one space for
+purposes of determining matching:
+
+```````````````````````````````` example
+[Foo
+  bar]: /url
+
+[Baz][Foo bar]
+.
+<p><a href="/url">Baz</a></p>
+````````````````````````````````
+
+
+No [whitespace] is allowed between the [link text] and the
+[link label]:
+
+```````````````````````````````` example
+[foo] [bar]
+
+[bar]: /url "title"
+.
+<p>[foo] <a href="/url" title="title">bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+[bar]
+
+[bar]: /url "title"
+.
+<p>[foo]
+<a href="/url" title="title">bar</a></p>
+````````````````````````````````
+
+
+This is a departure from John Gruber's original Markdown syntax
+description, which explicitly allows whitespace between the link
+text and the link label.  It brings reference links in line with
+[inline links], which (according to both original Markdown and
+this spec) cannot have whitespace after the link text.  More
+importantly, it prevents inadvertent capture of consecutive
+[shortcut reference links]. If whitespace is allowed between the
+link text and the link label, then in the following we will have
+a single reference link, not two shortcut reference links, as
+intended:
+
+``` markdown
+[foo]
+[bar]
+
+[foo]: /url1
+[bar]: /url2
+```
+
+(Note that [shortcut reference links] were introduced by Gruber
+himself in a beta version of `Markdown.pl`, but never included
+in the official syntax description.  Without shortcut reference
+links, it is harmless to allow space between the link text and
+link label; but once shortcut references are introduced, it is
+too dangerous to allow this, as it frequently leads to
+unintended results.)
+
+When there are multiple matching [link reference definitions],
+the first is used:
+
+```````````````````````````````` example
+[foo]: /url1
+
+[foo]: /url2
+
+[bar][foo]
+.
+<p><a href="/url1">bar</a></p>
+````````````````````````````````
+
+
+Note that matching is performed on normalized strings, not parsed
+inline content.  So the following does not match, even though the
+labels define equivalent inline content:
+
+```````````````````````````````` example
+[bar][foo\!]
+
+[foo!]: /url
+.
+<p>[bar][foo!]</p>
+````````````````````````````````
+
+
+[Link labels] cannot contain brackets, unless they are
+backslash-escaped:
+
+```````````````````````````````` example
+[foo][ref[]
+
+[ref[]: /uri
+.
+<p>[foo][ref[]</p>
+<p>[ref[]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo][ref[bar]]
+
+[ref[bar]]: /uri
+.
+<p>[foo][ref[bar]]</p>
+<p>[ref[bar]]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[[foo]]]
+
+[[[foo]]]: /url
+.
+<p>[[[foo]]]</p>
+<p>[[[foo]]]: /url</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo][ref\[]
+
+[ref\[]: /uri
+.
+<p><a href="/uri">foo</a></p>
+````````````````````````````````
+
+
+Note that in this example `]` is not backslash-escaped:
+
+```````````````````````````````` example
+[bar\\]: /uri
+
+[bar\\]
+.
+<p><a href="/uri">bar\</a></p>
+````````````````````````````````
+
+
+A [link label] must contain at least one [non-whitespace character]:
+
+```````````````````````````````` example
+[]
+
+[]: /uri
+.
+<p>[]</p>
+<p>[]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[
+ ]
+
+[
+ ]: /uri
+.
+<p>[
+]</p>
+<p>[
+]: /uri</p>
+````````````````````````````````
+
+
+A [collapsed reference link](@)
+consists of a [link label] that [matches] a
+[link reference definition] elsewhere in the
+document, followed by the string `[]`.
+The contents of the first link label are parsed as inlines,
+which are used as the link's text.  The link's URI and title are
+provided by the matching reference link definition.  Thus,
+`[foo][]` is equivalent to `[foo][foo]`.
+
+```````````````````````````````` example
+[foo][]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[*foo* bar][]
+
+[*foo* bar]: /url "title"
+.
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+[Foo][]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">Foo</a></p>
+````````````````````````````````
+
+
+
+As with full reference links, [whitespace] is not
+allowed between the two sets of brackets:
+
+```````````````````````````````` example
+[foo] 
+[]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a>
+[]</p>
+````````````````````````````````
+
+
+A [shortcut reference link](@)
+consists of a [link label] that [matches] a
+[link reference definition] elsewhere in the
+document and is not followed by `[]` or a link label.
+The contents of the first link label are parsed as inlines,
+which are used as the link's text.  The link's URI and title
+are provided by the matching link reference definition.
+Thus, `[foo]` is equivalent to `[foo][]`.
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[*foo* bar]
+
+[*foo* bar]: /url "title"
+.
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[*foo* bar]]
+
+[*foo* bar]: /url "title"
+.
+<p>[<a href="/url" title="title"><em>foo</em> bar</a>]</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[bar [foo]
+
+[foo]: /url
+.
+<p>[[bar <a href="/url">foo</a></p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+[Foo]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">Foo</a></p>
+````````````````````````````````
+
+
+A space after the link text should be preserved:
+
+```````````````````````````````` example
+[foo] bar
+
+[foo]: /url
+.
+<p><a href="/url">foo</a> bar</p>
+````````````````````````````````
+
+
+If you just want bracketed text, you can backslash-escape the
+opening bracket to avoid links:
+
+```````````````````````````````` example
+\[foo]
+
+[foo]: /url "title"
+.
+<p>[foo]</p>
+````````````````````````````````
+
+
+Note that this is a link, because a link label ends with the first
+following closing bracket:
+
+```````````````````````````````` example
+[foo*]: /url
+
+*[foo*]
+.
+<p>*<a href="/url">foo*</a></p>
+````````````````````````````````
+
+
+Full and compact references take precedence over shortcut
+references:
+
+```````````````````````````````` example
+[foo][bar]
+
+[foo]: /url1
+[bar]: /url2
+.
+<p><a href="/url2">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo][]
+
+[foo]: /url1
+.
+<p><a href="/url1">foo</a></p>
+````````````````````````````````
+
+Inline links also take precedence:
+
+```````````````````````````````` example
+[foo]()
+
+[foo]: /url1
+.
+<p><a href="">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo](not a link)
+
+[foo]: /url1
+.
+<p><a href="/url1">foo</a>(not a link)</p>
+````````````````````````````````
+
+In the following case `[bar][baz]` is parsed as a reference,
+`[foo]` as normal text:
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url
+.
+<p>[foo]<a href="/url">bar</a></p>
+````````````````````````````````
+
+
+Here, though, `[foo][bar]` is parsed as a reference, since
+`[bar]` is defined:
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url1
+[bar]: /url2
+.
+<p><a href="/url2">foo</a><a href="/url1">baz</a></p>
+````````````````````````````````
+
+
+Here `[foo]` is not parsed as a shortcut reference, because it
+is followed by a link label (even though `[bar]` is not defined):
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url1
+[foo]: /url2
+.
+<p>[foo]<a href="/url1">bar</a></p>
+````````````````````````````````
+
+
+
+## Images
+
+Syntax for images is like the syntax for links, with one
+difference. Instead of [link text], we have an
+[image description](@).  The rules for this are the
+same as for [link text], except that (a) an
+image description starts with `![` rather than `[`, and
+(b) an image description may contain links.
+An image description has inline elements
+as its contents.  When an image is rendered to HTML,
+this is standardly used as the image's `alt` attribute.
+
+```````````````````````````````` example
+![foo](/url "title")
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo *bar*]
+
+[foo *bar*]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo ![bar](/url)](/url2)
+.
+<p><img src="/url2" alt="foo bar" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo [bar](/url)](/url2)
+.
+<p><img src="/url2" alt="foo bar" /></p>
+````````````````````````````````
+
+
+Though this spec is concerned with parsing, not rendering, it is
+recommended that in rendering to HTML, only the plain string content
+of the [image description] be used.  Note that in
+the above example, the alt attribute's value is `foo bar`, not `foo
+[bar](/url)` or `foo <a href="/url">bar</a>`.  Only the plain string
+content is rendered, without formatting.
+
+```````````````````````````````` example
+![foo *bar*][]
+
+[foo *bar*]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo *bar*][foobar]
+
+[FOOBAR]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo](train.jpg)
+.
+<p><img src="train.jpg" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+My ![foo bar](/path/to/train.jpg  "title"   )
+.
+<p>My <img src="/path/to/train.jpg" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo](<url>)
+.
+<p><img src="url" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![](/url)
+.
+<p><img src="/url" alt="" /></p>
+````````````````````````````````
+
+
+Reference-style:
+
+```````````````````````````````` example
+![foo][bar]
+
+[bar]: /url
+.
+<p><img src="/url" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo][bar]
+
+[BAR]: /url
+.
+<p><img src="/url" alt="foo" /></p>
+````````````````````````````````
+
+
+Collapsed:
+
+```````````````````````````````` example
+![foo][]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![*foo* bar][]
+
+[*foo* bar]: /url "title"
+.
+<p><img src="/url" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+The labels are case-insensitive:
+
+```````````````````````````````` example
+![Foo][]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="Foo" title="title" /></p>
+````````````````````````````````
+
+
+As with reference links, [whitespace] is not allowed
+between the two sets of brackets:
+
+```````````````````````````````` example
+![foo] 
+[]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" />
+[]</p>
+````````````````````````````````
+
+
+Shortcut:
+
+```````````````````````````````` example
+![foo]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![*foo* bar]
+
+[*foo* bar]: /url "title"
+.
+<p><img src="/url" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+Note that link labels cannot contain unescaped brackets:
+
+```````````````````````````````` example
+![[foo]]
+
+[[foo]]: /url "title"
+.
+<p>![[foo]]</p>
+<p>[[foo]]: /url &quot;title&quot;</p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+![Foo]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="Foo" title="title" /></p>
+````````````````````````````````
+
+
+If you just want bracketed text, you can backslash-escape the
+opening `!` and `[`:
+
+```````````````````````````````` example
+\!\[foo]
+
+[foo]: /url "title"
+.
+<p>![foo]</p>
+````````````````````````````````
+
+
+If you want a link after a literal `!`, backslash-escape the
+`!`:
+
+```````````````````````````````` example
+\![foo]
+
+[foo]: /url "title"
+.
+<p>!<a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+## Autolinks
+
+[Autolink](@)s are absolute URIs and email addresses inside
+`<` and `>`. They are parsed as links, with the URL or email address
+as the link label.
+
+A [URI autolink](@) consists of `<`, followed by an
+[absolute URI] not containing `<`, followed by `>`.  It is parsed as
+a link to the URI, with the URI as the link's label.
+
+An [absolute URI](@),
+for these purposes, consists of a [scheme] followed by a colon (`:`)
+followed by zero or more characters other than ASCII
+[whitespace] and control characters, `<`, and `>`.  If
+the URI includes these characters, they must be percent-encoded
+(e.g. `%20` for a space).
+
+For purposes of this spec, a [scheme](@) is any sequence
+of 2--32 characters beginning with an ASCII letter and followed
+by any combination of ASCII letters, digits, or the symbols plus
+("+"), period ("."), or hyphen ("-").
+
+Here are some valid autolinks:
+
+```````````````````````````````` example
+<http://foo.bar.baz>
+.
+<p><a href="http://foo.bar.baz">http://foo.bar.baz</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://foo.bar.baz/test?q=hello&id=22&boolean>
+.
+<p><a href="http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<irc://foo.bar:2233/baz>
+.
+<p><a href="irc://foo.bar:2233/baz">irc://foo.bar:2233/baz</a></p>
+````````````````````````````````
+
+
+Uppercase is also fine:
+
+```````````````````````````````` example
+<MAILTO:FOO@BAR.BAZ>
+.
+<p><a href="MAILTO:FOO@BAR.BAZ">MAILTO:FOO@BAR.BAZ</a></p>
+````````````````````````````````
+
+
+Note that many strings that count as [absolute URIs] for
+purposes of this spec are not valid URIs, because their
+schemes are not registered or because of other problems
+with their syntax:
+
+```````````````````````````````` example
+<a+b+c:d>
+.
+<p><a href="a+b+c:d">a+b+c:d</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<made-up-scheme://foo,bar>
+.
+<p><a href="made-up-scheme://foo,bar">made-up-scheme://foo,bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://../>
+.
+<p><a href="http://../">http://../</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<localhost:5001/foo>
+.
+<p><a href="localhost:5001/foo">localhost:5001/foo</a></p>
+````````````````````````````````
+
+
+Spaces are not allowed in autolinks:
+
+```````````````````````````````` example
+<http://foo.bar/baz bim>
+.
+<p>&lt;http://foo.bar/baz bim&gt;</p>
+````````````````````````````````
+
+
+Backslash-escapes do not work inside autolinks:
+
+```````````````````````````````` example
+<http://example.com/\[\>
+.
+<p><a href="http://example.com/%5C%5B%5C">http://example.com/\[\</a></p>
+````````````````````````````````
+
+
+An [email autolink](@)
+consists of `<`, followed by an [email address],
+followed by `>`.  The link's label is the email address,
+and the URL is `mailto:` followed by the email address.
+
+An [email address](@),
+for these purposes, is anything that matches
+the [non-normative regex from the HTML5
+spec](https://html.spec.whatwg.org/multipage/forms.html#e-mail-state-(type=email)):
+
+    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
+    (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+
+Examples of email autolinks:
+
+```````````````````````````````` example
+<foo@bar.example.com>
+.
+<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<foo+special@Bar.baz-bar0.com>
+.
+<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
+````````````````````````````````
+
+
+Backslash-escapes do not work inside email autolinks:
+
+```````````````````````````````` example
+<foo\+@bar.example.com>
+.
+<p>&lt;foo+@bar.example.com&gt;</p>
+````````````````````````````````
+
+
+These are not autolinks:
+
+```````````````````````````````` example
+<>
+.
+<p>&lt;&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+< http://foo.bar >
+.
+<p>&lt; http://foo.bar &gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<m:abc>
+.
+<p>&lt;m:abc&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<foo.bar.baz>
+.
+<p>&lt;foo.bar.baz&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+http://example.com
+.
+<p>http://example.com</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo@bar.example.com
+.
+<p>foo@bar.example.com</p>
+````````````````````````````````
+
+
+## Raw HTML
+
+Text between `<` and `>` that looks like an HTML tag is parsed as a
+raw HTML tag and will be rendered in HTML without escaping.
+Tag and attribute names are not limited to current HTML tags,
+so custom tags (and even, say, DocBook tags) may be used.
+
+Here is the grammar for tags:
+
+A [tag name](@) consists of an ASCII letter
+followed by zero or more ASCII letters, digits, or
+hyphens (`-`).
+
+An [attribute](@) consists of [whitespace],
+an [attribute name], and an optional
+[attribute value specification].
+
+An [attribute name](@)
+consists of an ASCII letter, `_`, or `:`, followed by zero or more ASCII
+letters, digits, `_`, `.`, `:`, or `-`.  (Note:  This is the XML
+specification restricted to ASCII.  HTML5 is laxer.)
+
+An [attribute value specification](@)
+consists of optional [whitespace],
+a `=` character, optional [whitespace], and an [attribute
+value].
+
+An [attribute value](@)
+consists of an [unquoted attribute value],
+a [single-quoted attribute value], or a [double-quoted attribute value].
+
+An [unquoted attribute value](@)
+is a nonempty string of characters not
+including spaces, `"`, `'`, `=`, `<`, `>`, or `` ` ``.
+
+A [single-quoted attribute value](@)
+consists of `'`, zero or more
+characters not including `'`, and a final `'`.
+
+A [double-quoted attribute value](@)
+consists of `"`, zero or more
+characters not including `"`, and a final `"`.
+
+An [open tag](@) consists of a `<` character, a [tag name],
+zero or more [attributes], optional [whitespace], an optional `/`
+character, and a `>` character.
+
+A [closing tag](@) consists of the string `</`, a
+[tag name], optional [whitespace], and the character `>`.
+
+An [HTML comment](@) consists of `<!--` + *text* + `-->`,
+where *text* does not start with `>` or `->`, does not end with `-`,
+and does not contain `--`.  (See the
+[HTML5 spec](http://www.w3.org/TR/html5/syntax.html#comments).)
+
+A [processing instruction](@)
+consists of the string `<?`, a string
+of characters not including the string `?>`, and the string
+`?>`.
+
+A [declaration](@) consists of the
+string `<!`, a name consisting of one or more uppercase ASCII letters,
+[whitespace], a string of characters not including the
+character `>`, and the character `>`.
+
+A [CDATA section](@) consists of
+the string `<![CDATA[`, a string of characters not including the string
+`]]>`, and the string `]]>`.
+
+An [HTML tag](@) consists of an [open tag], a [closing tag],
+an [HTML comment], a [processing instruction], a [declaration],
+or a [CDATA section].
+
+Here are some simple open tags:
+
+```````````````````````````````` example
+<a><bab><c2c>
+.
+<p><a><bab><c2c></p>
+````````````````````````````````
+
+
+Empty elements:
+
+```````````````````````````````` example
+<a/><b2/>
+.
+<p><a/><b2/></p>
+````````````````````````````````
+
+
+[Whitespace] is allowed:
+
+```````````````````````````````` example
+<a  /><b2
+data="foo" >
+.
+<p><a  /><b2
+data="foo" ></p>
+````````````````````````````````
+
+
+With attributes:
+
+```````````````````````````````` example
+<a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 />
+.
+<p><a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 /></p>
+````````````````````````````````
+
+
+Custom tag names can be used:
+
+```````````````````````````````` example
+Foo <responsive-image src="foo.jpg" />
+.
+<p>Foo <responsive-image src="foo.jpg" /></p>
+````````````````````````````````
+
+
+Illegal tag names, not parsed as HTML:
+
+```````````````````````````````` example
+<33> <__>
+.
+<p>&lt;33&gt; &lt;__&gt;</p>
+````````````````````````````````
+
+
+Illegal attribute names:
+
+```````````````````````````````` example
+<a h*#ref="hi">
+.
+<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>
+````````````````````````````````
+
+
+Illegal attribute values:
+
+```````````````````````````````` example
+<a href="hi'> <a href=hi'>
+.
+<p>&lt;a href=&quot;hi'&gt; &lt;a href=hi'&gt;</p>
+````````````````````````````````
+
+
+Illegal [whitespace]:
+
+```````````````````````````````` example
+< a><
+foo><bar/ >
+.
+<p>&lt; a&gt;&lt;
+foo&gt;&lt;bar/ &gt;</p>
+````````````````````````````````
+
+
+Missing [whitespace]:
+
+```````````````````````````````` example
+<a href='bar'title=title>
+.
+<p>&lt;a href='bar'title=title&gt;</p>
+````````````````````````````````
+
+
+Closing tags:
+
+```````````````````````````````` example
+</a></foo >
+.
+<p></a></foo ></p>
+````````````````````````````````
+
+
+Illegal attributes in closing tag:
+
+```````````````````````````````` example
+</a href="foo">
+.
+<p>&lt;/a href=&quot;foo&quot;&gt;</p>
+````````````````````````````````
+
+
+Comments:
+
+```````````````````````````````` example
+foo <!-- this is a
+comment - with hyphen -->
+.
+<p>foo <!-- this is a
+comment - with hyphen --></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo <!-- not a comment -- two hyphens -->
+.
+<p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>
+````````````````````````````````
+
+
+Not comments:
+
+```````````````````````````````` example
+foo <!--> foo -->
+
+foo <!-- foo--->
+.
+<p>foo &lt;!--&gt; foo --&gt;</p>
+<p>foo &lt;!-- foo---&gt;</p>
+````````````````````````````````
+
+
+Processing instructions:
+
+```````````````````````````````` example
+foo <?php echo $a; ?>
+.
+<p>foo <?php echo $a; ?></p>
+````````````````````````````````
+
+
+Declarations:
+
+```````````````````````````````` example
+foo <!ELEMENT br EMPTY>
+.
+<p>foo <!ELEMENT br EMPTY></p>
+````````````````````````````````
+
+
+CDATA sections:
+
+```````````````````````````````` example
+foo <![CDATA[>&<]]>
+.
+<p>foo <![CDATA[>&<]]></p>
+````````````````````````````````
+
+
+Entity and numeric character references are preserved in HTML
+attributes:
+
+```````````````````````````````` example
+foo <a href="&ouml;">
+.
+<p>foo <a href="&ouml;"></p>
+````````````````````````````````
+
+
+Backslash escapes do not work in HTML attributes:
+
+```````````````````````````````` example
+foo <a href="\*">
+.
+<p>foo <a href="\*"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="\"">
+.
+<p>&lt;a href=&quot;&quot;&quot;&gt;</p>
+````````````````````````````````
+
+
+## Hard line breaks
+
+A line break (not in a code span or HTML tag) that is preceded
+by two or more spaces and does not occur at the end of a block
+is parsed as a [hard line break](@) (rendered
+in HTML as a `<br />` tag):
+
+```````````````````````````````` example
+foo  
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+For a more visible alternative, a backslash before the
+[line ending] may be used instead of two spaces:
+
+```````````````````````````````` example
+foo\
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+More than two spaces can be used:
+
+```````````````````````````````` example
+foo       
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+Leading spaces at the beginning of the next line are ignored:
+
+```````````````````````````````` example
+foo  
+     bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo\
+     bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+Line breaks can occur inside emphasis, links, and other constructs
+that allow inline content:
+
+```````````````````````````````` example
+*foo  
+bar*
+.
+<p><em>foo<br />
+bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo\
+bar*
+.
+<p><em>foo<br />
+bar</em></p>
+````````````````````````````````
+
+
+Line breaks do not occur inside code spans
+
+```````````````````````````````` example
+`code  
+span`
+.
+<p><code>code span</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`code\
+span`
+.
+<p><code>code\ span</code></p>
+````````````````````````````````
+
+
+or HTML tags:
+
+```````````````````````````````` example
+<a href="foo  
+bar">
+.
+<p><a href="foo  
+bar"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="foo\
+bar">
+.
+<p><a href="foo\
+bar"></p>
+````````````````````````````````
+
+
+Hard line breaks are for separating inline content within a block.
+Neither syntax for hard line breaks works at the end of a paragraph or
+other block element:
+
+```````````````````````````````` example
+foo\
+.
+<p>foo\</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo  
+.
+<p>foo</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+### foo\
+.
+<h3>foo\</h3>
+````````````````````````````````
+
+
+```````````````````````````````` example
+### foo  
+.
+<h3>foo</h3>
+````````````````````````````````
+
+
+## Soft line breaks
+
+A regular line break (not in a code span or HTML tag) that is not
+preceded by two or more spaces or a backslash is parsed as a
+[softbreak](@).  (A softbreak may be rendered in HTML either as a
+[line ending] or as a space. The result will be the same in
+browsers. In the examples here, a [line ending] will be used.)
+
+```````````````````````````````` example
+foo
+baz
+.
+<p>foo
+baz</p>
+````````````````````````````````
+
+
+Spaces at the end of the line and beginning of the next line are
+removed:
+
+```````````````````````````````` example
+foo 
+ baz
+.
+<p>foo
+baz</p>
+````````````````````````````````
+
+
+A conforming parser may render a soft line break in HTML either as a
+line break or as a space.
+
+A renderer may also provide an option to render soft line breaks
+as hard line breaks.
+
+## Textual content
+
+Any characters not given an interpretation by the above rules will
+be parsed as plain textual content.
+
+```````````````````````````````` example
+hello $.;'there
+.
+<p>hello $.;'there</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo χρῆν
+.
+<p>Foo χρῆν</p>
+````````````````````````````````
+
+
+Internal spaces are preserved verbatim:
+
+```````````````````````````````` example
+Multiple     spaces
+.
+<p>Multiple     spaces</p>
+````````````````````````````````
+
+
+<!-- END TESTS -->
+
+# Appendix: A parsing strategy
+
+In this appendix we describe some features of the parsing strategy
+used in the CommonMark reference implementations.
+
+## Overview
+
+Parsing has two phases:
+
+1. In the first phase, lines of input are consumed and the block
+structure of the document---its division into paragraphs, block quotes,
+list items, and so on---is constructed.  Text is assigned to these
+blocks but not parsed. Link reference definitions are parsed and a
+map of links is constructed.
+
+2. In the second phase, the raw text contents of paragraphs and headings
+are parsed into sequences of Markdown inline elements (strings,
+code spans, links, emphasis, and so on), using the map of link
+references constructed in phase 1.
+
+At each point in processing, the document is represented as a tree of
+**blocks**.  The root of the tree is a `document` block.  The `document`
+may have any number of other blocks as **children**.  These children
+may, in turn, have other blocks as children.  The last child of a block
+is normally considered **open**, meaning that subsequent lines of input
+can alter its contents.  (Blocks that are not open are **closed**.)
+Here, for example, is a possible document tree, with the open blocks
+marked by arrows:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+         list_item
+           paragraph
+             "Qui *quodsi iracundia*"
+      -> list_item
+        -> paragraph
+             "aliquando id"
+```
+
+## Phase 1: block structure
+
+Each line that is processed has an effect on this tree.  The line is
+analyzed and, depending on its contents, the document may be altered
+in one or more of the following ways:
+
+1. One or more open blocks may be closed.
+2. One or more new blocks may be created as children of the
+   last open block.
+3. Text may be added to the last (deepest) open block remaining
+   on the tree.
+
+Once a line has been incorporated into the tree in this way,
+it can be discarded, so input can be read in a stream.
+
+For each line, we follow this procedure:
+
+1. First we iterate through the open blocks, starting with the
+root document, and descending through last children down to the last
+open block.  Each block imposes a condition that the line must satisfy
+if the block is to remain open.  For example, a block quote requires a
+`>` character.  A paragraph requires a non-blank line.
+In this phase we may match all or just some of the open
+blocks.  But we cannot close unmatched blocks yet, because we may have a
+[lazy continuation line].
+
+2.  Next, after consuming the continuation markers for existing
+blocks, we look for new block starts (e.g. `>` for a block quote).
+If we encounter a new block start, we close any blocks unmatched
+in step 1 before creating the new block as a child of the last
+matched block.
+
+3.  Finally, we look at the remainder of the line (after block
+markers like `>`, list markers, and indentation have been consumed).
+This is text that can be incorporated into the last open
+block (a paragraph, code block, heading, or raw HTML).
+
+Setext headings are formed when we see a line of a paragraph
+that is a [setext heading underline].
+
+Reference link definitions are detected when a paragraph is closed;
+the accumulated text lines are parsed to see if they begin with
+one or more reference link definitions.  Any remainder becomes a
+normal paragraph.
+
+We can see how this works by considering how the tree above is
+generated by four lines of Markdown:
+
+``` markdown
+> Lorem ipsum dolor
+sit amet.
+> - Qui *quodsi iracundia*
+> - aliquando id
+```
+
+At the outset, our document model is just
+
+``` tree
+-> document
+```
+
+The first line of our text,
+
+``` markdown
+> Lorem ipsum dolor
+```
+
+causes a `block_quote` block to be created as a child of our
+open `document` block, and a `paragraph` block as a child of
+the `block_quote`.  Then the text is added to the last open
+block, the `paragraph`:
+
+``` tree
+-> document
+  -> block_quote
+    -> paragraph
+         "Lorem ipsum dolor"
+```
+
+The next line,
+
+``` markdown
+sit amet.
+```
+
+is a "lazy continuation" of the open `paragraph`, so it gets added
+to the paragraph's text:
+
+``` tree
+-> document
+  -> block_quote
+    -> paragraph
+         "Lorem ipsum dolor\nsit amet."
+```
+
+The third line,
+
+``` markdown
+> - Qui *quodsi iracundia*
+```
+
+causes the `paragraph` block to be closed, and a new `list` block
+opened as a child of the `block_quote`.  A `list_item` is also
+added as a child of the `list`, and a `paragraph` as a child of
+the `list_item`.  The text is then added to the new `paragraph`:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+      -> list_item
+        -> paragraph
+             "Qui *quodsi iracundia*"
+```
+
+The fourth line,
+
+``` markdown
+> - aliquando id
+```
+
+causes the `list_item` (and its child the `paragraph`) to be closed,
+and a new `list_item` opened up as child of the `list`.  A `paragraph`
+is added as a child of the new `list_item`, to contain the text.
+We thus obtain the final tree:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+         list_item
+           paragraph
+             "Qui *quodsi iracundia*"
+      -> list_item
+        -> paragraph
+             "aliquando id"
+```
+
+## Phase 2: inline structure
+
+Once all of the input has been parsed, all open blocks are closed.
+
+We then "walk the tree," visiting every node, and parse raw
+string contents of paragraphs and headings as inlines.  At this
+point we have seen all the link reference definitions, so we can
+resolve reference links as we go.
+
+``` tree
+document
+  block_quote
+    paragraph
+      str "Lorem ipsum dolor"
+      softbreak
+      str "sit amet."
+    list (type=bullet tight=true bullet_char=-)
+      list_item
+        paragraph
+          str "Qui "
+          emph
+            str "quodsi iracundia"
+      list_item
+        paragraph
+          str "aliquando id"
+```
+
+Notice how the [line ending] in the first paragraph has
+been parsed as a `softbreak`, and the asterisks in the first list item
+have become an `emph`.
+
+### An algorithm for parsing nested emphasis and links
+
+By far the trickiest part of inline parsing is handling emphasis,
+strong emphasis, links, and images.  This is done using the following
+algorithm.
+
+When we're parsing inlines and we hit either
+
+- a run of `*` or `_` characters, or
+- a `[` or `![`
+
+we insert a text node with these symbols as its literal content, and we
+add a pointer to this text node to the [delimiter stack](@).
+
+The [delimiter stack] is a doubly linked list.  Each
+element contains a pointer to a text node, plus information about
+
+- the type of delimiter (`[`, `![`, `*`, `_`)
+- the number of delimiters,
+- whether the delimiter is "active" (all are active to start), and
+- whether the delimiter is a potential opener, a potential closer,
+  or both (which depends on what sort of characters precede
+  and follow the delimiters).
+
+When we hit a `]` character, we call the *look for link or image*
+procedure (see below).
+
+When we hit the end of the input, we call the *process emphasis*
+procedure (see below), with `stack_bottom` = NULL.
+
+#### *look for link or image*
+
+Starting at the top of the delimiter stack, we look backwards
+through the stack for an opening `[` or `![` delimiter.
+
+- If we don't find one, we return a literal text node `]`.
+
+- If we do find one, but it's not *active*, we remove the inactive
+  delimiter from the stack, and return a literal text node `]`.
+
+- If we find one and it's active, then we parse ahead to see if
+  we have an inline link/image, reference link/image, compact reference
+  link/image, or shortcut reference link/image.
+
+  + If we don't, then we remove the opening delimiter from the
+    delimiter stack and return a literal text node `]`.
+
+  + If we do, then
+
+    * We return a link or image node whose children are the inlines
+      after the text node pointed to by the opening delimiter.
+
+    * We run *process emphasis* on these inlines, with the `[` opener
+      as `stack_bottom`.
+
+    * We remove the opening delimiter.
+
+    * If we have a link (and not an image), we also set all
+      `[` delimiters before the opening delimiter to *inactive*.  (This
+      will prevent us from getting links within links.)
+
+#### *process emphasis*
+
+Parameter `stack_bottom` sets a lower bound to how far we
+descend in the [delimiter stack].  If it is NULL, we can
+go all the way to the bottom.  Otherwise, we stop before
+visiting `stack_bottom`.
+
+Let `current_position` point to the element on the [delimiter stack]
+just above `stack_bottom` (or the first element if `stack_bottom`
+is NULL).
+
+We keep track of the `openers_bottom` for each delimiter
+type (`*`, `_`).  Initialize this to `stack_bottom`.
+
+Then we repeat the following until we run out of potential
+closers:
+
+- Move `current_position` forward in the delimiter stack (if needed)
+  until we find the first potential closer with delimiter `*` or `_`.
+  (This will be the potential closer closest
+  to the beginning of the input -- the first one in parse order.)
+
+- Now, look back in the stack (staying above `stack_bottom` and
+  the `openers_bottom` for this delimiter type) for the
+  first matching potential opener ("matching" means same delimiter).
+
+- If one is found:
+
+  + Figure out whether we have emphasis or strong emphasis:
+    if both closer and opener spans have length >= 2, we have
+    strong, otherwise regular.
+
+  + Insert an emph or strong emph node accordingly, after
+    the text node corresponding to the opener.
+
+  + Remove any delimiters between the opener and closer from
+    the delimiter stack.
+
+  + Remove 1 (for regular emph) or 2 (for strong emph) delimiters
+    from the opening and closing text nodes.  If they become empty
+    as a result, remove them and remove the corresponding element
+    of the delimiter stack.  If the closing node is removed, reset
+    `current_position` to the next element in the stack.
+
+- If none in found:
+
+  + Set `openers_bottom` to the element before `current_position`.
+    (We know that there are no openers for this kind of closer up to and
+    including this point, so this puts a lower bound on future searches.)
+
+  + If the closer at `current_position` is not a potential opener,
+    remove it from the delimiter stack (since we know it can't
+    be a closer either).
+
+  + Advance `current_position` to the next element in the stack.
+
+After we're done, we remove all delimiters above `stack_bottom` from the
+delimiter stack.
+
diff --git a/spec/fixtures/plugins/my_plugin/plugin.rb b/spec/fixtures/plugins/my_plugin/plugin.rb
index 92468f3c5e..db3f2f891f 100644
--- a/spec/fixtures/plugins/my_plugin/plugin.rb
+++ b/spec/fixtures/plugins/my_plugin/plugin.rb
@@ -3,8 +3,8 @@
 # version: 0.1
 # authors: Frank Zappa
 
-auth_provider :title => 'with Ubuntu',
-              :authenticator => Auth::OpenIdAuthenticator.new('ubuntu','https://login.ubuntu.com', trusted: true),
-              :message => 'Authenticating with Ubuntu (make sure pop up blockers are not enbaled)',
-              :frame_width => 1000,   # the frame size used for the pop up window, overrides default
-              :frame_height => 800
+auth_provider title: 'with Ubuntu',
+              authenticator: Auth::OpenIdAuthenticator.new('ubuntu', 'https://login.ubuntu.com', trusted: true),
+              message: 'Authenticating with Ubuntu (make sure pop up blockers are not enbaled)',
+              frame_width: 1000,   # the frame size used for the pop up window, overrides default
+              frame_height: 800
diff --git a/spec/integration/admin/emojis_spec.rb b/spec/integration/admin/emojis_spec.rb
index c0d72fcdfb..54c3b2cecb 100644
--- a/spec/integration/admin/emojis_spec.rb
+++ b/spec/integration/admin/emojis_spec.rb
@@ -12,11 +12,9 @@ RSpec.describe "Managing custom emojis" do
     describe 'when upload is invalid' do
       it 'should publish the right error' do
         message = MessageBus.track_publish do
-          post("/admin/customize/emojis.json", {
-            name: 'test',
-            file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg")
-          })
-        end.find{|m| m.channel == "/uploads/emoji"}
+          post("/admin/customize/emojis.json",             name: 'test',
+                                                           file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/fake.jpg"))
+        end.find { |m| m.channel == "/uploads/emoji" }
 
         expect(message.channel).to eq("/uploads/emoji")
         expect(message.data["errors"]).to eq([I18n.t('upload.images.size_not_found')])
@@ -28,11 +26,9 @@ RSpec.describe "Managing custom emojis" do
         CustomEmoji.create!(name: 'test', upload: upload)
 
         message = MessageBus.track_publish do
-          post("/admin/customize/emojis.json", {
-            name: 'test',
-            file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
-          })
-        end.find{|m| m.channel == "/uploads/emoji"}
+          post("/admin/customize/emojis.json",             name: 'test',
+                                                           file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"))
+        end.find { |m| m.channel == "/uploads/emoji" }
 
         expect(message.channel).to eq("/uploads/emoji")
 
@@ -43,14 +39,12 @@ RSpec.describe "Managing custom emojis" do
     end
 
     it 'should allow an admin to add a custom emoji' do
-        Emoji.expects(:clear_cache)
+      Emoji.expects(:clear_cache)
 
         message = MessageBus.track_publish do
-          post("/admin/customize/emojis.json", {
-            name: 'test',
-            file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png")
-          })
-        end.find{|m| m.channel == "/uploads/emoji"}
+          post("/admin/customize/emojis.json",             name: 'test',
+                                                           file: fixture_file_upload("#{Rails.root}/spec/fixtures/images/logo.png"))
+        end.find { |m| m.channel == "/uploads/emoji" }
 
         custom_emoji = CustomEmoji.last
         upload = custom_emoji.upload
diff --git a/spec/integration/admin/groups_spec.rb b/spec/integration/admin/groups_spec.rb
new file mode 100644
index 0000000000..4f41f6d219
--- /dev/null
+++ b/spec/integration/admin/groups_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe "Managing groups as an admin" do
+  let(:admin) { Fabricate(:admin) }
+  let(:user) { Fabricate(:user) }
+
+  before do
+    sign_in(admin)
+  end
+
+  describe 'creating a new group' do
+    it 'should work' do
+      post "/admin/groups.json", group: {
+        name: 'testing',
+        usernames: [admin.username, user.username].join(","),
+        owner_usernames: [user.username].join(","),
+        allow_membership_requests: true
+      }
+
+      expect(response).to be_success
+
+      group = Group.last
+
+      expect(group.name).to eq('testing')
+      expect(group.users).to contain_exactly(admin, user)
+      expect(group.allow_membership_requests).to eq(true)
+    end
+  end
+end
diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb
index 047056cedc..cbc58c0d8a 100644
--- a/spec/integration/category_tag_spec.rb
+++ b/spec/integration/category_tag_spec.rb
@@ -9,7 +9,7 @@ describe "category tag restrictions" do
     tag_records.map(&:name).sort
   end
 
-  def filter_allowed_tags(opts={})
+  def filter_allowed_tags(opts = {})
     DiscourseTagging.filter_allowed_tags(Tag.all, Guardian.new(user), opts)
   end
 
@@ -45,8 +45,8 @@ describe "category tag restrictions" do
 
     it "search can show only permitted tags" do
       expect(filter_allowed_tags.count).to eq(Tag.count)
-      expect(filter_allowed_tags({for_input: true, category: category_with_tags}).pluck(:name).sort).to eq([tag1.name, tag2.name].sort)
-      expect(filter_allowed_tags({for_input: true}).pluck(:name).sort).to eq([tag3.name, tag4.name].sort)
+      expect(filter_allowed_tags(for_input: true, category: category_with_tags).pluck(:name).sort).to eq([tag1.name, tag2.name].sort)
+      expect(filter_allowed_tags(for_input: true).pluck(:name).sort).to eq([tag3.name, tag4.name].sort)
     end
 
     it "can't create new tags in a restricted category" do
@@ -80,13 +80,13 @@ describe "category tag restrictions" do
       category.allowed_tag_groups = [tag_group1.name]
       category.reload
 
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag1, tag2]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag3, tag4]))
 
       tag_group1.tags = [tag2, tag3, tag4]
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag2, tag3, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag2, tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag1]))
     end
 
     it "groups and individual tags can be mixed" do
@@ -94,9 +94,9 @@ describe "category tag restrictions" do
       category.allowed_tags = [tag4.name]
       category.reload
 
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: category}))).to eq(sorted_tag_names([tag1, tag2, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag3]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag3]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: category))).to eq(sorted_tag_names([tag1, tag2, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag3]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag3]))
     end
   end
 
@@ -104,9 +104,9 @@ describe "category tag restrictions" do
     it "filter_allowed_tags returns results based on whether parent tag is present or not" do
       tag_group = Fabricate(:tag_group, parent_tag_id: tag1.id)
       tag_group.tags = [tag3, tag4]
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1, tag2]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, selected_tags: [tag1.name]}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
-      expect(sorted_tag_names(filter_allowed_tags({for_input: true, selected_tags: [tag1.name, tag3.name]}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1, tag2]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, selected_tags: [tag1.name]))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+      expect(sorted_tag_names(filter_allowed_tags(for_input: true, selected_tags: [tag1.name, tag3.name]))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
     end
 
     context "and category restrictions" do
@@ -137,15 +137,15 @@ describe "category tag restrictions" do
 
       it "handles all those rules" do
         # car tags can't be used outside of car category:
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: other_category}))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: other_category))).to eq(sorted_tag_names([tag1, tag2, tag3, tag4]))
 
         # in car category, a make tag must be given first:
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category}))).to eq(['ford', 'honda'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category))).to eq(['ford', 'honda'])
 
         # model tags depend on which make is chosen:
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda']}))).to eq(['accord', 'civic', 'ford', 'honda'])
-        expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford']}))).to eq(['ford', 'honda', 'mustang', 'taurus'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'ford', 'honda'])
+        expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['ford', 'honda', 'mustang', 'taurus'])
       end
 
       it "can apply the tags to a topic" do
@@ -161,10 +161,10 @@ describe "category tag restrictions" do
         end
 
         it "can restrict one tag from each group" do
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category}))).to eq(['ford', 'honda'])
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda']}))).to eq(['accord', 'civic', 'honda'])
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford']}))).to eq(['ford', 'mustang', 'taurus'])
-          expect(sorted_tag_names(filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['ford', 'mustang']}))).to eq(['ford', 'mustang'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category))).to eq(['ford', 'honda'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda']))).to eq(['accord', 'civic', 'honda'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford']))).to eq(['ford', 'mustang', 'taurus'])
+          expect(sorted_tag_names(filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['ford', 'mustang']))).to eq(['ford', 'mustang'])
         end
 
         it "can apply the tags to a topic" do
@@ -175,7 +175,7 @@ describe "category tag restrictions" do
         it "can remove extra tags from the same group" do
           # A weird case that input field wouldn't allow.
           # Only one tag from car makers is allowed, but we're saying that two have been selected.
-          names = filter_allowed_tags({for_input: true, category: car_category, selected_tags: ['honda', 'ford']}).map(&:name)
+          names = filter_allowed_tags(for_input: true, category: car_category, selected_tags: ['honda', 'ford']).map(&:name)
           expect(names.include?('honda') && names.include?('ford')).to eq(false)
           expect(names.include?('honda') || names.include?('ford')).to eq(true)
         end
diff --git a/spec/integration/groups_spec.rb b/spec/integration/groups_spec.rb
index ed5b5bb7c6..410b2f77cb 100644
--- a/spec/integration/groups_spec.rb
+++ b/spec/integration/groups_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe "Groups" do
   let(:user) { Fabricate(:user) }
-  let!(:group) { Fabricate(:group, users: [user]) }
+  let(:group) { Fabricate(:group, users: [user]) }
 
   describe 'viewing groups' do
     let!(:staff_group) do
@@ -19,6 +19,7 @@ describe "Groups" do
     end
 
     it 'should return the right response' do
+      group
       get "/groups.json"
 
       expect(response).to be_success
@@ -61,7 +62,7 @@ describe "Groups" do
       sign_in(user)
       group.update_attributes!(name: 'test')
 
-      get "/groups/test/mentionable.json", { name: group.name }
+      get "/groups/test/mentionable.json", name: group.name
 
       expect(response).to be_success
 
@@ -70,7 +71,7 @@ describe "Groups" do
 
       group.update_attributes!(alias_level: Group::ALIAS_LEVELS[:everyone])
 
-      get "/groups/test/mentionable.json", { name: group.name }
+      get "/groups/test/mentionable.json", name: group.name
       expect(response).to be_success
 
       response_body = JSON.parse(response.body)
@@ -79,7 +80,14 @@ describe "Groups" do
   end
 
   describe "group can be updated" do
-    let(:group) { Fabricate(:group, name: 'test', users: [user], public: false) }
+    let(:group) do
+      Fabricate(:group,
+        name: 'test',
+        users: [user],
+        public_admission: false,
+        public_exit: false
+      )
+    end
 
     before do
       sign_in(user)
@@ -95,16 +103,17 @@ describe "Groups" do
         group.update!(allow_membership_requests: false)
 
         expect do
-          xhr :put, "/groups/#{group.id}", { group: {
+          xhr :put, "/groups/#{group.id}", group: {
             flair_bg_color: 'FFF',
             flair_color: 'BBB',
             flair_url: 'fa-adjust',
             bio_raw: 'testing',
             full_name: 'awesome team',
-            public: true,
+            public_admission: true,
+            public_exit: true,
             allow_membership_requests: true
-          } }
-        end.to change { GroupHistory.count }.by(7)
+          }
+        end.to change { GroupHistory.count }.by(8)
 
         expect(response).to be_success
 
@@ -115,7 +124,8 @@ describe "Groups" do
         expect(group.flair_url).to eq('fa-adjust')
         expect(group.bio_raw).to eq('testing')
         expect(group.full_name).to eq('awesome team')
-        expect(group.public).to eq(true)
+        expect(group.public_admission).to eq(true)
+        expect(group.public_exit).to eq(true)
         expect(group.allow_membership_requests).to eq(true)
         expect(GroupHistory.last.subject).to eq('allow_membership_requests')
       end
@@ -128,7 +138,7 @@ describe "Groups" do
       end
 
       it 'should be able to update the group' do
-        xhr :put, "/groups/#{group.id}", { group: { flair_color: 'BBB' } }
+        xhr :put, "/groups/#{group.id}", group: { flair_color: 'BBB' }
 
         expect(response).to be_success
         expect(group.reload.flair_color).to eq('BBB')
@@ -139,7 +149,7 @@ describe "Groups" do
       it 'should not be able to update the group' do
         sign_in(user)
 
-        xhr :put, "/groups/#{group.id}", { group: { name: 'testing' } }
+        xhr :put, "/groups/#{group.id}", group: { name: 'testing' }
 
         expect(response.status).to eq(403)
       end
@@ -224,7 +234,10 @@ describe "Groups" do
 
       context 'public group' do
         it 'should be fobidden' do
-          group.update_attributes!(public: true)
+          group.update_attributes!(
+            public_admission: true,
+            public_exit: true
+          )
 
           expect { xhr :put, "/groups/#{group.id}/members", usernames: "bob" }
             .to raise_error(Discourse::NotLoggedIn)
@@ -315,6 +328,13 @@ describe "Groups" do
 
           expect(response).to be_success
         end
+
+        it "adds by email" do
+          expect { xhr :put, "/groups/#{group.id}/members", user_emails: [user1.email, user2.email].join(",") }
+            .to change { group.users.count }.by(2)
+
+          expect(response).to be_success
+        end
       end
 
       it "returns 422 if member already exists" do
@@ -333,7 +353,10 @@ describe "Groups" do
         let(:other_user) { Fabricate(:user) }
 
         before do
-          group.update!(public: true)
+          group.update!(
+            public_admission: true,
+            public_exit: true
+          )
         end
 
         context 'admin' do
@@ -416,11 +439,7 @@ describe "Groups" do
 
         context 'public group' do
           let(:other_user) { Fabricate(:user) }
-          let(:group) { Fabricate(:group, users: [other_user]) }
-
-          before do
-            group.update!(public: true)
-          end
+          let(:group) { Fabricate(:public_group, users: [other_user]) }
 
           context "admin" do
             it "removes by username" do
@@ -476,7 +495,12 @@ describe "Groups" do
       context 'public group' do
         before do
           group.add_owner(user)
-          group.update_attributes!(public: true)
+
+          group.update_attributes!(
+            public_admission: true,
+            public_exit: true
+          )
+
           GroupActionLogger.new(user, group).log_change_group_settings
           sign_in(user)
         end
@@ -489,7 +513,7 @@ describe "Groups" do
           result = JSON.parse(response.body)["logs"].first
 
           expect(result["action"]).to eq(GroupHistory.actions[1].to_s)
-          expect(result["subject"]).to eq('public')
+          expect(result["subject"]).to eq('public_exit')
           expect(result["prev_value"]).to eq('f')
           expect(result["new_value"]).to eq('t')
         end
@@ -571,4 +595,96 @@ describe "Groups" do
       expect(topic.allowed_groups).to eq([])
     end
   end
+
+  describe 'search for groups' do
+    let(:hidden_group) do
+      Fabricate(:group,
+        visibility_level: Group.visibility_levels[:owners],
+        name: 'KingOfTheNorth'
+      )
+    end
+
+    before do
+      group.update!(
+        name: 'GOT',
+        full_name: 'Daenerys Targaryen'
+      )
+
+      hidden_group
+    end
+
+    context 'as an anon user' do
+      it "returns the right response" do
+        expect { xhr :get, '/groups/search' }.to raise_error(Discourse::NotLoggedIn)
+      end
+    end
+
+    context 'as a normal user' do
+      it "returns the right response" do
+        sign_in(user)
+
+        xhr :get, '/groups/search'
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expected_ids = Group::AUTO_GROUPS.map { |name, id| id }
+        expected_ids.delete(Group::AUTO_GROUPS[:everyone])
+        expected_ids << group.id
+
+        expect(groups.map { |group| group["id"] }).to contain_exactly(*expected_ids)
+
+        ['GO', 'nerys'].each do |term|
+          xhr :get, "/groups/search?term=#{term}"
+
+          expect(response).to be_success
+          groups = JSON.parse(response.body)
+
+          expect(groups.length).to eq(1)
+          expect(groups.first['id']).to eq(group.id)
+        end
+
+        xhr :get, "/groups/search?term=KingOfTheNorth"
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expect(groups).to eq([])
+      end
+    end
+
+    context 'as a group owner' do
+      before do
+        hidden_group.add_owner(user)
+      end
+
+      it "returns the right response" do
+        sign_in(user)
+
+        xhr :get, "/groups/search?term=north"
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expect(groups.length).to eq(1)
+        expect(groups.first['id']).to eq(hidden_group.id)
+      end
+    end
+
+    context 'as an admin' do
+      it "returns the right response" do
+        sign_in(Fabricate(:admin))
+
+        xhr :get, '/groups/search?ignore_automatic=true'
+
+        expect(response).to be_success
+        groups = JSON.parse(response.body)
+
+        expect(groups.length).to eq(2)
+
+        expect(groups.map { |group| group['id'] })
+          .to contain_exactly(group.id, hidden_group.id)
+      end
+    end
+  end
 end
diff --git a/spec/integration/managing_topic_status_spec.rb b/spec/integration/managing_topic_status_spec.rb
index 0673c27959..eede1cbb09 100644
--- a/spec/integration/managing_topic_status_spec.rb
+++ b/spec/integration/managing_topic_status_spec.rb
@@ -60,7 +60,7 @@ RSpec.describe "Managing a topic's status update", type: :request do
     end
 
     it 'should be able to delete a topic status update' do
-      topic.update!(topic_timers: [Fabricate(:topic_timer)])
+      Fabricate(:topic_timer, topic: topic)
 
       post "/t/#{topic.id}/timer.json",
         time: nil,
diff --git a/spec/integration/spam_rules_spec.rb b/spec/integration/spam_rules_spec.rb
index bb28573e8f..adec648d23 100644
--- a/spec/integration/spam_rules_spec.rb
+++ b/spec/integration/spam_rules_spec.rb
@@ -50,8 +50,8 @@ describe SpamRulesEnforcer do
             PostAction.act(user2, spam_post, PostActionType.types[:spam])
 
             expect(Guardian.new(spammer).can_create_topic?(nil)).to be(false)
-            expect{PostCreator.create(spammer, {title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1})}.to raise_error(Discourse::InvalidAccess)
-            expect(PostCreator.create(spammer, {topic_id: another_topic.id, raw: 'my reply is spam in your topic', archetype_id: 1})).to eq(nil)
+            expect { PostCreator.create(spammer, title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1) }.to raise_error(Discourse::InvalidAccess)
+            expect(PostCreator.create(spammer, topic_id: another_topic.id, raw: 'my reply is spam in your topic', archetype_id: 1)).to eq(nil)
           end
 
           it 'should hide the posts' do
@@ -111,7 +111,7 @@ describe SpamRulesEnforcer do
 
           expect(spam_post.reload).to_not be_hidden
           expect(Guardian.new(spammer).can_create_topic?(nil)).to be(true)
-          expect{PostCreator.create(spammer, {title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1})}.to_not raise_error
+          expect { PostCreator.create(spammer, title: 'limited time offer for you', raw: 'better buy this stuff ok', archetype_id: 1) }.to_not raise_error
           expect(spammer.reload.private_topics_count).to eq(private_messages_count)
         end
       end
diff --git a/spec/integration/tags_spec.rb b/spec/integration/tags_spec.rb
index 61f0bf6b3d..34b0977abb 100644
--- a/spec/integration/tags_spec.rb
+++ b/spec/integration/tags_spec.rb
@@ -9,7 +9,7 @@ describe "Tags" do
     let(:tag) { Fabricate(:tag, name: 'test') }
 
     it "should return the right response" do
-      get "/tags/check.json", { tag_values: [tag.name] }
+      get "/tags/check.json", tag_values: [tag.name]
 
       expect(response).to be_success
 
diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb
index 75d2e07c2c..ad4a091cd2 100644
--- a/spec/integration/topic_auto_close_spec.rb
+++ b/spec/integration/topic_auto_close_spec.rb
@@ -33,11 +33,7 @@ describe Topic do
     context 'jobs may be queued' do
       before do
         SiteSetting.queue_jobs = true
-        Timecop.freeze(Time.zone.now)
-      end
-
-      after do
-        Timecop.return
+        freeze_time
       end
 
       context 'category has a default auto-close' do
@@ -78,14 +74,14 @@ describe Topic do
 
           context 'topic is closed manually' do
             it 'should remove the schedule to auto-close the topic' do
-              Timecop.freeze do
-                topic_timer_id = staff_topic.public_topic_timer.id
+              freeze_time
 
-                staff_topic.update_status('closed', true, admin)
+              topic_timer_id = staff_topic.public_topic_timer.id
 
-                expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
-                  .to be_within(1.second).of(Time.zone.now)
-              end
+              staff_topic.update_status('closed', true, admin)
+
+              expect(TopicTimer.with_deleted.find(topic_timer_id).deleted_at)
+                .to be_within(1.second).of(Time.zone.now)
             end
           end
         end
diff --git a/spec/integration/users_spec.rb b/spec/integration/users_spec.rb
index 46ea6bf661..78deb7539c 100644
--- a/spec/integration/users_spec.rb
+++ b/spec/integration/users_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe "Users" do
     end
 
     it "should be able to update a user" do
-      put "/u/#{user.username}.json", { name: 'test.test' }
+      put "/u/#{user.username}.json", name: 'test.test'
 
       expect(response).to be_success
       expect(user.reload.name).to eq('test.test')
@@ -44,7 +44,7 @@ RSpec.describe "Users" do
       end
 
       it "should be able to update a user" do
-        put "/u/#{user.username}.json", { name: 'testing123' }
+        put "/u/#{user.username}.json", name: 'testing123'
 
         expect(response).to be_success
         expect(user.reload.name).to eq('testing123')
diff --git a/spec/integration/watched_words_spec.rb b/spec/integration/watched_words_spec.rb
new file mode 100644
index 0000000000..bfef752a6d
--- /dev/null
+++ b/spec/integration/watched_words_spec.rb
@@ -0,0 +1,173 @@
+require 'rails_helper'
+
+describe WatchedWord do
+  let(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
+  let(:admin) { Fabricate(:admin) }
+  let(:moderator) { Fabricate(:moderator) }
+
+  let(:topic) { Fabricate(:topic) }
+  let(:first_post) { Fabricate(:post, topic: topic) }
+
+  let(:require_approval_word) { Fabricate(:watched_word, action: WatchedWord.actions[:require_approval]) }
+  let(:flag_word) { Fabricate(:watched_word, action: WatchedWord.actions[:flag]) }
+  let(:block_word) { Fabricate(:watched_word, action: WatchedWord.actions[:block]) }
+
+  after do
+    $redis.flushall
+  end
+
+  context "block" do
+    def should_block_post(manager)
+      expect {
+        result = manager.perform
+        expect(result).to_not be_success
+        expect(result.errors[:base]&.first).to eq(I18n.t('contains_blocked_words'))
+      }.to_not change { Post.count }
+    end
+
+    it "should prevent the post from being created" do
+      manager = NewPostManager.new(tl2_user, raw: "Want some #{block_word.word} for cheap?", topic_id: topic.id)
+      should_block_post(manager)
+    end
+
+    it "look at title too" do
+      manager = NewPostManager.new(tl2_user, title: "We sell #{block_word.word} online", raw: "Want some poutine for cheap?", topic_id: topic.id)
+      should_block_post(manager)
+    end
+
+    it "should not block the post from admin" do
+      manager = NewPostManager.new(admin, raw: "Want some #{block_word.word} for cheap?", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "should not block the post from moderator" do
+      manager = NewPostManager.new(moderator, raw: "Want some #{block_word.word} for cheap?", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "should block in a private message too" do
+      manager = NewPostManager.new(
+        tl2_user,
+        raw: "Want some #{block_word.word} for cheap?",
+        title: 'this is a new title',
+        archetype: Archetype.private_message,
+        target_usernames: Fabricate(:user, trust_level: TrustLevel[2]).username
+      )
+      should_block_post(manager)
+    end
+
+    it "blocks on revisions" do
+      post = Fabricate(:post, topic: Fabricate(:topic, user: tl2_user), user: tl2_user)
+      expect {
+        PostRevisor.new(post).revise!(post.user, { raw: "Want some #{block_word.word} for cheap?" }, revised_at: post.updated_at + 10.seconds)
+        expect(post.errors).to be_present
+        post.reload
+      }.to_not change { post.raw }
+    end
+  end
+
+  context "require_approval" do
+    it "should queue the post for approval" do
+      manager = NewPostManager.new(tl2_user, raw: "My dog's name is #{require_approval_word.word}.", topic_id: topic.id)
+      result = manager.perform
+      expect(result.action).to eq(:enqueued)
+    end
+
+    it "looks at title too" do
+      manager = NewPostManager.new(tl2_user, title: "You won't believe these #{require_approval_word.word} dog names!", raw: "My dog's name is Porkins.", topic_id: topic.id)
+      result = manager.perform
+      expect(result.action).to eq(:enqueued)
+    end
+
+    it "should not queue posts from admin" do
+      manager = NewPostManager.new(admin, raw: "My dog's name is #{require_approval_word.word}.", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "should not queue posts from moderator" do
+      manager = NewPostManager.new(moderator, raw: "My dog's name is #{require_approval_word.word}.", topic_id: topic.id)
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+
+    it "doesn't need approval in a private message" do
+      manager = NewPostManager.new(
+        tl2_user,
+        raw: "Want some #{require_approval_word.word} for cheap?",
+        title: 'this is a new title',
+        archetype: Archetype.private_message,
+        target_usernames: Fabricate(:user, trust_level: TrustLevel[2]).username
+      )
+      result = manager.perform
+      expect(result).to be_success
+      expect(result.action).to eq(:create_post)
+    end
+  end
+
+  context "flag" do
+    def should_flag_post(author, raw, topic)
+      post = Fabricate(:post, raw: raw, topic: topic, user: author)
+      expect {
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+      }.to change { PostAction.count }.by(1)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+    end
+
+    def should_not_flag_post(author, raw, topic)
+      post = Fabricate(:post, raw: raw, topic: topic, user: author)
+      expect {
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+      }.to_not change { PostAction.count }
+    end
+
+    it "should flag the post as inappropriate" do
+      should_flag_post(tl2_user, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: tl2_user))
+    end
+
+    it "should look at the title too" do
+      should_flag_post(tl2_user, "I thought the movie was not bad actually.", Fabricate(:topic, user: tl2_user, title: "Read my #{flag_word.word} review!"))
+    end
+
+    it "shouldn't flag posts by admin" do
+      should_not_flag_post(admin, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: admin))
+    end
+
+    it "shouldn't flag posts by moderator" do
+      should_not_flag_post(moderator, "I thought the #{flag_word.word} was bad.", Fabricate(:topic, user: moderator))
+    end
+
+    it "is compatible with flag_sockpuppets" do
+      # e.g., handle PostAction::AlreadyActed
+      SiteSetting.flag_sockpuppets = true
+      ip_address = '182.189.119.174'
+      user1 = Fabricate(:user, ip_address: ip_address, created_at: 2.days.ago)
+      user2 = Fabricate(:user, ip_address: ip_address)
+      first = create_post(user: user1, created_at: 2.days.ago)
+      sockpuppet_post = create_post(user: user2, topic: first.topic, raw: "I thought the #{flag_word.word} was bad.")
+      expect(PostAction.where(post_id: sockpuppet_post.id).count).to eq(1)
+    end
+
+    it "flags in private message too" do
+      post = Fabricate(:private_message_post, raw: "Want some #{flag_word.word} for cheap?", user: tl2_user)
+      expect {
+        Jobs::ProcessPost.new.execute(post_id: post.id)
+      }.to change { PostAction.count }.by(1)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+    end
+
+    it "flags on revisions" do
+      post = Fabricate(:post, topic: Fabricate(:topic, user: tl2_user), user: tl2_user)
+      expect {
+        PostRevisor.new(post).revise!(post.user, { raw: "Want some #{flag_word.word} for cheap?" }, revised_at: post.updated_at + 10.seconds)
+      }.to change { PostAction.count }.by(1)
+      expect(PostAction.where(post_id: post.id, post_action_type_id: PostActionType.types[:inappropriate]).exists?).to eq(true)
+    end
+  end
+end
diff --git a/spec/integrity/common_mark_spec.rb b/spec/integrity/common_mark_spec.rb
new file mode 100644
index 0000000000..063e6ddff9
--- /dev/null
+++ b/spec/integrity/common_mark_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe "CommonMark" do
+  it 'passes spec' do
+
+    SiteSetting.traditional_markdown_linebreaks = true
+    SiteSetting.enable_markdown_typographer = false
+
+    html, state, md = nil
+    failed = 0
+
+    File.readlines(Rails.root + 'spec/fixtures/md/spec.txt').each do |line|
+      if line == "```````````````````````````````` example\n"
+        state = :example
+        next
+      end
+
+      if line == "````````````````````````````````\n"
+        md.gsub!('→', "\t")
+        html ||= String.new
+        html.gsub!('→', "\t")
+        html.strip!
+
+        # normalize brs
+        html.gsub!('<br />', '<br>')
+        html.gsub!('<hr />', '<hr>')
+        html.gsub!(/<img([^>]+) \/>/, "<img\\1>")
+
+        cooked = PrettyText.markdown(md, sanitize: false, linkify: false)
+        cooked.strip!
+        cooked.gsub!(" class=\"lang-auto\"", '')
+        cooked.gsub!(/<span class="hashtag">(.*)<\/span>/, "\\1")
+        # we don't care about this
+        cooked.gsub!("<blockquote>\n</blockquote>", "<blockquote></blockquote>")
+        html.gsub!("<blockquote>\n</blockquote>", "<blockquote></blockquote>")
+        html.gsub!("language-ruby", "lang-ruby")
+        # strip out unsupported languages
+        html.gsub!(/ class="language-[;f].*"/, "")
+
+        unless cooked == html
+          failed += 1
+          puts "FAILED SPEC"
+          puts "Expected: "
+          puts html
+          puts "Got: "
+          puts cooked
+          puts "Markdown: "
+          puts md
+          puts
+        end
+        html, state, md = nil
+        next
+      end
+
+      if state == :example && line == ".\n"
+        state = :html
+        next
+      end
+
+      if state == :example
+        md = (md || String.new) << line
+      end
+
+      if state == :html
+        html = (html || String.new) << line
+      end
+
+    end
+
+    expect(failed).to eq(0)
+  end
+end
diff --git a/spec/integrity/i18n_spec.rb b/spec/integrity/i18n_spec.rb
index 616e826b12..b564c27d01 100644
--- a/spec/integrity/i18n_spec.rb
+++ b/spec/integrity/i18n_spec.rb
@@ -36,7 +36,6 @@ def is_yaml_compatible?(english, translated)
   true
 end
 
-
 describe "i18n integrity checks" do
 
   it 'has an i18n key for each Trust Levels' do
diff --git a/spec/jobs/bulk_grant_trust_level_spec.rb b/spec/jobs/bulk_grant_trust_level_spec.rb
index 0c8112d386..5db643b199 100644
--- a/spec/jobs/bulk_grant_trust_level_spec.rb
+++ b/spec/jobs/bulk_grant_trust_level_spec.rb
@@ -4,7 +4,7 @@ require_dependency 'jobs/regular/bulk_grant_trust_level'
 describe Jobs::BulkGrantTrustLevel do
 
   it "raises an error when trust_level is missing" do
-    expect { Jobs::BulkGrantTrustLevel.new.execute(user_ids: [1,2]) }.to raise_error(Discourse::InvalidParameters)
+    expect { Jobs::BulkGrantTrustLevel.new.execute(user_ids: [1, 2]) }.to raise_error(Discourse::InvalidParameters)
   end
 
   it "raises an error when user_ids are missing" do
@@ -15,7 +15,7 @@ describe Jobs::BulkGrantTrustLevel do
     user1 = Fabricate(:user, email: "foo@wat.com", trust_level: 0)
     user2 = Fabricate(:user, email: "foo@bar.com", trust_level: 2)
 
-    Jobs::BulkGrantTrustLevel.new.execute(trust_level: 3, user_ids: [user1.id,user2.id])
+    Jobs::BulkGrantTrustLevel.new.execute(trust_level: 3, user_ids: [user1.id, user2.id])
 
     user1.reload
     user2.reload
diff --git a/spec/jobs/clean_up_digest_keys.rb b/spec/jobs/clean_up_digest_keys.rb
index d3cbcff40e..d148836a71 100644
--- a/spec/jobs/clean_up_digest_keys.rb
+++ b/spec/jobs/clean_up_digest_keys.rb
@@ -10,4 +10,3 @@ module Jobs
   end
 
 end
-
diff --git a/spec/jobs/dashboard_stats_spec.rb b/spec/jobs/dashboard_stats_spec.rb
index 1a325f62ee..9a339c53a8 100644
--- a/spec/jobs/dashboard_stats_spec.rb
+++ b/spec/jobs/dashboard_stats_spec.rb
@@ -2,17 +2,17 @@ require 'rails_helper'
 
 describe Jobs::DashboardStats do
   it 'caches the stats' do
-    Timecop.freeze do
-      begin
-        stats = AdminDashboardData.fetch_stats.to_json
-        cache_key = AdminDashboardData.stats_cache_key
+    freeze_time
 
-        expect($redis.get(cache_key)).to eq(nil)
-        expect(described_class.new.execute({})).to eq(stats)
-        expect($redis.get(cache_key)).to eq(stats)
-      ensure
-        $redis.del(cache_key)
-      end
+    begin
+      stats = AdminDashboardData.fetch_stats.to_json
+      cache_key = AdminDashboardData.stats_cache_key
+
+      expect($redis.get(cache_key)).to eq(nil)
+      expect(described_class.new.execute({})).to eq(stats)
+      expect($redis.get(cache_key)).to eq(stats)
+    ensure
+      $redis.del(cache_key)
     end
   end
 end
diff --git a/spec/jobs/delete_topic_spec.rb b/spec/jobs/delete_topic_spec.rb
index 11a49d7a29..03ca8a53ef 100644
--- a/spec/jobs/delete_topic_spec.rb
+++ b/spec/jobs/delete_topic_spec.rb
@@ -4,9 +4,7 @@ describe Jobs::DeleteTopic do
   let(:admin) { Fabricate(:admin) }
 
   let(:topic) do
-    Fabricate(:topic,
-      topic_timers: [Fabricate(:topic_timer, user: admin)]
-    )
+    Fabricate(:topic_timer, user: admin).topic
   end
 
   let(:first_post) { create_post(topic: topic) }
@@ -18,47 +16,47 @@ describe Jobs::DeleteTopic do
   it "can delete a topic" do
     first_post
 
-    Timecop.freeze(2.hours.from_now) do
-      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
-      expect(topic.reload).to be_trashed
-      expect(first_post.reload).to be_trashed
-      expect(topic.reload.public_topic_timer).to eq(nil)
-    end
+    freeze_time (2.hours.from_now)
+
+    described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+    expect(topic.reload).to be_trashed
+    expect(first_post.reload).to be_trashed
+    expect(topic.reload.public_topic_timer).to eq(nil)
+
   end
 
   it "should do nothing if topic is already deleted" do
     first_post
     topic.trash!
-    Timecop.freeze(2.hours.from_now) do
-      Topic.any_instance.expects(:trash!).never
-      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
-    end
+
+    freeze_time 2.hours.from_now
+
+    Topic.any_instance.expects(:trash!).never
+    described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
   end
 
   it "should do nothing if it's too early" do
-    t = Fabricate(:topic,
-      topic_timers: [Fabricate(:topic_timer, user: admin, execute_at: 5.hours.from_now)]
-    )
+    t = Fabricate(:topic_timer, user: admin, execute_at: 5.hours.from_now).topic
     create_post(topic: t)
-    Timecop.freeze(4.hours.from_now) do
-      described_class.new.execute(topic_timer_id: t.public_topic_timer.id)
-      expect(t.reload).to_not be_trashed
-    end
+
+    freeze_time 4.hours.from_now
+
+    described_class.new.execute(topic_timer_id: t.public_topic_timer.id)
+    expect(t.reload).to_not be_trashed
   end
 
   describe "user isn't authorized to delete topics" do
     let(:topic) {
-      Fabricate(:topic,
-        topic_timers: [Fabricate(:topic_timer, user: Fabricate(:user))]
-      )
+      Fabricate(:topic_timer, user: Fabricate(:user)).topic
     }
 
     it "shouldn't delete the topic" do
       create_post(topic: topic)
-      Timecop.freeze(2.hours.from_now) do
-        described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
-        expect(topic.reload).to_not be_trashed
-      end
+
+      freeze_time 2.hours.from_now
+
+      described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
+      expect(topic.reload).to_not be_trashed
     end
   end
 
diff --git a/spec/jobs/emit_web_hook_event_spec.rb b/spec/jobs/emit_web_hook_event_spec.rb
index 3750fff8de..fbc1cf13ec 100644
--- a/spec/jobs/emit_web_hook_event_spec.rb
+++ b/spec/jobs/emit_web_hook_event_spec.rb
@@ -80,7 +80,7 @@ describe Jobs::EmitWebHookEvent do
       expect(headers['X-Discourse-Event-Type']).to eq('ping')
       expect(headers['X-Discourse-Event']).to eq('ping')
       expect(headers['X-Discourse-Event-Signature']).to eq('sha256=162f107f6b5022353274eb1a7197885cfd35744d8d08e5bcea025d309386b7d6')
-      expect(event.payload).to eq(MultiJson.dump({ping: 'OK'}))
+      expect(event.payload).to eq(MultiJson.dump(ping: 'OK'))
       expect(event.status).to eq(200)
       expect(MultiJson.load(event.response_headers)['Test']).to eq('string')
       expect(event.response_body).to eq('OK')
diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb
index 089bf243b5..c729c99138 100644
--- a/spec/jobs/enqueue_digest_emails_spec.rb
+++ b/spec/jobs/enqueue_digest_emails_spec.rb
@@ -33,7 +33,7 @@ describe Jobs::EnqueueDigestEmails do
         expect(Jobs::EnqueueDigestEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true)
 
         # As an approved user
-        unapproved_user.update_attributes(admin: false, moderator: false, approved: true )
+        unapproved_user.update_attributes(admin: false, moderator: false, approved: true)
         expect(Jobs::EnqueueDigestEmails.new.target_user_ids.include?(unapproved_user.id)).to eq(true)
       end
     end
@@ -149,5 +149,4 @@ describe Jobs::EnqueueDigestEmails do
 
   end
 
-
 end
diff --git a/spec/jobs/export_csv_file_spec.rb b/spec/jobs/export_csv_file_spec.rb
index de188be272..daec9aec83 100644
--- a/spec/jobs/export_csv_file_spec.rb
+++ b/spec/jobs/export_csv_file_spec.rb
@@ -9,7 +9,7 @@ describe Jobs::ExportCsvFile do
   end
 
   let :user_list_header do
-    ['id','name','username','email','title','created_at','last_seen_at','last_posted_at','last_emailed_at','trust_level','approved','suspended_at','suspended_till','blocked','active','admin','moderator','ip_address','topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received','location','website','views','external_id','external_email', 'external_username', 'external_name', 'external_avatar_url']
+    ['id', 'name', 'username', 'email', 'title', 'created_at', 'last_seen_at', 'last_posted_at', 'last_emailed_at', 'trust_level', 'approved', 'suspended_at', 'suspended_till', 'blocked', 'active', 'admin', 'moderator', 'ip_address', 'topics_entered', 'posts_read_count', 'time_read', 'topic_count', 'post_count', 'likes_given', 'likes_received', 'location', 'website', 'views', 'external_id', 'external_email', 'external_username', 'external_name', 'external_avatar_url']
   end
 
   let :user_list_export do
@@ -26,7 +26,7 @@ describe Jobs::ExportCsvFile do
     user.user_profile.update_column(:location, "La La Land")
     user.create_single_sign_on_record(external_id: "123", last_payload: "xxx", external_email: 'test@test.com')
 
-    user = to_hash(user_list_export.find{|u| u[0].to_i == user.id})
+    user = to_hash(user_list_export.find { |u| u[0].to_i == user.id })
 
     expect(user["location"]).to eq("La La Land")
     expect(user["external_id"]).to eq("123")
diff --git a/spec/jobs/feature_topic_users_spec.rb b/spec/jobs/feature_topic_users_spec.rb
index b651e85668..5d34ff74c9 100644
--- a/spec/jobs/feature_topic_users_spec.rb
+++ b/spec/jobs/feature_topic_users_spec.rb
@@ -17,8 +17,8 @@ describe Jobs::FeatureTopicUsers do
     let(:topic) { post.topic }
     let!(:coding_horror) { Fabricate(:coding_horror) }
     let!(:evil_trout) { Fabricate(:evil_trout) }
-    let!(:second_post) { create_post(topic: topic, user: coding_horror)}
-    let!(:third_post) { create_post(topic: topic, user: evil_trout)}
+    let!(:second_post) { create_post(topic: topic, user: coding_horror) }
+    let!(:third_post) { create_post(topic: topic, user: evil_trout) }
 
     it "won't feature the OP" do
       Jobs::FeatureTopicUsers.new.execute(topic_id: topic.id)
@@ -42,7 +42,6 @@ describe Jobs::FeatureTopicUsers do
     let!(:post) { create_post }
     let(:topic) { post.topic }
 
-
     it "it works as expected" do
 
       # It has 1 participant after creation
diff --git a/spec/jobs/grant_anniversary_badges_spec.rb b/spec/jobs/grant_anniversary_badges_spec.rb
index a391b8c2f1..2ca7348097 100644
--- a/spec/jobs/grant_anniversary_badges_spec.rb
+++ b/spec/jobs/grant_anniversary_badges_spec.rb
@@ -102,9 +102,10 @@ describe Jobs::GrantAnniversaryBadges do
       user = Fabricate(:user, created_at: 800.days.ago)
       Fabricate(:post, user: user, created_at: 450.days.ago)
 
-      Timecop.freeze(400.days.ago) do
+      freeze_time(400.days.ago) do
         granter.execute({})
       end
+
       badge = user.user_badges.where(badge_id: Badge::Anniversary)
       expect(badge.count).to eq(1)
 
@@ -133,5 +134,4 @@ describe Jobs::GrantAnniversaryBadges do
     end
   end
 
-
 end
diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
index 7eef9cf1db..27023373cc 100644
--- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
+++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb
@@ -62,7 +62,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do
     expect(badge).to be_blank
   end
 
-
   it "does nothing if it's been awarded recently" do
     u0 = Fabricate(:user, created_at: 2.weeks.ago)
     BadgeGranter.grant(Badge.find(Badge::NewUserOfTheMonth), u0)
diff --git a/spec/jobs/invite_email_spec.rb b/spec/jobs/invite_email_spec.rb
index ed3e2d0969..184fd60b46 100644
--- a/spec/jobs/invite_email_spec.rb
+++ b/spec/jobs/invite_email_spec.rb
@@ -24,5 +24,4 @@ describe Jobs::InviteEmail do
 
   end
 
-
 end
diff --git a/spec/jobs/jobs_base_spec.rb b/spec/jobs/jobs_base_spec.rb
index 4388dc4886..b1ec54c5a8 100644
--- a/spec/jobs/jobs_base_spec.rb
+++ b/spec/jobs/jobs_base_spec.rb
@@ -27,12 +27,12 @@ describe Jobs::Base do
   end
 
   it 'handles errors in multisite' do
-    RailsMultisite::ConnectionManagement.expects(:all_dbs).returns(['default','default','default'])
+    RailsMultisite::ConnectionManagement.expects(:all_dbs).returns(['default', 'default', 'default'])
     # one exception per database
     Discourse.expects(:handle_job_exception).times(3)
 
     bad = BadJob.new
-    expect{bad.perform({})}.to raise_error(Jobs::HandledExceptionWrapper)
+    expect { bad.perform({}) }.to raise_error(Jobs::HandledExceptionWrapper)
     expect(bad.fail_count).to eq(3)
   end
 
@@ -47,4 +47,3 @@ describe Jobs::Base do
   end
 
 end
-
diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb
index a5e6203ac3..9f200eceb2 100644
--- a/spec/jobs/jobs_spec.rb
+++ b/spec/jobs/jobs_spec.rb
@@ -107,17 +107,15 @@ describe Jobs do
 
   describe 'enqueue_at' do
     it 'calls enqueue_in for you' do
-      Timecop.freeze(Time.zone.now) do
-        Jobs.expects(:enqueue_in).with(3 * 60 * 60, :eat_lunch, {}).returns(true)
-        Jobs.enqueue_at(3.hours.from_now, :eat_lunch, {})
-      end
+      freeze_time
+      Jobs.expects(:enqueue_in).with(3 * 60 * 60, :eat_lunch, {}).returns(true)
+      Jobs.enqueue_at(3.hours.from_now, :eat_lunch, {})
     end
 
     it 'handles datetimes that are in the past' do
-      Timecop.freeze(Time.zone.now) do
-        Jobs.expects(:enqueue_in).with(0, :eat_lunch, {}).returns(true)
-        Jobs.enqueue_at(3.hours.ago, :eat_lunch, {})
-      end
+      freeze_time
+      Jobs.expects(:enqueue_in).with(0, :eat_lunch, {}).returns(true)
+      Jobs.enqueue_at(3.hours.ago, :eat_lunch, {})
     end
   end
 
diff --git a/spec/jobs/notify_mailing_list_subscribers_spec.rb b/spec/jobs/notify_mailing_list_subscribers_spec.rb
index 1749b1df15..fa2576be73 100644
--- a/spec/jobs/notify_mailing_list_subscribers_spec.rb
+++ b/spec/jobs/notify_mailing_list_subscribers_spec.rb
@@ -21,6 +21,13 @@ describe Jobs::NotifyMailingListSubscribers do
       UserNotifications.expects(:mailing_list_notify).with(mailing_list_user, post).once
       Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
     end
+
+    it "triggers :notify_mailing_list_subscribers" do
+      events = DiscourseEvent.track_events do
+        Jobs::NotifyMailingListSubscribers.new.execute(post_id: post.id)
+      end
+      expect(events).to include(event_name: :notify_mailing_list_subscribers, params: [[mailing_list_user], post])
+    end
   end
 
   context "when mailing list mode is globally disabled" do
diff --git a/spec/jobs/notify_moved_posts_spec.rb b/spec/jobs/notify_moved_posts_spec.rb
index 29ab275eec..19474e998d 100644
--- a/spec/jobs/notify_moved_posts_spec.rb
+++ b/spec/jobs/notify_moved_posts_spec.rb
@@ -9,10 +9,9 @@ describe Jobs::NotifyMovedPosts do
   end
 
   it "raises an error without moved_by_id" do
-    expect { Jobs::NotifyMovedPosts.new.execute(post_ids: [1,2,3]) }.to raise_error(Discourse::InvalidParameters)
+    expect { Jobs::NotifyMovedPosts.new.execute(post_ids: [1, 2, 3]) }.to raise_error(Discourse::InvalidParameters)
   end
 
-
   context 'with post ids' do
     let!(:p1) { Fabricate(:post) }
     let!(:p2) { Fabricate(:post, user: Fabricate(:evil_trout), topic: p1.topic) }
@@ -33,5 +32,4 @@ describe Jobs::NotifyMovedPosts do
 
   end
 
-
 end
diff --git a/spec/jobs/pending_queued_posts_reminder_spec.rb b/spec/jobs/pending_queued_posts_reminder_spec.rb
index 3eb0f6c4b5..5e774287a9 100644
--- a/spec/jobs/pending_queued_posts_reminder_spec.rb
+++ b/spec/jobs/pending_queued_posts_reminder_spec.rb
@@ -24,7 +24,7 @@ describe Jobs::PendingQueuedPostReminder do
     end
 
     it "emails if there are new queued posts" do
-      described_class.any_instance.stubs(:should_notify_ids).returns([1,2])
+      described_class.any_instance.stubs(:should_notify_ids).returns([1, 2])
       described_class.any_instance.stubs(:last_notified_id).returns(nil)
       Email::Sender.any_instance.expects(:send).once
       described_class.new.execute({})
diff --git a/spec/jobs/periodical_updates_spec.rb b/spec/jobs/periodical_updates_spec.rb
index 01071f290f..7c4e79cce8 100644
--- a/spec/jobs/periodical_updates_spec.rb
+++ b/spec/jobs/periodical_updates_spec.rb
@@ -3,12 +3,10 @@ require_dependency 'jobs/scheduled/periodical_updates'
 
 describe Jobs::PeriodicalUpdates do
 
-
   it "works" do
 
     # does not blow up, no mocks, everything is called
     Jobs::PeriodicalUpdates.new.execute(nil)
   end
 
-
 end
diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rb
index e240f6ef9d..9c21d4f5fb 100644
--- a/spec/jobs/process_post_spec.rb
+++ b/spec/jobs/process_post_spec.rb
@@ -50,7 +50,7 @@ describe Jobs::ProcessPost do
 
     it "extracts links to quoted posts" do
       quoted_post = Fabricate(:post, raw: "This is a post with a link to https://www.discourse.org", post_number: 42)
-      post.update_columns(raw: "This quote is the best\n\n[quote=\"#{quoted_post.user.username}, topic:#{quoted_post.topic_id}, post:#{quoted_post.post_number}\"]#{quoted_post.excerpt}[/quote]")
+      post.update_columns(raw: "This quote is the best\n\n[quote=\"#{quoted_post.user.username}, topic:#{quoted_post.topic_id}, post:#{quoted_post.post_number}\"]\n#{quoted_post.excerpt}\n[/quote]")
       # when creating a quote, we also create the reflexion link
       expect { Jobs::ProcessPost.new.execute(post_id: post.id) }.to change { TopicLink.count }.by(2)
     end
diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb
index 2cb97a1cca..2090b3106f 100644
--- a/spec/jobs/publish_topic_to_category_spec.rb
+++ b/spec/jobs/publish_topic_to_category_spec.rb
@@ -5,12 +5,15 @@ RSpec.describe Jobs::PublishTopicToCategory do
   let(:another_category) { Fabricate(:category) }
 
   let(:topic) do
-    Fabricate(:topic, category: category, topic_timers: [
-      Fabricate(:topic_timer,
-        status_type: TopicTimer.types[:publish_to_category],
-        category_id: another_category.id
-      )
-    ])
+    topic = Fabricate(:topic, category: category)
+
+    Fabricate(:topic_timer,
+      status_type: TopicTimer.types[:publish_to_category],
+      category_id: another_category.id,
+      topic: topic
+    )
+
+    topic
   end
 
   before do
@@ -26,7 +29,10 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
   describe 'when topic has been deleted' do
     it 'should not publish the topic to the new category' do
-      Timecop.travel(1.hour.ago) { topic }
+      freeze_time 1.hour.ago
+      topic
+
+      freeze_time 1.hour.from_now
       topic.trash!
 
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
@@ -38,7 +44,9 @@ RSpec.describe Jobs::PublishTopicToCategory do
   end
 
   it 'should publish the topic to the new category' do
-    Timecop.travel(1.hour.ago) { topic.update!(visible: false) }
+    freeze_time 1.hour.ago do
+      topic.update!(visible: false)
+    end
 
     message = MessageBus.track_publish do
       described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
@@ -59,13 +67,12 @@ RSpec.describe Jobs::PublishTopicToCategory do
 
   describe 'when topic is a private message' do
     before do
-      Timecop.travel(1.hour.ago) do
+      freeze_time 1.hour.ago do
         expect { topic.convert_to_private_message(Discourse.system_user) }
           .to change { topic.private_message? }.to(true)
       end
     end
 
-
     it 'should publish the topic to the new category' do
       message = MessageBus.track_publish do
         described_class.new.execute(topic_timer_id: topic.public_topic_timer.id)
diff --git a/spec/jobs/test_email_spec.rb b/spec/jobs/test_email_spec.rb
index 252a96b85e..7207abfff5 100644
--- a/spec/jobs/test_email_spec.rb
+++ b/spec/jobs/test_email_spec.rb
@@ -22,6 +22,4 @@ describe Jobs::TestEmail do
 
   end
 
-
 end
-
diff --git a/spec/jobs/tl3_promotions_spec.rb b/spec/jobs/tl3_promotions_spec.rb
index 7c4aff7354..bf440918fd 100644
--- a/spec/jobs/tl3_promotions_spec.rb
+++ b/spec/jobs/tl3_promotions_spec.rb
@@ -33,7 +33,8 @@ describe Jobs::Tl3Promotions do
 
     it "demotes if was promoted more than X days ago" do
       user = nil
-      Timecop.freeze(4.days.ago) do
+
+      freeze_time 4.days.ago do
         user = create_leader_user
       end
 
@@ -45,7 +46,7 @@ describe Jobs::Tl3Promotions do
 
     it "doesn't demote if user was promoted recently" do
       user = nil
-      Timecop.freeze(1.day.ago) do
+      freeze_time 1.day.ago do
         user = create_leader_user
       end
 
@@ -57,7 +58,7 @@ describe Jobs::Tl3Promotions do
 
     it "doesn't demote if user hasn't lost requirements (low water mark)" do
       user = nil
-      Timecop.freeze(4.days.ago) do
+      freeze_time(4.days.ago) do
         user = create_leader_user
       end
 
diff --git a/spec/jobs/toggle_topic_closed_spec.rb b/spec/jobs/toggle_topic_closed_spec.rb
index 2c4b5c6c8a..2e36f8abaa 100644
--- a/spec/jobs/toggle_topic_closed_spec.rb
+++ b/spec/jobs/toggle_topic_closed_spec.rb
@@ -4,9 +4,7 @@ describe Jobs::ToggleTopicClosed do
   let(:admin) { Fabricate(:admin) }
 
   let(:topic) do
-    Fabricate(:topic,
-      topic_timers: [Fabricate(:topic_timer, user: admin)]
-    )
+    Fabricate(:topic_timer, user: admin).topic
   end
 
   before do
@@ -16,7 +14,7 @@ describe Jobs::ToggleTopicClosed do
   it 'should be able to close a topic' do
     topic
 
-    Timecop.travel(1.hour.from_now) do
+    freeze_time(1.hour.from_now) do
       described_class.new.execute(
         topic_timer_id: topic.public_topic_timer.id,
         state: true
@@ -33,7 +31,7 @@ describe Jobs::ToggleTopicClosed do
   it 'should be able to open a topic' do
     topic.update!(closed: true)
 
-    Timecop.travel(1.hour.from_now) do
+    freeze_time(1.hour.from_now) do
       described_class.new.execute(
         topic_timer_id: topic.public_topic_timer.id,
         state: false
@@ -62,9 +60,7 @@ describe Jobs::ToggleTopicClosed do
 
   describe 'when user is not authorized to close topics' do
     let(:topic) do
-      Fabricate(:topic,
-        topic_timers: [Fabricate(:topic_timer, execute_at: 2.hours.from_now)]
-      )
+      Fabricate(:topic_timer, execute_at: 2.hours.from_now).topic
     end
 
     it 'should not do anything' do
diff --git a/spec/jobs/topic_reminder_spec.rb b/spec/jobs/topic_reminder_spec.rb
index fd8b71697e..1a373c87da 100644
--- a/spec/jobs/topic_reminder_spec.rb
+++ b/spec/jobs/topic_reminder_spec.rb
@@ -2,9 +2,13 @@ require 'rails_helper'
 
 describe Jobs::TopicReminder do
   let(:admin) { Fabricate(:admin) }
-  let(:topic) { Fabricate(:topic, topic_timers: [
-    Fabricate(:topic_timer, user: admin, status_type: TopicTimer.types[:reminder])
-  ]) }
+
+  let(:topic) do
+    Fabricate(:topic_timer,
+      user: admin,
+      status_type: TopicTimer.types[:reminder]
+    ).topic
+  end
 
   before do
     SiteSetting.queue_jobs = true
@@ -12,43 +16,46 @@ describe Jobs::TopicReminder do
 
   it "should be able to create a reminder" do
     topic_timer = topic.topic_timers.first
-    Timecop.freeze(1.day.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to change { Notification.count }.by(1)
-      expect( admin.notifications.where(notification_type: Notification.types[:topic_reminder]).first&.topic_id ).to eq(topic.id)
-      expect( TopicTimer.where(id: topic_timer.id).first ).to be_nil
-    end
+    freeze_time 1.day.from_now
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to change { Notification.count }.by(1)
+    expect(admin.notifications.where(notification_type: Notification.types[:topic_reminder]).first&.topic_id).to eq(topic.id)
+    expect(TopicTimer.where(id: topic_timer.id).first).to be_nil
   end
 
   it "does nothing if it was trashed before the scheduled time" do
     topic_timer = topic.topic_timers.first
     topic_timer.trash!(Discourse.system_user)
-    Timecop.freeze(1.day.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to_not change { Notification.count }
-    end
+
+    freeze_time(1.day.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to_not change { Notification.count }
   end
 
   it "does nothing if job runs too early" do
     topic_timer = topic.topic_timers.first
     topic_timer.update_attribute(:execute_at, 8.hours.from_now)
-    Timecop.freeze(6.hours.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to_not change { Notification.count }
-    end
+
+    freeze_time(6.hours.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to_not change { Notification.count }
   end
 
   it "does nothing if topic was deleted" do
     topic_timer = topic.topic_timers.first
     topic.trash!
-    Timecop.freeze(1.day.from_now) do
-      expect {
-        described_class.new.execute(topic_timer_id: topic_timer.id)
-      }.to_not change { Notification.count }
-    end
+
+    freeze_time(1.day.from_now)
+
+    expect {
+      described_class.new.execute(topic_timer_id: topic_timer.id)
+    }.to_not change { Notification.count }
   end
-  
+
 end
diff --git a/spec/jobs/user_email_spec.rb b/spec/jobs/user_email_spec.rb
index 27788a7fdf..6f2fcf5795 100644
--- a/spec/jobs/user_email_spec.rb
+++ b/spec/jobs/user_email_spec.rb
@@ -7,10 +7,10 @@ describe Jobs::UserEmail do
     SiteSetting.email_time_window_mins = 10
   end
 
-  let(:user) { Fabricate(:user, last_seen_at: 11.minutes.ago ) }
-  let(:staged) { Fabricate(:user, staged: true, last_seen_at: 11.minutes.ago ) }
-  let(:suspended) { Fabricate(:user, last_seen_at: 10.minutes.ago, suspended_at: 5.minutes.ago, suspended_till: 7.days.from_now ) }
-  let(:anonymous) { Fabricate(:anonymous, last_seen_at: 11.minutes.ago ) }
+  let(:user) { Fabricate(:user, last_seen_at: 11.minutes.ago) }
+  let(:staged) { Fabricate(:user, staged: true, last_seen_at: 11.minutes.ago) }
+  let(:suspended) { Fabricate(:user, last_seen_at: 10.minutes.ago, suspended_at: 5.minutes.ago, suspended_till: 7.days.from_now) }
+  let(:anonymous) { Fabricate(:anonymous, last_seen_at: 11.minutes.ago) }
   let(:mailer) { Mail::Message.new(to: user.email) }
 
   it "raises an error when there is no user" do
@@ -115,7 +115,7 @@ describe Jobs::UserEmail do
   context 'args' do
 
     it 'passes a token as an argument when a token is present' do
-      UserNotifications.expects(:forgot_password).with(user, {email_token: 'asdfasdf'}).returns(mailer)
+      UserNotifications.expects(:forgot_password).with(user, email_token: 'asdfasdf').returns(mailer)
       Email::Sender.any_instance.expects(:send)
       Jobs::UserEmail.new.execute(type: :forgot_password, user_id: user.id, email_token: 'asdfasdf')
     end
@@ -124,7 +124,7 @@ describe Jobs::UserEmail do
       let(:post) { Fabricate(:post, user: user) }
 
       it 'passes a post as an argument when a post_id is present' do
-        UserNotifications.expects(:user_private_message).with(user, {post: post}).returns(mailer)
+        UserNotifications.expects(:user_private_message).with(user, post: post).returns(mailer)
         Email::Sender.any_instance.expects(:send)
         Jobs::UserEmail.new.execute(type: :user_private_message, user_id: user.id, post_id: post.id)
       end
@@ -178,7 +178,6 @@ describe Jobs::UserEmail do
       end
     end
 
-
     context 'notification' do
       let(:post) { Fabricate(:post, user: user) }
       let!(:notification) {
@@ -283,7 +282,7 @@ describe Jobs::UserEmail do
 
       context 'user is suspended' do
         it "doesn't send email for a pm from a regular user" do
-          msg,err = Jobs::UserEmail.new.message_for_email(
+          msg, err = Jobs::UserEmail.new.message_for_email(
               suspended,
               Fabricate.build(:post),
               :user_private_message,
@@ -316,7 +315,7 @@ describe Jobs::UserEmail do
           end
 
           it "sends an email" do
-            msg,err = sent_message
+            msg, err = sent_message
             expect(msg).not_to be(nil)
             expect(err).to be(nil)
           end
@@ -324,7 +323,7 @@ describe Jobs::UserEmail do
           it "sends an email even if user was last seen recently" do
             suspended.update_column(:last_seen_at, 1.minute.ago)
 
-            msg,err = sent_message
+            msg, err = sent_message
             expect(msg).not_to be(nil)
             expect(err).to be(nil)
           end
diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb
index ce21d2c957..4bf13fddfd 100644
--- a/spec/mailers/invite_mailer_spec.rb
+++ b/spec/mailers/invite_mailer_spec.rb
@@ -73,7 +73,6 @@ describe InviteMailer do
       end
     end
 
-
     context "invite to topic" do
       let(:trust_level_2) { build(:user, trust_level: 2) }
       let(:topic) { Fabricate(:topic, excerpt: "Topic invite support is now available in Discourse!", user: trust_level_2) }
diff --git a/spec/mailers/rejection_mailer_spec.rb b/spec/mailers/rejection_mailer_spec.rb
index a3d76044b2..0062f609f9 100644
--- a/spec/mailers/rejection_mailer_spec.rb
+++ b/spec/mailers/rejection_mailer_spec.rb
@@ -6,7 +6,7 @@ describe RejectionMailer do
 
     context 'sends rejection email' do
       let (:user) { Fabricate(:user) }
-      let (:template_args) { {former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title} }
+      let (:template_args) { { former_title: "Mail Subject", destination: user.email, site_name: SiteSetting.title } }
       let (:reject_mail) { RejectionMailer.send_rejection("email_reject_topic_not_found", user.email, template_args) }
 
       it 'renders the senders email' do
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index e68158580c..34265ec960 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -13,7 +13,7 @@ describe UserNotifications do
       _post5 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:moderator_action])
       _post6 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:small_action])
       _post7 = Fabricate(:post, topic: post1.topic, post_type: Post.types[:whisper])
-      last  = Fabricate(:post, topic: post1.topic)
+      last = Fabricate(:post, topic: post1.topic)
 
       post1.user.user_option.email_previous_replies = UserOption.previous_replies_type[:always]
 
@@ -29,8 +29,8 @@ describe UserNotifications do
 
     it "allows users to control context" do
       post1 = create_post
-      _post2  = Fabricate(:post, topic: post1.topic)
-      post3  = Fabricate(:post, topic: post1.topic)
+      _post2 = Fabricate(:post, topic: post1.topic)
+      post3 = Fabricate(:post, topic: post1.topic)
 
       user = Fabricate(:user)
       TopicUser.change(user.id, post1.topic_id, last_emailed_post_number: 1)
@@ -185,7 +185,7 @@ describe UserNotifications do
     let(:category) { Fabricate(:category, name: 'India') }
     let(:topic) { Fabricate(:topic, category: category) }
     let(:post) { Fabricate(:post, topic: topic, raw: 'This is My super duper cool topic') }
-    let(:response) { Fabricate(:post, reply_to_post_number: 1, topic: post.topic, user: response_by_user)}
+    let(:response) { Fabricate(:post, reply_to_post_number: 1, topic: post.topic, user: response_by_user) }
     let(:user) { Fabricate(:user) }
     let(:notification) { Fabricate(:notification, user: user) }
 
@@ -223,7 +223,6 @@ describe UserNotifications do
       tu = TopicUser.get(post.topic_id, response.user)
       expect(tu.last_emailed_post_number).to eq(response.post_number)
 
-
       # no In Reply To if user opts out
       response.user.user_option.email_in_reply_to = false
       mail = UserNotifications.user_replied(response.user,
@@ -232,7 +231,6 @@ describe UserNotifications do
                                              notification_data_hash: notification.data_hash
                                            )
 
-
       expect(mail.html_part.to_s.scan(/In Reply To/).count).to eq(0)
 
       SiteSetting.enable_names = true
@@ -249,7 +247,6 @@ describe UserNotifications do
                                              notification_data_hash: notification.data_hash
                                            )
 
-
       mail_html = mail.html_part.to_s
       expect(mail_html.scan(/>Bob Marley/).count).to eq(1)
       expect(mail_html.scan(/>bobmarley/).count).to eq(0)
@@ -286,9 +283,9 @@ describe UserNotifications do
   describe '.user_posted' do
     let(:response_by_user) { Fabricate(:user, name: "John Doe", username: "john") }
     let(:post) { Fabricate(:post) }
-    let(:response) { Fabricate(:post, topic: post.topic, user: response_by_user)}
+    let(:response) { Fabricate(:post, topic: post.topic, user: response_by_user) }
     let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
+    let(:notification) { Fabricate(:notification, user: user, data: { original_username: response_by_user.username }.to_json) }
 
     it 'generates a correct email' do
       SiteSetting.enable_names = false
@@ -335,9 +332,9 @@ describe UserNotifications do
   describe '.user_private_message' do
     let(:response_by_user) { Fabricate(:user, name: "", username: "john") }
     let(:topic) { Fabricate(:private_message_topic) }
-    let(:response) { Fabricate(:post, topic: topic, user: response_by_user)}
+    let(:response) { Fabricate(:post, topic: topic, user: response_by_user) }
     let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
+    let(:notification) { Fabricate(:notification, user: user, data: { original_username: response_by_user.username }.to_json) }
 
     it 'generates a correct email' do
       SiteSetting.enable_names = true
@@ -384,7 +381,6 @@ describe UserNotifications do
     end
   end
 
-
   it 'adds a warning when mail limit is reached' do
     SiteSetting.max_emails_per_day_per_user = 2
     user = Fabricate(:user)
@@ -394,7 +390,7 @@ describe UserNotifications do
     reply = Fabricate(:post, topic_id: post.topic_id)
 
     notification = Fabricate(:notification, topic_id: post.topic_id, post_number: reply.post_number,
-                             user: post.user, data: {original_username: 'bob'}.to_json)
+                                            user: post.user, data: { original_username: 'bob' }.to_json)
 
     mail = UserNotifications.user_replied(
       user,
@@ -467,15 +463,16 @@ describe UserNotifications do
 
   shared_examples "notification email building" do
     let(:post) { Fabricate(:post, user: user) }
-    let(:mail_type) { "user_#{notification_type}"}
-    let(:username) { "walterwhite"}
+    let(:mail_type) { "user_#{notification_type}" }
+    let(:mail_template) { "user_notifications.#{mail_type}" }
+    let(:username) { "walterwhite" }
     let(:notification) do
       Fabricate(:notification,
                 user: user,
                 topic: post.topic,
                 notification_type: Notification.types[notification_type],
                 post_number: post.post_number,
-                data: {original_username: username}.to_json )
+                data: { original_username: username }.to_json)
     end
 
     describe 'email building' do
@@ -488,7 +485,7 @@ describe UserNotifications do
       end
 
       it "has a template" do
-        expects_build_with(has_entry(:template, "user_notifications.#{mail_type}"))
+        expects_build_with(has_entry(:template, mail_template))
       end
 
       it "overrides the html part" do
@@ -549,7 +546,11 @@ describe UserNotifications do
         end
 
         before do
-          TranslationOverride.upsert!("en", "user_notifications.user_#{notification_type}.text_body_template", custom_body)
+          TranslationOverride.upsert!(
+            "en",
+            "#{mail_template}.text_body_template",
+            custom_body
+          )
         end
 
         it "shouldn't use the default html_override" do
@@ -598,6 +599,33 @@ describe UserNotifications do
   describe "user invited to a private message" do
     include_examples "notification email building" do
       let(:notification_type) { :invited_to_private_message }
+      let(:post) { Fabricate(:private_message_post) }
+      let(:user) { post.user }
+      let(:mail_template) { "user_notifications.user_#{notification_type}_pm" }
+
+      include_examples "respect for private_email"
+      include_examples "no reply by email"
+      include_examples "sets user locale"
+    end
+  end
+
+  describe "group invited to a private message" do
+    include_examples "notification email building" do
+      let(:notification_type) { :invited_to_private_message }
+      let(:post) { Fabricate(:private_message_post) }
+      let(:user) { post.user }
+      let(:group) { Fabricate(:group) }
+      let(:mail_template) { "user_notifications.user_#{notification_type}_pm_group" }
+
+      before do
+        notification.data_hash[:group_id] = group.id
+        notification.save!
+      end
+
+      it "should include the group name" do
+        expects_build_with(has_entry(:group_name, group.name))
+      end
+
       include_examples "respect for private_email"
       include_examples "no reply by email"
       include_examples "sets user locale"
diff --git a/spec/models/admin_dashboard_data_spec.rb b/spec/models/admin_dashboard_data_spec.rb
index 05a078cf9c..d04142bef5 100644
--- a/spec/models/admin_dashboard_data_spec.rb
+++ b/spec/models/admin_dashboard_data_spec.rb
@@ -199,7 +199,7 @@ describe AdminDashboardData do
       def all_setting_permutations(keys)
         ['a', ''].repeated_permutation(keys.size) do |*values|
           hash = Hash[keys.zip(values)]
-          hash.each do |key,value|
+          hash.each do |key, value|
             SiteSetting.public_send("#{key}=", value)
           end
           yield hash
diff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rb
index 5d163dc368..5196c16eb5 100644
--- a/spec/models/api_key_spec.rb
+++ b/spec/models/api_key_spec.rb
@@ -3,14 +3,18 @@ require 'rails_helper'
 require_dependency 'api_key'
 
 describe ApiKey do
+  let(:user) { Fabricate(:user) }
+
   it { is_expected.to belong_to :user }
   it { is_expected.to belong_to :created_by }
-
   it { is_expected.to validate_presence_of :key }
 
-  skip 'validates uniqueness of user_id' do
-    Fabricate(:api_key)
-    is_expected.to validate_uniqueness_of(:user_id)
+  it 'validates uniqueness of user_id' do
+    Fabricate(:api_key, user: user)
+    api_key = Fabricate.build(:api_key, user: user)
+
+    expect(api_key.save).to eq(false)
+    expect(api_key.errors).to include(:user_id)
   end
 
 end
diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb
index 7aca4b71d3..78488de3de 100644
--- a/spec/models/application_request_spec.rb
+++ b/spec/models/application_request_spec.rb
@@ -1,13 +1,16 @@
 require 'rails_helper'
 
 describe ApplicationRequest do
-
   before do
     ApplicationRequest.clear_cache!
   end
 
-  def inc(key,opts=nil)
-    ApplicationRequest.increment!(key,opts)
+  after do
+    ApplicationRequest.clear_cache!
+  end
+
+  def inc(key, opts = nil)
+    ApplicationRequest.increment!(key, opts)
   end
 
   it 'logs nothing for an unflushed increment' do
diff --git a/spec/models/badge_spec.rb b/spec/models/badge_spec.rb
index 8a39087fe6..f6f8b0c0d7 100644
--- a/spec/models/badge_spec.rb
+++ b/spec/models/badge_spec.rb
@@ -62,4 +62,3 @@ describe Badge do
   end
 
 end
-
diff --git a/spec/models/category_featured_topic_spec.rb b/spec/models/category_featured_topic_spec.rb
index b7fe537017..ee102375d4 100644
--- a/spec/models/category_featured_topic_spec.rb
+++ b/spec/models/category_featured_topic_spec.rb
@@ -15,7 +15,7 @@ describe CategoryFeaturedTopic do
       # so much dancing, I am thinking fixures make sense here.
       user.change_trust_level!(TrustLevel[1])
 
-      category.set_permissions(:trust_level_1 => :full)
+      category.set_permissions(trust_level_1: :full)
       category.save
 
       _uncategorized_post = PostCreator.create(user, raw: "this is my new post 123 post", title: "hello world")
@@ -32,7 +32,6 @@ describe CategoryFeaturedTopic do
       expect(CategoryFeaturedTopic.count).to be(1)
     end
 
-
     it 'should feature stuff in the correct order' do
       category = Fabricate(:category, num_featured_topics: 2)
       t5 = Fabricate(:topic, category_id: category.id, bumped_at: 12.minutes.ago)
@@ -53,4 +52,3 @@ describe CategoryFeaturedTopic do
   end
 
 end
-
diff --git a/spec/models/category_list_spec.rb b/spec/models/category_list_spec.rb
index 44bb7c67a5..c3d5efb88f 100644
--- a/spec/models/category_list_spec.rb
+++ b/spec/models/category_list_spec.rb
@@ -12,7 +12,7 @@ describe CategoryList do
     it "properly hide secure categories" do
       cat = Fabricate(:category)
       Fabricate(:topic, category: cat)
-      cat.set_permissions(:admins => :full)
+      cat.set_permissions(admins: :full)
       cat.save
 
       # uncategorized + this
@@ -55,7 +55,7 @@ describe CategoryList do
 
     context "with a topic in a category" do
       let!(:topic) { Fabricate(:topic, category: topic_category) }
-      let(:category) { category_list.categories.find{|c| c.id == topic_category.id} }
+      let(:category) { category_list.categories.find { |c| c.id == topic_category.id } }
 
       it "should return the category" do
         expect(category).to be_present
@@ -69,7 +69,7 @@ describe CategoryList do
       let!(:topic2) { Fabricate(:topic, category: topic_category, bumped_at: 5.minutes.ago) }
       let!(:topic3) { Fabricate(:topic, category: topic_category, bumped_at: 2.minutes.ago) }
       let!(:pinned) { Fabricate(:topic, category: topic_category, pinned_at: 10.minutes.ago, bumped_at: 10.minutes.ago) }
-      let(:category) { category_list.categories.find{|c| c.id == topic_category.id} }
+      let(:category) { category_list.categories.find { |c| c.id == topic_category.id } }
 
       it "returns pinned topic first" do
         expect(category.displayable_topics.map(&:id)).to eq([pinned.id, topic3.id])
@@ -104,7 +104,7 @@ describe CategoryList do
 
       it "handles duplicate position values" do
         cat1, cat2, cat3, cat4 = Fabricate(:category, position: 0), Fabricate(:category, position: 0), Fabricate(:category, position: nil), Fabricate(:category, position: 0)
-        first_three = category_ids[0,3] # The order is not deterministic
+        first_three = category_ids[0, 3] # The order is not deterministic
         expect(first_three).to include(cat1.id)
         expect(first_three).to include(cat2.id)
         expect(first_three).to include(cat4.id)
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index cac2e66530..1090a6bb69 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -29,7 +29,7 @@ describe Category do
 
   describe "resolve_permissions" do
     it "can determine read_restricted" do
-      read_restricted, resolved = Category.resolve_permissions(:everyone => :full)
+      read_restricted, resolved = Category.resolve_permissions(everyone: :full)
 
       expect(read_restricted).to be false
       expect(resolved).to be_blank
@@ -41,7 +41,7 @@ describe Category do
       category = Fabricate(:category)
       group = Fabricate(:group)
       category_group = Fabricate(:category_group, category: category, group: group)
-      expect(category.permissions_params).to eq({ "#{group.name}" => category_group.permission_type })
+      expect(category.permissions_params).to eq("#{group.name}" => category_group.permission_type)
     end
   end
 
@@ -55,7 +55,6 @@ describe Category do
       can_post_category = Fabricate(:category)
       can_read_category = Fabricate(:category)
 
-
       user = Fabricate(:user)
       group = Fabricate(:group)
       group.add(user)
@@ -85,7 +84,7 @@ describe Category do
       expect(Category.scoped_to_permissions(nil, [:readonly]).count).to be(2)
 
       # everyone has special semantics, test it as well
-      can_post_category.set_permissions(:everyone => :create_post)
+      can_post_category.set_permissions(everyone: :create_post)
       can_post_category.save
 
       expect(Category.post_create_allowed(guardian).count).to be(4)
@@ -112,7 +111,7 @@ describe Category do
       category.set_permissions({})
       expect(category.read_restricted?).to be true
 
-      category.set_permissions(:everyone => :full)
+      category.set_permissions(everyone: :full)
       expect(category.read_restricted?).to be false
 
       expect(user.secure_categories).to be_empty
@@ -137,7 +136,7 @@ describe Category do
       category_2.save
 
       expect(Category.secured).to match_array([uncategorized])
-      expect(Category.secured(Guardian.new(user))).to match_array([uncategorized,category, category_2])
+      expect(Category.secured(Guardian.new(user))).to match_array([uncategorized, category, category_2])
     end
   end
 
@@ -166,7 +165,7 @@ describe Category do
     category.save
 
     category = Category.find(category.id)
-    expect(category.custom_fields).to eq({"bob" => "marley", "jack" => "black"})
+    expect(category.custom_fields).to eq("bob" => "marley", "jack" => "black")
   end
 
   describe "short name" do
@@ -522,7 +521,7 @@ describe Category do
       it "includes the parent category" do
         parent_category = Fabricate(:category, name: "parent")
         subcategory = Fabricate(:category, name: "child",
-                                parent_category_id: parent_category.id)
+                                           parent_category_id: parent_category.id)
         expect(subcategory.url).to eq "/c/parent/child"
       end
     end
diff --git a/spec/models/category_user_spec.rb b/spec/models/category_user_spec.rb
index d22098ab99..d4608f2f46 100644
--- a/spec/models/category_user_spec.rb
+++ b/spec/models/category_user_spec.rb
@@ -117,7 +117,6 @@ describe CategoryUser do
       expect(tu.notification_level).to eq TopicUser.notification_levels[:tracking]
     end
 
-
     it "unwatches categories that have been changed" do
       user = Fabricate(:user)
       watched_category = Fabricate(:category)
diff --git a/spec/models/color_scheme_spec.rb b/spec/models/color_scheme_spec.rb
index a19f86dcfe..329eaa81d2 100644
--- a/spec/models/color_scheme_spec.rb
+++ b/spec/models/color_scheme_spec.rb
@@ -2,10 +2,10 @@ require 'rails_helper'
 
 describe ColorScheme do
 
-  let(:valid_params) { {name: "Best Colors Evar", colors: valid_colors} }
+  let(:valid_params) { { name: "Best Colors Evar", colors: valid_colors } }
   let(:valid_colors) { [
-    {name: '$primary_background_color', hex: 'FFBB00'},
-    {name: '$secondary_background_color', hex: '888888'}
+    { name: '$primary_background_color', hex: 'FFBB00' },
+    { name: '$secondary_background_color', hex: '888888' }
   ]}
 
   it "correctly invalidates theme css when changed" do
@@ -35,22 +35,22 @@ describe ColorScheme do
   end
 
   describe "create_from_base" do
-    let(:base_colors) { {first_one: 'AAAAAA', second_one: '333333', third_one: 'BEEBEE'} }
+    let(:base_colors) { { first_one: 'AAAAAA', second_one: '333333', third_one: 'BEEBEE' } }
     let!(:base) { Fabricate(:color_scheme, name: 'Base', color_scheme_colors: [
                     Fabricate(:color_scheme_color, name: 'first_one',  hex: base_colors[:first_one]),
                     Fabricate(:color_scheme_color, name: 'second_one', hex: base_colors[:second_one]),
                     Fabricate(:color_scheme_color, name: 'third_one', hex: base_colors[:third_one])]) }
 
     before do
-       ColorScheme.stubs(:base).returns(base)
+      ColorScheme.stubs(:base).returns(base)
     end
 
     it "creates a new color scheme" do
-      c = described_class.create_from_base(name: 'Yellow', colors: {first_one: 'FFFF00', third_one: 'F00D33'})
+      c = described_class.create_from_base(name: 'Yellow', colors: { first_one: 'FFFF00', third_one: 'F00D33' })
       expect(c.colors.size).to eq base_colors.size
-      first  = c.colors.find {|x| x.name == 'first_one'}
-      second = c.colors.find {|x| x.name == 'second_one'}
-      third  = c.colors.find {|x| x.name == 'third_one'}
+      first  = c.colors.find { |x| x.name == 'first_one' }
+      second = c.colors.find { |x| x.name == 'second_one' }
+      third  = c.colors.find { |x| x.name == 'third_one' }
       expect(first.hex).to eq 'FFFF00'
       expect(second.hex).to eq base_colors[:second_one]
       expect(third.hex).to eq 'F00D33'
diff --git a/spec/models/developer_spec.rb b/spec/models/developer_spec.rb
index f980ef693d..6775c0ba51 100644
--- a/spec/models/developer_spec.rb
+++ b/spec/models/developer_spec.rb
@@ -17,4 +17,3 @@ describe Developer do
     expect(guardian.is_developer?).to eq(true)
   end
 end
-
diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb
index ca3659605f..451b909dbc 100644
--- a/spec/models/discourse_single_sign_on_spec.rb
+++ b/spec/models/discourse_single_sign_on_spec.rb
@@ -271,7 +271,7 @@ describe DiscourseSingleSignOn do
       user = sso.lookup_or_create_user(ip_address)
       expect(user.active).to eq(true)
 
-      user.update_columns(email: 'xXx@themovie.com')
+      user.primary_email.update_columns(email: 'xXx@themovie.com')
 
       user = sso.lookup_or_create_user(ip_address)
       expect(user.email).to eq(old_email)
@@ -359,7 +359,6 @@ describe DiscourseSingleSignOn do
       user = sso.lookup_or_create_user(ip_address)
       expect(user.user_profile.bio_cooked).to match_html("<p>new profile</p>")
 
-
       # yes override if site setting
       sso.bio = "new profile 2"
       SiteSetting.sso_overrides_bio = true
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index 96782b28b4..06ddf3d86e 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -10,7 +10,7 @@ describe Draft do
   end
 
   it "uses the user id and key correctly" do
-    Draft.set(@user, "test", 0,"data")
+    Draft.set(@user, "test", 0, "data")
     expect(Draft.get(Fabricate.build(:coding_horror), "test", 0)).to eq nil
   end
 
@@ -38,19 +38,19 @@ describe Draft do
     user = Fabricate(:user)
     key = Draft::NEW_TOPIC
 
-    Draft.set(user,key,0,'draft')
+    Draft.set(user, key, 0, 'draft')
     Draft.cleanup!
     expect(Draft.count).to eq 1
 
     seq = DraftSequence.next!(user, key)
 
-    Draft.set(user,key,seq,'draft')
+    Draft.set(user, key, seq, 'draft')
     DraftSequence.update_all('sequence = sequence + 1')
 
     Draft.cleanup!
 
     expect(Draft.count).to eq 0
-    Draft.set(Fabricate(:user), Draft::NEW_TOPIC, seq+1, 'draft')
+    Draft.set(Fabricate(:user), Draft::NEW_TOPIC, seq + 1, 'draft')
 
     Draft.cleanup!
 
@@ -64,7 +64,6 @@ describe Draft do
     expect(Draft.count).to eq 0
   end
 
-
   context 'key expiry' do
     it 'nukes new topic draft after a topic is created' do
       u = Fabricate(:user)
@@ -95,7 +94,7 @@ describe Draft do
       user = Fabricate(:user)
       topic = Fabricate(:topic)
       p = PostCreator.new(user, raw: Fabricate.build(:post).raw, topic_id: topic.id).create
-      Draft.set(p.user, p.topic.draft_key, 0,'hello')
+      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
 
       PostCreator.new(user, raw: Fabricate.build(:post).raw).create
       expect(Draft.get(p.user, p.topic.draft_key, DraftSequence.current(p.user, p.topic.draft_key))).to eq nil
@@ -103,8 +102,8 @@ describe Draft do
 
     it 'nukes the post draft when a post is revised' do
       p = Fabricate(:post)
-      Draft.set(p.user, p.topic.draft_key, 0,'hello')
-      p.revise(p.user, { raw: 'another test' })
+      Draft.set(p.user, p.topic.draft_key, 0, 'hello')
+      p.revise(p.user, raw: 'another test')
       s = DraftSequence.current(p.user, p.topic.draft_key)
       expect(Draft.get(p.user, p.topic.draft_key, s)).to eq nil
     end
diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb
index 8717f958d3..a59c70f13f 100644
--- a/spec/models/email_log_spec.rb
+++ b/spec/models/email_log_spec.rb
@@ -16,7 +16,6 @@ describe EmailLog do
       # skipped emails do not matter
       Fabricate(:email_log, user: user, email_type: 'blah', post_id: post.id, to_address: user.email, user_id: user.id, skipped: true)
 
-
       ran = EmailLog.unique_email_per_post(post, user) do
         true
       end
diff --git a/spec/models/email_token_spec.rb b/spec/models/email_token_spec.rb
index edbfff853c..f13f19616d 100644
--- a/spec/models/email_token_spec.rb
+++ b/spec/models/email_token_spec.rb
@@ -6,7 +6,6 @@ describe EmailToken do
   it { is_expected.to validate_presence_of :email }
   it { is_expected.to belong_to :user }
 
-
   context '#create' do
     let(:user) { Fabricate(:user, active: false) }
     let!(:original_token) { user.email_tokens.first }
diff --git a/spec/models/given_daily_like_spec.rb b/spec/models/given_daily_like_spec.rb
index b3a8636776..0216c30b04 100644
--- a/spec/models/given_daily_like_spec.rb
+++ b/spec/models/given_daily_like_spec.rb
@@ -21,28 +21,27 @@ describe GivenDailyLike do
     it 'can be incremented and decremented' do
       SiteSetting.max_likes_per_day = 2
 
-      Timecop.freeze(Date.today) do
-        dt = Date.today
+      dt = Date.today
+      freeze_time dt
 
-        expect(value_for(user.id, dt)).to eq(0)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
+      expect(value_for(user.id, dt)).to eq(0)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
 
-        GivenDailyLike.increment_for(user.id)
-        expect(value_for(user.id, dt)).to eq(1)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
+      GivenDailyLike.increment_for(user.id)
+      expect(value_for(user.id, dt)).to eq(1)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
 
-        GivenDailyLike.increment_for(user.id)
-        expect(value_for(user.id, dt)).to eq(2)
-        expect(limit_reached_for(user.id, dt)).to eq(true)
+      GivenDailyLike.increment_for(user.id)
+      expect(value_for(user.id, dt)).to eq(2)
+      expect(limit_reached_for(user.id, dt)).to eq(true)
 
-        GivenDailyLike.decrement_for(user.id)
-        expect(value_for(user.id, dt)).to eq(1)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
+      GivenDailyLike.decrement_for(user.id)
+      expect(value_for(user.id, dt)).to eq(1)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
 
-        GivenDailyLike.decrement_for(user.id)
-        expect(value_for(user.id, dt)).to eq(0)
-        expect(limit_reached_for(user.id, dt)).to eq(false)
-      end
+      GivenDailyLike.decrement_for(user.id)
+      expect(value_for(user.id, dt)).to eq(0)
+      expect(limit_reached_for(user.id, dt)).to eq(false)
     end
 
   end
diff --git a/spec/models/global_setting_spec.rb b/spec/models/global_setting_spec.rb
index bc1ea0303f..b7f2f29eb9 100644
--- a/spec/models/global_setting_spec.rb
+++ b/spec/models/global_setting_spec.rb
@@ -85,13 +85,13 @@ describe GlobalSetting::FileProvider do
 
     provider = GlobalSetting::FileProvider.from(f.path)
 
-    expect(provider.lookup(:a,"")).to eq 1000
-    expect(provider.lookup(:b,"")).to eq "10 # = 00"
-    expect(provider.lookup(:c,"")).to eq "10 # = 00"
-    expect(provider.lookup(:d,"bob")).to eq nil
-    expect(provider.lookup(:e,"bob")).to eq "bob"
-    expect(provider.lookup(:f,"bob")).to eq "bob"
-    expect(provider.lookup(:a1,"")).to eq 1
+    expect(provider.lookup(:a, "")).to eq 1000
+    expect(provider.lookup(:b, "")).to eq "10 # = 00"
+    expect(provider.lookup(:c, "")).to eq "10 # = 00"
+    expect(provider.lookup(:d, "bob")).to eq nil
+    expect(provider.lookup(:e, "bob")).to eq "bob"
+    expect(provider.lookup(:f, "bob")).to eq "bob"
+    expect(provider.lookup(:a1, "")).to eq 1
 
     expect(provider.keys.sort).to eq [:a, :a1, :b, :c, :d]
 
@@ -105,7 +105,7 @@ describe GlobalSetting::FileProvider do
 
     provider = GlobalSetting::FileProvider.from(f.path)
 
-    expect(provider.lookup(:a,"")).to eq 500
+    expect(provider.lookup(:a, "")).to eq 500
 
     f.unlink
   end
diff --git a/spec/models/group_history_spec.rb b/spec/models/group_history_spec.rb
index 2b287de434..baa0e43f30 100644
--- a/spec/models/group_history_spec.rb
+++ b/spec/models/group_history_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe GroupHistory do
 
       expect(described_class.with_filters(
         group_history.group,
-        { :action => GroupHistory.actions[3]}
+        action: GroupHistory.actions[3]
       )).to eq([other_group_history])
     end
 
@@ -39,7 +39,7 @@ RSpec.describe GroupHistory do
       other_group_history.update_attributes!(subject: "test")
 
       expect(described_class.with_filters(group_history.group,
-        :action => GroupHistory.actions[3], subject: 'test'
+        action: GroupHistory.actions[3], subject: 'test'
       )).to eq([other_group_history])
     end
 
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index d2ba94714b..081577ca1c 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -47,6 +47,13 @@ describe Group do
       expect(group.valid?).to eq false
     end
 
+    it 'strips trailing and leading spaces' do
+      group.name = '  dragon  '
+
+      expect(group.save).to eq(true)
+      expect(group.reload.name).to eq('dragon')
+    end
+
     it "is invalid for case-insensitive existing names" do
       build(:group, name: 'this_is_a_name').save
       group.name = 'This_Is_A_Name'
@@ -79,6 +86,22 @@ describe Group do
     end
 
     context 'when a group has no owners' do
+      describe 'group has not been persisted' do
+        it 'should not allow membership requests' do
+          group = Fabricate.build(:group, allow_membership_requests: true)
+
+          expect(group.valid?).to eq(false)
+
+          expect(group.errors.full_messages).to include(I18n.t(
+            "groups.errors.cant_allow_membership_requests"
+          ))
+
+          group.group_users.build(user_id: user.id, owner: true)
+
+          expect(group.valid?).to eq(true)
+        end
+      end
+
       it 'should not allow membership requests' do
         group.allow_membership_requests = true
 
@@ -100,15 +123,15 @@ describe Group do
   end
 
   def real_admins
-    Group[:admins].user_ids - [-1]
+    Group[:admins].user_ids.reject { |id| id < 0 }
   end
 
   def real_moderators
-    Group[:moderators].user_ids - [-1]
+    Group[:moderators].user_ids.reject { |id| id < 0 }
   end
 
   def real_staff
-    Group[:staff].user_ids - [-1]
+    Group[:staff].user_ids.reject { |id| id < 0 }
   end
 
   it "Correctly handles primary groups" do
@@ -183,6 +206,28 @@ describe Group do
       expect(g.visibility_level).to eq(Group.visibility_levels[:owners])
     end
 
+    it "does not reset the localized name" do
+      begin
+        default_locale = SiteSetting.default_locale
+        I18n.locale = SiteSetting.default_locale = 'fi'
+
+        group = Group.find(Group::AUTO_GROUPS[:everyone])
+        group.update!(name: I18n.t("groups.default_names.everyone"))
+
+        Group.refresh_automatic_group!(:everyone)
+
+        expect(group.reload.name).to eq(I18n.t("groups.default_names.everyone"))
+
+        I18n.locale = SiteSetting.default_locale = 'en'
+
+        Group.refresh_automatic_group!(:everyone)
+
+        expect(group.reload.name).to eq(I18n.t("groups.default_names.everyone"))
+      ensure
+        I18n.locale = SiteSetting.default_locale = default_locale
+      end
+    end
+
     it "uses the localized name if name has not been taken" do
       begin
         default_locale = SiteSetting.default_locale
@@ -242,7 +287,7 @@ describe Group do
 
     expect(real_admins).to eq [admin.id]
     expect(real_moderators).to eq [moderator.id]
-    expect(real_staff.sort).to eq [moderator.id,admin.id].sort
+    expect(real_staff.sort).to eq [moderator.id, admin.id].sort
 
     admin.admin = false
     admin.save
@@ -285,11 +330,11 @@ describe Group do
     user2 = Fabricate(:coding_horror)
     user2.change_trust_level!(TrustLevel[3])
 
-    expect(Group[:trust_level_2].user_ids.sort).to eq [-1, user.id, user2.id].sort
+    expect(Group[:trust_level_2].user_ids.sort.reject { |id| id < -1 }).to eq [-1, user.id, user2.id].sort
   end
 
   it "Correctly updates all automatic groups upon request" do
-    Fabricate(:admin)
+    admin = Fabricate(:admin)
     user = Fabricate(:user)
     user.change_trust_level!(TrustLevel[2])
 
@@ -300,23 +345,23 @@ describe Group do
     groups = Group.includes(:users).to_a
     expect(groups.count).to eq Group::AUTO_GROUPS.count
 
-    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:admins]}
-    expect(g.users.count).to eq 2
-    expect(g.user_count).to eq 2
+    g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:admins] }
+    expect(g.users.count).to eq(g.user_count)
+    expect(g.users.pluck(:id).sort.reject { |id| id < -1 }).to eq([-1, admin.id])
 
-    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:staff]}
-    expect(g.users.count).to eq 2
-    expect(g.user_count).to eq 2
+    g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:staff] }
+    expect(g.users.count).to eq (g.user_count)
+    expect(g.users.pluck(:id).sort.reject { |id| id < -1 }).to eq([-1, admin.id])
 
-    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:trust_level_1]}
+    g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:trust_level_1] }
     # admin, system and user
-    expect(g.users.count).to eq 3
-    expect(g.user_count).to eq 3
+    expect(g.users.count).to eq g.user_count
+    expect(g.users.where('users.id > -2').count).to eq 3
 
-    g = groups.find{|grp| grp.id == Group::AUTO_GROUPS[:trust_level_2]}
+    g = groups.find { |grp| grp.id == Group::AUTO_GROUPS[:trust_level_2] }
     # system and user
-    expect(g.users.count).to eq 2
-    expect(g.user_count).to eq 2
+    expect(g.users.count).to eq g.user_count
+    expect(g.users.where('users.id > -2').count).to eq 2
 
   end
 
@@ -355,7 +400,6 @@ describe Group do
     expect(GroupUser.where(group_id: g.id).count).to eq 0
   end
 
-
   it "has custom fields" do
     group = Fabricate(:group)
     expect(group.custom_fields["a"]).to be_nil
@@ -365,7 +409,7 @@ describe Group do
     group.save
 
     group = Group.find(group.id)
-    expect(group.custom_fields).to eq({"hugh" => "jackman", "jack" => "black"})
+    expect(group.custom_fields).to eq("hugh" => "jackman", "jack" => "black")
   end
 
   it "allows you to lookup a new group by name" do
@@ -375,14 +419,14 @@ describe Group do
   end
 
   it "can find desired groups correctly" do
-    expect(Group.desired_trust_level_groups(2).sort).to eq [10,11,12]
+    expect(Group.desired_trust_level_groups(2).sort).to eq [10, 11, 12]
   end
 
   it "correctly handles trust level changes" do
     user = Fabricate(:user, trust_level: 2)
     Group.user_trust_level_change!(user.id, 2)
 
-    expect(user.groups.map(&:name).sort).to eq ["trust_level_0","trust_level_1", "trust_level_2"]
+    expect(user.groups.map(&:name).sort).to eq ["trust_level_0", "trust_level_1", "trust_level_2"]
 
     Group.user_trust_level_change!(user.id, 0)
     user.reload
@@ -390,7 +434,7 @@ describe Group do
   end
 
   context "group management" do
-    let(:group) {Fabricate(:group)}
+    let(:group) { Fabricate(:group) }
 
     it "by default has no managers" do
       expect(group.group_users.where('group_users.owner')).to be_empty
@@ -487,7 +531,7 @@ describe Group do
       let(:category) { Fabricate(:category) }
 
       it "should publish the group's categories to the client" do
-        group.update!(public: true, categories: [category])
+        group.update!(public_admission: true, categories: [category])
 
         message = MessageBus.track_publish { group.add(user) }.first
 
@@ -511,4 +555,12 @@ describe Group do
       expect(Group.search_group('test2')).to eq([])
     end
   end
+
+  describe '#bulk_add' do
+    it 'should be able to add multiple users' do
+      group.bulk_add([user.id, admin.id])
+
+      expect(group.group_users.map(&:user_id)).to contain_exactly(user.id, admin.id)
+    end
+  end
 end
diff --git a/spec/models/incoming_links_report_spec.rb b/spec/models/incoming_links_report_spec.rb
index 1ed432f745..2ce2398fc7 100644
--- a/spec/models/incoming_links_report_spec.rb
+++ b/spec/models/incoming_links_report_spec.rb
@@ -40,20 +40,20 @@ describe IncomingLinksReport do
 
       r = IncomingLinksReport.find('top_referrers').as_json
       expect(r[:data]).to eq [
-        {username: p1.user.username, user_id: p1.user.id, num_clicks: 7 + 2, num_topics: 2},
-        {username: p2.user.username, user_id: p2.user.id, num_clicks: 3, num_topics: 1}
+        { username: p1.user.username, user_id: p1.user.id, num_clicks: 7 + 2, num_topics: 2 },
+        { username: p2.user.username, user_id: p2.user.id, num_clicks: 3, num_topics: 1 }
       ]
 
       r = IncomingLinksReport.find('top_traffic_sources').as_json
       expect(r[:data]).to eq [
-        {domain: 'test.com', num_clicks: 7, num_topics: 1},
-        {domain: 'foo.com', num_clicks: 3 + 2, num_topics: 1}
+        { domain: 'test.com', num_clicks: 7, num_topics: 1 },
+        { domain: 'foo.com', num_clicks: 3 + 2, num_topics: 1 }
       ]
 
       r = IncomingLinksReport.find('top_referred_topics').as_json
       expect(r[:data]).to eq [
-        {topic_id: p1.topic.id, topic_title: p1.topic.title, topic_slug: p1.topic.slug, num_clicks: 7},
-        {topic_id: p2.topic.id, topic_title: p2.topic.title, topic_slug: p2.topic.slug, num_clicks: 2 + 3},
+        { topic_id: p1.topic.id, topic_title: p1.topic.title, topic_slug: p1.topic.slug, num_clicks: 7 },
+        { topic_id: p2.topic.id, topic_title: p2.topic.title, topic_slug: p2.topic.slug, num_clicks: 2 + 3 },
       ]
     end
   end
@@ -98,8 +98,8 @@ describe IncomingLinksReport do
         Fabricate(:incoming_link, user: bob, post: post1).save
       end
 
-      expect(top_referrers[:data][0]).to eq({username: 'amy', user_id: amy.id, num_clicks: 3, num_topics: 2})
-      expect(top_referrers[:data][1]).to eq({username: 'bob', user_id: bob.id, num_clicks: 2, num_topics: 1})
+      expect(top_referrers[:data][0]).to eq(username: 'amy', user_id: amy.id, num_clicks: 3, num_topics: 2)
+      expect(top_referrers[:data][1]).to eq(username: 'bob', user_id: bob.id, num_clicks: 2, num_topics: 1)
     end
   end
 
@@ -129,10 +129,10 @@ describe IncomingLinksReport do
     end
 
     it 'with some IncomingLink records, it returns correct data' do
-      IncomingLinksReport.stubs(:link_count_per_domain).returns({'twitter.com' => 8, 'facebook.com' => 3})
-      IncomingLinksReport.stubs(:topic_count_per_domain).returns({'twitter.com' => 2, 'facebook.com' => 3})
-      expect(top_traffic_sources[:data][0]).to eq({domain: 'twitter.com', num_clicks: 8, num_topics: 2})
-      expect(top_traffic_sources[:data][1]).to eq({domain: 'facebook.com', num_clicks: 3, num_topics: 3})
+      IncomingLinksReport.stubs(:link_count_per_domain).returns('twitter.com' => 8, 'facebook.com' => 3)
+      IncomingLinksReport.stubs(:topic_count_per_domain).returns('twitter.com' => 2, 'facebook.com' => 3)
+      expect(top_traffic_sources[:data][0]).to eq(domain: 'twitter.com', num_clicks: 8, num_topics: 2)
+      expect(top_traffic_sources[:data][1]).to eq(domain: 'facebook.com', num_clicks: 3, num_topics: 3)
     end
   end
 
@@ -160,11 +160,11 @@ describe IncomingLinksReport do
     it 'with some IncomingLink records, it returns correct data' do
       topic1 = Fabricate.build(:topic, id: 123); topic2 = Fabricate.build(:topic, id: 234)
       # TODO: OMG OMG THE STUBBING
-      IncomingLinksReport.stubs(:link_count_per_topic).returns({topic1.id => 8, topic2.id => 3})
+      IncomingLinksReport.stubs(:link_count_per_topic).returns(topic1.id => 8, topic2.id => 3)
       Topic.stubs(:select).returns(Topic); Topic.stubs(:where).returns(Topic) # bypass some activerecord methods
       Topic.stubs(:all).returns([topic1, topic2])
-      expect(top_referred_topics[:data][0]).to eq({topic_id: topic1.id, topic_title: topic1.title, topic_slug: topic1.slug, num_clicks: 8 })
-      expect(top_referred_topics[:data][1]).to eq({topic_id: topic2.id, topic_title: topic2.title, topic_slug: topic2.slug, num_clicks: 3 })
+      expect(top_referred_topics[:data][0]).to eq(topic_id: topic1.id, topic_title: topic1.title, topic_slug: topic1.slug, num_clicks: 8)
+      expect(top_referred_topics[:data][1]).to eq(topic_id: topic2.id, topic_title: topic2.title, topic_slug: topic2.slug, num_clicks: 3)
     end
   end
 
diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rb
index 3778221dc7..9c2c0de93c 100644
--- a/spec/models/invite_redeemer_spec.rb
+++ b/spec/models/invite_redeemer_spec.rb
@@ -36,7 +36,7 @@ describe InviteRedeemer do
     let(:invite) { Fabricate(:invite) }
     let(:name) { 'john snow' }
     let(:username) { 'kingofthenorth' }
-    let(:password) { 'know5nOthiNG'}
+    let(:password) { 'know5nOthiNG' }
     let(:invite_redeemer) { InviteRedeemer.new(invite, username, name) }
 
     it "should redeem the invite if invited by staff" do
@@ -96,7 +96,7 @@ describe InviteRedeemer do
 
     it "can set custom fields" do
       required_field = Fabricate(:user_field)
-      optional_field= Fabricate(:user_field, required: false)
+      optional_field = Fabricate(:user_field, required: false)
       user_fields = {
         required_field.id.to_s => 'value1',
         optional_field.id.to_s => 'value2'
diff --git a/spec/models/invite_spec.rb b/spec/models/invite_spec.rb
index bf6288e3c3..13162f74f6 100644
--- a/spec/models/invite_spec.rb
+++ b/spec/models/invite_spec.rb
@@ -282,7 +282,6 @@ describe Invite do
           expect(invite).to be_redeemed
         end
 
-
         context 'again' do
           context "without a passthrough" do
             before do
@@ -465,25 +464,6 @@ describe Invite do
 
   end
 
-  describe '.redeem_from_token' do
-    let(:inviter) { Fabricate(:user) }
-    let(:invite) { Fabricate(:invite, invited_by: inviter, email: 'test@example.com', user_id: nil) }
-    let(:user) { Fabricate(:user, email: invite.email) }
-
-    it 'redeems the invite from token' do
-      Invite.redeem_from_token(invite.invite_key, user.email)
-      invite.reload
-      expect(invite).to be_redeemed
-    end
-
-    it 'does not redeem the invite if token does not match' do
-      Invite.redeem_from_token("bae0071f995bb4b6f756e80b383778b5", user.email)
-      invite.reload
-      expect(invite).not_to be_redeemed
-    end
-
-  end
-
   describe '.rescind_all_invites_from' do
     it 'removes all invites sent by a user' do
       user = Fabricate(:user)
diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index 6a19cb7d8d..115354701c 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -14,7 +14,7 @@ describe LocaleSiteSetting do
 
   describe 'values' do
     it 'returns all the locales that we have translations for' do
-      expect(LocaleSiteSetting.values.map {|x| x[:value]}.sort).to eq(Dir.glob( File.join(Rails.root, 'config', 'locales', 'client.*.yml') ).map {|x| x.split('.')[-2]}.sort)
+      expect(LocaleSiteSetting.values.map { |x| x[:value] }.sort).to eq(Dir.glob(File.join(Rails.root, 'config', 'locales', 'client.*.yml')).map { |x| x.split('.')[-2] }.sort)
     end
   end
 
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 1c39367f6d..b8ad1da108 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -30,7 +30,7 @@ describe Notification do
   describe 'post' do
     let(:topic) { Fabricate(:topic) }
     let(:post_args) do
-      {user: topic.user, topic: topic}
+      { user: topic.user, topic: topic }
     end
 
     let(:coding_horror) { Fabricate(:coding_horror) }
@@ -138,12 +138,11 @@ describe Notification do
     end
   end
 
-
   describe 'private message' do
     before do
       @topic = Fabricate(:private_message_topic)
       @post = Fabricate(:post, topic: @topic, user: @topic.user)
-      @target = @post.topic.topic_allowed_users.reject{|a| a.user_id == @post.user_id}[0].user
+      @target = @post.topic.topic_allowed_users.reject { |a| a.user_id == @post.user_id }[0].user
 
       TopicUser.change(@target.id, @topic.id, notification_level: TopicUser.notification_levels[:watching])
 
@@ -200,12 +199,11 @@ describe Notification do
                            notification_type: Notification.types[:private_message])
 
       other = Notification.create!(read: false,
-                           user_id: user.id,
-                           topic_id: t.id,
-                           post_number: 1,
-                           data: '{}',
-                           notification_type: Notification.types[:mentioned])
-
+                                   user_id: user.id,
+                                   topic_id: t.id,
+                                   post_number: 1,
+                                   data: '{}',
+                                   notification_type: Notification.types[:mentioned])
 
       user.saw_notification_id(other.id)
       user.reload
@@ -225,11 +223,10 @@ describe Notification do
       end
       Notification.create!(read: true, user_id: user.id, topic_id: 2, post_number: 4, data: '{}', notification_type: 1)
 
-      expect { Notification.mark_posts_read(user,2,[1,2,3,4]) }.to change { Notification.where(read: true).count }.by(3)
+      expect { Notification.mark_posts_read(user, 2, [1, 2, 3, 4]) }.to change { Notification.where(read: true).count }.by(3)
     end
   end
 
-
   describe 'ensure consistency' do
     it 'deletes notifications if post is missing or deleted' do
 
@@ -259,8 +256,8 @@ end
 # pulling this out cause I don't want an observer
 describe Notification do
   describe '#recent_report' do
-    let(:user){ Fabricate(:user) }
-    let(:post){ Fabricate(:post) }
+    let(:user) { Fabricate(:user) }
+    let(:post) { Fabricate(:post) }
 
     def fab(type, read)
       @i ||= 0
@@ -297,7 +294,7 @@ describe Notification do
       # bumps unread pms to front of list
 
       notifications = Notification.recent_report(user, 3)
-      expect(notifications.map{|n| n.id}).to eq([a.id, d.id, c.id])
+      expect(notifications.map { |n| n.id }).to eq([a.id, d.id, c.id])
 
     end
   end
diff --git a/spec/models/plugin_store_spec.rb b/spec/models/plugin_store_spec.rb
index 9c236a0436..c4f629de3b 100644
--- a/spec/models/plugin_store_spec.rb
+++ b/spec/models/plugin_store_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 require_dependency "plugin_store"
 
 describe PluginStore do
-  def set(k,v)
+  def set(k, v)
     PluginStore.set("my_plugin", k, v)
   end
 
@@ -38,10 +38,9 @@ describe PluginStore do
     expect(get("hello")).to eq(nil)
   end
 
-
   it "handles hashes correctly" do
 
-    val = {"hi" => "there", "1" => 1}
+    val = { "hi" => "there", "1" => 1 }
     set("hello", val)
     result = get("hello")
 
@@ -53,7 +52,7 @@ describe PluginStore do
 
   it "handles nested hashes correctly" do
 
-    val = {"hi" => "there", "nested" => {"a" => "b", "with list" => ["a", "b", 3] }}
+    val = { "hi" => "there", "nested" => { "a" => "b", "with list" => ["a", "b", 3] } }
     set("hello", val)
     result = get("hello")
 
@@ -67,7 +66,7 @@ describe PluginStore do
 
   it "handles arrays correctly" do
 
-    val = ["a", "b", {"hash"=> "inside", "c"=> 1}]
+    val = ["a", "b", { "hash" => "inside", "c" => 1 }]
     set("hello", val)
     result = get("hello")
 
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 408ca8014e..ba66b98ee3 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -50,9 +50,9 @@ describe PostAction do
       action = PostAction.act(codinghorror, post, PostActionType.types[:notify_moderators], message: "this is my special long message")
 
       posts = Post.joins(:topic)
-                  .select('posts.id, topics.subtype, posts.topic_id')
-                  .where('topics.archetype' => Archetype.private_message)
-                  .to_a
+        .select('posts.id, topics.subtype, posts.topic_id')
+        .where('topics.archetype' => Archetype.private_message)
+        .to_a
 
       expect(posts.count).to eq(1)
       expect(action.related_post_id).to eq(posts[0].id.to_i)
@@ -61,7 +61,7 @@ describe PostAction do
       topic = posts[0].topic
 
       # Moderators should be invited to the private topic, otherwise they're not permitted to see it
-      topic_user_ids = topic.topic_users(true).map {|x| x.user_id}
+      topic_user_ids = topic.topic_users(true).map { |x| x.user_id }
       expect(topic_user_ids).to include(codinghorror.id)
       expect(topic_user_ids).to include(mod.id)
 
@@ -178,24 +178,23 @@ describe PostAction do
   describe "update_counters" do
 
     it "properly updates topic counters" do
-      Timecop.freeze(Date.today) do
-        # we need this to test it
-        TopicUser.change(codinghorror, post.topic, posted: true)
+      freeze_time Date.today
+      # we need this to test it
+      TopicUser.change(codinghorror, post.topic, posted: true)
 
-        expect(value_for(moderator.id, Date.today)).to eq(0)
+      expect(value_for(moderator.id, Date.today)).to eq(0)
 
-        PostAction.act(moderator, post, PostActionType.types[:like])
-        PostAction.act(codinghorror, second_post, PostActionType.types[:like])
+      PostAction.act(moderator, post, PostActionType.types[:like])
+      PostAction.act(codinghorror, second_post, PostActionType.types[:like])
 
-        post.topic.reload
-        expect(post.topic.like_count).to eq(2)
+      post.topic.reload
+      expect(post.topic.like_count).to eq(2)
 
-        expect(value_for(moderator.id, Date.today)).to eq(1)
+      expect(value_for(moderator.id, Date.today)).to eq(1)
 
-        tu = TopicUser.get(post.topic, codinghorror)
-        expect(tu.liked).to be true
-        expect(tu.bookmarked).to be false
-      end
+      tu = TopicUser.get(post.topic, codinghorror)
+      expect(tu.liked).to be true
+      expect(tu.bookmarked).to be false
     end
 
   end
@@ -249,33 +248,33 @@ describe PostAction do
     end
 
     it 'should increase the `like_count` and `like_score` when a user likes something' do
-      Timecop.freeze(Date.today) do
-        PostAction.act(codinghorror, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(1)
-        expect(post.like_score).to eq(1)
-        post.topic.reload
-        expect(post.topic.like_count).to eq(1)
-        expect(value_for(codinghorror.id, Date.today)).to eq(1)
+      freeze_time Date.today
 
-        # When a staff member likes it
-        PostAction.act(moderator, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(2)
-        expect(post.like_score).to eq(4)
+      PostAction.act(codinghorror, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(1)
+      expect(post.like_score).to eq(1)
+      post.topic.reload
+      expect(post.topic.like_count).to eq(1)
+      expect(value_for(codinghorror.id, Date.today)).to eq(1)
 
-        # Removing likes
-        PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(1)
-        expect(post.like_score).to eq(3)
-        expect(value_for(codinghorror.id, Date.today)).to eq(0)
+      # When a staff member likes it
+      PostAction.act(moderator, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(2)
+      expect(post.like_score).to eq(4)
 
-        PostAction.remove_act(moderator, post, PostActionType.types[:like])
-        post.reload
-        expect(post.like_count).to eq(0)
-        expect(post.like_score).to eq(0)
-      end
+      # Removing likes
+      PostAction.remove_act(codinghorror, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(1)
+      expect(post.like_score).to eq(3)
+      expect(value_for(codinghorror.id, Date.today)).to eq(0)
+
+      PostAction.remove_act(moderator, post, PostActionType.types[:like])
+      post.reload
+      expect(post.like_count).to eq(0)
+      expect(post.like_score).to eq(0)
     end
   end
 
@@ -380,7 +379,7 @@ describe PostAction do
       expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:flag_threshold_reached])
       expect(post.topic.visible).to eq(false)
 
-      post.revise(post.user, { raw: post.raw + " ha I edited it " })
+      post.revise(post.user, raw: post.raw + " ha I edited it ")
 
       post.reload
 
@@ -399,7 +398,7 @@ describe PostAction do
       expect(post.hidden_reason_id).to eq(Post.hidden_reasons[:flag_threshold_reached_again])
       expect(post.topic.visible).to eq(false)
 
-      post.revise(post.user, { raw: post.raw + " ha I edited it again " })
+      post.revise(post.user, raw: post.raw + " ha I edited it again ")
 
       post.reload
 
@@ -427,13 +426,13 @@ describe PostAction do
     it "can flag the topic instead of a post" do
       post1 = create_post
       _post2 = create_post(topic: post1.topic)
-      post_action = PostAction.act(Fabricate(:user), post1, PostActionType.types[:spam], { flag_topic: true })
+      post_action = PostAction.act(Fabricate(:user), post1, PostActionType.types[:spam], flag_topic: true)
       expect(post_action.targets_topic).to eq(true)
     end
 
     it "will flag the first post if you flag a topic but there is only one post in the topic" do
       post = create_post
-      post_action = PostAction.act(Fabricate(:user), post, PostActionType.types[:spam], { flag_topic: true })
+      post_action = PostAction.act(Fabricate(:user), post, PostActionType.types[:spam], flag_topic: true)
       expect(post_action.targets_topic).to eq(false)
       expect(post_action.post_id).to eq(post.id)
     end
@@ -442,7 +441,7 @@ describe PostAction do
       Discourse.stubs(:site_contact_user).returns(admin)
 
       post = create_post
-      PostAction.act(moderator, post, PostActionType.types[:spam], { take_action: true })
+      PostAction.act(moderator, post, PostActionType.types[:spam], take_action: true)
 
       post.reload
       expect(post.hidden).to eq(true)
@@ -539,7 +538,7 @@ describe PostAction do
 
       map = PostAction.lookup_for(user, [post.topic], post_action.post_action_type_id)
 
-      expect(map).to eq({post.topic_id => [post.post_number]})
+      expect(map).to eq(post.topic_id => [post.post_number])
     end
   end
 
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index ecda5cc6a0..fda9180071 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -6,7 +6,7 @@ describe PostAnalyzer do
   let(:url) { 'https://twitter.com/evil_trout/status/345954894420787200' }
 
   describe '#cook' do
-    let(:post_analyzer) {PostAnalyzer.new nil, nil  }
+    let(:post_analyzer) { PostAnalyzer.new nil, nil  }
 
     let(:raw) { "Here's a tweet:\n#{url}" }
     let(:options) { {} }
@@ -26,7 +26,7 @@ describe PostAnalyzer do
     end
 
     context 'when invalidating oneboxes' do
-      let(:options) {{ invalidate_oneboxes: true }}
+      let(:options) { { invalidate_oneboxes: true } }
 
       it 'invalidates the oneboxes for urls in the post' do
         Oneboxer.expects(:invalidate).with url
@@ -78,17 +78,12 @@ describe PostAnalyzer do
 
       it "returns the host and a count for links" do
         post_analyzer = PostAnalyzer.new(raw_two_links_html, default_topic_id)
-        expect(post_analyzer.linked_hosts).to eq({"disneyland.disney.go.com" => 1, "reddit.com" => 1})
+        expect(post_analyzer.linked_hosts).to eq("disneyland.disney.go.com" => 1, "reddit.com" => 1)
       end
 
       it "it counts properly with more than one link on the same host" do
         post_analyzer = PostAnalyzer.new(raw_three_links, default_topic_id)
-        expect(post_analyzer.linked_hosts).to eq({"discourse.org" => 1, "www.imdb.com" => 1})
-      end
-
-      it 'returns blank for ipv6 output' do
-        post_analyzer = PostAnalyzer.new('PING www.google.com(lb-in-x93.1e100.net) 56 data bytes', default_topic_id)
-        expect(post_analyzer.linked_hosts).to be_blank
+        expect(post_analyzer.linked_hosts).to eq("discourse.org" => 1, "www.imdb.com" => 1)
       end
     end
   end
@@ -167,7 +162,6 @@ describe PostAnalyzer do
     end
   end
 
-
   describe "raw_mentions" do
 
     it "returns an empty array with no matches" do
@@ -181,12 +175,14 @@ describe PostAnalyzer do
     end
 
     it "ignores pre" do
-      post_analyzer = PostAnalyzer.new("<pre>@Jake</pre> @Finn", default_topic_id)
+      # note, CommonMark has rules for dealing with HTML, if your paragraph starts with it
+      # it will no longer be an "inline" so this means that @Finn in this case would not be a mention
+      post_analyzer = PostAnalyzer.new(". <pre>@Jake</pre> @Finn", default_topic_id)
       expect(post_analyzer.raw_mentions).to eq(['finn'])
     end
 
     it "catches content between pre tags" do
-      post_analyzer = PostAnalyzer.new("<pre>hello</pre> @Finn <pre></pre>", default_topic_id)
+      post_analyzer = PostAnalyzer.new(". <pre>hello</pre> @Finn <pre></pre>", default_topic_id)
       expect(post_analyzer.raw_mentions).to eq(['finn'])
     end
 
@@ -201,7 +197,7 @@ describe PostAnalyzer do
     end
 
     it "ignores quotes" do
-      post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]@Jake[/quote] @Finn", default_topic_id)
+      post_analyzer = PostAnalyzer.new("[quote=\"Evil Trout\"]\n@Jake\n[/quote]\n @Finn", default_topic_id)
       expect(post_analyzer.raw_mentions).to eq(['finn'])
     end
 
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 28abdc8876..c573b7e9d0 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -235,7 +235,7 @@ describe PostMover do
       end
 
       context "to an existing topic" do
-        let!(:destination_topic) { Fabricate(:topic, user: user ) }
+        let!(:destination_topic) { Fabricate(:topic, user: user) }
         let!(:destination_op) { Fabricate(:post, topic: destination_topic, user: user) }
 
         it "works correctly" do
@@ -360,10 +360,10 @@ describe PostMover do
           topic.expects(:add_moderator_post)
         end
 
-        let!(:destination_topic) { Fabricate(:topic, user: user ) }
+        let!(:destination_topic) { Fabricate(:topic, user: user) }
         let!(:destination_op) { Fabricate(:post, topic: destination_topic, user: user) }
         let!(:destination_deleted_reply) { Fabricate(:post, topic: destination_topic, user: another_user) }
-        let(:moved_to) { topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id)}
+        let(:moved_to) { topic.move_posts(user, [p2.id, p4.id], destination_topic_id: destination_topic.id) }
 
         it "works correctly" do
           destination_deleted_reply.trash!
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 32d1566cef..aff50f205d 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -53,7 +53,7 @@ describe Post do
   end
 
   # Help us build a post with a raw body
-  def post_with_body(body, user=nil)
+  def post_with_body(body, user = nil)
     args = post_args.merge(raw: body)
     args[:user] = user if user.present?
     Fabricate.build(:post, args)
@@ -220,7 +220,7 @@ describe Post do
           post_no_images.user.trust_level = TrustLevel[0]
           post_no_images.save
           expect {
-            post_no_images.revise(post_no_images.user, { raw: post_two_images.raw })
+            post_no_images.revise(post_no_images.user, raw: post_two_images.raw)
             post_no_images.reload
           }.not_to change(post_no_images, :raw)
         end
@@ -268,7 +268,7 @@ describe Post do
           post_no_attachments.user.trust_level = TrustLevel[0]
           post_no_attachments.save
           expect {
-            post_no_attachments.revise(post_no_attachments.user, { raw: post_two_attachments.raw })
+            post_no_attachments.revise(post_no_attachments.user, raw: post_two_attachments.raw)
             post_no_attachments.reload
           }.not_to change(post_no_attachments, :raw)
         end
@@ -287,8 +287,8 @@ describe Post do
     let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
     let(:no_links) { post_with_body("hello world my name is evil trout", newuser) }
     let(:one_link) { post_with_body("[jlawr](http://www.imdb.com/name/nm2225369)", newuser) }
-    let(:two_links) { post_with_body("<a href='http://disneyland.disney.go.com/'>disney</a> <a href='http://reddit.com'>reddit</a>", newuser)}
-    let(:three_links) { post_with_body("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369", newuser)}
+    let(:two_links) { post_with_body("<a href='http://disneyland.disney.go.com/'>disney</a> <a href='http://reddit.com'>reddit</a>", newuser) }
+    let(:three_links) { post_with_body("http://discourse.org and http://discourse.org/another_url and http://www.imdb.com/name/nm2225369", newuser) }
 
     describe "raw_links" do
       it "returns a blank collection for a post with no links" do
@@ -314,11 +314,11 @@ describe Post do
       end
 
       it "returns the host and a count for links" do
-        expect(two_links.linked_hosts).to eq({"disneyland.disney.go.com" => 1, "reddit.com" => 1})
+        expect(two_links.linked_hosts).to eq("disneyland.disney.go.com" => 1, "reddit.com" => 1)
       end
 
       it "it counts properly with more than one link on the same host" do
-        expect(three_links.linked_hosts).to eq({"discourse.org" => 1, "www.imdb.com" => 1})
+        expect(three_links.linked_hosts).to eq("discourse.org" => 1, "www.imdb.com" => 1)
       end
     end
 
@@ -339,17 +339,15 @@ describe Post do
         end
 
         it "contains the new post's links, PLUS the previous one" do
-          expect(two_links.total_hosts_usage).to eq({'disneyland.disney.go.com' => 2, 'reddit.com' => 1})
+          expect(two_links.total_hosts_usage).to eq('disneyland.disney.go.com' => 2, 'reddit.com' => 1)
         end
 
       end
 
     end
 
-
   end
 
-
   describe "maximum links" do
     let(:newuser) { Fabricate(:user, trust_level: TrustLevel[0]) }
     let(:post_one_link) { post_with_body("[sherlock](http://www.bbc.co.uk/programmes/b018ttws)", newuser) }
@@ -398,7 +396,6 @@ describe Post do
 
   end
 
-
   describe "@mentions" do
 
     context 'raw_mentions' do
@@ -414,12 +411,14 @@ describe Post do
       end
 
       it "ignores pre" do
-        post = Fabricate.build(:post, post_args.merge(raw: "<pre>@Jake</pre> @Finn"))
+        # we need to force an inline
+        post = Fabricate.build(:post, post_args.merge(raw: "p <pre>@Jake</pre> @Finn"))
         expect(post.raw_mentions).to eq(['finn'])
       end
 
       it "catches content between pre tags" do
-        post = Fabricate.build(:post, post_args.merge(raw: "<pre>hello</pre> @Finn <pre></pre>"))
+        # per common mark we need to force an inline
+        post = Fabricate.build(:post, post_args.merge(raw: "a <pre>hello</pre> @Finn <pre></pre>"))
         expect(post.raw_mentions).to eq(['finn'])
       end
 
@@ -429,7 +428,7 @@ describe Post do
       end
 
       it "ignores quotes" do
-        post = Fabricate.build(:post, post_args.merge(raw: "[quote=\"Evil Trout\"]@Jake[/quote] @Finn"))
+        post = Fabricate.build(:post, post_args.merge(raw: "[quote=\"Evil Trout\"]\n@Jake\n[/quote]\n@Finn"))
         expect(post.raw_mentions).to eq(['finn'])
       end
 
@@ -483,7 +482,6 @@ describe Post do
         end
       end
 
-
     end
 
   end
@@ -500,7 +498,7 @@ describe Post do
 
   context "raw_hash" do
 
-    let(:raw) { "this is our test post body"}
+    let(:raw) { "this is our test post body" }
     let(:post) { post_with_body(raw) }
 
     it "returns a value" do
@@ -533,13 +531,13 @@ describe Post do
     it 'has no revision' do
       expect(post.revisions.size).to eq(0)
       expect(first_version_at).to be_present
-      expect(post.revise(post.user, { raw: post.raw })).to eq(false)
+      expect(post.revise(post.user, raw: post.raw)).to eq(false)
     end
 
     describe 'with the same body' do
 
       it "doesn't change version" do
-        expect { post.revise(post.user, { raw: post.raw }); post.reload }.not_to change(post, :version)
+        expect { post.revise(post.user, raw: post.raw); post.reload }.not_to change(post, :version)
       end
 
     end
@@ -592,13 +590,13 @@ describe Post do
 
       it "triggers a rate limiter" do
         EditRateLimiter.any_instance.expects(:performed!)
-        post.revise(changed_by, { raw: 'updated body' })
+        post.revise(changed_by, raw: 'updated body')
       end
     end
 
     describe 'with a new body' do
       let(:changed_by) { Fabricate(:coding_horror) }
-      let!(:result) { post.revise(changed_by, { raw: 'updated body' }) }
+      let!(:result) { post.revise(changed_by, raw: 'updated body') }
 
       it 'acts correctly' do
         expect(result).to eq(true)
@@ -672,7 +670,7 @@ describe Post do
       end
 
       it "doesn't find the quote in a different topic" do
-        reply.raw = "[quote=\"EvilTrout, post:#{post.post_number}, topic:#{post.topic_id+1}\"]hello[/quote]"
+        reply.raw = "[quote=\"EvilTrout, post:#{post.post_number}, topic:#{post.topic_id + 1}\"]hello[/quote]"
         reply.extract_quoted_post_numbers
         expect(reply.quoted_post_numbers).to be_blank
       end
@@ -683,9 +681,9 @@ describe Post do
 
       let(:topic) { Fabricate(:topic) }
       let(:other_user) { Fabricate(:coding_horror) }
-      let(:reply_text) { "[quote=\"Evil Trout, post:1\"]\nhello\n[/quote]\nHmmm!"}
+      let(:reply_text) { "[quote=\"Evil Trout, post:1\"]\nhello\n[/quote]\nHmmm!" }
       let!(:post) { PostCreator.new(topic.user, raw: Fabricate.build(:post).raw, topic_id: topic.id).create }
-      let!(:reply) { PostCreator.new(other_user, raw: reply_text, topic_id: topic.id, reply_to_post_number: post.post_number ).create }
+      let!(:reply) { PostCreator.new(other_user, raw: reply_text, topic_id: topic.id, reply_to_post_number: post.post_number).create }
 
       it 'has a quote' do
         expect(reply.quote_count).to eq(1)
@@ -709,7 +707,6 @@ describe Post do
         expect(post.replies).to eq([reply])
       end
 
-
       it "doesn't change the post count when you edit the reply" do
         reply.raw = 'updated raw'
         reply.save
@@ -747,7 +744,6 @@ describe Post do
 
   end
 
-
   context 'sort_order' do
     context 'regular topic' do
 
@@ -786,7 +782,7 @@ describe Post do
     it 'finds urls for posts presented' do
       p1 = Fabricate(:post)
       p2 = Fabricate(:post)
-      expect(Post.urls([p1.id, p2.id])).to eq({p1.id => p1.url, p2.id => p2.url})
+      expect(Post.urls([p1.id, p2.id])).to eq(p1.id => p1.url, p2.id => p2.url)
     end
   end
 
@@ -838,12 +834,11 @@ describe Post do
     end
   end
 
-
   describe "has_host_spam" do
     it "correctly detects host spam" do
       post = Fabricate(:post, raw: "hello from my site http://www.somesite.com http://#{GlobalSetting.hostname} http://#{RailsMultisite::ConnectionManagement.current_hostname}")
 
-      expect(post.total_hosts_usage).to eq({"www.somesite.com" => 1})
+      expect(post.total_hosts_usage).to eq("www.somesite.com" => 1)
       post.acting_user.trust_level = 0
 
       expect(post.has_host_spam?).to eq(false)
@@ -866,7 +861,7 @@ describe Post do
     post.save
 
     post = Post.find(post.id)
-    expect(post.custom_fields).to eq({"Tommy" => "Hanks", "Vincent" => "Vega"})
+    expect(post.custom_fields).to eq("Tommy" => "Hanks", "Vincent" => "Vega")
   end
 
   describe "#rebake!" do
@@ -913,7 +908,7 @@ describe Post do
   describe ".rebake_old" do
     it "will catch posts it needs to rebake" do
       post = create_post
-      post.update_columns(baked_at: Time.new(2000,1,1), baked_version: -1)
+      post.update_columns(baked_at: Time.new(2000, 1, 1), baked_version: -1)
       Post.rebake_old(100)
 
       post.reload
diff --git a/spec/models/post_timing_spec.rb b/spec/models/post_timing_spec.rb
index 74aec7b8e6..889524911b 100644
--- a/spec/models/post_timing_spec.rb
+++ b/spec/models/post_timing_spec.rb
@@ -28,16 +28,16 @@ describe PostTiming do
     end
 
     it 'works correctly' do
-      timing(1,1)
-      timing(2,1)
-      timing(2,2)
-      timing(3,1)
-      timing(3,2)
-      timing(3,3)
+      timing(1, 1)
+      timing(2, 1)
+      timing(2, 2)
+      timing(3, 1)
+      timing(3, 2)
+      timing(3, 3)
 
-      _tu_one = topic_user(1,1,1)
-      _tu_two = topic_user(2,2,2)
-      _tu_three = topic_user(3,3,3)
+      _tu_one = topic_user(1, 1, 1)
+      _tu_two = topic_user(2, 2, 2)
+      _tu_three = topic_user(3, 3, 3)
 
       PostTiming.pretend_read(topic_id, 2, 3)
 
@@ -105,7 +105,7 @@ describe PostTiming do
       @post = Fabricate(:post)
       @topic = @post.topic
       @coding_horror = Fabricate(:coding_horror)
-      @timing_attrs = {msecs: 1234, topic_id: @post.topic_id, user_id: @coding_horror.id, post_number: @post.post_number}
+      @timing_attrs = { msecs: 1234, topic_id: @post.topic_id, user_id: @coding_horror.id, post_number: @post.post_number }
     end
 
     it 'adds a view to the post' do
diff --git a/spec/models/queued_post_spec.rb b/spec/models/queued_post_spec.rb
index 8a16ca3a92..5f5f32eb93 100644
--- a/spec/models/queued_post_spec.rb
+++ b/spec/models/queued_post_spec.rb
@@ -38,7 +38,7 @@ describe QueuedPost do
       expect(create_options[:cooking_options]).to eq(cat: 'hat')
       expect(create_options[:cook_method]).to eq(Post.cook_methods[:raw_html])
       expect(create_options[:not_create_option]).to eq(nil)
-      expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => {"width" => 0, "height" => 222})
+      expect(create_options[:image_sizes]).to eq("http://foo.bar/image.png" => { "width" => 0, "height" => 222 })
     end
 
     it "follows the correct workflow for approval" do
@@ -100,10 +100,9 @@ describe QueuedPost do
                                      title: 'This is the topic title to queue up',
                                      archetype: 'regular',
                                      category: category.id,
-                                     meta_data: {evil: 'trout'}
+                                     meta_data: { evil: 'trout' }
                                    }) }
 
-
       it "returns the appropriate options for creating a topic" do
         create_options = qp.create_options
 
diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb
index 563056ac7f..1bac7d8485 100644
--- a/spec/models/remote_theme_spec.rb
+++ b/spec/models/remote_theme_spec.rb
@@ -83,7 +83,7 @@ JSON
 
       expect(@theme.theme_fields.length).to eq(6)
 
-      mapped = Hash[*@theme.theme_fields.map{|f| ["#{f.target_id}-#{f.name}", f.value]}.flatten]
+      mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
 
       expect(mapped["0-header"]).to eq("I AM HEADER")
       expect(mapped["1-scss"]).to eq(scss_data)
@@ -106,7 +106,6 @@ JSON
 
       `cd #{initial_repo} && git commit -am "update"`
 
-
       time = Time.new('2001')
       freeze_time time
 
@@ -114,7 +113,6 @@ JSON
       expect(remote.commits_behind).to eq(1)
       expect(remote.remote_version).to eq(`cd #{initial_repo} && git rev-parse HEAD`.strip)
 
-
       remote.update_from_remote
       @theme.save
       @theme.reload
@@ -123,7 +121,7 @@ JSON
       expect(scheme.name).to eq("Amazing")
       expect(scheme.colors.find_by(name: 'love').hex).to eq('eaeaea')
 
-      mapped = Hash[*@theme.theme_fields.map{|f| ["#{f.target_id}-#{f.name}", f.value]}.flatten]
+      mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten]
 
       expect(mapped["0-header"]).to eq("I AM UPDATED")
       expect(mapped["1-scss"]).to eq(scss_data)
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 661cea8b2b..c88a72b9dc 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -40,14 +40,14 @@ describe Report do
 
       context "with #{pluralized}" do
         before(:each) do
-          Timecop.freeze
+          freeze_time
           fabricator = case arg
-          when :signup
-            :user
-          when :email
-            :email_log
+                       when :signup
+                         :user
+                       when :email
+                         :email_log
           else
-            arg
+                         arg
           end
           Fabricate(fabricator)
           Fabricate(fabricator, created_at: 1.hours.ago)
@@ -57,7 +57,6 @@ describe Report do
           Fabricate(fabricator, created_at: 30.days.ago)
           Fabricate(fabricator, created_at: 35.days.ago)
         end
-        after(:each) { Timecop.return }
 
         context 'returns a report with data'
           it "returns today's data" do
@@ -71,9 +70,9 @@ describe Report do
           it "returns previous 30 day's data" do
             expect(report.prev30Days).to be_present
           end
-        end
       end
     end
+  end
 
   [:http_total, :http_2xx, :http_background, :http_3xx, :http_4xx, :http_5xx, :page_view_crawler, :page_view_logged_in, :page_view_anon].each do |request_type|
     describe "#{request_type} request reports" do
@@ -87,15 +86,13 @@ describe Report do
 
       context "with #{request_type}" do
         before(:each) do
-          Timecop.freeze
+          freeze_time
           ApplicationRequest.create(date: 35.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 35)
           ApplicationRequest.create(date: 7.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 8)
           ApplicationRequest.create(date: Date.today.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 1)
           ApplicationRequest.create(date: 1.day.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 2)
           ApplicationRequest.create(date: 2.days.ago.to_time, req_type: ApplicationRequest.req_types[request_type.to_s], count: 3)
         end
-        after(:each) { Timecop.return }
-
 
         context 'returns a report with data' do
           it "returns expected number of recoords" do
@@ -203,9 +200,9 @@ describe Report do
 
       it "returns a report with data" do
         expect(report.data).to be_present
-        expect(report.data.find {|d| d[:x] == TrustLevel[0]}[:y]).to eq 3
-        expect(report.data.find {|d| d[:x] == TrustLevel[2]}[:y]).to eq 2
-        expect(report.data.find {|d| d[:x] == TrustLevel[4]}[:y]).to eq 1
+        expect(report.data.find { |d| d[:x] == TrustLevel[0] }[:y]).to eq 3
+        expect(report.data.find { |d| d[:x] == TrustLevel[2] }[:y]).to eq 2
+        expect(report.data.find { |d| d[:x] == TrustLevel[4] }[:y]).to eq 1
       end
     end
   end
diff --git a/spec/models/screened_email_spec.rb b/spec/models/screened_email_spec.rb
index 7364773158..af4e82c43d 100644
--- a/spec/models/screened_email_spec.rb
+++ b/spec/models/screened_email_spec.rb
@@ -78,7 +78,7 @@ describe ScreenedEmail do
 
     shared_examples "when a ScreenedEmail record matches" do
       it "updates statistics" do
-        Timecop.freeze(Time.zone.now) do
+        freeze_time(Time.zone.now) do
           expect { subject }.to change { screened_email.reload.match_count }.by(1)
           expect(screened_email.last_match_at).to be_within_one_second_of(Time.zone.now)
         end
diff --git a/spec/models/screened_ip_address_spec.rb b/spec/models/screened_ip_address_spec.rb
index 18924015d3..6210f832b0 100644
--- a/spec/models/screened_ip_address_spec.rb
+++ b/spec/models/screened_ip_address_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe ScreenedIpAddress do
   let(:ip_address) { '99.232.23.124' }
-  let(:valid_params) { {ip_address: ip_address} }
+  let(:valid_params) { { ip_address: ip_address } }
 
   describe 'new record' do
     it 'sets a default action_type' do
diff --git a/spec/models/screened_url_spec.rb b/spec/models/screened_url_spec.rb
index 6da3fd4769..8335784ecd 100644
--- a/spec/models/screened_url_spec.rb
+++ b/spec/models/screened_url_spec.rb
@@ -5,7 +5,7 @@ describe ScreenedUrl do
   let(:url)    { 'http://shopppping.com/bad/drugz' }
   let(:domain) { 'shopppping.com' }
 
-  let(:valid_params) { {url: url, domain: domain} }
+  let(:valid_params) { { url: url, domain: domain } }
 
   describe "new record" do
     it "sets a default action_type" do
diff --git a/spec/models/search_log_spec.rb b/spec/models/search_log_spec.rb
new file mode 100644
index 0000000000..34dabb0f38
--- /dev/null
+++ b/spec/models/search_log_spec.rb
@@ -0,0 +1,180 @@
+require 'rails_helper'
+
+RSpec.describe SearchLog, type: :model do
+
+  describe ".log" do
+
+    context "invalid arguments" do
+      it "no search type returns error" do
+        status, _ = SearchLog.log(
+          term: 'bounty hunter',
+          search_type: :missing,
+          ip_address: '127.0.0.1'
+        )
+        expect(status).to eq(:error)
+      end
+
+      it "no IP returns error" do
+        status, _ = SearchLog.log(
+          term: 'bounty hunter',
+          search_type: :header,
+          ip_address: nil
+        )
+        expect(status).to eq(:error)
+      end
+    end
+
+    context "when anonymous" do
+      it "logs and updates the search" do
+        freeze_time
+        action, log_id = SearchLog.log(
+          term: 'jabba',
+          search_type: :header,
+          ip_address: '192.168.0.33'
+        )
+        expect(action).to eq(:created)
+        log = SearchLog.find(log_id)
+        expect(log.term).to eq('jabba')
+        expect(log.search_type).to eq(SearchLog.search_types[:header])
+        expect(log.ip_address).to eq('192.168.0.33')
+
+        action, updated_log_id = SearchLog.log(
+          term: 'jabba the hut',
+          search_type: :header,
+          ip_address: '192.168.0.33'
+        )
+        expect(action).to eq(:updated)
+        expect(updated_log_id).to eq(log_id)
+      end
+
+      it "creates a new search with a different prefix" do
+        freeze_time
+        action, _ = SearchLog.log(
+          term: 'darth',
+          search_type: :header,
+          ip_address: '127.0.0.1'
+        )
+        expect(action).to eq(:created)
+
+        action, _ = SearchLog.log(
+          term: 'anakin',
+          search_type: :header,
+          ip_address: '127.0.0.1'
+        )
+        expect(action).to eq(:created)
+      end
+
+      it "creates a new search with a different ip" do
+        freeze_time
+        action, _ = SearchLog.log(
+          term: 'darth',
+          search_type: :header,
+          ip_address: '127.0.0.1'
+        )
+        expect(action).to eq(:created)
+
+        action, _ = SearchLog.log(
+          term: 'darth',
+          search_type: :header,
+          ip_address: '127.0.0.2'
+        )
+        expect(action).to eq(:created)
+      end
+    end
+
+    context "when logged in" do
+      let(:user) { Fabricate(:user) }
+
+      it "logs and updates the search" do
+        freeze_time
+        action, log_id = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+        expect(action).to eq(:created)
+        log = SearchLog.find(log_id)
+        expect(log.term).to eq('hello')
+        expect(log.search_type).to eq(SearchLog.search_types[:full_page])
+        expect(log.ip_address).to eq('192.168.0.1')
+        expect(log.user_id).to eq(user.id)
+
+        action, updated_log_id = SearchLog.log(
+          term: 'hello dolly',
+          search_type: :header,
+          ip_address: '192.168.0.33',
+          user_id: user.id
+        )
+        expect(action).to eq(:updated)
+        expect(updated_log_id).to eq(log_id)
+      end
+
+      it "logs again if time has passed" do
+        freeze_time(10.minutes.ago)
+
+        action, _ = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+        expect(action).to eq(:created)
+
+        freeze_time(10.minutes.from_now)
+
+        action, _ = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+
+        expect(action).to eq(:created)
+      end
+
+      it "logs again with a different user" do
+        freeze_time
+
+        action, _ = SearchLog.log(
+          term: 'hello',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: user.id
+        )
+        expect(action).to eq(:created)
+
+        action, _ = SearchLog.log(
+          term: 'hello dolly',
+          search_type: :full_page,
+          ip_address: '192.168.0.1',
+          user_id: Fabricate(:user).id
+        )
+        expect(action).to eq(:created)
+      end
+
+    end
+  end
+
+  context "clean_up" do
+
+    it "will remove old logs" do
+      SearchLog.log(term: 'jawa', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'jedi', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'rey', search_type: :header, ip_address: '127.0.0.1')
+      SearchLog.log(term: 'finn', search_type: :header, ip_address: '127.0.0.1')
+
+      SiteSetting.search_query_log_max_size = 5
+      SearchLog.clean_up
+      expect(SearchLog.count).to eq(4)
+
+      SiteSetting.search_query_log_max_size = 2
+      SearchLog.clean_up
+      expect(SearchLog.count).to eq(2)
+      expect(SearchLog.where(term: 'rey').first).to be_present
+      expect(SearchLog.where(term: 'finn').first).to be_present
+    end
+
+  end
+
+end
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index d1905b2c08..65907a77a5 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -111,7 +111,6 @@ describe SiteSetting do
       SiteSetting.force_https = true
     end
 
-
     it "returns http when ssl is disabled" do
       SiteSetting.force_https = false
       expect(SiteSetting.scheme).to eq("http")
@@ -128,10 +127,6 @@ describe SiteSetting do
       SiteSetting.force_https = true
     end
 
-    after do
-      SiteSetting.force_https = false
-    end
-
     describe '#use_https' do
       it 'should act as a proxy to the new methods' do
         expect(SiteSetting.use_https).to eq(true)
diff --git a/spec/models/site_spec.rb b/spec/models/site_spec.rb
index 8899269c80..2463fddd79 100644
--- a/spec/models/site_spec.rb
+++ b/spec/models/site_spec.rb
@@ -9,9 +9,9 @@ describe Site do
 
     expected = Theme.where('key = :default OR user_selectable',
                     default: SiteSetting.default_theme_key)
-         .order(:name)
-         .pluck(:key, :name)
-         .map{|k,n| {"theme_key" => k, "name" => n, "default" => k == SiteSetting.default_theme_key}}
+      .order(:name)
+      .pluck(:key, :name)
+      .map { |k, n| { "theme_key" => k, "name" => n, "default" => k == SiteSetting.default_theme_key } }
 
     expect(parsed["user_themes"]).to eq(expected)
   end
@@ -46,20 +46,20 @@ describe Site do
 
     expect(Site.new(Guardian.new(user)).categories.count).to eq(2)
 
-    category.set_permissions(:everyone => :create_post)
+    category.set_permissions(everyone: :create_post)
     category.save
 
     guardian = Guardian.new(user)
 
     expect(Site.new(guardian)
         .categories
-        .keep_if{|c| c.name == category.name}
+        .keep_if { |c| c.name == category.name }
         .first
         .permission)
-        .not_to eq(CategoryGroup.permission_types[:full])
+      .not_to eq(CategoryGroup.permission_types[:full])
 
     # If a parent category is not visible, the child categories should not be returned
-    category.set_permissions(:staff => :full)
+    category.set_permissions(staff: :full)
     category.save
 
     sub_category = Fabricate(:category, parent_category_id: category.id)
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 808791d5af..cf58742fc5 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -38,7 +38,7 @@ describe Tag do
 
       it "can be used to filter before doing the count" do
         counts = described_class.tags_by_count_query.where("topics.id = ?", @topics[1].id).count(Tag::COUNT_ARG)
-        expect(counts).to eq({@tags[0].name => 1})
+        expect(counts).to eq(@tags[0].name => 1)
       end
 
       it "returns unused tags too" do
@@ -65,7 +65,7 @@ describe Tag do
         make_some_tags(count: 4) # one tag that isn't used
         @category1 = Fabricate(:category)
         @private_category = Fabricate(:category)
-        @private_category.set_permissions(:admins => :full)
+        @private_category.set_permissions(admins: :full)
         @private_category.save!
         @topics = []
         @topics << Fabricate(:topic, category: @category1, tags: [@tags[0]])
diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb
index aee8839eca..b5b9dabacb 100644
--- a/spec/models/tag_user_spec.rb
+++ b/spec/models/tag_user_spec.rb
@@ -141,12 +141,10 @@ describe TagUser do
         TopicUser.change(user.id, post.topic_id, total_msecs_viewed: 1)
         expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
 
-
         DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [watched_tag.name])
         post.topic.save!
         expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:watching]
 
-
         DiscourseTagging.tag_topic_by_names(post.topic, Guardian.new(user), [])
         post.topic.save!
         expect(TopicUser.get(post.topic, user).notification_level).to eq TopicUser.notification_levels[:tracking]
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
index 5df2a2abf7..43e1a91fda 100644
--- a/spec/models/theme_spec.rb
+++ b/spec/models/theme_spec.rb
@@ -11,7 +11,7 @@ describe Theme do
   end
 
   let :customization_params do
-    {name: 'my name', user_id: user.id, header: "my awesome header"}
+    { name: 'my name', user_id: user.id, header: "my awesome header" }
   end
 
   let :customization do
@@ -50,7 +50,6 @@ describe Theme do
     expect(Theme.lookup_field(child.key, :desktop, "header")).to eq("World\nDesktop")
     expect(Theme.lookup_field(child.key, "mobile", :header)).to eq("World\nMobile")
 
-
     child.set_field(target: :common, name: "header", value: "Worldie")
     child.save!
 
@@ -80,7 +79,6 @@ describe Theme do
     expect(grandchild.dependant_themes.length).to eq(2)
   end
 
-
   it 'should correct bad html in body_tag_baked and head_tag_baked' do
     theme = Theme.new(user_id: -1, name: "test")
     theme.set_field(target: :common, name: "head_tag", value: "<b>I am bold")
@@ -160,7 +158,7 @@ HTML
       theme.set_field(target: :common, name: :content, value: 'Sam\'s Test', type: :theme_var)
       theme.save
 
-      scss,_map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
       expect(scss).to include("red")
       expect(scss).to include('"Sam\'s Test"')
     end
@@ -186,7 +184,7 @@ HTML
       theme.reload
       expect(theme.theme_fields.find_by(name: :scss).error).to eq(nil)
 
-      scss,_map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
+      scss, _map = Stylesheet::Compiler.compile('@import "theme_variables"; @import "desktop_theme"; ', "theme.scss", theme_id: theme.id)
       expect(scss).to include(upload.url)
     end
   end
@@ -216,5 +214,4 @@ HTML
     expect(Theme.user_theme_keys).to eq(Set.new([]))
   end
 
-
 end
diff --git a/spec/models/top_topic_spec.rb b/spec/models/top_topic_spec.rb
index 7c73a98b3c..1d83694f68 100644
--- a/spec/models/top_topic_spec.rb
+++ b/spec/models/top_topic_spec.rb
@@ -47,7 +47,7 @@ describe TopTopic do
     let(:coding_horror) { Fabricate(:coding_horror) }
 
     let!(:topic_1) { Fabricate(:topic, posts_count: 10, like_count: 28) }
-    let!(:t1_post_1) { Fabricate(:post, topic: topic_1, like_count: 28, post_number: 1)}
+    let!(:t1_post_1) { Fabricate(:post, topic: topic_1, like_count: 28, post_number: 1) }
 
     let!(:topic_2) { Fabricate(:topic, posts_count: 10, like_count: 20) }
     let!(:t2_post_1) { Fabricate(:post, topic: topic_2, like_count: 10, post_number: 1) }
diff --git a/spec/models/topic_converter_spec.rb b/spec/models/topic_converter_spec.rb
index cee779633b..2e76cf9bba 100644
--- a/spec/models/topic_converter_spec.rb
+++ b/spec/models/topic_converter_spec.rb
@@ -11,7 +11,7 @@ describe TopicConverter do
     context 'success' do
       it "converts private message to regular topic" do
         SiteSetting.allow_uncategorized_topics = true
-        topic = described_class.new(private_message, admin).convert_to_public_topic
+        topic = TopicConverter.new(private_message, admin).convert_to_public_topic
         topic.reload
 
         expect(topic).to be_valid
@@ -26,18 +26,22 @@ describe TopicConverter do
         end
 
         it 'should convert private message into the right category' do
-          topic = described_class.new(private_message, admin).convert_to_public_topic
+          topic = TopicConverter.new(private_message, admin).convert_to_public_topic
           topic.reload
 
           expect(topic).to be_valid
           expect(topic.archetype).to eq("regular")
-          expect(topic.category_id).to eq(category.id)
+
+          first_category = Category.where.not(id: SiteSetting.uncategorized_category_id)
+            .where(read_restricted: false).order('id asc').first
+
+          expect(topic.category_id).to eq(first_category.id)
         end
       end
 
       describe 'when a custom category_id is given' do
         it 'should convert private message into the right category' do
-          topic = described_class.new(private_message, admin).convert_to_public_topic(category.id)
+          topic = TopicConverter.new(private_message, admin).convert_to_public_topic(category.id)
 
           expect(topic.reload.category).to eq(category)
         end
diff --git a/spec/models/topic_link_click_spec.rb b/spec/models/topic_link_click_spec.rb
index 6200c24a07..5963ba4eec 100644
--- a/spec/models/topic_link_click_spec.rb
+++ b/spec/models/topic_link_click_spec.rb
@@ -39,7 +39,6 @@ describe TopicLinkClick do
 
     context 'create_from' do
 
-
       it "works correctly" do
 
         # returns nil to prevent exploits
@@ -57,8 +56,6 @@ describe TopicLinkClick do
 
       end
 
-
-
       context 'with a valid url and post_id' do
         before do
           @url = TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1')
@@ -206,7 +203,6 @@ describe TopicLinkClick do
         end
       end
 
-
       context 'with a valid url and topic_id' do
         before do
           @url = TopicLinkClick.create_from(url: @topic_link.url, topic_id: @topic.id, ip: '127.0.0.3')
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index 9ee96750f2..c42371a8bf 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -20,8 +20,8 @@ describe TopicLink do
 
   it "can't link to the same topic" do
     ftl = TopicLink.new(url: "/t/#{topic.id}",
-                              topic_id: topic.id,
-                              link_topic_id: topic.id)
+                        topic_id: topic.id,
+                        link_topic_id: topic.id)
     expect(ftl.valid?).to eq(false)
   end
 
@@ -30,8 +30,8 @@ describe TopicLink do
       post = Fabricate(:post, raw: "
 http://a.com/
 http://b.com/b
-http://#{'a'*200}.com/invalid
-http://b.com/#{'a'*500}
+http://#{'a' * 200}.com/invalid
+http://b.com/#{'a' * 500}
                         ", user: user, topic: topic)
 
       TopicLink.extract_from(post)
@@ -73,7 +73,6 @@ http://b.com/#{'a'*500}
       expect(link.url).to eq(url)
     end
 
-
     context 'topic link' do
 
       let(:other_topic) do
@@ -131,7 +130,7 @@ http://b.com/#{'a'*500}
         TopicLink.extract_from(linked_post)
         expect(topic.topic_links.first.url).to eq(url)
 
-        linked_post.revise(post.user, { raw: "no more linkies https://eviltrout.com" })
+        linked_post.revise(post.user, raw: "no more linkies https://eviltrout.com")
         expect(other_topic.topic_links.where(link_post_id: linked_post.id)).to be_blank
       end
     end
@@ -193,7 +192,7 @@ http://b.com/#{'a'*500}
     end
 
     context "link to a local attachments" do
-      let(:post) { topic.posts.create(user: user, raw: '<a class="attachment" href="/uploads/default/208/87bb3d8428eb4783.rb">ruby.rb</a>') }
+      let(:post) { topic.posts.create(user: user, raw: '<a class="attachment" href="/uploads/default/208/87bb3d8428eb4783.rb?foo=bar">ruby.rb</a>') }
 
       it "extracts the link" do
         TopicLink.extract_from(post)
@@ -203,9 +202,11 @@ http://b.com/#{'a'*500}
         # is set to internal
         expect(link).to be_internal
         # has the correct url
-        expect(link.url).to eq("/uploads/default/208/87bb3d8428eb4783.rb")
+        expect(link.url).to eq("/uploads/default/208/87bb3d8428eb4783.rb?foo=bar")
         # should not be the reflection
         expect(link).not_to be_reflection
+        # should have file extension
+        expect(link.extension).to eq('rb')
       end
 
     end
@@ -224,6 +225,8 @@ http://b.com/#{'a'*500}
         expect(link.url).to eq("//s3.amazonaws.com/bucket/2104a0211c9ce41ed67989a1ed62e9a394c1fbd1446.rb")
         # should not be the reflection
         expect(link).not_to be_reflection
+        # should have file extension
+        expect(link.extension).to eq('rb')
       end
 
     end
@@ -300,7 +303,7 @@ http://b.com/#{'a'*500}
         TopicLinkClick.create(topic_link: topic_link, ip_address: '192.168.1.1')
 
         expect(counts_for[post.id]).to be_present
-        expect(counts_for[post.id].find {|l| l[:url] == 'http://google.com'}[:clicks]).to eq(0)
+        expect(counts_for[post.id].find { |l| l[:url] == 'http://google.com' }[:clicks]).to eq(0)
         expect(counts_for[post.id].first[:clicks]).to eq(1)
 
         array = TopicLink.topic_map(Guardian.new, post.topic_id)
@@ -319,7 +322,7 @@ http://b.com/#{'a'*500}
         expect(TopicLink.topic_map(Guardian.new, post.topic_id).count).to eq(1)
         expect(TopicLink.counts_for(Guardian.new, post.topic, [post]).length).to eq(1)
 
-        category.set_permissions(:staff => :full)
+        category.set_permissions(staff: :full)
         category.save
 
         admin = Fabricate(:admin)
diff --git a/spec/models/topic_list_spec.rb b/spec/models/topic_list_spec.rb
index 83290142cb..dcb6b5aab7 100644
--- a/spec/models/topic_list_spec.rb
+++ b/spec/models/topic_list_spec.rb
@@ -60,7 +60,7 @@ describe TopicList do
       let!(:other_topic) { Fabricate(:topic) } # uncategorized
       let!(:tag) { Fabricate(:tag, topics: [topic], categories: [category], name: "category-tag") }
       let!(:other_tag) { Fabricate(:tag, topics: [topic], name: "use-anywhere") }
-      let(:topic_list) { TopicList.new('latest', topic.user, [topic], { category: category.id, category_id: category.id }) }
+      let(:topic_list) { TopicList.new('latest', topic.user, [topic], category: category.id, category_id: category.id) }
 
       it 'should only return tags allowed in the category' do
         expect(topic_list.tags).to eq([tag.name])
@@ -73,7 +73,7 @@ describe TopicList do
       it "with another category with no tags, should return no tags" do
         other_category = Fabricate(:category)
         topic3 = Fabricate(:topic, category: other_category)
-        list = TopicList.new('latest', topic3.user, [topic3], { category: other_category.id, category_id: other_category.id })
+        list = TopicList.new('latest', topic3.user, [topic3], category: other_category.id, category_id: other_category.id)
         expect(list.tags).to be_empty
       end
     end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 5325b9f89d..a666a81702 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -4,7 +4,7 @@ require 'rails_helper'
 require_dependency 'post_destroyer'
 
 describe Topic do
-  let(:now) { Time.zone.local(2013,11,20,8,0) }
+  let(:now) { Time.zone.local(2013, 11, 20, 8, 0) }
   let(:user) { Fabricate(:user) }
 
   context 'validations' do
@@ -30,9 +30,13 @@ describe Topic do
       end
 
       describe 'censored words' do
+        after do
+          $redis.flushall
+        end
+
         describe 'when title contains censored words' do
           it 'should not be valid' do
-            SiteSetting.censored_words = 'pineapple|pen'
+            ['pineapple', 'pen'].each { |w| Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor]) }
 
             topic.title = 'pen PinEapple apple pen is a complete sentence'
 
@@ -46,7 +50,7 @@ describe Topic do
 
         describe 'titles with censored words not on boundaries' do
           it "should be valid" do
-            SiteSetting.censored_words = 'apple'
+            Fabricate(:watched_word, word: 'apple', action: WatchedWord.actions[:censor])
             topic.title = "Pineapples are great fruit! Applebee's is a great restaurant"
             expect(topic).to be_valid
           end
@@ -62,10 +66,12 @@ describe Topic do
 
         describe 'escape special characters in censored words' do
           before do
-            SiteSetting.censored_words = 'co(onut|coconut|a**le'
+            ['co(onut', 'coconut', 'a**le'].each do |w|
+              Fabricate(:watched_word, word: w, action: WatchedWord.actions[:censor])
+            end
           end
 
-          it 'should not valid' do
+          it 'should not be valid' do
             topic.title = "I have a co(onut a**le"
 
             expect(topic.valid?).to eq(false)
@@ -259,12 +265,12 @@ describe Topic do
   context 'html in title' do
 
     def build_topic_with_title(title)
-      build(:topic, title: title).tap{ |t| t.valid? }
+      build(:topic, title: title).tap { |t| t.valid? }
     end
 
-    let(:topic_bold) { build_topic_with_title("Topic with <b>bold</b> text in its title" ) }
-    let(:topic_image) { build_topic_with_title("Topic with <img src='something'> image in its title" ) }
-    let(:topic_script) { build_topic_with_title("Topic with <script>alert('title')</script> script in its title" ) }
+    let(:topic_bold) { build_topic_with_title("Topic with <b>bold</b> text in its title") }
+    let(:topic_image) { build_topic_with_title("Topic with <img src='something'> image in its title") }
+    let(:topic_script) { build_topic_with_title("Topic with <script>alert('title')</script> script in its title") }
     let(:topic_emoji) { build_topic_with_title("I 💖 candy alot") }
 
     it "escapes script contents" do
@@ -286,7 +292,7 @@ describe Topic do
   end
 
   context 'fancy title' do
-    let(:topic) { Fabricate.build(:topic, title: "\"this topic\" -- has ``fancy stuff''" ) }
+    let(:topic) { Fabricate.build(:topic, title: "\"this topic\" -- has ``fancy stuff''") }
 
     context 'title_fancy_entities disabled' do
       before do
@@ -361,7 +367,6 @@ describe Topic do
     end
   end
 
-
   context 'similar_to' do
 
     it 'returns blank with nil params' do
@@ -424,7 +429,6 @@ describe Topic do
 
   end
 
-
   context 'private message' do
     let(:coding_horror) { User.find_by(username: "CodingHorror") }
     let(:evil_trout) { Fabricate(:evil_trout) }
@@ -526,9 +530,9 @@ describe Topic do
       it "should set up actions correctly" do
         UserActionCreator.enable
 
-        expect(actions.map{|a| a.action_type}).not_to include(UserAction::NEW_TOPIC)
-        expect(actions.map{|a| a.action_type}).to include(UserAction::NEW_PRIVATE_MESSAGE)
-        expect(coding_horror.user_actions.map{|a| a.action_type}).to include(UserAction::GOT_PRIVATE_MESSAGE)
+        expect(actions.map { |a| a.action_type }).not_to include(UserAction::NEW_TOPIC)
+        expect(actions.map { |a| a.action_type }).to include(UserAction::NEW_PRIVATE_MESSAGE)
+        expect(coding_horror.user_actions.map { |a| a.action_type }).to include(UserAction::GOT_PRIVATE_MESSAGE)
       end
 
     end
@@ -595,21 +599,21 @@ describe Topic do
 
       it "bumps the topic when a new version is made of the last post" do
         expect {
-          @last_post.revise(Fabricate(:moderator), { raw: 'updated contents' })
+          @last_post.revise(Fabricate(:moderator), raw: 'updated contents')
           @topic.reload
         }.to change(@topic, :bumped_at)
       end
 
       it "doesn't bump the topic when a post that isn't the last post receives a new version" do
         expect {
-          @earlier_post.revise(Fabricate(:moderator), { raw: 'updated contents' })
+          @earlier_post.revise(Fabricate(:moderator), raw: 'updated contents')
           @topic.reload
         }.not_to change(@topic, :bumped_at)
       end
 
       it "doesn't bump the topic when a post have invalid topic title while edit" do
         expect {
-          @last_post.revise(Fabricate(:moderator), { title: 'invalid title' })
+          @last_post.revise(Fabricate(:moderator), title: 'invalid title')
           @topic.reload
         }.not_to change(@topic, :bumped_at)
       end
@@ -650,7 +654,6 @@ describe Topic do
     end
   end
 
-
   context 'update_status' do
     before do
       @topic = Fabricate(:topic, bumped_at: 1.hour.ago)
@@ -795,7 +798,7 @@ describe Topic do
 
       context 'topic was set to close when it was created' do
         it 'puts the autoclose duration in the moderator post' do
-          freeze_time(Time.new(2000,1,1))
+          freeze_time(Time.new(2000, 1, 1))
           @topic.created_at = 3.days.ago
           @topic.update_status(status, true, @user)
           expect(@topic.posts.last.raw).to include "closed after 3 days"
@@ -804,7 +807,7 @@ describe Topic do
 
       context 'topic was set to close after it was created' do
         it 'puts the autoclose duration in the moderator post' do
-          freeze_time(Time.new(2000,1,1))
+          freeze_time(Time.new(2000, 1, 1))
 
           @topic.created_at = 7.days.ago
 
@@ -872,7 +875,6 @@ describe Topic do
 
     end
 
-
   end
 
   context 'last_poster info' do
@@ -920,7 +922,7 @@ describe Topic do
   end
 
   describe 'meta data' do
-    let(:topic) { Fabricate(:topic, meta_data: {'hello' => 'world'}) }
+    let(:topic) { Fabricate(:topic, meta_data: { 'hello' => 'world' }) }
 
     it 'allows us to create a topic with meta data' do
       expect(topic.meta_data['hello']).to eq('world')
@@ -965,7 +967,6 @@ describe Topic do
         end
       end
 
-
     end
 
   end
@@ -1008,7 +1009,7 @@ describe Topic do
       end
 
       it 'should not change the topic_count when not changed' do
-       expect { topic.change_category_to_id(topic.category.id); category.reload }.not_to change(category, :topic_count)
+        expect { topic.change_category_to_id(topic.category.id); category.reload }.not_to change(category, :topic_count)
       end
 
       it "doesn't change the category when it can't be found" do
@@ -1119,7 +1120,7 @@ describe Topic do
         b = Fabricate(:topic, created_at: now)
         c = Fabricate(:topic, created_at: now)
         d = Fabricate(:topic, created_at: now - 2.minutes)
-        expect(Topic.by_newest).to eq([c,b,d,a])
+        expect(Topic.by_newest).to eq([c, b, d, a])
       end
     end
 
@@ -1155,9 +1156,7 @@ describe Topic do
     let(:topic) { Fabricate.build(:topic) }
 
     let(:closing_topic) do
-      Fabricate(:topic,
-        topic_timers: [Fabricate(:topic_timer, execute_at: 5.hours.from_now)]
-      )
+      Fabricate(:topic_timer, execute_at: 5.hours.from_now).topic
     end
 
     let(:admin) { Fabricate(:admin) }
@@ -1166,82 +1165,74 @@ describe Topic do
     before { Discourse.stubs(:system_user).returns(admin) }
 
     it 'can take a number of hours as an integer' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin)
-        expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
-      end
+      freeze_time now
+
+      topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin)
+      expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
     end
 
     it 'can take a number of hours as an integer, with timezone offset' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], 72, {by_user: admin, timezone_offset: 240})
-        expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], 72, by_user: admin, timezone_offset: 240)
+      expect(topic.topic_timers.first.execute_at).to eq(3.days.from_now)
     end
 
     it 'can take a number of hours as a string' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin)
-        expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin)
+      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
     end
 
     it 'can take a number of hours as a string, with timezone offset' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '18', {by_user: admin, timezone_offset: 240})
-        expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin, timezone_offset: 240)
+      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
     end
 
     it 'can take a number of hours as a string and can handle based on last post' do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '18', {by_user: admin, based_on_last_post: true})
-        expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '18', by_user: admin, based_on_last_post: true)
+      expect(topic.topic_timers.first.execute_at).to eq(18.hours.from_now)
     end
 
     it "can take a timestamp for a future time" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', {by_user: admin})
-        expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,22,5,0))
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', by_user: admin)
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 22, 5, 0))
     end
 
     it "can take a timestamp for a future time, with timezone offset" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', {by_user: admin, timezone_offset: 240})
-        expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,22,9,0))
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-22 5:00', by_user: admin, timezone_offset: 240)
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 22, 9, 0))
     end
 
     it "sets a validation error when given a timestamp in the past" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-19 5:00', {by_user: admin})
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-19 5:00', by_user: admin)
 
-        expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013,11,19,5,0))
-        expect(topic.topic_timers.first.errors[:execute_at]).to be_present
-      end
+      expect(topic.topic_timers.first.execute_at).to eq(Time.zone.local(2013, 11, 19, 5, 0))
+      expect(topic.topic_timers.first.errors[:execute_at]).to be_present
     end
 
     it "can take a timestamp with timezone" do
-      Timecop.freeze(now) do
-        topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', {by_user: admin})
-        expect(topic.topic_timers.first.execute_at).to eq(Time.utc(2013,11,25,9,35))
-      end
+      freeze_time now
+      topic.set_or_create_timer(TopicTimer.types[:close], '2013-11-25T01:35:00-08:00', by_user: admin)
+      expect(topic.topic_timers.first.execute_at).to eq(Time.utc(2013, 11, 25, 9, 35))
     end
 
     it 'sets topic status update user to given user if it is a staff or TL4 user' do
-      topic.set_or_create_timer(TopicTimer.types[:close], 3, {by_user: admin})
+      topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: admin)
       expect(topic.topic_timers.first.user).to eq(admin)
     end
 
     it 'sets topic status update user to given user if it is a TL4 user' do
-      topic.set_or_create_timer(TopicTimer.types[:close], 3, {by_user: trust_level_4})
+      topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: trust_level_4)
       expect(topic.topic_timers.first.user).to eq(trust_level_4)
     end
 
     it 'sets topic status update user to system user if given user is not staff or a TL4 user' do
-      topic.set_or_create_timer(TopicTimer.types[:close], 3, {by_user: Fabricate.build(:user, id: 444)})
+      topic.set_or_create_timer(TopicTimer.types[:close], 3, by_user: Fabricate.build(:user, id: 444))
       expect(topic.topic_timers.first.user).to eq(admin)
     end
 
@@ -1269,24 +1260,23 @@ describe Topic do
     end
 
     it 'updates topic status update execute_at if it was already set to close' do
-      Timecop.freeze(now) do
-        closing_topic.set_or_create_timer(TopicTimer.types[:close], 48)
-        expect(closing_topic.reload.public_topic_timer.execute_at).to eq(2.days.from_now)
-      end
+      freeze_time now
+      closing_topic.set_or_create_timer(TopicTimer.types[:close], 48)
+      expect(closing_topic.reload.public_topic_timer.execute_at).to eq(2.days.from_now)
     end
 
     it 'should allow status_type to be updated' do
-      Timecop.freeze do
-        topic_timer = closing_topic.set_or_create_timer(
-          TopicTimer.types[:publish_to_category], 72, by_user: admin
-        )
+      freeze_time
 
-        expect(topic_timer.execute_at).to eq(3.days.from_now)
-      end
+      topic_timer = closing_topic.set_or_create_timer(
+        TopicTimer.types[:publish_to_category], 72, by_user: admin
+      )
+
+      expect(topic_timer.execute_at).to eq(3.days.from_now)
     end
 
     it "does not update topic's topic status created_at it was already set to close" do
-      expect{
+      expect {
         closing_topic.set_or_create_timer(TopicTimer.types[:close], 14)
       }.to_not change { closing_topic.topic_timers.first.created_at }
     end
@@ -1302,10 +1292,10 @@ describe Topic do
 
         expect(topic.reload.closed).to eq(false)
 
-        Timecop.travel(3.hours.from_now) do
-          TopicTimer.ensure_consistency!
-          expect(topic.reload.closed).to eq(true)
-        end
+        freeze_time 3.hours.from_now
+
+        TopicTimer.ensure_consistency!
+        expect(topic.reload.closed).to eq(true)
       end
     end
 
@@ -1322,14 +1312,14 @@ describe Topic do
       end
 
       it "can update a user's existing record" do
-        Timecop.freeze(now) do
-          reminder
-          expect {
-            topic.set_or_create_timer(TopicTimer.types[:reminder], 11, by_user: admin)
-          }.to_not change { TopicTimer.count }
-          reminder.reload
-          expect(reminder.execute_at).to eq(11.hours.from_now)
-        end
+        freeze_time now
+
+        reminder
+        expect {
+          topic.set_or_create_timer(TopicTimer.types[:reminder], 11, by_user: admin)
+        }.to_not change { TopicTimer.count }
+        reminder.reload
+        expect(reminder.execute_at).to eq(11.hours.from_now)
       end
     end
   end
@@ -1428,9 +1418,9 @@ describe Topic do
 
     it "sorts by category notification levels" do
       category1, category2 = Fabricate(:category), Fabricate(:category)
-      2.times {|i| Fabricate(:topic, category: category1) }
+      2.times { |i| Fabricate(:topic, category: category1) }
       topic1 = Fabricate(:topic, category: category2)
-      2.times {|i| Fabricate(:topic, category: category1) }
+      2.times { |i| Fabricate(:topic, category: category1) }
       CategoryUser.create(user: user, category: category2, notification_level: CategoryUser.notification_levels[:watching])
       for_digest = Topic.for_digest(user, 1.year.ago, top_order: true)
       expect(for_digest.first).to eq(topic1)
@@ -1438,7 +1428,7 @@ describe Topic do
 
     it "sorts by topic notification levels" do
       topics = []
-      3.times {|i| topics << Fabricate(:topic) }
+      3.times { |i| topics << Fabricate(:topic) }
       user = Fabricate(:user)
       TopicUser.create(user_id: user.id, topic_id: topics[0].id, notification_level: TopicUser.notification_levels[:tracking])
       TopicUser.create(user_id: user.id, topic_id: topics[2].id, notification_level: TopicUser.notification_levels[:watching])
@@ -1512,39 +1502,38 @@ describe Topic do
 
   describe '#listable_count_per_day' do
     before(:each) do
-      Timecop.freeze
+      freeze_time
+
       Fabricate(:topic)
       Fabricate(:topic, created_at: 1.day.ago)
       Fabricate(:topic, created_at: 1.day.ago)
       Fabricate(:topic, created_at: 2.days.ago)
       Fabricate(:topic, created_at: 4.days.ago)
     end
-    after(:each) do
-      Timecop.return
-    end
-    let(:listable_topics_count_per_day) { {1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1 } }
+
+    let(:listable_topics_count_per_day) { { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1 } }
 
     it 'collect closed interval listable topics count' do
       expect(Topic.listable_count_per_day(2.days.ago, Time.now)).to include(listable_topics_count_per_day)
-      expect(Topic.listable_count_per_day(2.days.ago, Time.now)).not_to include({4.days.ago.to_date => 1})
+      expect(Topic.listable_count_per_day(2.days.ago, Time.now)).not_to include(4.days.ago.to_date => 1)
     end
   end
 
   describe '#secure_category?' do
-    let(:category){ Category.new }
+    let(:category) { Category.new }
 
     it "is true if the category is secure" do
       category.stubs(:read_restricted).returns(true)
-      expect(Topic.new(:category => category)).to be_read_restricted_category
+      expect(Topic.new(category: category)).to be_read_restricted_category
     end
 
     it "is false if the category is not secure" do
       category.stubs(:read_restricted).returns(false)
-      expect(Topic.new(:category => category)).not_to be_read_restricted_category
+      expect(Topic.new(category: category)).not_to be_read_restricted_category
     end
 
     it "is false if there is no category" do
-      expect(Topic.new(:category => nil)).not_to be_read_restricted_category
+      expect(Topic.new(category: nil)).not_to be_read_restricted_category
     end
   end
 
@@ -1714,7 +1703,7 @@ describe Topic do
     topic.save
 
     topic = Topic.find(topic.id)
-    expect(topic.custom_fields).to eq({"bob" => "marley", "jack" => "black"})
+    expect(topic.custom_fields).to eq("bob" => "marley", "jack" => "black")
   end
 
   it "doesn't validate the title again if it isn't changing" do
@@ -1748,7 +1737,7 @@ describe Topic do
 
       it "should add user to the group" do
         expect(Guardian.new(walter).can_see?(group_private_topic)).to be_falsey
-        expect { group_private_topic.invite(group_manager, walter.email) }.to raise_error(Invite::UserExists)
+        group_private_topic.invite(group_manager, walter.email)
         expect(walter.groups).to include(group)
         expect(Guardian.new(walter).can_see?(group_private_topic)).to be_truthy
       end
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index d38a939b94..d48760616e 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -113,63 +113,60 @@ RSpec.describe TopicTimer, type: :model do
 
     describe 'when #execute_at value is changed' do
       it 'reschedules the job' do
-        Timecop.freeze do
-          topic_timer
+        freeze_time
+        topic_timer
 
-          Jobs.expects(:cancel_scheduled_job).with(
-            :toggle_topic_closed, topic_timer_id: topic_timer.id
-          )
+        Jobs.expects(:cancel_scheduled_job).with(
+          :toggle_topic_closed, topic_timer_id: topic_timer.id
+        )
 
-          Jobs.expects(:enqueue_at).with(
-            3.days.from_now, :toggle_topic_closed,
-            topic_timer_id: topic_timer.id,
-            state: true
-          )
+        Jobs.expects(:enqueue_at).with(
+          3.days.from_now, :toggle_topic_closed,
+          topic_timer_id: topic_timer.id,
+          state: true
+        )
 
-          topic_timer.update!(execute_at: 3.days.from_now, created_at: Time.zone.now)
-        end
+        topic_timer.update!(execute_at: 3.days.from_now, created_at: Time.zone.now)
       end
 
       describe 'when execute_at is smaller than the current time' do
         it 'should enqueue the job immediately' do
-          Timecop.freeze do
-            topic_timer
+          freeze_time
+          topic_timer
 
-            Jobs.expects(:enqueue_at).with(
-              Time.zone.now, :toggle_topic_closed,
-              topic_timer_id: topic_timer.id,
-              state: true
-            )
+          Jobs.expects(:enqueue_at).with(
+            Time.zone.now, :toggle_topic_closed,
+            topic_timer_id: topic_timer.id,
+            state: true
+          )
 
-            topic_timer.update!(
-              execute_at: Time.zone.now - 1.hour,
-              created_at: Time.zone.now - 2.hour
-            )
-          end
+          topic_timer.update!(
+            execute_at: Time.zone.now - 1.hour,
+            created_at: Time.zone.now - 2.hour
+          )
         end
       end
     end
 
     describe 'when user is changed' do
       it 'should update the job' do
-        Timecop.freeze do
-          topic_timer
+        freeze_time
+        topic_timer
 
-          Jobs.expects(:cancel_scheduled_job).with(
-            :toggle_topic_closed, topic_timer_id: topic_timer.id
-          )
+        Jobs.expects(:cancel_scheduled_job).with(
+          :toggle_topic_closed, topic_timer_id: topic_timer.id
+        )
 
-          admin = Fabricate(:admin)
+        admin = Fabricate(:admin)
 
-          Jobs.expects(:enqueue_at).with(
-            topic_timer.execute_at,
-            :toggle_topic_closed,
-            topic_timer_id: topic_timer.id,
-            state: true
-          )
+        Jobs.expects(:enqueue_at).with(
+          topic_timer.execute_at,
+          :toggle_topic_closed,
+          topic_timer_id: topic_timer.id,
+          state: true
+        )
 
-          topic_timer.update!(user: admin)
-        end
+        topic_timer.update!(user: admin)
       end
     end
 
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index cd51c5ff76..aed7813ed8 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -39,7 +39,6 @@ describe TopicTrackingState do
     expect(report.length).to eq(1)
   end
 
-
   it "correctly handles capping" do
     user = Fabricate(:user)
 
diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb
index bcc481c9c8..e1d15e030f 100644
--- a/spec/models/topic_user_spec.rb
+++ b/spec/models/topic_user_spec.rb
@@ -90,7 +90,7 @@ describe TopicUser do
     u
   }
 
-  let(:topic_new_user) { TopicUser.get(topic, new_user)}
+  let(:topic_new_user) { TopicUser.get(topic, new_user) }
   let(:yesterday) { DateTime.now.yesterday }
 
   def ensure_topic_user
@@ -135,12 +135,12 @@ describe TopicUser do
 
     it 'should be set to "regular" notifications, by default on non creators' do
       ensure_topic_user
-      expect(TopicUser.get(topic,user).notification_level).to eq(TopicUser.notification_levels[:regular])
+      expect(TopicUser.get(topic, user).notification_level).to eq(TopicUser.notification_levels[:regular])
     end
 
     it 'reason should reset when changed' do
       topic.notify_muted!(topic.user)
-      expect(TopicUser.get(topic,topic.user).notifications_reason_id).to eq(TopicUser.notification_reasons[:user_changed])
+      expect(TopicUser.get(topic, topic.user).notifications_reason_id).to eq(TopicUser.notification_reasons[:user_changed])
     end
 
     it 'should have the correct reason for a user change when watched' do
@@ -190,7 +190,7 @@ describe TopicUser do
 
       TopicUser.track_visit!(topic.id, user.id)
       # reload is a no go
-      topic_user = TopicUser.get(topic,user)
+      topic_user = TopicUser.get(topic, user)
       expect(topic_user.first_visited_at.to_i).to eq(yesterday.to_i)
       expect(topic_user.last_visited_at.to_i).to eq(Time.zone.now.to_i)
 
@@ -201,7 +201,7 @@ describe TopicUser do
 
     context "without auto tracking" do
 
-      let(:topic_user) { TopicUser.get(topic,user) }
+      let(:topic_user) { TopicUser.get(topic, user) }
 
       it 'should create a new record for a visit' do
         freeze_time yesterday
@@ -225,7 +225,7 @@ describe TopicUser do
 
         Fabricate(:post, topic: topic, user: user)
         TopicUser.update_last_read(user, topic.id, 2, 0)
-        topic_user = TopicUser.get(topic,user)
+        topic_user = TopicUser.get(topic, user)
 
         expect(topic_user.last_read_post_number).to eq(2)
         expect(topic_user.last_visited_at.to_i).to eq(today.to_i)
@@ -370,7 +370,7 @@ describe TopicUser do
     TopicUser.exec_sql("UPDATE topic_users set highest_seen_post_number=1, last_read_post_number=0
                        WHERE topic_id = :topic_id AND user_id = :user_id", topic_id: p1.topic_id, user_id: p1.user_id)
 
-    [p1,p2].each do |p|
+    [p1, p2].each do |p|
       PostTiming.create(topic_id: p.topic_id, post_number: p.post_number, user_id: p.user_id, msecs: 100)
     end
 
diff --git a/spec/models/topic_view_item_spec.rb b/spec/models/topic_view_item_spec.rb
index ff5940a3a4..d811a56c40 100644
--- a/spec/models/topic_view_item_spec.rb
+++ b/spec/models/topic_view_item_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe TopicViewItem do
 
-  def add(topic_id, ip, user_id=nil)
+  def add(topic_id, ip, user_id = nil)
     skip_redis = true
     TopicViewItem.add(topic_id, ip, user_id, nil, skip_redis)
   end
diff --git a/spec/models/translation_override_spec.rb b/spec/models/translation_override_spec.rb
index 0a6dc00d57..e331a73e3d 100644
--- a/spec/models/translation_override_spec.rb
+++ b/spec/models/translation_override_spec.rb
@@ -19,19 +19,6 @@ describe TranslationOverride do
           ))
         end
       end
-
-      describe 'when interpolation keys are invalid' do
-        it 'should not be valid' do
-          translation_override = TranslationOverride.upsert!(
-            I18n.locale, 'some_key', '%{first} %{second} %{third}'
-          )
-
-          expect(translation_override.errors.full_messages).to include(I18n.t(
-            'activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys',
-            keys: 'third'
-          ))
-        end
-      end
     end
   end
 
diff --git a/spec/models/trust_level3_requirements_spec.rb b/spec/models/trust_level3_requirements_spec.rb
index 8b0ad4b4bf..1c99fd9ee9 100644
--- a/spec/models/trust_level3_requirements_spec.rb
+++ b/spec/models/trust_level3_requirements_spec.rb
@@ -10,7 +10,7 @@ describe TrustLevel3Requirements do
   end
 
   def make_view(id, at, user_id)
-    TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis=true)
+    TopicViewItem.add(id, '11.22.33.44', user_id, at, _skip_redis = true)
   end
 
   describe "requirements" do
@@ -125,12 +125,12 @@ describe TrustLevel3Requirements do
 
       _not_a_reply = create_post(user: user) # user created the topic, so it doesn't count
 
-      topic1      = create_post.topic
+      topic1 = create_post.topic
       _reply1      = create_post(topic: topic1, user: user)
       _reply_again = create_post(topic: topic1, user: user) # two replies in one topic
 
-      topic2      = create_post(created_at: 101.days.ago).topic
-      _reply2      = create_post(topic: topic2, user: user, created_at: 101.days.ago) # topic is over 100 days old
+      topic2 = create_post(created_at: 101.days.ago).topic
+      _reply2 = create_post(topic: topic2, user: user, created_at: 101.days.ago) # topic is over 100 days old
 
       expect(tl3_requirements.num_topics_replied_to).to eq(1)
     end
diff --git a/spec/models/twitter_user_info_spec.rb b/spec/models/twitter_user_info_spec.rb
index 708b3d4c60..6c664068ba 100644
--- a/spec/models/twitter_user_info_spec.rb
+++ b/spec/models/twitter_user_info_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe TwitterUserInfo do
   it "does not overflow" do
-    id =  22019458041
+    id = 22019458041
     info = TwitterUserInfo.create!(user_id: -1, screen_name: 'sam', twitter_user_id: id)
     info.reload
     expect(info.twitter_user_id).to eq(id)
diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb
index d6eaedee76..6625cc5fd8 100644
--- a/spec/models/upload_spec.rb
+++ b/spec/models/upload_spec.rb
@@ -46,6 +46,11 @@ describe Upload do
 
   end
 
+  it "extracts file extension" do
+    created_upload = UploadCreator.new(image, image_filename).create_for(user_id)
+    expect(created_upload.extension).to eq("png")
+  end
+
   context ".get_from_url" do
     let(:url) { "/uploads/default/original/3X/1/0/10f73034616a796dfd70177dc54b6def44c4ba6f.png" }
     let(:upload) { Fabricate(:upload, url: url) }
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index 73ccd9a067..181a8fb0d9 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -23,7 +23,7 @@ describe UserAction do
       topic
     end
 
-    def log_test_action(opts={})
+    def log_test_action(opts = {})
       UserAction.log_action!({
         action_type: UserAction::NEW_PRIVATE_MESSAGE,
         user_id: user.id,
@@ -41,11 +41,11 @@ describe UserAction do
       log_test_action(action_type: UserAction::BOOKMARK)
     end
 
-    def stats_for_user(viewer=nil)
-      UserAction.stats(user.id, Guardian.new(viewer)).map{|r| r["action_type"].to_i}.sort
+    def stats_for_user(viewer = nil)
+      UserAction.stats(user.id, Guardian.new(viewer)).map { |r| r["action_type"].to_i }.sort
     end
 
-    def stream_count(viewer=nil)
+    def stream_count(viewer = nil)
       UserAction.stream(user_id: user.id, guardian: Guardian.new(viewer)).count
     end
 
@@ -94,7 +94,7 @@ describe UserAction do
       # recategorize belongs to the right user
       category2 = Fabricate(:category)
       admin = Fabricate(:admin)
-      public_post.revise(admin, { category_id: category2.id})
+      public_post.revise(admin, category_id: category2.id)
 
       action = UserAction.stream(user_id: public_topic.user_id, guardian: Guardian.new)[0]
       expect(action.acting_user_id).to eq(admin.id)
@@ -198,7 +198,6 @@ describe UserAction do
       expect(@post.user.user_actions.find_by(action_type: UserAction::REPLY)).to eq(nil)
     end
 
-
     describe 'when another user posts on the topic' do
       before do
         @other_user = Fabricate(:coding_horror)
@@ -254,7 +253,7 @@ describe UserAction do
     end
 
     let(:private_message) do
-      PostCreator.create( user,
+      PostCreator.create(user,
                           raw: 'this is a private message',
                           title: 'this is the pm title',
                           target_usernames: user2.username,
diff --git a/spec/models/user_api_key_spec.rb b/spec/models/user_api_key_spec.rb
index 0ad783865b..90293fcba4 100644
--- a/spec/models/user_api_key_spec.rb
+++ b/spec/models/user_api_key_spec.rb
@@ -8,11 +8,10 @@ describe UserApiKey do
       expect(key.allow?("PATH_INFO" => "/random", "REQUEST_METHOD" => "GET")).to eq(false)
       expect(key.allow?("PATH_INFO" => "/message-bus/1234/poll", "REQUEST_METHOD" => "POST")).to eq(true)
 
-      expect(key.allow?("action_dispatch.request.path_parameters" => {:controller => "notifications", :action => "mark_read"},
+      expect(key.allow?("action_dispatch.request.path_parameters" => { controller: "notifications", action: "mark_read" },
                         "PATH_INFO" => "/xyz", "REQUEST_METHOD" => "PUT")).to eq(true)
 
-
-      expect(key.allow?("action_dispatch.request.path_parameters" => {:controller => "user_api_keys", :action => "revoke"},
+      expect(key.allow?("action_dispatch.request.path_parameters" => { controller: "user_api_keys", action: "revoke" },
                         "PATH_INFO" => "/xyz", "REQUEST_METHOD" => "POST")).to eq(true)
 
     end
diff --git a/spec/models/user_archived_message_spec.rb b/spec/models/user_archived_message_spec.rb
index cb3567b5db..060a097de8 100644
--- a/spec/models/user_archived_message_spec.rb
+++ b/spec/models/user_archived_message_spec.rb
@@ -7,7 +7,7 @@ describe UserArchivedMessage do
 
     topic = create_post(user: user,
                         skip_validations: true,
-                        target_usernames: [user2.username,user.username].join(","),
+                        target_usernames: [user2.username, user.username].join(","),
                         archetype: Archetype.private_message).topic
 
     UserArchivedMessage.archive!(user.id, topic.id)
@@ -18,4 +18,3 @@ describe UserArchivedMessage do
     expect(topic.message_archived?(user)).to eq(true)
   end
 end
-
diff --git a/spec/models/user_auth_token_spec.rb b/spec/models/user_auth_token_spec.rb
index 11ed5f8212..ffe003c43d 100644
--- a/spec/models/user_auth_token_spec.rb
+++ b/spec/models/user_auth_token_spec.rb
@@ -58,8 +58,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     expect(user_token.auth_token_seen).to eq(false)
 
@@ -75,8 +75,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     user_token.update_columns(auth_token_seen: true)
     expect(user_token.rotate!).to eq(true)
@@ -90,8 +90,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     UserAuthToken.lookup(user_token.unhashed_auth_token, seen: true)
 
@@ -118,8 +118,8 @@ describe UserAuthToken do
     user = Fabricate(:user)
 
     user_token = UserAuthToken.generate!(user_id: user.id,
-                                    user_agent: "some user agent 2",
-                                    client_ip: "1.1.2.3")
+                                         user_agent: "some user agent 2",
+                                         client_ip: "1.1.2.3")
 
     prev_auth_token = user_token.auth_token
     unhashed_prev = user_token.unhashed_auth_token
@@ -242,7 +242,6 @@ describe UserAuthToken do
       path: "/path"
     ).count).to eq(1)
 
-
     freeze_time(UserAuthToken::ROTATE_TIME.from_now)
 
     token.rotate!(user_agent: "firefox", client_ip: "1.1.1.1")
@@ -264,7 +263,6 @@ describe UserAuthToken do
                                     user_agent: "some user agent",
                                     client_ip: "1.1.2.3")
 
-
     lookup = UserAuthToken.lookup(token.unhashed_auth_token, seen: true)
     lookup = UserAuthToken.lookup(token.unhashed_auth_token, seen: true)
     lookup.reload
diff --git a/spec/models/user_avatar_spec.rb b/spec/models/user_avatar_spec.rb
index 46269b6a34..e76da53807 100644
--- a/spec/models/user_avatar_spec.rb
+++ b/spec/models/user_avatar_spec.rb
@@ -23,7 +23,6 @@ describe UserAvatar do
       user.user_avatar.destroy
       user.reload
 
-
       FileHelper.stubs(:download).returns(file_from_fixtures("logo.png"))
 
       UserAvatar.import_url_for_user("logo.png", user)
diff --git a/spec/models/user_history_spec.rb b/spec/models/user_history_spec.rb
index 659432d956..823dcc5440 100644
--- a/spec/models/user_history_spec.rb
+++ b/spec/models/user_history_spec.rb
@@ -21,8 +21,8 @@ describe UserHistory do
   describe '#staff_action_records' do
     context "with some records" do
       before do
-        @change_site_setting = UserHistory.create!({action: UserHistory.actions[:change_site_setting], subject: "title", previous_value: "Old", new_value: "New"})
-        @change_trust_level  = UserHistory.create!({action: UserHistory.actions[:change_trust_level], target_user_id: Fabricate(:user).id, details: "stuff happened"})
+        @change_site_setting = UserHistory.create!(action: UserHistory.actions[:change_site_setting], subject: "title", previous_value: "Old", new_value: "New")
+        @change_trust_level  = UserHistory.create!(action: UserHistory.actions[:change_trust_level], target_user_id: Fabricate(:user).id, details: "stuff happened")
       end
 
       it "returns all records for admins" do
diff --git a/spec/models/user_option_spec.rb b/spec/models/user_option_spec.rb
index 8b85a552a4..d494896cef 100644
--- a/spec/models/user_option_spec.rb
+++ b/spec/models/user_option_spec.rb
@@ -19,7 +19,7 @@ describe UserOption do
     let!(:user) { Fabricate(:user) }
 
     it "should be redirected to top when there is a reason to" do
-      user.user_option.expects(:redirected_to_top).returns({ reason: "42" })
+      user.user_option.expects(:redirected_to_top).returns(reason: "42")
       expect(user.user_option.should_be_redirected_to_top).to eq(true)
     end
 
@@ -87,10 +87,8 @@ describe UserOption do
             end
 
             it "should have a reason for the first visit" do
-              expect(user.user_option.redirected_to_top).to eq({
-                reason: I18n.t('redirected_to_top_reasons.new_user'),
-                period: :monthly
-              })
+              expect(user.user_option.redirected_to_top).to eq(reason: I18n.t('redirected_to_top_reasons.new_user'),
+                                                               period: :monthly)
             end
 
             it "should not have a reason for next visits" do
@@ -108,10 +106,8 @@ describe UserOption do
               user.last_seen_at = 2.months.ago
               user.user_option.expects(:update_last_redirected_to_top!).once
 
-              expect(user.user_option.redirected_to_top).to eq({
-                reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'),
-                period: :monthly
-              })
+              expect(user.user_option.redirected_to_top).to eq(reason: I18n.t('redirected_to_top_reasons.not_seen_in_a_month'),
+                                                               period: :monthly)
             end
 
           end
diff --git a/spec/models/user_profile_view_spec.rb b/spec/models/user_profile_view_spec.rb
index 8c4f8a56de..de82b167c7 100644
--- a/spec/models/user_profile_view_spec.rb
+++ b/spec/models/user_profile_view_spec.rb
@@ -5,14 +5,14 @@ RSpec.describe UserProfileView do
   let(:other_user) { Fabricate(:user) }
   let(:user_profile_id) { user.user_profile.id }
 
-  def add(user_profile_id, ip, user_id=nil, at=nil)
+  def add(user_profile_id, ip, user_id = nil, at = nil)
     described_class.add(user_profile_id, ip, user_id, at, true)
   end
 
   it "should increase user's profile view count" do
-    expect{ add(user_profile_id, '1.1.1.1') }.to change{ described_class.count }.by(1)
+    expect { add(user_profile_id, '1.1.1.1') }.to change { described_class.count }.by(1)
     expect(user.user_profile.reload.views).to eq(1)
-    expect{ add(user_profile_id, '1.1.1.1', other_user.id) }.to change{ described_class.count }.by(1)
+    expect { add(user_profile_id, '1.1.1.1', other_user.id) }.to change { described_class.count }.by(1)
 
     user_profile = user.user_profile.reload
     expect(user_profile.views).to eq(2)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2db4346b0d..4f5524ec9d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5,15 +5,15 @@ describe User do
 
   context 'validations' do
     it { is_expected.to validate_presence_of :username }
+    it { is_expected.to validate_presence_of :primary_email }
 
     describe 'emails' do
       let(:user) { Fabricate.build(:user) }
 
-      it { is_expected.to validate_presence_of :email }
-
       describe 'when record has a valid email' do
         it "should be valid" do
           user.email = 'test@gmail.com'
+
           expect(user).to be_valid
         end
       end
@@ -21,7 +21,19 @@ describe User do
       describe 'when record has an invalid email' do
         it 'should not be valid' do
           user.email = 'test@gmailcom'
+
           expect(user).to_not be_valid
+          expect(user.errors.messages).to include(:primary_email)
+        end
+      end
+
+      describe 'when user is staged' do
+        it 'should still validate primary_email' do
+          user.staged = true
+          user.primary_email = nil
+
+          expect(user).to_not be_valid
+          expect(user.errors.messages).to include(:primary_email)
         end
       end
     end
@@ -30,19 +42,18 @@ describe User do
   describe '#count_by_signup_date' do
     before(:each) do
       User.destroy_all
-      Timecop.freeze
+      freeze_time
       Fabricate(:user)
       Fabricate(:user, created_at: 1.day.ago)
       Fabricate(:user, created_at: 1.day.ago)
       Fabricate(:user, created_at: 2.days.ago)
       Fabricate(:user, created_at: 4.days.ago)
     end
-    after(:each) { Timecop.return }
-    let(:signups_by_day) { {1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1} }
+    let(:signups_by_day) { { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.now.utc.to_date => 1 } }
 
     it 'collect closed interval signups' do
       expect(User.count_by_signup_date(2.days.ago, Time.now)).to include(signups_by_day)
-      expect(User.count_by_signup_date(2.days.ago, Time.now)).not_to include({4.days.ago.to_date => 1})
+      expect(User.count_by_signup_date(2.days.ago, Time.now)).not_to include(4.days.ago.to_date => 1)
     end
   end
 
@@ -106,7 +117,6 @@ describe User do
     end
   end
 
-
   describe 'bookmark' do
     before do
       @post = Fabricate(:post)
@@ -283,7 +293,6 @@ describe User do
 
     end
 
-
   end
 
   describe 'staff and regular users' do
@@ -453,12 +462,12 @@ describe User do
     end
 
     it "should not allow saving if username is reused" do
-       @codinghorror.username = @user.username
+      @codinghorror.username = @user.username
        expect(@codinghorror.save).to eq(false)
     end
 
     it "should not allow saving if username is reused in different casing" do
-       @codinghorror.username = @user.username.upcase
+      @codinghorror.username = @user.username.upcase
        expect(@codinghorror.save).to eq(false)
     end
   end
@@ -715,14 +724,10 @@ describe User do
       let!(:date) { Time.zone.now }
 
       before do
-        Timecop.freeze(date)
+        freeze_time date
         user.update_last_seen!
       end
 
-      after do
-        Timecop.return
-      end
-
       it "updates last_seen_at" do
         expect(user.last_seen_at).to be_within_one_second_of(date)
       end
@@ -739,16 +744,12 @@ describe User do
       context "called twice" do
 
         before do
-          Timecop.freeze(date)
+          freeze_time date
           user.update_last_seen!
           user.update_last_seen!
           user.reload
         end
 
-        after do
-          Timecop.return
-        end
-
         it "doesn't increase days_visited twice" do
           expect(user.user_stat.days_visited).to eq(1)
         end
@@ -759,14 +760,10 @@ describe User do
         let!(:future_date) { 3.days.from_now }
 
         before do
-          Timecop.freeze(future_date)
+          freeze_time future_date
           user.update_last_seen!
         end
 
-        after do
-          Timecop.return
-        end
-
         it "should log a second visited_at record when we log an update later" do
           expect(user.user_visits.count).to eq(2)
         end
@@ -794,7 +791,7 @@ describe User do
 
     context 'when user has no email tokens for some reason' do
       it 'should return false' do
-        user.email_tokens.each {|t| t.destroy}
+        user.email_tokens.each { |t| t.destroy }
         user.reload
         expect(user.email_confirmed?).to eq(true)
       end
@@ -889,8 +886,8 @@ describe User do
 
   describe "#new_user_posting_on_first_day?" do
 
-    def test_user?(opts={})
-      Fabricate.build(:user, {created_at: Time.zone.now}.merge(opts)).new_user_posting_on_first_day?
+    def test_user?(opts = {})
+      Fabricate.build(:user, { created_at: Time.zone.now }.merge(opts)).new_user_posting_on_first_day?
     end
 
     it "handles when user has never posted" do
@@ -1119,7 +1116,6 @@ describe User do
     end
   end
 
-
   describe "automatic avatar creation" do
     it "sets a system avatar for new users" do
       SiteSetting.external_system_avatars_enabled = false
@@ -1152,7 +1148,7 @@ describe User do
       user.save
       user = User.find(user.id)
 
-      expect(user.custom_fields).to eq({"jack" => "jill"})
+      expect(user.custom_fields).to eq("jack" => "jill")
     end
   end
 
@@ -1497,7 +1493,7 @@ describe User do
 
   describe '.human_users' do
     it 'should only return users with a positive primary key' do
-      Fabricate(:user, id: -2)
+      Fabricate(:user, id: -1979)
       user = Fabricate(:user)
 
       expect(User.human_users).to eq([user])
diff --git a/spec/models/user_stat_spec.rb b/spec/models/user_stat_spec.rb
index f440d78b21..ccb9638d7a 100644
--- a/spec/models/user_stat_spec.rb
+++ b/spec/models/user_stat_spec.rb
@@ -72,7 +72,6 @@ describe UserStat do
     end
   end
 
-
   describe 'update_time_read!' do
     let(:user) { Fabricate(:user) }
     let(:stat) { user.user_stat }
diff --git a/spec/models/user_visit_spec.rb b/spec/models/user_visit_spec.rb
index 658d1a43c2..7532c73cb4 100644
--- a/spec/models/user_visit_spec.rb
+++ b/spec/models/user_visit_spec.rb
@@ -23,19 +23,18 @@ describe UserVisit do
 
   describe '#by_day' do
     before(:each) do
-      Timecop.freeze
+      freeze_time
       user.user_visits.create(visited_at: Time.zone.now)
       user.user_visits.create(visited_at: 1.day.ago)
       other_user.user_visits.create(visited_at: 1.day.ago)
       user.user_visits.create(visited_at: 2.days.ago)
       user.user_visits.create(visited_at: 4.days.ago)
     end
-    after(:each) { Timecop.return }
-    let(:visits_by_day) { {1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.zone.now.to_date => 1 } }
+    let(:visits_by_day) { { 1.day.ago.to_date => 2, 2.days.ago.to_date => 1, Time.zone.now.to_date => 1 } }
 
     it 'collect closed interval visits' do
       expect(UserVisit.by_day(2.days.ago, Time.zone.now)).to include(visits_by_day)
-      expect(UserVisit.by_day(2.days.ago, Time.zone.now)).not_to include({4.days.ago.to_date => 1})
+      expect(UserVisit.by_day(2.days.ago, Time.zone.now)).not_to include(4.days.ago.to_date => 1)
     end
   end
 end
diff --git a/spec/models/watched_word_spec.rb b/spec/models/watched_word_spec.rb
new file mode 100644
index 0000000000..7bc52d47e5
--- /dev/null
+++ b/spec/models/watched_word_spec.rb
@@ -0,0 +1,92 @@
+require 'rails_helper'
+
+describe WatchedWord do
+
+  it "can't have duplicate words" do
+    Fabricate(:watched_word, word: "darn", action: described_class.actions[:block])
+    w = Fabricate.build(:watched_word, word: "darn", action: described_class.actions[:block])
+    expect(w.save).to eq(false)
+    w = Fabricate.build(:watched_word, word: "darn", action: described_class.actions[:flag])
+    expect(w.save).to eq(false)
+    expect(described_class.count).to eq(1)
+  end
+
+  it "downcases words" do
+    expect(described_class.create(word: "ShooT").word).to eq('shoot')
+  end
+
+  it "strips leading and trailing spaces" do
+    expect(described_class.create(word: "  poutine  ").word).to eq('poutine')
+  end
+
+  it "squeezes multiple asterisks" do
+    expect(described_class.create(word: "a**les").word).to eq('a*les')
+  end
+
+  describe "action_key=" do
+    let(:w) { WatchedWord.new(word: "troll") }
+
+    it "sets action attr from symbol" do
+      described_class.actions.keys.each do |k|
+        w.action_key = k
+        expect(w.action).to eq(described_class.actions[k])
+      end
+    end
+
+    it "sets action attr from string" do
+      described_class.actions.keys.each do |k|
+        w.action_key = k.to_s
+        expect(w.action).to eq(described_class.actions[k])
+      end
+    end
+
+    it "sets error for invalid key" do
+      w.action_key = "shame"
+      expect(w).to_not be_valid
+      expect(w.errors[:action]).to be_present
+    end
+  end
+
+  describe '#create_or_update_word' do
+    it "can create a new record" do
+      expect {
+        w = described_class.create_or_update_word(word: 'nickelback', action_key: :block)
+        expect(w.reload.action).to eq(described_class.actions[:block])
+      }.to change { described_class.count }.by(1)
+    end
+
+    it "can update an existing record with different action" do
+      existing = Fabricate(:watched_word, action: described_class.actions[:flag])
+      expect {
+        w = described_class.create_or_update_word(word: existing.word, action_key: :block)
+        expect(w.reload.action).to eq(described_class.actions[:block])
+        expect(w.id).to eq(existing.id)
+      }.to_not change { described_class.count }
+    end
+
+    it "doesn't error for existing record with same action" do
+      existing = Fabricate(:watched_word, action: described_class.actions[:flag], created_at: 1.day.ago, updated_at: 1.day.ago)
+      expect {
+        w = described_class.create_or_update_word(word: existing.word, action_key: :flag)
+        expect(w.id).to eq(existing.id)
+        expect(w.updated_at).to eq(w.updated_at)
+      }.to_not change { described_class.count }
+    end
+
+    it "allows action param instead of action_key" do
+      expect {
+        w = described_class.create_or_update_word(word: 'nickelback', action: described_class.actions[:block])
+        expect(w.reload.action).to eq(described_class.actions[:block])
+      }.to change { described_class.count }.by(1)
+    end
+
+    it "normalizes input" do
+      existing = Fabricate(:watched_word, action: described_class.actions[:flag])
+      expect {
+        w = described_class.create_or_update_word(word: "  #{existing.word.upcase}  ", action_key: :block)
+        expect(w.reload.action).to eq(described_class.actions[:block])
+        expect(w.id).to eq(existing.id)
+      }.to_not change { described_class.count }
+    end
+  end
+end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index d65641ea7e..8a8c3092a1 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -113,7 +113,7 @@ describe WebHook do
       Fabricate(:topic_web_hook)
 
       Sidekiq::Testing.fake! do
-        post = PostCreator.create(user, { raw: 'post', title: 'topic', skip_validations: true })
+        post = PostCreator.create(user, raw: 'post', title: 'topic', skip_validations: true)
         topic_id = post.topic_id
         job_args = Jobs::EmitWebHookEvent.jobs.last["args"].first
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 6354862d9e..986bde936c 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -26,8 +26,8 @@ Spork.prefork do
 
   # Requires supporting ruby files with custom matchers and macros, etc,
   # in spec/support/ and its subdirectories.
-  Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
-  Dir[Rails.root.join("spec/fabricators/*.rb")].each {|f| require f}
+  Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+  Dir[Rails.root.join("spec/fabricators/*.rb")].each { |f| require f }
 
   # Require plugin helpers at plugin/[plugin]/spec/plugin_helper.rb (includes symlinked plugins).
   if ENV['LOAD_PLUGINS'] == "1"
@@ -64,7 +64,6 @@ Spork.prefork do
     config.infer_base_class_for_anonymous_controllers = true
 
     config.before(:suite) do
-
       Sidekiq.error_handlers.clear
 
       # Ugly, but needed until we have a user creator
@@ -80,8 +79,9 @@ Spork.prefork do
       # We nuke the DB storage provider from site settings, so need to yank out the existing settings
       #  and pretend they are default.
       # There are a bunch of settings that are seeded, they must be loaded as defaults
-      SiteSetting.current.each do |k,v|
-        SiteSetting.defaults[k] = v
+      SiteSetting.current.each do |k, v|
+        # skip setting defauls for settings that are in unloaded plugins
+        SiteSetting.defaults[k] = v if SiteSetting.respond_to? k
       end
 
       require_dependency 'site_settings/local_process_provider'
@@ -129,12 +129,12 @@ Spork.prefork do
     end
 
     class TestCurrentUserProvider < Auth::DefaultCurrentUserProvider
-      def log_on_user(user,session,cookies)
+      def log_on_user(user, session, cookies)
         session[:current_user_id] = user.id
         super
       end
 
-      def log_off_user(session,cookies)
+      def log_off_user(session, cookies)
         session[:current_user_id] = nil
         super
       end
@@ -142,19 +142,42 @@ Spork.prefork do
 
   end
 
-  def freeze_time(now=Time.now)
+  class TrackTimeStub
+    def self.stubbed
+      false
+    end
+  end
+
+  def freeze_time(now = Time.now)
     datetime = DateTime.parse(now.to_s)
     time = Time.parse(now.to_s)
 
     if block_given?
-      raise "Don't use a block with freeze_time"
+      raise "nested freeze time not supported" if TrackTimeStub.stubbed
     end
 
     DateTime.stubs(:now).returns(datetime)
     Time.stubs(:now).returns(time)
+    Date.stubs(:today).returns(datetime.to_date)
+    TrackTimeStub.stubs(:stubbed).returns(true)
+
+    if block_given?
+      begin
+        yield
+      ensure
+        unfreeze_time
+      end
+    end
   end
 
-  def file_from_fixtures(filename, directory="images")
+  def unfreeze_time
+    DateTime.unstub(:now)
+    Time.unstub(:now)
+    Date.unstub(:today)
+    TrackTimeStub.unstub(:stubbed)
+  end
+
+  def file_from_fixtures(filename, directory = "images")
     FileUtils.mkdir_p("#{Rails.root}/tmp/spec") unless Dir.exists?("#{Rails.root}/tmp/spec")
     FileUtils.cp("#{Rails.root}/spec/fixtures/#{directory}/#{filename}", "#{Rails.root}/tmp/spec/#{filename}")
     File.new("#{Rails.root}/tmp/spec/#{filename}")
diff --git a/spec/serializers/basic_group_serializer.rb b/spec/serializers/basic_group_serializer_spec.rb
similarity index 100%
rename from spec/serializers/basic_group_serializer.rb
rename to spec/serializers/basic_group_serializer_spec.rb
diff --git a/spec/serializers/basic_group_user_serializer_spec.rb b/spec/serializers/basic_group_user_serializer_spec.rb
new file mode 100644
index 0000000000..065981604e
--- /dev/null
+++ b/spec/serializers/basic_group_user_serializer_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+describe BasicGroupUserSerializer do
+  let(:group) { Fabricate(:group) }
+  let(:user) { Fabricate(:user) }
+
+  before do
+    group.add(user)
+  end
+
+  describe '#owner' do
+    describe 'when scoped to the user' do
+      it 'should be false' do
+        json = described_class.new(
+          GroupUser.last,
+          scope: Guardian.new(user),
+          root: false
+        ).as_json
+
+        expect(json[:owner]).to eq(false)
+      end
+    end
+
+    describe 'when not scoped to the user' do
+      it 'should be nil' do
+        json = described_class.new(
+          GroupUser.last,
+          scope: Guardian.new,
+          root: false
+        ).as_json
+
+        expect(json[:owner]).to eq(nil)
+      end
+    end
+  end
+end
diff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rb
index 5641ccd8d0..b90db108e5 100644
--- a/spec/serializers/group_show_serializer_spec.rb
+++ b/spec/serializers/group_show_serializer_spec.rb
@@ -1,6 +1,9 @@
 require 'rails_helper'
 
 describe GroupShowSerializer do
+  let(:user) { Fabricate(:user) }
+  let(:group) { Fabricate(:group) }
+
   context 'admin user' do
     let(:user) { Fabricate(:admin) }
     let(:group) { Fabricate(:group, users: [user]) }
@@ -14,9 +17,6 @@ describe GroupShowSerializer do
   end
 
   context 'group owner' do
-    let(:user) { Fabricate(:user) }
-    let(:group) { Fabricate(:group) }
-
     before do
       group.add_owner(user)
     end
@@ -28,4 +28,18 @@ describe GroupShowSerializer do
       expect(json[:group_show][:is_group_user]).to eq(true)
     end
   end
+
+  describe '#mentionable' do
+    let(:group) { Fabricate(:group, alias_level: Group::ALIAS_LEVELS[:everyone]) }
+
+    it 'should return the right value' do
+      json = GroupShowSerializer.new(group, scope: Guardian.new).as_json
+
+      expect(json[:group_show][:mentionable]).to eq(nil)
+
+      json = GroupShowSerializer.new(group, scope: Guardian.new(user)).as_json
+
+      expect(json[:group_show][:mentionable]).to eq(true)
+    end
+  end
 end
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index f1a08da400..50f9f08c65 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -9,8 +9,8 @@ describe PostSerializer do
     let(:admin) { Fabricate(:admin) }
     let(:acted_ids) {
       PostActionType.public_types.values
-        .concat([:notify_user,:spam]
-        .map{|k| PostActionType.types[k]})
+        .concat([:notify_user, :spam]
+        .map { |k| PostActionType.types[k] })
     }
 
     def visible_actions_for(user)
@@ -19,21 +19,21 @@ describe PostSerializer do
       serializer.post_actions = PostAction.counts_for([post], actor)[post.id] if user.try(:id) == actor.id
       actions = serializer.as_json[:actions_summary]
       lookup = PostActionType.types.invert
-      actions.keep_if{|a| (a[:count] || 0) > 0}.map{|a| lookup[a[:id]]}
+      actions.keep_if { |a| (a[:count] || 0) > 0 }.map { |a| lookup[a[:id]] }
     end
 
     before do
-      acted_ids.each do|id|
+      acted_ids.each do |id|
         PostAction.act(actor, post, id)
       end
       post.reload
     end
 
     it "displays the correct info" do
-      expect(visible_actions_for(actor).sort).to eq([:like,:notify_user,:spam,:vote])
-      expect(visible_actions_for(post.user).sort).to eq([:like,:vote])
-      expect(visible_actions_for(nil).sort).to eq([:like,:vote])
-      expect(visible_actions_for(admin).sort).to eq([:like,:notify_user,:spam,:vote])
+      expect(visible_actions_for(actor).sort).to eq([:like, :notify_user, :spam, :vote])
+      expect(visible_actions_for(post.user).sort).to eq([:like, :vote])
+      expect(visible_actions_for(nil).sort).to eq([:like, :vote])
+      expect(visible_actions_for(admin).sort).to eq([:like, :notify_user, :spam, :vote])
     end
 
     it "can't flag your own post to notify yourself" do
@@ -145,7 +145,6 @@ describe PostSerializer do
       end
     end
 
-
   end
 
 end
diff --git a/spec/serializers/user_serializer_spec.rb b/spec/serializers/user_serializer_spec.rb
index 599020d078..6ed8891c64 100644
--- a/spec/serializers/user_serializer_spec.rb
+++ b/spec/serializers/user_serializer_spec.rb
@@ -20,7 +20,7 @@ describe UserSerializer do
       # so we serialize more stuff
       SiteSetting.default_other_auto_track_topics_after_msecs = 0
       SiteSetting.default_other_notification_level_when_replying = 3
-      SiteSetting.default_other_new_topic_duration_minutes = 60*24
+      SiteSetting.default_other_new_topic_duration_minutes = 60 * 24
 
       user = Fabricate.build(:user,
                               user_profile: Fabricate.build(:user_profile),
@@ -31,7 +31,7 @@ describe UserSerializer do
       json = UserSerializer.new(user, scope: Guardian.new(user), root: false).as_json
 
       expect(json[:user_option][:dynamic_favicon]).to eq(true)
-      expect(json[:user_option][:new_topic_duration_minutes]).to eq(60*24)
+      expect(json[:user_option][:new_topic_duration_minutes]).to eq(60 * 24)
       expect(json[:user_option][:auto_track_topics_after_msecs]).to eq(0)
       expect(json[:user_option][:notification_level_when_replying]).to eq(3)
 
@@ -39,7 +39,7 @@ describe UserSerializer do
   end
 
   context "with a user" do
-    let(:user) { Fabricate.build(:user, user_profile: Fabricate.build(:user_profile) ) }
+    let(:user) { Fabricate.build(:user, user_profile: Fabricate.build(:user_profile)) }
     let(:serializer) { UserSerializer.new(user, scope: Guardian.new, root: false) }
     let(:json) { serializer.as_json }
 
@@ -57,7 +57,6 @@ describe UserSerializer do
       end
     end
 
-
     context "with `enable_names` false" do
       before do
         SiteSetting.enable_names = false
diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rb
index bda16a7824..2ec4ea90a7 100644
--- a/spec/services/anonymous_shadow_creator_spec.rb
+++ b/spec/services/anonymous_shadow_creator_spec.rb
@@ -48,7 +48,6 @@ describe AnonymousShadowCreator do
 
       expect(shadow.created_at).not_to eq(user.created_at)
 
-
       p = create_post
       expect(Guardian.new(shadow).post_can_act?(p, :like)).to eq(false)
       expect(Guardian.new(user).post_can_act?(p, :like)).to eq(true)
diff --git a/spec/services/auto_block_spec.rb b/spec/services/auto_block_spec.rb
index e4331ed233..f64d89d3f3 100644
--- a/spec/services/auto_block_spec.rb
+++ b/spec/services/auto_block_spec.rb
@@ -131,8 +131,8 @@ describe SpamRule::AutoBlock do
     subject       { described_class.new(user) }
 
     before do
-      described_class.stubs(:block?).with {|u| u.id != user.id }.returns(false)
-      described_class.stubs(:block?).with {|u| u.id == user.id }.returns(true)
+      described_class.stubs(:block?).with { |u| u.id != user.id }.returns(false)
+      described_class.stubs(:block?).with { |u| u.id == user.id }.returns(true)
       subject.stubs(:block?).returns(true)
     end
 
@@ -150,7 +150,7 @@ describe SpamRule::AutoBlock do
         SiteSetting.notify_mods_when_user_blocked = true
         moderator = Fabricate(:moderator)
         GroupMessage.expects(:create).with do |group, msg_type, params|
-          group == Group[:moderators].name and msg_type == :user_automatically_blocked and params[:user].id == user.id
+          group == (Group[:moderators].name) && msg_type == (:user_automatically_blocked) && params[:user].id == (user.id)
         end
         subject.block_user
       end
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index cb906c282d..64d4b96fa7 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -38,8 +38,10 @@ describe BadgeGranter do
   describe 'preview' do
     it 'can correctly preview' do
       Fabricate(:user, email: 'sam@gmail.com')
-      result = BadgeGranter.preview('select id user_id, null post_id, created_at granted_at from users
-                                     where email like \'%gmail.com\'', explain: true)
+      result = BadgeGranter.preview('select u.id user_id, null post_id, u.created_at granted_at from users u
+                                     join user_emails ue on ue.user_id = u.id AND ue.primary
+                                     where ue.email like \'%gmail.com\'', explain: true)
+
       expect(result[:grant_count]).to eq(1)
       expect(result[:query_plan]).to be_present
     end
@@ -81,7 +83,7 @@ describe BadgeGranter do
       }
 
       # TODO add welcome
-      expect(post.user.user_badges.pluck(:badge_id).sort).to eq([Badge::NiceTopic,Badge::GoodTopic])
+      expect(post.user.user_badges.pluck(:badge_id).sort).to eq([Badge::NiceTopic, Badge::GoodTopic])
 
       expect(post.user.notifications.count).to eq(2)
 
@@ -143,13 +145,11 @@ describe BadgeGranter do
     end
 
     it 'sets granted_at' do
-      time = Time.zone.now
-      Timecop.freeze time
+      time = 1.day.ago
+      freeze_time time
 
       user_badge = BadgeGranter.grant(badge, user)
-      expect(user_badge.granted_at).to eq(time)
-
-      Timecop.return
+      expect(user_badge.granted_at).to be_within(1.second).of(time)
     end
 
     it 'sets granted_by if the option is present' do
@@ -205,7 +205,7 @@ describe BadgeGranter do
     end
 
     it "grants autobiographer" do
-      user.user_profile.bio_raw  = "THIS IS MY bio it a long bio I like my bio"
+      user.user_profile.bio_raw = "THIS IS MY bio it a long bio I like my bio"
       user.uploaded_avatar_id = 10
       user.user_profile.save
       user.save
@@ -237,7 +237,7 @@ describe BadgeGranter do
 
       expect(UserBadge.where(user_id: user.id, badge_id: Badge::Editor).count).to eq(0)
 
-      PostRevisor.new(post).revise!(user, { raw: "This is my new test 1235 123" })
+      PostRevisor.new(post).revise!(user, raw: "This is my new test 1235 123")
       BadgeGranter.process_queue!
 
       expect(UserBadge.where(user_id: user.id, badge_id: Badge::Editor).count).to eq(1)
diff --git a/spec/services/color_scheme_revisor_spec.rb b/spec/services/color_scheme_revisor_spec.rb
index c2dc09d2c7..d8a2346951 100644
--- a/spec/services/color_scheme_revisor_spec.rb
+++ b/spec/services/color_scheme_revisor_spec.rb
@@ -25,8 +25,8 @@ describe ColorSchemeRevisor do
 
     it 'can change colors' do
       ColorSchemeRevisor.revise(color_scheme, valid_params.merge(colors: [
-        {name: color.name, hex: 'BEEF99'},
-        {name: 'bob', hex: 'AAAAAA'}
+        { name: color.name, hex: 'BEEF99' },
+        { name: 'bob', hex: 'AAAAAA' }
       ]))
       color_scheme.reload
 
@@ -39,7 +39,7 @@ describe ColorSchemeRevisor do
     it "doesn't make changes when a color is invalid" do
       expect {
         cs = ColorSchemeRevisor.revise(color_scheme, valid_params.merge(colors: [
-          {name: color.name, hex: 'OOPS'}
+          { name: color.name, hex: 'OOPS' }
         ]))
         expect(cs).not_to be_valid
         expect(cs.errors).to be_present
diff --git a/spec/services/group_action_logger_spec.rb b/spec/services/group_action_logger_spec.rb
index 0ec4efe261..ec08846c77 100644
--- a/spec/services/group_action_logger_spec.rb
+++ b/spec/services/group_action_logger_spec.rb
@@ -36,32 +36,90 @@ RSpec.describe GroupActionLogger do
   end
 
   describe '#log_add_user_to_group' do
-    it 'should create the right record' do
-      subject.log_add_user_to_group(user)
+    describe 'as a group owner' do
+      it 'should create the right record' do
+        subject.log_add_user_to_group(user)
 
-      group_history = GroupHistory.last
+        group_history = GroupHistory.last
 
-      expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
-      expect(group_history.acting_user).to eq(group_owner)
-      expect(group_history.target_user).to eq(user)
+        expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
+        expect(group_history.acting_user).to eq(group_owner)
+        expect(group_history.target_user).to eq(user)
+      end
+    end
+
+    context 'as a normal user' do
+      subject { described_class.new(user, group) }
+
+      describe 'user cannot freely exit group' do
+        it 'should not be allowed to log the action' do
+          expect { subject.log_add_user_to_group(user) }
+            .to raise_error(Discourse::InvalidParameters)
+        end
+      end
+
+      describe 'user can freely exit group' do
+        before do
+          group.update!(public_admission: true)
+        end
+
+        it 'should create the right record' do
+          subject.log_add_user_to_group(user)
+
+          group_history = GroupHistory.last
+
+          expect(group_history.action).to eq(GroupHistory.actions[:add_user_to_group])
+          expect(group_history.acting_user).to eq(user)
+          expect(group_history.target_user).to eq(user)
+        end
+      end
     end
   end
 
   describe '#log_remove_user_from_group' do
-    it 'should create the right record' do
-      subject.log_remove_user_from_group(user)
+    describe 'as group owner' do
+      it 'should create the right record' do
+        subject.log_remove_user_from_group(user)
 
-      group_history = GroupHistory.last
+        group_history = GroupHistory.last
 
-      expect(group_history.action).to eq(GroupHistory.actions[:remove_user_from_group])
-      expect(group_history.acting_user).to eq(group_owner)
-      expect(group_history.target_user).to eq(user)
+        expect(group_history.action).to eq(GroupHistory.actions[:remove_user_from_group])
+        expect(group_history.acting_user).to eq(group_owner)
+        expect(group_history.target_user).to eq(user)
+      end
+    end
+
+    context 'as a normal user' do
+      subject { described_class.new(user, group) }
+
+      describe 'user cannot freely exit group' do
+        it 'should not be allowed to log the action' do
+          expect { subject.log_remove_user_from_group(user) }
+            .to raise_error(Discourse::InvalidParameters)
+        end
+      end
+
+      describe 'user can freely exit group' do
+        before do
+          group.update!(public_exit: true)
+        end
+
+        it 'should create the right record' do
+          subject.log_remove_user_from_group(user)
+
+          group_history = GroupHistory.last
+
+          expect(group_history.action).to eq(GroupHistory.actions[:remove_user_from_group])
+          expect(group_history.acting_user).to eq(user)
+          expect(group_history.target_user).to eq(user)
+        end
+      end
     end
   end
 
   describe '#log_change_group_settings' do
     it 'should create the right record' do
-      group.update_attributes!(public: true, created_at: Time.zone.now)
+      group.update_attributes!(public_admission: true, created_at: Time.zone.now)
 
       expect { subject.log_change_group_settings }.to change { GroupHistory.count }.by(1)
 
@@ -69,7 +127,7 @@ RSpec.describe GroupActionLogger do
 
       expect(group_history.action).to eq(GroupHistory.actions[:change_group_setting])
       expect(group_history.acting_user).to eq(group_owner)
-      expect(group_history.subject).to eq('public')
+      expect(group_history.subject).to eq('public_admission')
       expect(group_history.prev_value).to eq('f')
       expect(group_history.new_value).to eq('t')
     end
diff --git a/spec/services/group_message_spec.rb b/spec/services/group_message_spec.rb
index b4ddeaff04..206ea4a8e4 100644
--- a/spec/services/group_message_spec.rb
+++ b/spec/services/group_message_spec.rb
@@ -11,19 +11,19 @@ describe GroupMessage do
     Discourse.stubs(:system_user).returns(admin)
   end
 
-  subject(:send_group_message) { GroupMessage.create(moderators_group, :user_automatically_blocked, {user: user}) }
+  subject(:send_group_message) { GroupMessage.create(moderators_group, :user_automatically_blocked, user: user) }
 
   describe 'not sent recently' do
     before { GroupMessage.any_instance.stubs(:sent_recently?).returns(false) }
 
     it 'should send a private message to the given group' do
       PostCreator.expects(:create).with do |from_user, opts|
-          from_user.id == admin.id and
-            opts[:target_group_names] and opts[:target_group_names].include?(Group[:moderators].name) and
-            opts[:archetype] == Archetype.private_message and
-            opts[:title].present? and
-            opts[:raw].present?
-        end.returns(stub_everything)
+        from_user.id == (admin.id) &&
+          opts[:target_group_names] && opts[:target_group_names].include?(Group[:moderators].name) &&
+          opts[:archetype] == (Archetype.private_message) &&
+          opts[:title].present? &&
+          opts[:raw].present?
+      end.returns(stub_everything)
       send_group_message
     end
 
@@ -42,7 +42,7 @@ describe GroupMessage do
 
   describe 'sent recently' do
     before  { GroupMessage.any_instance.stubs(:sent_recently?).returns(true) }
-    subject { GroupMessage.create(moderators_group, :user_automatically_blocked, {user: user}) }
+    subject { GroupMessage.create(moderators_group, :user_automatically_blocked, user: user) }
 
     it { is_expected.to eq(false) }
 
@@ -62,19 +62,19 @@ describe GroupMessage do
     end
 
     context 'user_automatically_blocked' do
-      subject { GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user}).message_params }
+      subject { GroupMessage.new(moderators_group, :user_automatically_blocked, user: user).message_params }
       include_examples 'common message params for group messages'
     end
 
     context 'spam_post_blocked' do
-      subject { GroupMessage.new(moderators_group, :spam_post_blocked, {user: user}).message_params }
+      subject { GroupMessage.new(moderators_group, :spam_post_blocked, user: user).message_params }
       include_examples 'common message params for group messages'
     end
   end
 
   describe 'methods that use redis' do
     let(:user)              { Fabricate.build(:user, id: 123123) }
-    subject(:group_message) { GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user}) }
+    subject(:group_message) { GroupMessage.new(moderators_group, :user_automatically_blocked, user: user) }
     before do
       PostCreator.stubs(:create).returns(stub_everything)
       group_message.stubs(:sent_recently_key).returns('the_key')
@@ -92,7 +92,7 @@ describe GroupMessage do
       end
 
       it 'always returns false if limit_once_per is false' do
-        gm = GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user, limit_once_per: false})
+        gm = GroupMessage.new(moderators_group, :user_automatically_blocked, user: user, limit_once_per: false)
         gm.stubs(:sent_recently_key).returns('the_key')
         $redis.stubs(:get).with(gm.sent_recently_key).returns('1')
         expect(gm.sent_recently?).to be_falsey
@@ -107,12 +107,12 @@ describe GroupMessage do
 
       it 'can use a given expiry time' do
         $redis.expects(:setex).with(anything, 30 * 60, anything).returns('OK')
-        GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user, limit_once_per: 30.minutes}).remember_message_sent
+        GroupMessage.new(moderators_group, :user_automatically_blocked, user: user, limit_once_per: 30.minutes).remember_message_sent
       end
 
       it 'can be disabled' do
         $redis.expects(:setex).never
-        GroupMessage.new(moderators_group, :user_automatically_blocked, {user: user, limit_once_per: false}).remember_message_sent
+        GroupMessage.new(moderators_group, :user_automatically_blocked, user: user, limit_once_per: false).remember_message_sent
       end
     end
   end
diff --git a/spec/services/notification_emailer_spec.rb b/spec/services/notification_emailer_spec.rb
index 8e44538af3..ce107f47bf 100644
--- a/spec/services/notification_emailer_spec.rb
+++ b/spec/services/notification_emailer_spec.rb
@@ -10,7 +10,7 @@ describe NotificationEmailer do
   let(:post) { Fabricate(:post, topic: topic) }
 
   # something is off with fabricator
-  def create_notification(type, user=nil)
+  def create_notification(type, user = nil)
     user ||= Fabricate(:user)
     Notification.create(data: "{\"a\": 1}",
                         user: user,
@@ -22,7 +22,7 @@ describe NotificationEmailer do
   shared_examples "enqueue" do
 
     it "enqueues a job for the email" do
-      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification,type))
+      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
       NotificationEmailer.process_notification(notification)
     end
 
@@ -36,7 +36,7 @@ describe NotificationEmailer do
 
       it "enqueues a job if the user is staged" do
         notification.user.staged = true
-        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification,type))
+        Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
         NotificationEmailer.process_notification(notification)
       end
     end
@@ -96,7 +96,7 @@ describe NotificationEmailer do
 
     it "enqueue a delayed job for users that are online" do
       notification.user.last_seen_at = 1.minute.ago
-      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification,type))
+      Jobs.expects(:enqueue_in).with(delay, :user_email, NotificationEmailer::EmailUser.notification_params(notification, type))
       NotificationEmailer.process_notification(notification)
     end
 
diff --git a/spec/services/post_action_notifier_spec.rb b/spec/services/post_action_notifier_spec.rb
index 0f6f594525..e69ad79664 100644
--- a/spec/services/post_action_notifier_spec.rb
+++ b/spec/services/post_action_notifier_spec.rb
@@ -33,7 +33,7 @@ describe PostActionNotifier do
   context 'when editing a post' do
     it 'notifies a user of the revision' do
       expect {
-        post.revise(evil_trout, { raw: "world is the new body of the message" })
+        post.revise(evil_trout, raw: "world is the new body of the message")
       }.to change(post.user.notifications, :count).by(1)
     end
 
@@ -41,16 +41,15 @@ describe PostActionNotifier do
 
       before { SiteSetting.disable_edit_notifications = true }
 
-
       it 'notifies a user of the revision made by another user' do
         expect {
-          post.revise(evil_trout, { raw: "world is the new body of the message" })
+          post.revise(evil_trout, raw: "world is the new body of the message")
         }.to change(post.user.notifications, :count).by(1)
       end
 
       it 'does not notifiy a user of the revision made by the system user' do
         expect {
-          post.revise(Discourse.system_user, { raw: "world is the new body of the message" })
+          post.revise(Discourse.system_user, raw: "world is the new body of the message")
         }.not_to change(post.user.notifications, :count)
       end
 
@@ -60,7 +59,7 @@ describe PostActionNotifier do
 
   context 'private message' do
     let(:user) { Fabricate(:user) }
-    let(:mention_post) { Fabricate(:post, user: user, raw: 'Hello @eviltrout')}
+    let(:mention_post) { Fabricate(:post, user: user, raw: 'Hello @eviltrout') }
     let(:topic) do
       topic = mention_post.topic
       topic.update_columns archetype: Archetype.private_message, category_id: nil
@@ -86,7 +85,7 @@ describe PostActionNotifier do
 
   context 'moderator action post' do
     let(:user) { Fabricate(:user) }
-    let(:first_post) { Fabricate(:post, user: user, raw: 'A useless post for you.')}
+    let(:first_post) { Fabricate(:post, user: user, raw: 'A useless post for you.') }
     let(:topic) { first_post.topic }
 
     it 'should not notify anyone' do
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 1a8103a4d1..9bbd4b23a6 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -5,7 +5,7 @@ describe PostAlerter do
   let!(:evil_trout) { Fabricate(:evil_trout) }
   let(:user) { Fabricate(:user) }
 
-  def create_post_with_alerts(args={})
+  def create_post_with_alerts(args = {})
     post = Fabricate(:post, args)
     PostAlerter.post_created(post)
   end
@@ -43,7 +43,21 @@ describe PostAlerter do
       # yes notification cause we were replied to
       expect(Notification.where(user_id: pm.user_id).count).to eq(1)
 
+    end
 
+    it "triggers :before_create_notifications_for_users" do
+      pm = Fabricate(:topic, archetype: 'private_message', category_id: nil)
+      op = Fabricate(:post, user_id: pm.user_id, topic: pm)
+      user1 = Fabricate(:user)
+      user2 = Fabricate(:user)
+      group = Fabricate(:group, users: [user2])
+      pm.allowed_users << user1
+      pm.allowed_groups << group
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(op)
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user1], op])
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user2], op])
     end
   end
 
@@ -51,11 +65,10 @@ describe PostAlerter do
     it "does not return whispers as unread posts" do
       op = Fabricate(:post)
       _whisper = Fabricate(:post, raw: 'this is a whisper post',
-                                 user: Fabricate(:admin),
-                                 topic: op.topic,
-                                 reply_to_post_number: op.post_number,
-                                 post_type: Post.types[:whisper])
-
+                                  user: Fabricate(:admin),
+                                  topic: op.topic,
+                                  reply_to_post_number: op.post_number,
+                                  post_type: Post.types[:whisper])
 
       expect(PostAlerter.new.first_unread_post(op.user, op.topic)).to be_blank
     end
@@ -68,18 +81,16 @@ describe PostAlerter do
       post = Fabricate(:post, raw: 'I love waffles')
 
       admin = Fabricate(:admin)
-      post.revise(admin, {raw: 'I made a revision'})
+      post.revise(admin, raw: 'I made a revision')
 
       # skip this notification cause we already notified on a similar edit
-      Timecop.freeze(2.hours.from_now) do
-        post.revise(admin, {raw: 'I made another revision'})
-      end
+      freeze_time 2.hours.from_now
+      post.revise(admin, raw: 'I made another revision')
 
-      post.revise(Fabricate(:admin), {raw: 'I made a revision'})
+      post.revise(Fabricate(:admin), raw: 'I made a revision')
 
-      Timecop.freeze(4.hours.from_now) do
-        post.revise(admin, {raw: 'I made another revision'})
-      end
+      freeze_time 2.hours.from_now
+      post.revise(admin, raw: 'I made another revision')
 
       expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(3)
     end
@@ -122,20 +133,27 @@ describe PostAlerter do
       PostAction.act(admin, post, PostActionType.types[:like])
 
       # one like
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
+        .to eq(1)
 
-
-      post.user.user_option.update_columns(like_notification_frequency:
-                                           UserOption.like_notification_frequency_type[:always])
+      post.user.user_option.update_columns(
+        like_notification_frequency: UserOption.like_notification_frequency_type[:always]
+      )
 
       admin2 = Fabricate(:admin)
+
+      # Travel 1 hour in time to test that order post_actions by `created_at`
+      freeze_time 1.hour.from_now
       PostAction.act(admin2, post, PostActionType.types[:like])
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
+
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
+        .to eq(1)
 
       # adds info to the notification
-      notification = Notification.find_by(post_number: 1,
-                                          topic_id: post.topic_id)
-
+      notification = Notification.find_by(
+        post_number: 1,
+        topic_id: post.topic_id
+      )
 
       expect(notification.data_hash["count"].to_i).to eq(2)
       expect(notification.data_hash["username2"]).to eq(evil_trout.username)
@@ -144,15 +162,18 @@ describe PostAlerter do
       PostAction.remove_act(evil_trout, post, PostActionType.types[:like])
 
       # rebuilds the missing notification
-      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(1)
-      notification = Notification.find_by(post_number: 1,
-                                          topic_id: post.topic_id)
+      expect(Notification.where(post_number: 1, topic_id: post.topic_id).count)
+        .to eq(1)
+
+      notification = Notification.find_by(
+        post_number: 1,
+        topic_id: post.topic_id
+      )
 
       expect(notification.data_hash["count"]).to eq(2)
       expect(notification.data_hash["username"]).to eq(admin2.username)
       expect(notification.data_hash["username2"]).to eq(admin.username)
 
-
       post.user.user_option.update_columns(like_notification_frequency:
                                            UserOption.like_notification_frequency_type[:first_time_and_daily])
 
@@ -160,10 +181,10 @@ describe PostAlerter do
       admin3 = Fabricate(:admin)
       PostAction.act(admin3, post, PostActionType.types[:like])
 
-      Timecop.freeze(2.days.from_now) do
-        admin4 = Fabricate(:admin)
-        PostAction.act(admin4, post, PostActionType.types[:like])
-      end
+      freeze_time 2.days.from_now
+
+      admin4 = Fabricate(:admin)
+      PostAction.act(admin4, post, PostActionType.types[:like])
 
       # first happend within the same day, no need to notify
       expect(Notification.where(post_number: 1, topic_id: post.topic_id).count).to eq(2)
@@ -191,7 +212,7 @@ describe PostAlerter do
     it "won't notify the user a second time on revision" do
       p1 = create_post_with_alerts(raw: '[quote="Evil Trout, post:1"]whatup[/quote]')
       expect {
-        p1.revise(p1.user, { raw: '[quote="Evil Trout, post:1"]whatup now?[/quote]' })
+        p1.revise(p1.user, raw: '[quote="Evil Trout, post:1"]whatup now?[/quote]')
       }.not_to change(evil_trout.notifications, :count)
     end
 
@@ -201,13 +222,23 @@ describe PostAlerter do
         Fabricate(:post, topic: topic, user: topic.user, raw: '[quote="Bruce Wayne, post:1"]whatup[/quote]')
       }.not_to change(topic.user.notifications, :count)
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      post = Fabricate(:post, raw: '[quote="EvilTrout, post:1"]whatup[/quote]')
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(post)
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], post])
+    end
   end
 
   context 'linked' do
+    let(:post1) { create_post }
+    let(:user) { post1.user }
+    let(:linking_post) { create_post(raw: "my magic topic\n##{Discourse.base_url}#{post1.url}") }
+
     it "will notify correctly on linking" do
-      post1 = create_post
-      user = post1.user
-      create_post(raw: "my magic topic\n##{Discourse.base_url}#{post1.url}")
+      linking_post
 
       expect(user.notifications.count).to eq(1)
 
@@ -228,17 +259,24 @@ describe PostAlerter do
       expect(PostAlerter.new.extract_linked_users(post1).length).to eq(0)
 
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      events = DiscourseEvent.track_events do
+        linking_post
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], linking_post])
+    end
   end
 
   context '@group mentions' do
 
+    let(:group) { Fabricate(:group, name: 'group', alias_level: Group::ALIAS_LEVELS[:everyone]) }
+    let(:post) { create_post_with_alerts(raw: "Hello @group how are you?") }
+    before { group.add(evil_trout) }
+
     it 'notifies users correctly' do
-
-      group = Fabricate(:group, name: 'group', alias_level: Group::ALIAS_LEVELS[:everyone])
-      group.add(evil_trout)
-
       expect {
-        create_post_with_alerts(raw: "Hello @group how are you?")
+        post
       }.to change(evil_trout.notifications, :count).by(1)
 
       expect(GroupMention.count).to eq(1)
@@ -258,11 +296,18 @@ describe PostAlerter do
 
       expect(GroupMention.count).to eq(3)
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      events = DiscourseEvent.track_events do
+        post
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], post])
+    end
   end
 
   context '@mentions' do
 
-    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout')}
+    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout') }
     let(:topic) { mention_post.topic }
 
     it 'notifies a user' do
@@ -274,7 +319,7 @@ describe PostAlerter do
     it "won't notify the user a second time on revision" do
       mention_post
       expect {
-        mention_post.revise(mention_post.user, { raw: "New raw content that still mentions @eviltrout" })
+        mention_post.revise(mention_post.user, raw: "New raw content that still mentions @eviltrout")
       }.not_to change(evil_trout.notifications, :count)
     end
 
@@ -286,15 +331,22 @@ describe PostAlerter do
       }.not_to change(user.notifications, :count)
     end
 
+    it "triggers :before_create_notifications_for_users" do
+      events = DiscourseEvent.track_events do
+        mention_post
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[evil_trout], mention_post])
+    end
+
   it "notification comes from editor is mention is added later" do
-      admin = Fabricate(:admin)
+    admin = Fabricate(:admin)
       post = create_post_with_alerts(user: user, raw: 'No mention here.')
       expect {
-        post.revise(admin, { raw: "Mention @eviltrout in this edit." })
+        post.revise(admin, raw: "Mention @eviltrout in this edit.")
       }.to change(evil_trout.notifications, :count)
       n = evil_trout.notifications.last
       expect(n.data_hash["original_username"]).to eq(admin.username)
-    end
+  end
   end
 
   describe ".create_notification" do
@@ -322,10 +374,22 @@ describe PostAlerter do
 
       expect(user.notifications.last.data_hash["topic_title"]).to eq(original_title)
     end
+
+    it "triggers :post_notification_alert" do
+
+    end
+
+    it "triggers :before_create_notification" do
+      type = Notification.types[:private_message]
+      events = DiscourseEvent.track_events do
+        PostAlerter.new.create_notification(user, type, post, {})
+      end
+      expect(events).to include(event_name: :before_create_notification, params: [user, type, post, {}])
+    end
   end
 
   describe "push_notification" do
-    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:')}
+    let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:') }
     let(:topic) { mention_post.topic }
 
     it "pushes nothing to suspended users" do
@@ -361,7 +425,7 @@ describe PostAlerter do
       body = nil
       headers = nil
 
-      Excon.expects(:post).with{|_req, _body|
+      Excon.expects(:post).with { |_req, _body|
         headers = _body[:headers]
         body = _body[:body]
       }.returns("OK")
@@ -447,5 +511,59 @@ describe PostAlerter do
       PostAlerter.post_created(post)
       expect(user.notifications.where(notification_type: Notification.types[:watching_first_post]).count).to eq(1)
     end
+
+    it "triggers :before_create_notifications_for_users" do
+      level = CategoryUser.notification_levels[:watching_first_post]
+      CategoryUser.set_notification_level_for_category(user, level, category.id)
+      events = DiscourseEvent.track_events do
+        PostAlerter.new.after_save_post(post, true)
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
+    end
+  end
+
+  context "replies" do
+    it "triggers :before_create_notifications_for_users" do
+      user = Fabricate(:user)
+      topic = Fabricate(:topic)
+      post = Fabricate(:post, user: user, topic: topic)
+      reply = Fabricate(:post, topic: topic, reply_to_post_number: 1)
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(reply)
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], reply])
+    end
+  end
+
+  context "watching" do
+    it "triggers :before_create_notifications_for_users" do
+      user = Fabricate(:user)
+      category = Fabricate(:category)
+      topic = Fabricate(:topic, category: category)
+      post = Fabricate(:post, topic: topic)
+      level = CategoryUser.notification_levels[:watching]
+      CategoryUser.set_notification_level_for_category(user, level, category.id)
+      events = DiscourseEvent.track_events do
+        PostAlerter.post_created(post)
+      end
+      expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
+    end
+  end
+
+  context "tags" do
+    context "watching" do
+      it "triggers :before_create_notifications_for_users" do
+        user = Fabricate(:user)
+        tag = Fabricate(:tag)
+        topic = Fabricate(:topic, tags: [tag])
+        post = Fabricate(:post, topic: topic)
+        level = TagUser.notification_levels[:watching]
+        TagUser.change(user.id, tag.id, level)
+        events = DiscourseEvent.track_events do
+          PostAlerter.post_created(post)
+        end
+        expect(events).to include(event_name: :before_create_notifications_for_users, params: [[user], post])
+      end
+    end
   end
 end
diff --git a/spec/services/post_owner_changer_spec.rb b/spec/services/post_owner_changer_spec.rb
index 10fb1cebec..52acee5245 100644
--- a/spec/services/post_owner_changer_spec.rb
+++ b/spec/services/post_owner_changer_spec.rb
@@ -79,11 +79,10 @@ describe PostOwnerChanger do
           topic_reply_count: 1
         )
 
-        UserAction.create!( action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
-                            target_post_id: -1, target_topic_id: p1.topic_id, created_at: p1.created_at )
-        UserAction.create!( action_type: UserAction::REPLY, user_id: p2user.id, acting_user_id: p2user.id,
-                            target_post_id: p2.id, target_topic_id: p2.topic_id, created_at: p2.created_at )
-
+        UserAction.create!(action_type: UserAction::NEW_TOPIC, user_id: p1user.id, acting_user_id: p1user.id,
+                           target_post_id: -1, target_topic_id: p1.topic_id, created_at: p1.created_at)
+        UserAction.create!(action_type: UserAction::REPLY, user_id: p2user.id, acting_user_id: p2user.id,
+                           target_post_id: p2.id, target_topic_id: p2.topic_id, created_at: p2.created_at)
 
         UserActionCreator.enable
       end
diff --git a/spec/services/random_topic_selector_spec.rb b/spec/services/random_topic_selector_spec.rb
index 18decd73c7..8b0dbbccf4 100644
--- a/spec/services/random_topic_selector_spec.rb
+++ b/spec/services/random_topic_selector_spec.rb
@@ -12,13 +12,13 @@ describe RandomTopicSelector do
     end
 
     expect(RandomTopicSelector.next(0)).to eq([])
-    expect(RandomTopicSelector.next(2)).to eq([0,1])
+    expect(RandomTopicSelector.next(2)).to eq([0, 1])
 
     $redis.expects(:multi).returns(Discourse.received_readonly!)
-    expect(RandomTopicSelector.next(2)).to eq([2,3])
+    expect(RandomTopicSelector.next(2)).to eq([2, 3])
     $redis.unstub(:multi)
 
-    expect(RandomTopicSelector.next(2)).to eq([2,3])
+    expect(RandomTopicSelector.next(2)).to eq([2, 3])
     expect(RandomTopicSelector.next(2)).to eq([])
   end
 
@@ -29,6 +29,6 @@ describe RandomTopicSelector do
     _t3 = Fabricate(:topic, category_id: category.id, deleted_at: 1.minute.ago)
     t4 = Fabricate(:topic, category_id: category.id)
 
-    expect(RandomTopicSelector.next(5, category).sort).to eq([t1.id,t4.id].sort)
+    expect(RandomTopicSelector.next(5, category).sort).to eq([t1.id, t4.id].sort)
   end
 end
diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb
index b6cdc0a85b..7fb6575467 100644
--- a/spec/services/staff_action_logger_spec.rb
+++ b/spec/services/staff_action_logger_spec.rb
@@ -151,7 +151,7 @@ describe StaffActionLogger do
     end
 
     it "logs updated site customizations" do
-      old_json = ThemeSerializer.new(theme, root:false).to_json
+      old_json = ThemeSerializer.new(theme, root: false).to_json
 
       theme.set_field(target: :common, name: :scss, value: "body{margin: 10px;}")
 
@@ -160,7 +160,7 @@ describe StaffActionLogger do
       expect(log_record.previous_value).to be_present
 
       json = ::JSON.parse(log_record.new_value)
-      expect(json['theme_fields']).to eq([{"name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1}])
+      expect(json['theme_fields']).to eq([{ "name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1 }])
     end
   end
 
@@ -178,7 +178,7 @@ describe StaffActionLogger do
       expect(log_record.new_value).to eq(nil)
       json = ::JSON.parse(log_record.previous_value)
 
-      expect(json['theme_fields']).to eq([{"name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1}])
+      expect(json['theme_fields']).to eq([{ "name" => "scss", "target" => "common", "value" => "body{margin: 10px;}", "type_id" => 1 }])
     end
   end
 
@@ -278,11 +278,9 @@ describe StaffActionLogger do
     end
 
     it "creates the UserHistory record" do
-      logged = logger.log_custom('clicked_something', {
-        evil: 'trout',
-        clicked_on: 'thing',
-        topic_id: 1234
-      })
+      logged = logger.log_custom('clicked_something',         evil: 'trout',
+                                                              clicked_on: 'thing',
+                                                              topic_id: 1234)
       expect(logged).to be_valid
       expect(logged.details).to eq("evil: trout\nclicked_on: thing")
       expect(logged.action).to eq(UserHistory.actions[:custom_staff])
@@ -308,7 +306,7 @@ describe StaffActionLogger do
       category.update!(attributes)
 
       logger.log_category_settings_change(category, attributes,
-        { category_group.group_name => category_group.permission_type }
+        category_group.group_name => category_group.permission_type
       )
 
       expect(UserHistory.count).to eq(2)
@@ -331,7 +329,7 @@ describe StaffActionLogger do
       old_permission = category.permissions_params
       category.update!(attributes)
 
-      logger.log_category_settings_change(category, attributes.merge({ permissions: { "everyone" => 1 } }), old_permission)
+      logger.log_category_settings_change(category, attributes.merge(permissions: { "everyone" => 1 }), old_permission)
 
       expect(UserHistory.count).to eq(1)
       expect(UserHistory.find_by_subject('name').category).to eq(category)
diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
index 1e9821adeb..1cc740dab2 100644
--- a/spec/services/topic_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -21,26 +21,25 @@ describe TopicTimestampChanger do
       let(:new_timestamp) { old_timestamp - 2.day }
 
       it 'changes the timestamp of the topic and opening post' do
-        Timecop.freeze do
-          TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+        freeze_time
+        TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
 
-          topic.reload
-          [:created_at, :updated_at, :bumped_at].each do |column|
-            expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
-          end
-
-          p1.reload
-          [:created_at, :updated_at].each do |column|
-            expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
-          end
-
-          p2.reload
-          [:created_at, :updated_at].each do |column|
-            expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
-          end
-
-          expect(topic.last_posted_at).to be_within(1.second).of(p2.reload.created_at)
+        topic.reload
+        [:created_at, :updated_at, :bumped_at].each do |column|
+          expect(topic.public_send(column)).to be_within(1.second).of(new_timestamp)
         end
+
+        p1.reload
+        [:created_at, :updated_at].each do |column|
+          expect(p1.public_send(column)).to be_within(1.second).of(new_timestamp)
+        end
+
+        p2.reload
+        [:created_at, :updated_at].each do |column|
+          expect(p2.public_send(column)).to be_within(1.second).of(new_timestamp + 1.day)
+        end
+
+        expect(topic.last_posted_at).to be_within(1.second).of(p2.reload.created_at)
       end
 
       describe 'when posts have timestamps in the future' do
@@ -48,15 +47,16 @@ describe TopicTimestampChanger do
         let(:p3) { Fabricate(:post, topic: topic, created_at: new_timestamp + 3.day) }
 
         it 'should set the new timestamp as the default timestamp' do
-          Timecop.freeze do
-            p3
-            TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+          freeze_time
 
-            p3.reload
+          p3
 
-            [:created_at, :updated_at].each do |column|
-              expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
-            end
+          TopicTimestampChanger.new(topic: topic, timestamp: new_timestamp.to_f).change!
+
+          p3.reload
+
+          [:created_at, :updated_at].each do |column|
+            expect(p3.public_send(column)).to be_within(1.second).of(new_timestamp)
           end
         end
       end
diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb
index 5d463e2fcc..57172c91c7 100644
--- a/spec/services/user_anonymizer_spec.rb
+++ b/spec/services/user_anonymizer_spec.rb
@@ -38,16 +38,16 @@ describe UserAnonymizer do
       end
 
       it "resets profile to default values" do
-        user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
+        user.update_attributes(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star")
 
         profile = user.user_profile(true)
-        profile.update_attributes( location: "Moose Jaw",
-                                   website: "www.bim.com",
-                                   bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
-                                   bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
-                                   profile_background: "http://example.com/bg.jpg",
-                                   bio_cooked_version: 2,
-                                   card_background: "http://example.com/cb.jpg")
+        profile.update_attributes(location: "Moose Jaw",
+                                  website: "www.bim.com",
+                                  bio_raw: "I'm Bibi from Moosejaw. I sing and dance.",
+                                  bio_cooked: "I'm Bibi from Moosejaw. I sing and dance.",
+                                  profile_background: "http://example.com/bg.jpg",
+                                  bio_cooked_version: 2,
+                                  card_background: "http://example.com/cb.jpg")
 
         prev_username = user.username
 
@@ -80,7 +80,7 @@ describe UserAnonymizer do
       it "changes name to anonymized username" do
         prev_username = user.username
 
-        user.update_attributes( name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star" )
+        user.update_attributes(name: "Bibi", date_of_birth: 19.years.ago, title: "Super Star")
 
         make_anonymous
         user.reload
diff --git a/spec/services/user_blocker_spec.rb b/spec/services/user_blocker_spec.rb
index 34c0b99fbd..16980610a1 100644
--- a/spec/services/user_blocker_spec.rb
+++ b/spec/services/user_blocker_spec.rb
@@ -41,7 +41,7 @@ describe UserBlocker do
       it 'sends that message to the user' do
         SystemMessage.unstub(:create)
         SystemMessage.expects(:create).with(user, :the_custom_message).returns(true)
-        UserBlocker.block(user, Fabricate.build(:admin), {message: :the_custom_message})
+        UserBlocker.block(user, Fabricate.build(:admin), message: :the_custom_message)
       end
     end
 
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index 4d0a23043b..d803e9f2ee 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -54,15 +54,14 @@ describe UserDestroyer do
       end
 
       it "adds email to block list if block_email is true" do
-        b = Fabricate.build(:screened_email, email: @user.email)
-        ScreenedEmail.expects(:block).with(@user.email, has_key(:ip_address)).returns(b)
-        b.expects(:record_match!).once.returns(true)
-        UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge({block_email: true}))
+        expect {
+          UserDestroyer.new(@admin).destroy(@user, destroy_opts.merge(block_email: true))
+        }.to change { ScreenedEmail.count }.by(1)
       end
     end
 
     context 'user deletes self' do
-      let(:destroy_opts) { {delete_posts: true} }
+      let(:destroy_opts) { { delete_posts: true } }
       subject(:destroy) { UserDestroyer.new(@user).destroy(@user, destroy_opts) }
 
       include_examples "successfully destroy a user"
@@ -127,7 +126,7 @@ describe UserDestroyer do
         end
 
         it 'should raise an error' do
-          expect { destroy }.to raise_error( UserDestroyer::PostsExistError )
+          expect { destroy }.to raise_error(UserDestroyer::PostsExistError)
         end
 
         it 'should not log the action' do
@@ -137,7 +136,7 @@ describe UserDestroyer do
       end
 
       context "delete_posts is true" do
-        let(:destroy_opts) { {delete_posts: true} }
+        let(:destroy_opts) { { delete_posts: true } }
 
         context "staff deletes user" do
           subject(:destroy) { UserDestroyer.new(@admin).destroy(@user, destroy_opts) }
@@ -203,7 +202,7 @@ describe UserDestroyer do
         # out of sync user_stat data shouldn't break UserDestroyer
         @user.user_stat.update_attribute(:post_count, 1)
       end
-      subject(:destroy) { UserDestroyer.new(@user).destroy(@user, {delete_posts: false}) }
+      subject(:destroy) { UserDestroyer.new(@user).destroy(@user, delete_posts: false) }
 
       include_examples "successfully destroy a user"
     end
@@ -228,15 +227,8 @@ describe UserDestroyer do
       context 'and destroy fails' do
         subject(:destroy) { UserDestroyer.new(@admin).destroy(@user) }
 
-        before do
-          @user.stubs(:destroy).returns(false)
-        end
-
-        it 'should return false' do
-          expect(destroy).to eq(false)
-        end
-
         it 'should not log the action' do
+          @user.stubs(:destroy).returns(false)
           StaffActionLogger.any_instance.expects(:log_user_deletion).never
           destroy
         end
@@ -270,7 +262,7 @@ describe UserDestroyer do
 
         it "doesn't add ScreenedUrl records" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, {delete_posts: true, block_urls: true})
+          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
         end
       end
 
@@ -282,7 +274,7 @@ describe UserDestroyer do
 
         it "doesn't add ScreenedUrl records" do
           ScreenedUrl.expects(:watch).never
-          UserDestroyer.new(@admin).destroy(@user, {delete_posts: true, block_urls: true})
+          UserDestroyer.new(@admin).destroy(@user, delete_posts: true, block_urls: true)
         end
       end
     end
@@ -296,14 +288,14 @@ describe UserDestroyer do
       context "block_ip is true" do
         it "creates a new screened_ip_address record" do
           ScreenedIpAddress.expects(:watch).with(@user.ip_address).returns(stub_everything)
-          UserDestroyer.new(@admin).destroy(@user, {block_ip: true})
+          UserDestroyer.new(@admin).destroy(@user, block_ip: true)
         end
 
         it "creates two new screened_ip_address records when registration_ip_address is different than last ip_address" do
           @user.registration_ip_address = '12.12.12.12'
           ScreenedIpAddress.expects(:watch).with(@user.ip_address).returns(stub_everything)
           ScreenedIpAddress.expects(:watch).with(@user.registration_ip_address).returns(stub_everything)
-          UserDestroyer.new(@admin).destroy(@user, {block_ip: true})
+          UserDestroyer.new(@admin).destroy(@user, block_ip: true)
         end
       end
     end
@@ -312,7 +304,7 @@ describe UserDestroyer do
       let!(:category) { Fabricate(:category, user: @user) }
 
       it "assigns the system user to the categories" do
-        UserDestroyer.new(@admin).destroy(@user, {delete_posts: true})
+        UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
         expect(category.reload.user_id).to eq(Discourse.system_user.id)
         expect(category.topic).to be_present
         expect(category.topic.user_id).to eq(Discourse.system_user.id)
@@ -325,7 +317,7 @@ describe UserDestroyer do
 
       it "deletes the email log" do
         expect {
-          UserDestroyer.new(@admin).destroy(user, {delete_posts: true})
+          UserDestroyer.new(@admin).destroy(user, delete_posts: true)
         }.to change { EmailLog.count }.by(-1)
       end
     end
@@ -339,7 +331,7 @@ describe UserDestroyer do
 
       it 'should destroy the like' do
         expect {
-          UserDestroyer.new(@admin).destroy(@user, {delete_posts: true})
+          UserDestroyer.new(@admin).destroy(@user, delete_posts: true)
         }.to change { PostAction.count }.by(-1)
         expect(@post.reload.like_count).to eq(0)
       end
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 0d025c8cc4..91fde1605a 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -10,18 +10,15 @@ describe UserUpdater do
       u2 = Fabricate(:user)
       u3 = Fabricate(:user)
 
-
       updater = UserUpdater.new(u1, u1)
       updater.update_muted_users("#{u2.username},#{u3.username}")
 
       updater = UserUpdater.new(u2, u2)
       updater.update_muted_users("#{u3.username},#{u1.username}")
 
-
       updater = UserUpdater.new(u3, u3)
       updater.update_muted_users("")
 
-
       expect(MutedUser.where(user_id: u2.id).count).to eq 2
       expect(MutedUser.where(user_id: u1.id).count).to eq 2
       expect(MutedUser.where(user_id: u3.id).count).to eq 0
@@ -71,15 +68,15 @@ describe UserUpdater do
       seq = user.user_option.theme_key_seq
 
       val = updater.update(bio_raw: 'my new bio',
-                     email_always: 'true',
-                     mailing_list_mode: true,
-                     digest_after_minutes: "45",
-                     new_topic_duration_minutes: 100,
-                     auto_track_topics_after_msecs: 101,
-                     notification_level_when_replying: 3,
-                     email_in_reply_to: false,
-                     date_of_birth: date_of_birth,
-                     theme_key: theme.key
+                           email_always: 'true',
+                           mailing_list_mode: true,
+                           digest_after_minutes: "45",
+                           new_topic_duration_minutes: 100,
+                           auto_track_topics_after_msecs: 101,
+                           notification_level_when_replying: 3,
+                           email_in_reply_to: false,
+                           date_of_birth: date_of_birth,
+                           theme_key: theme.key
                     )
       expect(val).to be_truthy
 
@@ -94,7 +91,7 @@ describe UserUpdater do
       expect(user.user_option.notification_level_when_replying).to eq 3
       expect(user.user_option.email_in_reply_to).to eq false
       expect(user.user_option.theme_key).to eq theme.key
-      expect(user.user_option.theme_key_seq).to eq(seq+1)
+      expect(user.user_option.theme_key_seq).to eq(seq + 1)
       expect(user.date_of_birth).to eq(date_of_birth.to_date)
     end
 
@@ -189,12 +186,12 @@ describe UserUpdater do
     context 'when custom_fields is empty string' do
       it "update is successful" do
         user = Fabricate(:user)
-        user.custom_fields = {'import_username' => 'my_old_username'}
+        user.custom_fields = { 'import_username' => 'my_old_username' }
         user.save
         updater = UserUpdater.new(acting_user, user)
 
         updater.update(website: 'example.com', custom_fields: '')
-        expect(user.reload.custom_fields).to eq({'import_username' => 'my_old_username'})
+        expect(user.reload.custom_fields).to eq('import_username' => 'my_old_username')
       end
     end
 
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
new file mode 100644
index 0000000000..98c2776d8e
--- /dev/null
+++ b/spec/services/word_watcher_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+describe WordWatcher do
+
+  let(:raw) { "Do you like liquorice?\n\nI really like them. One could even say that I am *addicted* to liquorice. Anf if\nyou can mix it up with some anise, then I'm in heaven ;)" }
+
+  after do
+    $redis.flushall
+  end
+
+  describe "word_matches_for_action?" do
+    it "is falsey when there are no watched words" do
+      expect(WordWatcher.new(raw).word_matches_for_action?(:require_approval)).to be_falsey
+    end
+
+    context "with watched words" do
+      let!(:anise) { Fabricate(:watched_word, word: "anise", action: WatchedWord.actions[:require_approval]) }
+
+      it "is falsey without a match" do
+        expect(WordWatcher.new("No liquorice for me, thanks...").word_matches_for_action?(:require_approval)).to be_falsey
+      end
+
+      it "is returns matched words if there's a match" do
+        m = WordWatcher.new(raw).word_matches_for_action?(:require_approval)
+        expect(m).to be_truthy
+        expect(m[1]).to eq(anise.word)
+      end
+
+      it "finds at start of string" do
+        m = WordWatcher.new("#{anise.word} is garbage").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq(anise.word)
+      end
+
+      it "finds at end of string" do
+        m = WordWatcher.new("who likes #{anise.word}").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq(anise.word)
+      end
+
+      it "finds non-letters in place of letters" do
+        Fabricate(:watched_word, word: "co(onut", action: WatchedWord.actions[:require_approval])
+        m = WordWatcher.new("This co(onut is delicious.").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq("co(onut")
+      end
+
+      it "handles * for wildcards" do
+        Fabricate(:watched_word, word: "a**le*", action: WatchedWord.actions[:require_approval])
+        m = WordWatcher.new("I acknowledge you.").word_matches_for_action?(:require_approval)
+        expect(m[1]).to eq("acknowledge")
+      end
+    end
+  end
+
+end
diff --git a/spec/support/diagnostics_helper.rb b/spec/support/diagnostics_helper.rb
index 5d4c9eed49..45a0f5146c 100644
--- a/spec/support/diagnostics_helper.rb
+++ b/spec/support/diagnostics_helper.rb
@@ -11,7 +11,7 @@ module MessageBus::DiagnosticsHelper
   end
 
   def track_publish
-    @tracking = tracking =  []
+    @tracking = tracking = []
     yield
     @tracking = nil
     tracking
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 9238cf9771..44a1aad9e6 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -5,7 +5,7 @@ module Helpers
     @next_seq = (@next_seq || 0) + 1
   end
 
-  def log_in(fabricator=nil)
+  def log_in(fabricator = nil)
     user = Fabricate(fabricator || :user)
     log_in_user(user)
     user
@@ -13,7 +13,7 @@ module Helpers
 
   def log_in_user(user)
     provider = Discourse.current_user_provider.new(request.env)
-    provider.log_on_user(user,session,cookies)
+    provider.log_on_user(user, session, cookies)
   end
 
   def fixture_file(filename)
@@ -26,7 +26,7 @@ module Helpers
     Fabricate.build(*args)
   end
 
-  def create_topic(args={})
+  def create_topic(args = {})
     args[:title] ||= "This is my title #{Helpers.next_seq}"
     user = args.delete(:user) || Fabricate(:user)
     guardian = Guardian.new(user)
@@ -34,7 +34,7 @@ module Helpers
     TopicCreator.create(user, guardian, args)
   end
 
-  def create_post(args={})
+  def create_post(args = {})
     args[:title] ||= "This is my title #{Helpers.next_seq}"
     args[:raw] ||= "This is the raw body of my post, it is cool #{Helpers.next_seq}"
     args[:topic_id] = args[:topic].id if args[:topic]
@@ -50,9 +50,9 @@ module Helpers
     post
   end
 
-  def generate_username(length=10)
+  def generate_username(length = 10)
     range = [*'a'..'z']
-    Array.new(length){range.sample}.join
+    Array.new(length) { range.sample }.join
   end
 
   def stub_guardian(user)
@@ -64,7 +64,7 @@ module Helpers
   def wait_for(&blk)
     i = 0
     result = false
-    while !result && i < 300
+    while !result && i < 1000
       result = blk.call
       i += 1
       sleep 0.001
diff --git a/spec/support/integration_helpers.rb b/spec/support/integration_helpers.rb
index 24331a0761..a2ae8f46d4 100644
--- a/spec/support/integration_helpers.rb
+++ b/spec/support/integration_helpers.rb
@@ -3,7 +3,7 @@ module IntegrationHelpers
     password = 'somecomplicatedpassword'
     user.update!(password: password)
     Fabricate(:email_token, confirmed: true, user: user)
-    post "/session.json", { login: user.username, password: password }
+    post "/session.json", login: user.username, password: password
     expect(response).to be_success
   end
 end
diff --git a/spec/support/shared_examples_for_stats_cacheable.rb b/spec/support/shared_examples_for_stats_cacheable.rb
index decaf1f78d..0b4306f41b 100644
--- a/spec/support/shared_examples_for_stats_cacheable.rb
+++ b/spec/support/shared_examples_for_stats_cacheable.rb
@@ -11,16 +11,16 @@ shared_examples_for 'stats cachable' do
     end
 
     it 'returns fetches the stats if stats has not been cached' do
-      Timecop.freeze do
-        $redis.del(described_class.stats_cache_key)
-        expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json))
-      end
+      freeze_time
+
+      $redis.del(described_class.stats_cache_key)
+      expect(described_class.fetch_cached_stats).to eq(JSON.parse(described_class.fetch_stats.to_json))
     end
   end
 
   describe 'fetch_stats' do
     it 'has not been implemented' do
-      expect{ described_class.fetch_stats }.to_not raise_error
+      expect { described_class.fetch_stats }.to_not raise_error
     end
   end
 end
diff --git a/spec/tasks/posts_spec.rb b/spec/tasks/posts_spec.rb
index 788dd18797..f69a3bbf68 100644
--- a/spec/tasks/posts_spec.rb
+++ b/spec/tasks/posts_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe "Post rake tasks" do
     it 'should remap posts' do
       post = Fabricate(:post, raw: "The quick brown fox jumps over the lazy dog")
 
-      Rake::Task['posts:remap'].invoke("brown","red")
+      Rake::Task['posts:remap'].invoke("brown", "red")
       post.reload
       expect(post.raw).to eq('The quick red fox jumps over the lazy dog')
     end
diff --git a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb
index 614877fdb8..f66ad99d8a 100644
--- a/spec/views/omniauth_callbacks/complete.html.erb_spec.rb
+++ b/spec/views/omniauth_callbacks/complete.html.erb_spec.rb
@@ -39,5 +39,3 @@ describe "users/omniauth_callbacks/complete.html.erb" do
   end
 
 end
-
-
diff --git a/spec/views/omniauth_callbacks/failure.html.erb_spec.rb b/spec/views/omniauth_callbacks/failure.html.erb_spec.rb
index ce6adc032a..b4c16c984c 100644
--- a/spec/views/omniauth_callbacks/failure.html.erb_spec.rb
+++ b/spec/views/omniauth_callbacks/failure.html.erb_spec.rb
@@ -2,11 +2,11 @@ require "rails_helper"
 
 describe "users/omniauth_callbacks/failure.html.erb" do
 
-    it "renders the failure page" do
-        flash[:error] = I18n.t("login.omniauth_error", strategy: 'test')
-        render
+  it "renders the failure page" do
+    flash[:error] = I18n.t("login.omniauth_error", strategy: 'test')
+      render
 
-        expect(rendered.match(I18n.t("login.omniauth_error", strategy: 'test'))).not_to eq(nil)
-    end
+      expect(rendered.match(I18n.t("login.omniauth_error", strategy: 'test'))).not_to eq(nil)
+  end
 
 end
diff --git a/test/javascripts/acceptance/admin-watched-words-test.js.es6 b/test/javascripts/acceptance/admin-watched-words-test.js.es6
new file mode 100644
index 0000000000..308f8f4da5
--- /dev/null
+++ b/test/javascripts/acceptance/admin-watched-words-test.js.es6
@@ -0,0 +1,68 @@
+import { acceptance } from "helpers/qunit-helpers";
+acceptance("Admin - Watched Words", { loggedIn: true });
+
+QUnit.test("list words in groups", assert => {
+  visit("/admin/logs/watched_words/action/block");
+  andThen(() => {
+    assert.ok(exists('.watched-words-list'));
+    assert.ok(!exists('.watched-words-list .watched-word'), "Don't show bad words by default.");
+  });
+
+  fillIn('.admin-controls .controls input[type=text]', 'li');
+  andThen(() => {
+    assert.equal(find('.watched-words-list .watched-word').length, 1, "When filtering, show words even if checkbox is unchecked.");
+  });
+
+  fillIn('.admin-controls .controls input[type=text]', '');
+  andThen(() => {
+    assert.ok(!exists('.watched-words-list .watched-word'), "Clearing the filter hides words again.");
+  });
+
+  click('.show-words-checkbox');
+  andThen(() => {
+    assert.ok(exists('.watched-words-list .watched-word'), "Always show the words when checkbox is checked.");
+  });
+
+  click('.nav-stacked .censor');
+  andThen(() => {
+    assert.ok(exists('.watched-words-list'));
+    assert.ok(!exists('.watched-words-list .watched-word'), "Empty word list.");
+  });
+});
+
+QUnit.test("add words", assert => {
+  visit("/admin/logs/watched_words/action/block");
+  andThen(() => {
+    click('.show-words-checkbox');
+    fillIn('.watched-word-form input', 'poutine');
+  });
+  click('.watched-word-form button');
+  andThen(() => {
+    let found = [];
+    _.each(find('.watched-words-list .watched-word'), i => {
+      if ($(i).text().trim() === 'poutine') {
+        found.push(true);
+      }
+    });
+    assert.equal(found.length, 1);
+  });
+});
+
+QUnit.test("remove words", assert => {
+  visit("/admin/logs/watched_words/action/block");
+  click('.show-words-checkbox');
+
+  let word = null;
+  andThen(() => {
+    _.each(find('.watched-words-list .watched-word'), i => {
+      if ($(i).text().trim() === 'anise') {
+        word = i;
+      }
+    });
+    click('#' + $(word).attr('id'));
+  });
+  andThen(() => {
+    assert.equal(find('.watched-words-list .watched-word').length, 1);
+  });
+});
+
diff --git a/test/javascripts/acceptance/composer-test.js.es6 b/test/javascripts/acceptance/composer-test.js.es6
index b155418b78..fcbd971f23 100644
--- a/test/javascripts/acceptance/composer-test.js.es6
+++ b/test/javascripts/acceptance/composer-test.js.es6
@@ -264,7 +264,7 @@ QUnit.test("Composer can toggle between reply and createTopic", assert => {
 
   click('.topic-post:eq(0) button.reply');
   click('button.options');
-  click('.popup-menu .fa-eye-slash');
+  click('.popup-menu .d-icon-eye-slash');
   andThen(() => {
     assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.whisper")) > 0,
@@ -286,7 +286,7 @@ QUnit.test("Composer can toggle between reply and createTopic", assert => {
   });
 
   click('button.options');
-  click('.popup-menu .fa-eye-slash');
+  click('.popup-menu .d-icon-eye-slash');
   andThen(() => {
     assert.ok(
       find('.composer-fields .whisper').text().indexOf(I18n.t("composer.unlist")) > 0,
@@ -334,4 +334,4 @@ QUnit.test("Composer draft with dirty reply can toggle to edit", assert => {
   andThen(() => {
     assert.equal(find('.d-editor-input').val().indexOf('This is the first post.'), 0, 'it populates the input with the post text');
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/emoji-picker-test.js.es6 b/test/javascripts/acceptance/emoji-picker-test.js.es6
new file mode 100644
index 0000000000..56a0f2b926
--- /dev/null
+++ b/test/javascripts/acceptance/emoji-picker-test.js.es6
@@ -0,0 +1,165 @@
+import { acceptance } from "helpers/qunit-helpers";
+import { IMAGE_VERSION as v } from 'pretty-text/emoji';
+import { resetCache } from 'discourse/components/emoji-picker';
+
+acceptance("EmojiPicker", {
+  loggedIn: true,
+  beforeEach() { resetCache(); }
+});
+
+QUnit.test("emoji picker can be opened/closed", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    assert.notEqual(
+      find('.emoji-picker').html().trim(),
+      "",
+      "it opens the picker"
+    );
+  });
+
+  click("button.emoji.btn");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker').html().trim(),
+      "",
+      "it closes the picker"
+      );
+  });
+});
+
+QUnit.test("emojis can be hovered to display info", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    $(".emoji-picker button[title='grinning']").trigger('mouseover');
+    andThen(() => {
+      assert.equal(
+        find('.emoji-picker .info').html().trim(),
+        `<img src=\"/images/emoji/emoji_one/grinning.png?v=${v}\" class=\"emoji\"> <span>:grinning:<span></span></span>`,
+        "it displays emoji info when hovering emoji"
+      );
+    });
+  });
+});
+
+QUnit.test("emoji picker triggers event when picking emoji", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+  click("button.emoji.btn");
+
+  click(".emoji-picker button[title='grinning']");
+  andThen(() => {
+    assert.equal(
+      find('.d-editor-input').val(),
+      ":grinning:",
+      "it adds the emoji code in the editor when selected"
+    );
+  });
+});
+
+QUnit.test("emoji picker has a list of recently used emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+  click("button.emoji.btn");
+
+  click(".emoji-picker .section[data-section='people'] button.emoji[title='grinning']");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"]').css("display"),
+      "block",
+      "it shows recent section"
+    );
+
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"] .section-group button.emoji').length,
+      1,
+      "it adds the emoji code to the recently used emojis list"
+    );
+  });
+
+  click(".emoji-picker .clear-recent");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"] .section-group button.emoji').length,
+      0,
+      "it has cleared recent emojis"
+    );
+
+    assert.equal(
+      find('.emoji-picker .section[data-section="recent"]').css("display"),
+      "none",
+      "it hides recent section"
+    );
+
+    assert.equal(
+      find('.emoji-picker .category-icon button.emoji[data-section="recent"]').parent().css("display"),
+      "none",
+      "it hides recent category icon"
+    );
+  });
+});
+
+QUnit.test("emoji picker correctly orders recently used emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    click(".emoji-picker button[title='sunglasses']");
+    click(".emoji-picker button[title='grinning']");
+    andThen(() => {
+      assert.equal(
+        find('.section[data-section="recent"] .section-group button.emoji').length,
+        2,
+        "it has multiple recent emojis"
+      );
+
+      assert.equal(
+        /grinning/.test(find('.section[data-section="recent"] .section-group button.emoji').first().css('background-image')),
+        true,
+        "it puts the last used emoji in first"
+      );
+    });
+  });
+});
+
+QUnit.test("emoji picker lazy loads emojis", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker button[title="massage_woman"]').css("background-image"),
+      "none",
+      "it doesn't load invisible emojis"
+    );
+  });
+});
+
+
+QUnit.test("emoji picker persists state", assert => {
+  visit("/t/internationalization-localization/280");
+  click("#topic-footer-buttons .btn.create");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    click('.emoji-picker a.diversity-scale.medium-dark');
+  });
+  click("button.emoji.btn");
+
+  click("button.emoji.btn");
+  andThen(() => {
+    assert.equal(
+      find('.emoji-picker .diversity-scale.medium-dark').hasClass('selected'),
+      true,
+      "it stores diversity scale"
+    );
+  });
+});
diff --git a/test/javascripts/acceptance/group-edit-test.js.es6 b/test/javascripts/acceptance/group-edit-test.js.es6
index 676ee7a2fc..0c28f8af7f 100644
--- a/test/javascripts/acceptance/group-edit-test.js.es6
+++ b/test/javascripts/acceptance/group-edit-test.js.es6
@@ -12,7 +12,17 @@ QUnit.test("Editing group", assert => {
     assert.ok(find('.group-flair-inputs').length === 1, 'it should display avatar flair inputs');
     assert.ok(find('.group-edit-bio').length === 1, 'it should display group bio input');
     assert.ok(find('.group-edit-full-name').length === 1, 'it should display group full name input');
-    assert.ok(find('.group-edit-public').length === 1, 'it should display group public input');
+
+    assert.ok(
+      find('.group-edit-public-admission').length === 1,
+      'it should display group public admission input'
+    );
+
+    assert.ok(
+      find('.group-edit-public-exit').length === 1,
+      'it should display group public exit input'
+    );
+
     assert.ok(find('.group-edit-allow-membership-requests').length === 1, 'it should display group allow_membership_requets input');
     assert.ok(find('.group-members-input .item').length === 7, 'it should display group members');
     assert.ok(find('.group-members-input-selector').length === 1, 'it should display input to add group members');
@@ -20,14 +30,20 @@ QUnit.test("Editing group", assert => {
   });
 
   andThen(() => {
-    assert.ok(find('.group-edit-allow-membership-requests[disabled]').length === 1, 'it should disable group allow_membership_request input');
+    assert.ok(
+      find('.group-edit-allow-membership-requests[disabled]').length === 1,
+      'it should disable group allow_membership_request input'
+    );
   });
 
-  click('.group-edit-public');
+  click('.group-edit-public-admission');
   click('.group-edit-allow-membership-requests');
 
   andThen(() => {
-    assert.ok(find('.group-edit-public[disabled]').length === 1, 'it should disable group public input');
+    assert.ok(
+      find('.group-edit-public-admission[disabled]').length === 1,
+      'it should disable group public admission input'
+    );
   });
 });
 
@@ -37,4 +53,4 @@ QUnit.test("Editing group as an anonymous user", assert => {
   andThen(() => {
     assert.ok(count('.group-members tr') > 0, "it should redirect to members page for an anonymous user");
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/groups-test.js.es6 b/test/javascripts/acceptance/groups-test.js.es6
index 0534127ea7..017f672a73 100644
--- a/test/javascripts/acceptance/groups-test.js.es6
+++ b/test/javascripts/acceptance/groups-test.js.es6
@@ -42,12 +42,13 @@ QUnit.test("Browsing Groups", assert => {
   });
 });
 
-QUnit.test("Viewing Group", assert => {
+QUnit.test("Anonymous Viewing Group", assert => {
   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('.group-message-button') === 0, 'it does not show group message button');
   });
 
   click(".nav-pills li a[title='Activity']");
@@ -80,6 +81,20 @@ QUnit.test("Viewing Group", assert => {
   });
 });
 
+QUnit.test("User Viewing Group", assert => {
+  logIn();
+  Discourse.reset();
+
+  visit("/groups/discourse");
+
+  click('.group-message-button');
+
+  andThen(() => {
+    assert.ok(count('#reply-control') === 1, 'it opens the composer');
+    assert.equal(find('.ac-wrap .item').text(), 'discourse', 'it prefills the group name');
+  });
+});
+
 QUnit.test("Admin Viewing Group", assert => {
   logIn();
   Discourse.reset();
@@ -102,4 +117,4 @@ QUnit.test("Admin Viewing Group", assert => {
       'it should show messages tab if user is admin'
     );
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 475c164137..c3d6f11e81 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -72,4 +72,4 @@ QUnit.test("Search with context", assert => {
   andThen(() => {
     assert.ok(!$('.search-context input[type=checkbox]').is(":checked"));
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 08b54bfd51..581ef00cd3 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -33,7 +33,7 @@ QUnit.test("Share Popup", assert => {
 QUnit.test("Showing and hiding the edit controls", assert => {
   visit("/t/internationalization-localization/280");
 
-  click('#topic-title .fa-pencil');
+  click('#topic-title .d-icon-pencil');
 
   andThen(() => {
     assert.ok(exists('#edit-title'), 'it shows the editing controls');
@@ -48,7 +48,7 @@ QUnit.test("Showing and hiding the edit controls", assert => {
 
 QUnit.test("Updating the topic title and category", assert => {
   visit("/t/internationalization-localization/280");
-  click('#topic-title .fa-pencil');
+  click('#topic-title .d-icon-pencil');
 
   fillIn('#edit-title', 'this is the new title');
   selectDropdown('.category-combobox', 4);
@@ -140,7 +140,7 @@ QUnit.test("Reply as new message", assert => {
 
 QUnit.test("Updating the topic title with emojis", assert => {
   visit("/t/internationalization-localization/280");
-  click('#topic-title .fa-pencil');
+  click('#topic-title .d-icon-pencil');
 
   fillIn('#edit-title', 'emojis title :bike: :blonde_woman:t6:');
 
@@ -149,4 +149,4 @@ QUnit.test("Updating the topic title with emojis", assert => {
   andThen(() => {
     assert.equal(find('.fancy-title').html().trim(), 'emojis title <img src=\"/images/emoji/emoji_one/bike.png?v=5\" title=\"bike\" alt=\"bike\" class=\"emoji\"> <img src=\"/images/emoji/emoji_one/blonde_woman/6.png?v=5\" title=\"blonde_woman:t6\" alt=\"blonde_woman:t6\" class=\"emoji\">', 'it displays the new title with emojis');
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index 3847121cec..8bc3b0d09d 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -514,6 +514,32 @@ third line`
 });
 
 
+componentTest("quote button - empty lines", {
+  template: '{{d-editor value=value composerEvents=true}}',
+  beforeEach() {
+    this.set('value', "one\n\ntwo\n\nthree");
+  },
+  test(assert) {
+    const textarea = jumpEnd(this.$('textarea.d-editor-input')[0]);
+
+    andThen(() => {
+      textarea.selectionStart = 0;
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "> one\n> \n> two\n> \n> three");
+      assert.equal(textarea.selectionStart, 0);
+      assert.equal(textarea.selectionEnd, 25);
+    });
+
+    click('button.quote');
+    andThen(() => {
+      assert.equal(this.get('value'), "one\n\ntwo\n\nthree");
+    });
+  }
+});
+
 testCase('quote button', function(assert, textarea) {
 
   andThen(() => {
@@ -763,19 +789,11 @@ componentTest('emoji', {
     this.set('value', 'hello world.');
   },
   test(assert) {
-    assert.equal($('.emoji-modal').length, 0);
-
     jumpEnd(this.$('textarea.d-editor-input')[0]);
     click('button.emoji');
-    andThen(() => {
-      assert.equal($('.emoji-modal').length, 1);
-    });
-
-    click('a[data-group-id=0]');
-    click('a[title=grinning]');
 
+    click('.emoji-picker .section[data-section="people"] button.emoji[title="grinning"]');
     andThen(() => {
-      assert.ok($('.emoji-modal').length === 0);
       assert.equal(this.get('value'), 'hello world.:grinning:');
     });
   }
diff --git a/test/javascripts/components/group-membership-button-test.js.es6 b/test/javascripts/components/group-membership-button-test.js.es6
index 9f404c151b..1937d38088 100644
--- a/test/javascripts/components/group-membership-button-test.js.es6
+++ b/test/javascripts/components/group-membership-button-test.js.es6
@@ -2,18 +2,52 @@ moduleFor('component:group-membership-button');
 
 QUnit.test('canJoinGroup', function(assert) {
   this.subject().setProperties({
-    model: { public: false }
+    model: { public_admission: false, is_group_user: true }
   });
 
-  assert.equal(this.subject().get("canJoinGroup"), false, "non public group cannot be joined");
+  assert.equal(
+    this.subject().get("canJoinGroup"), false,
+    "can't join group if public_admission is false"
+  );
 
-  this.subject().set("model.public", true);
+  this.subject().set("model.public_admission", true);
 
-  assert.equal(this.subject().get("canJoinGroup"), true, "public group can be joined");
+  assert.equal(
+    this.subject().get("canJoinGroup"), false,
+    "can't join group if user is already in the group"
+  );
 
-  this.subject().setProperties({ currentUser: null, model: { public: true } });
+  this.subject().set("model.is_group_user", false);
 
-  assert.equal(this.subject().get("canJoinGroup"), true, "can't join group when not logged in");
+  assert.equal(
+    this.subject().get("canJoinGroup"), true,
+    "allowed to join group"
+  );
+});
+
+QUnit.test('canLeaveGroup', function(assert) {
+  this.subject().setProperties({
+    model: { public_exit: false, is_group_user: false }
+  });
+
+  assert.equal(
+    this.subject().get("canLeaveGroup"), false,
+    "can't leave group if public_exit is false"
+  );
+
+  this.subject().set("model.public_exit", true);
+
+  assert.equal(
+    this.subject().get("canLeaveGroup"), false,
+    "can't leave group if user is not in the group"
+  );
+
+  this.subject().set("model.is_group_user", true);
+
+  assert.equal(
+    this.subject().get("canLeaveGroup"), true,
+    "allowed to leave group"
+  );
 });
 
 QUnit.test('userIsGroupUser', function(assert) {
diff --git a/test/javascripts/controllers/admin-group-test.js.es6 b/test/javascripts/controllers/admin-group-test.js.es6
index b03ddf7422..01d77cb5ee 100644
--- a/test/javascripts/controllers/admin-group-test.js.es6
+++ b/test/javascripts/controllers/admin-group-test.js.es6
@@ -20,16 +20,22 @@ QUnit.test("disablePublicSetting", function(assert) {
 
 QUnit.test("disableMembershipRequestSetting", function(assert) {
   this.subject().setProperties({
-    model: { visibility_level: 1, public: false, canEveryoneMention: true }
+    model: { visibility_level: 1, public_admission: false, canEveryoneMention: true }
   });
 
   assert.equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disable setting");
 
   this.subject().set("model.visibility_level", 0);
 
-  assert.equal(this.subject().get("disableMembershipRequestSetting"), false, "it should enable setting");
+  assert.equal(
+    this.subject().get("disableMembershipRequestSetting"), false,
+    "it should enable setting"
+  );
 
-  this.subject().set("model.public", true);
+  this.subject().set("model.public_admission", true);
 
-  assert.equal(this.subject().get("disableMembershipRequestSetting"), true, "it should disalbe setting");
+  assert.equal(
+    this.subject().get("disableMembershipRequestSetting"), true,
+    "it should disable setting"
+  );
 });
diff --git a/test/javascripts/fixtures/group-fixtures.js.es6 b/test/javascripts/fixtures/group-fixtures.js.es6
index a55d8303cb..291db11d23 100644
--- a/test/javascripts/fixtures/group-fixtures.js.es6
+++ b/test/javascripts/fixtures/group-fixtures.js.es6
@@ -6,11 +6,13 @@ export default {
       "name":"discourse",
       "full_name":"Awesome Team",
       "user_count":8,
-      "alias_level":0,
+      "alias_level":99,
       "visible":true,
-      "public":true,
+      "public_admission":true,
+      "public_exit":true,
       "flair_url": 'fa-adjust',
-      "is_group_owner":true
+      "is_group_owner":true,
+      "mentionable":true
     }
   },
   "/groups/discourse/counts.json":{
diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js.es6
index 1baa42b560..bd819b47d5 100644
--- a/test/javascripts/fixtures/groups-fixtures.js.es6
+++ b/test/javascripts/fixtures/groups-fixtures.js.es6
@@ -1,3 +1,3 @@
 export default {
-  "/groups.json": {"groups":[{"id":41,"automatic":false,"name":"discourse","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":"","bio_cooked":null,"public":true,"allow_membership_requests":false,"full_name":"Awesome Team"},{"id":42,"automatic":false,"name":"Macdonald","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public":false,"allow_membership_requests":true,"full_name":null}],"extras":{"group_user_ids":[]},"total_rows_groups":2,"load_more_groups":"/groups?page=1"}
+  "/groups.json": {"groups":[{"id":41,"automatic":false,"name":"discourse","user_count":0,"alias_level":0,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":"","bio_cooked":null,"public_admission":true,"allow_membership_requests":false,"full_name":"Awesome Team"},{"id":42,"automatic":false,"name":"Macdonald","user_count":0,"alias_level":99,"visible":true,"automatic_membership_email_domains":"","automatic_membership_retroactive":false,"primary_group":false,"title":null,"grant_trust_level":null,"has_messages":false,"flair_url":null,"flair_bg_color":null,"flair_color":null,"bio_raw":null,"bio_cooked":null,"public_admission":false,"allow_membership_requests":true,"full_name":null}],"extras":{"group_user_ids":[]},"total_rows_groups":2,"load_more_groups":"/groups?page=1"}
 }
diff --git a/test/javascripts/fixtures/watched-words-fixtures.js.es6 b/test/javascripts/fixtures/watched-words-fixtures.js.es6
new file mode 100644
index 0000000000..5555923385
--- /dev/null
+++ b/test/javascripts/fixtures/watched-words-fixtures.js.es6
@@ -0,0 +1,12 @@
+export default {
+  "/admin/logs/watched_words.json": {
+    "actions": ["block", "censor", "require_approval", "flag"],
+    "words": [
+      {id: 1, word: "liquorice", action: "block"},
+      {id: 2, word: "anise", action: "block"},
+      {id: 3, word: "pyramid", action: "flag"},
+      {id: 4, word: "scheme", action: "flag"},
+      {id: 5, word: "coupon", action: "require_approval"}
+    ]
+  }
+};
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index bfa32ba4af..6cb2f8464b 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -334,6 +334,17 @@ export default function() {
     this.post('/admin/badges', success);
     this.delete('/admin/badges/:id', success);
 
+    this.get('/admin/logs/watched_words', () => {
+      return response(200, fixturesByUrl['/admin/logs/watched_words.json']);
+    });
+    this.delete('/admin/logs/watched_words/:id.json', success);
+
+    this.post('/admin/logs/watched_words.json', request => {
+      const result = parsePostData(request.requestBody);
+      result.id = new Date().getTime();
+      return response(200, result);
+    });
+
     this.get('/onebox', request => {
       if (request.queryParams.url === 'http://www.example.com/has-title.html' ||
           request.queryParams.url === 'http://www.example.com/has-title-and-a-url-that-is-more-than-80-characters-because-thats-good-for-seo-i-guess.html') {
diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6
index 558c105e3f..d53fcc346e 100644
--- a/test/javascripts/lib/pretty-text-test.js.es6
+++ b/test/javascripts/lib/pretty-text-test.js.es6
@@ -5,17 +5,19 @@ import { IMAGE_VERSION as v} from 'pretty-text/emoji';
 
 QUnit.module("lib:pretty-text");
 
-const defaultOpts = buildOptions({
+const rawOpts = {
   siteSettings: {
     enable_emoji: true,
     emoji_set: 'emoji_one',
     highlighted_languages: 'json|ruby|javascript',
     default_code_lang: 'auto',
-    censored_words: 'shucks|whiz|whizzer|a**le',
     censored_pattern: '\\d{3}-\\d{4}|tech\\w*'
   },
+  censoredWords: 'shucks|whiz|whizzer|a**le',
   getURL: url => url
-});
+};
+
+const defaultOpts = buildOptions(rawOpts);
 
 QUnit.assert.cooked = function(input, expected, message) {
   const actual = new PrettyText(defaultOpts).cook(input);
@@ -28,7 +30,8 @@ QUnit.assert.cooked = function(input, expected, message) {
 };
 
 QUnit.assert.cookedOptions = function(input, opts, expected, message) {
-  const actual = new PrettyText(_.merge({}, defaultOpts, opts)).cook(input);
+  const merged = _.merge({}, rawOpts, opts);
+  const actual = new PrettyText(buildOptions(merged)).cook(input);
   this.pushResult({
     result: actual === expected,
     actual,
@@ -41,12 +44,18 @@ QUnit.assert.cookedPara = function(input, expected, message) {
   QUnit.assert.cooked(input, `<p>${expected}</p>`, message);
 };
 
-QUnit.test("buildOptions", assert => {
-  assert.ok(buildOptions({ siteSettings: { allow_html_tables: true } }).features.table, 'tables enabled');
-  assert.ok(!buildOptions({ siteSettings: { allow_html_tables: false } }).features.table, 'tables disabled');
 
-  assert.ok(buildOptions({ siteSettings: { enable_emoji: true } }).features.emoji, 'emoji enabled');
-  assert.ok(!buildOptions({ siteSettings: { enable_emoji: false } }).features.emoji, 'emoji disabled');
+QUnit.skip("Pending Engine fixes and spec fixes", assert => {
+  assert.cooked("Derpy: http://derp.com?_test_=1",
+         '<p>Derpy: <a href=https://derp.com?_test_=1"http://derp.com?_test_=1">http://derp.com?_test_=1</a></p>',
+         "works with underscores in urls");
+
+  assert.cooked("**a*_b**", "<p><strong>a*_b</strong></p>", "allows for characters within bold");
+});
+
+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');
 });
 
 QUnit.test("basic cooking", assert => {
@@ -69,10 +78,8 @@ QUnit.test("Nested bold and italics", assert => {
 
 QUnit.test("Traditional Line Breaks", assert => {
   const input = "1\n2\n3";
-  assert.cooked(input, "<p>1<br/>2<br/>3</p>", "automatically handles trivial newlines");
-
-  const result = new PrettyText({ traditionalMarkdownLinebreaks: true }).cook(input);
-  assert.equal(result, "<p>1\n2\n3</p>");
+  assert.cooked(input, "<p>1<br>\n2<br>\n3</p>", "automatically handles trivial newlines");
+  assert.cookedOptions(input, { siteSettings: {traditional_markdown_linebreaks: true} }, "<p>1\n2\n3</p>");
 });
 
 QUnit.test("Unbalanced underscores", assert => {
@@ -81,15 +88,19 @@ QUnit.test("Unbalanced underscores", assert => {
 
 QUnit.test("Line Breaks", assert => {
   assert.cooked("[] first choice\n[] second choice",
-         "<p>[] first choice<br/>[] second choice</p>",
+         "<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>\n\n<p>trout</p>",
+         "<blockquote>evil</blockquote>\ntrout",
          "it doesn't insert <br> after blockquotes");
 
   assert.cooked("leading<blockquote>evil</blockquote>\ntrout",
-         "leading<blockquote>evil</blockquote>\n\n<p>trout</p>",
+         "<p>leading<blockquote>evil</blockquote><br>\ntrout</p>",
          "it doesn't insert <br> after blockquotes with leading text");
 });
 
@@ -114,10 +125,6 @@ QUnit.test("Links", assert => {
          '<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 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");
@@ -139,11 +146,11 @@ QUnit.test("Links", assert => {
          "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/><a href=\"https://twitter.com/evil_trout/status/345954894420787200\" class=\"onebox\" target=\"_blank\">https://twitter.com/evil_trout/status/345954894420787200</a></p>",
+         "<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><li>View <span class=\"mention\">@eviltrout</span>'s profile here: <a href=\"http://meta.discourse.org/u/eviltrout/activity\">http://meta.discourse.org/u/eviltrout/activity</a><br>next line.</li></ol>",
+        "<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");
@@ -158,8 +165,8 @@ QUnit.test("Links", assert => {
          "<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  [1]: http://eviltrout.com",
-         "<ul><li><a href=\"http://eviltrout.com\">Evil Trout</a></li></ul>",
+  assert.cooked("* [Evil Trout][1]\n\n[1]: http://eviltrout.com",
+         "<ul>\n<li><a href=\"http://eviltrout.com\">Evil Trout</a></li>\n</ul>",
          "allows markdown link references in a list");
 
   assert.cooked("User [MOD]: Hello!",
@@ -178,7 +185,7 @@ QUnit.test("Links", assert => {
 
 
   assert.cooked("[Link](http://www.example.com) (with an outer \"description\")",
-         "<p><a href=\"http://www.example.com\">Link</a> (with an outer \"description\")</p>",
+         "<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)",
@@ -191,50 +198,76 @@ QUnit.test("Links", assert => {
 });
 
 QUnit.test("simple quotes", assert => {
-  assert.cooked("> nice!", "<blockquote><p>nice!</p></blockquote>", "it supports simple quotes");
-  assert.cooked(" > nice!", "<blockquote><p>nice!</p></blockquote>", "it allows quotes with preceding 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><p>level 1</p><blockquote><p>level 2</p></blockquote></blockquote>",
+         "<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><p>level 1</p><blockquote><p>level 2</p></blockquote></blockquote>",
+         "<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><li>hello</li></ul>\n\n<blockquote><p>world<br/>eviltrout</p></blockquote>",
+`<ul>
+<li>
+<p>hello</p>
+<blockquote>
+<p>world<br>
+eviltrout</p>
+</blockquote>
+</li>
+</ul>`,
          "it allows quotes within a list.");
 
   assert.cooked("- <p>eviltrout</p>",
-         "<ul><li><p>eviltrout</p></li></ul>",
+         "<ul>\n<li>\n<p>eviltrout</p></li>\n</ul>",
          "it allows paragraphs within a list.");
 
 
-  assert.cooked("  > indent 1\n  > indent 2", "<blockquote><p>indent 1<br/>indent 2</p></blockquote>", "allow multiple spaces to indent");
+  assert.cooked("  > indent 1\n  > indent 2", "<blockquote>\n<p>indent 1<br>\nindent 2</p>\n</blockquote>", "allow multiple spaces to indent");
 
 });
 
 QUnit.test("Quotes", assert => {
 
-  assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line[/quote]",
+  assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]",
                 { topicId: 2 },
-                "<aside class=\"quote\" data-post=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>eviltrout:</div><blockquote>" +
-                "<p>a quote</p><p>second line</p><p>third line</p></blockquote></aside>",
+    `<aside class=\"quote\" data-post=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ eviltrout:</div>
+<blockquote>
+<p>a quote</p>
+<p>second line</p>
+<p>third line</p>
+</blockquote>
+</aside>`,
                 "works with multiple lines");
 
-  assert.cookedOptions("1[quote=\"bob, post:1\"]my quote[/quote]2",
-                { topicId: 2, lookupAvatar: function(name) { return "" + name; }, sanitize: true },
-                "<p>1</p>\n\n<aside class=\"quote\" data-post=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>bob" +
-                "bob:</div><blockquote><p>my quote</p></blockquote></aside>\n\n<p>2</p>",
-                "handles quotes properly");
 
-  assert.cookedOptions("1[quote=\"bob, post:1\"]my quote[/quote]2",
+  assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]",
                 { topicId: 2, lookupAvatar: function() { } },
-                "<p>1</p>\n\n<aside class=\"quote\" data-post=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>bob:" +
-                "</div><blockquote><p>my quote</p></blockquote></aside>\n\n<p>2</p>",
+    `<aside class=\"quote\" data-post=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ bob:</div>
+<blockquote>
+<p>my quote</p>
+</blockquote>
+</aside>`,
                 "includes no avatar if none is found");
 
   assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
-         "<p><aside class=\"quote\"><blockquote><p>a</p><p><aside class=\"quote\"><blockquote><p>b</p></blockquote></aside></p></blockquote></aside></p>",
+    `<aside class=\"quote\">
+<blockquote>
+<p>a</p>
+<aside class=\"quote\">
+<blockquote>
+<p>b</p>
+</blockquote>
+</aside>
+</blockquote>
+</aside>`,
          "handles nested quotes properly");
 
 });
@@ -264,7 +297,7 @@ QUnit.test("Mentions", assert => {
          "won't add mention class to an email address");
 
   assert.cooked("hanzo55@yahoo.com",
-         "<p>hanzo55@yahoo.com</p>",
+         "<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",
@@ -272,7 +305,7 @@ QUnit.test("Mentions", assert => {
          "it handles mentions at the beginning of a string");
 
   assert.cooked("yo\n@EvilTrout",
-         "<p>yo<br/><span class=\"mention\">@EvilTrout</span></p>",
+         "<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`",
@@ -280,15 +313,15 @@ QUnit.test("Mentions", assert => {
          "deals correctly with multiple <code> blocks");
 
   assert.cooked("```\na @test\n```",
-         "<p><pre><code class=\"lang-auto\">a @test</code></pre></p>",
+         "<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><p>foo bar baz <span class=\"mention\">@eviltrout</span></p></blockquote>",
+         "<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><p>foo bar baz <span class=\"mention\">@eviltrout</span> ohmagerd<br/>look at this</p></blockquote>",
+         "<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",
@@ -312,7 +345,7 @@ QUnit.test("Mentions", assert => {
          "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><li><p>this is  a list</p></li><li><p>this is an <span class=\"mention\">@eviltrout</span> mention</p></li></ol>",
+         "<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",
@@ -344,11 +377,11 @@ QUnit.test("Category hashtags", assert => {
          "it does not translate category hashtag within links");
 
   assert.cooked("```\n# #category-hashtag\n```",
-         "<p><pre><code class=\"lang-auto\"># #category-hashtag</code></pre></p>",
+         "<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><h1><span class=\"hashtag\">#category-hashtag</span></h1></blockquote>",
+         "<blockquote>\n<h1><span class=\"hashtag\">#category-hashtag</span></h1>\n</blockquote>",
          "it handles category hashtags in simple quotes");
 
   assert.cooked("# #category-hashtag",
@@ -359,10 +392,6 @@ QUnit.test("Category hashtags", assert => {
          "<p>don't <code>#category-hashtag</code></p>",
          "it does not mention in an inline code block");
 
-  assert.cooked("test #hashtag1/#hashtag2",
-         "<p>test <span class=\"hashtag\">#hashtag1</span>/#hashtag2</p>",
-         "it does not convert category hashtag not bounded by spaces");
-
   assert.cooked("<small>#category-hashtag</small>",
          "<p><small><span class=\"hashtag\">#category-hashtag</span></small></p>",
          "it works between HTML tags");
@@ -374,14 +403,12 @@ QUnit.test("Heading", assert => {
 });
 
 QUnit.test("bold and italics", assert => {
-  assert.cooked("a \"**hello**\"", "<p>a \"<strong>hello</strong>\"</p>", "bolds in quotes");
+  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>world</p>", "allows newline after bold");
-  assert.cooked("**hello**\n**world**", "<p><strong>hello</strong><br><strong>world</strong></p>", "newline between two bolds");
-  assert.cooked("**a*_b**", "<p><strong>a*_b</strong></p>", "allows for characters within bold");
+  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>你**hello**</p>", "does not bold chinese intra word");
   assert.cooked("**你hello**", "<p><strong>你hello</strong></p>", "allows bolded chinese");
 });
 
@@ -391,10 +418,11 @@ QUnit.test("Escaping", assert => {
 });
 
 QUnit.test("New Lines", assert => {
-  // Note: This behavior was discussed and we determined it does not make sense to do this
-  // unless you're using traditional line breaks
-  assert.cooked("_abc\ndef_", "<p>_abc<br>def_</p>", "it does not allow markup to span new lines");
-  assert.cooked("_abc\n\ndef_", "<p>_abc</p>\n\n<p>def_</p>", "it does not allow markup to span new paragraphs");
+  // 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");
 });
 
 QUnit.test("Oneboxing", assert => {
@@ -411,9 +439,9 @@ QUnit.test("Oneboxing", assert => {
   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/)",
+  assert.ok(!matches("[http://www.tomcruise.com/](http://www.tomcruise.com/)",
     "onebox"),
-    "Markdown links where the label is the same as the url are oneboxed");
+    "Markdown links where the label is the same as the url but link is explicit");
 
   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\"" +
@@ -431,63 +459,63 @@ QUnit.test("links with full urls", assert => {
 QUnit.test("Code Blocks", assert => {
 
   assert.cooked("<pre>\nhello\n</pre>\n",
-         "<p><pre>hello</pre></p>",
+         "<pre>\nhello\n</pre>",
          "pre blocks don't include extra lines");
 
   assert.cooked("```\na\nb\nc\n\nd\n```",
-         "<p><pre><code class=\"lang-auto\">a\nb\nc\n\nd</code></pre></p>",
+         "<pre><code class=\"lang-auto\">a\nb\nc\n\nd\n</code></pre>",
          "it treats new lines properly");
 
   assert.cooked("```\ntest\n```",
-         "<p><pre><code class=\"lang-auto\">test</code></pre></p>",
+         "<pre><code class=\"lang-auto\">test\n</code></pre>",
          "it supports basic code blocks");
 
   assert.cooked("```json\n{hello: 'world'}\n```\ntrailing",
-         "<p><pre><code class=\"lang-json\">{hello: &#x27;world&#x27;}</code></pre></p>\n\n<p>trailing</p>",
+         "<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```",
-         "<p><pre><code class=\"lang-json\">line 1\n\nline 2\n\n\nline3</code></pre></p>",
+         "<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/>world<br/></p>\n\n<p><pre><code class=\"lang-json\">line 1\n\nline 2\n\n\nline3</code></pre></p>",
+         "<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```",
-         "<p><pre><code class=\"lang-ruby\">&lt;header&gt;hello&lt;/header&gt;</code></pre></p>",
+         "<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```",
-         "<p><pre><code class=\"lang-nohighlight\">text</code></pre></p>",
+         "<pre><code class=\"lang-nohighlight\">text\n</code></pre>",
          "handles text by adding nohighlight");
 
   assert.cooked("```ruby\n# cool\n```",
-         "<p><pre><code class=\"lang-ruby\"># cool</code></pre></p>",
+         "<pre><code class=\"lang-ruby\"># cool\n</code></pre>",
          "it supports changing the language");
 
   assert.cooked("    ```\n    hello\n    ```",
-         "<pre><code>&#x60;&#x60;&#x60;\nhello\n&#x60;&#x60;&#x60;</code></pre>",
+         "<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```",
-         "<p><pre><code class=\"lang-ruby\">def self.parse(text)\n\n  text\nend</code></pre></p>",
+         "<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```",
-         "<p><pre><code class=\"lang-ruby\">hello &#x60;eviltrout&#x60;</code></pre></p>",
+         "<pre><code class=\"lang-ruby\">hello `eviltrout`\n</code></pre>",
          "it allows code with backticks in it");
 
   assert.cooked("```eviltrout\nhello\n```",
-          "<p><pre><code class=\"lang-auto\">hello</code></pre></p>",
+          "<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```",
-         "<p><pre><code class=\"lang-auto\">[quote=&quot;sam, post:1, topic:9441, full:true&quot;]This is &#x60;&lt;not&gt;&#x60; a bug.[/quote]</code></pre></p>",
+         "<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</code></pre>\n\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 ```",
@@ -495,7 +523,7 @@ QUnit.test("Code Blocks", assert => {
          "it tolerates misuse of code block tags as inline code");
 
   assert.cooked("```\nline1\n```\n```\nline2\n\nline3\n```",
-         "<p><pre><code class=\"lang-auto\">line1</code></pre></p>\n\n<p><pre><code class=\"lang-auto\">line2\n\nline3</code></pre></p>",
+         "<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>",
@@ -507,22 +535,22 @@ QUnit.test("Code Blocks", assert => {
          "it does not parse other block types in markdown code blocks");
 
   assert.cooked("## a\nb\n```\nc\n```",
-         "<h2>a</h2>\n\n<p><pre><code class=\"lang-auto\">c</code></pre></p>",
+         "<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\"/><img src=\"http://samsaffron.com/samsaffron.png\"/></p>",
+         "<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\">http://discourse.org</a></p>",
+         "<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\">discourse</a></p>",
+         "<p><a href=\"http://discourse.org\" data-bbcode=\"true\">discourse</a></p>",
          "named links are properly parsed");
 
 });
@@ -539,33 +567,33 @@ QUnit.test("images", assert => {
 
 QUnit.test("censoring", assert => {
   assert.cooked("aw shucks, golly gee whiz.",
-         "<p>aw &#9632;&#9632;&#9632;&#9632;&#9632;&#9632;, golly gee &#9632;&#9632;&#9632;&#9632;.</p>",
+         "<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. &#9632;&#9632;&#9632;&#9632;.</p>",
+         "<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 &#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632;! I love cheesewhiz. &#9632;&#9632;&#9632;&#9632;.</p>",
+         "<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\">&#9632;&#9632;&#9632;&#9632;</a></p>",
+         "<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 &#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632; the computer &#9632;&#9632;&#9632;&#9632; at 555-&#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632;&#9632; for free help.</p>",
+         "<p>Call ■■■■■■■ the computer ■■■■ at 555-■■■■■■■■ 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 &#9632;&#9632;&#9632;&#9632;&#9632;</p>",
+         "<p>I have a pen, I have an ■■■■■</p>",
          "it escapes regexp chars");
 });
 
 QUnit.test("code blocks/spans hoisting", assert => {
   assert.cooked("```\n\n    some code\n```",
-         "<p><pre><code class=\"lang-auto\">    some code</code></pre></p>",
+         "<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("`$&`",
@@ -578,47 +606,42 @@ QUnit.test('basic bbcode', assert => {
   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\">", "links images");
-  assert.cookedPara("[email]eviltrout@mailinator.com[/email]", "<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>", "supports [email] without a title");
+  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\">eviltrout@mailinator.com</a>", "supports upper case bbcode");
+  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]", "abc.com", "no error when a url has no protocol and begins with a");
-  assert.cookedPara("[url]http://bettercallsaul.com[/url]", "<a href=\"http://bettercallsaul.com\">http://bettercallsaul.com</a>", "supports [url] without parameter");
-  assert.cookedPara("[url=http://example.com]example[/url]", "<a href=\"http://example.com\">example</a>", "supports [url] with given href");
+  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\"><img src=\"http://example.com/logo.png\"></a>",
+         "<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 => {
-  const result = new PrettyText({ lookupAvatar: false }).cook("[code]I am not closed\n\nThis text exists.");
-  assert.equal(result, "<p>[code]I am not closed</p>\n\n<p>This text exists.</p>", "does not raise an error with an open bbcode tag.");
+  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.");
 });
 
 QUnit.test('code', assert => {
-  assert.cookedPara("[code]\nx++\n[/code]", "<pre><code class=\"lang-auto\">x++</code></pre>", "makes code into pre");
-  assert.cookedPara("[code]\nx++\ny++\nz++\n[/code]", "<pre><code class=\"lang-auto\">x++\ny++\nz++</code></pre>", "makes code into pre");
-  assert.cookedPara("[code]abc\n#def\n[/code]", '<pre><code class=\"lang-auto\">abc\n#def</code></pre>', 'it handles headings in a [code] block');
-  assert.cookedPara("[code]\n   s[/code]",
+  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('lists', assert => {
-  assert.cookedPara("[ul][li]option one[/li][/ul]", "<ul><li>option one</li></ul>", "creates an ul");
-  assert.cookedPara("[ol][li]option one[/li][/ol]", "<ol><li>option one</li></ol>", "creates an ol");
-  assert.cookedPara("[ul]\n[li]option one[/li]\n[li]option two[/li]\n[/ul]", "<ul><li>option one</li><li>option two</li></ul>", "suppresses empty lines in lists");
-});
-
 QUnit.test('tags with arguments', assert => {
-  assert.cookedPara("[url=http://bettercallsaul.com]better call![/url]", "<a href=\"http://bettercallsaul.com\">better call!</a>", "supports [url] with a title");
-  assert.cookedPara("[email=eviltrout@mailinator.com]evil trout[/email]", "<a href=\"mailto:eviltrout@mailinator.com\">evil trout</a>", "supports [email] with a title");
+  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");
 });
@@ -658,70 +681,140 @@ QUnit.test("quotes", assert => {
               "[quote=\"eviltrout, post:1, topic:2\"]\nthis is &lt;not&gt; a bug\n[/quote]\n\n",
               "it escapes the contents of the quote");
 
-  assert.cookedPara("[quote]test[/quote]",
-         "<aside class=\"quote\"><blockquote><p>test</p></blockquote></aside>",
+  assert.cooked("[quote]\ntest\n[/quote]",
+         "<aside class=\"quote\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
          "it supports quotes without params");
 
-  assert.cookedPara("[quote]\n*test*\n[/quote]",
-         "<aside class=\"quote\"><blockquote><p><em>test</em></p></blockquote></aside>",
+  assert.cooked("[quote]\n*test*\n[/quote]",
+         "<aside class=\"quote\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
          "it doesn't insert a new line for italics");
 
-  assert.cookedPara("[quote=,script='a'><script>alert('test');//':a][/quote]",
-         "<aside class=\"quote\"><blockquote></blockquote></aside>",
+  assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
+         "<aside class=\"quote\">\n<blockquote></blockquote>\n</aside>",
          "It will not create a script tag within an attribute");
 });
 
 QUnit.test("quote formatting", assert => {
 
-  assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"][sam][/quote]",
-          "<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">" +
-          "<div class=\"quote-controls\"></div>EvilTrout:</div><blockquote><p>[sam]</p></blockquote></aside>",
+  assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]",
+`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ EvilTrout:</div>
+<blockquote>
+<p>[sam]</p>
+</blockquote>
+</aside>`,
           "it allows quotes with [] inside");
 
-  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>eviltrout:" +
-         "</div><blockquote><p>abc</p></blockquote></aside>",
+  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ eviltrout:</div>
+<blockquote>
+<p>abc</p>
+</blockquote>
+</aside>`,
          "renders quotes properly");
 
-  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]\nhello",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>eviltrout:" +
-         "</div><blockquote><p>abc</p></blockquote></aside>\n\n<p>hello</p>",
+  assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ eviltrout:</div>
+<blockquote>
+<p>abc</p>
+</blockquote>
+</aside>
+<p>hello</p>`,
          "handles new lines properly");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:" +
-         "</div><blockquote><aside class=\"quote\" data-post=\"2\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Bob:" +
-         "</div><blockquote></blockquote></aside></blockquote></aside>",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Alice:</div>
+<blockquote>
+<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Bob:</div>
+<blockquote></blockquote>
+</aside>
+</blockquote>
+</aside>`,
          "quotes can be nested");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]",
-         "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:" +
-         "</div><blockquote><p>[quote=\"Bob, post:2, topic:1\"]</p></blockquote></aside>",
-         "handles mismatched nested quote tags");
+`<p>[quote=&quot;Alice, post:1, topic:1&quot;]</p>
+<aside class=\"quote\" data-post=\"2\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Bob:</div>
+<blockquote></blockquote>
+</aside>`,
+
+         "handles mismatched nested quote tags (non greedy)");
 
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-          "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:</div><blockquote><p><pre><code class=\"lang-javascript\">var foo =&#x27;foo&#x27;;\nvar bar = &#x27;bar&#x27;;</code></pre></p></blockquote></aside>",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Alice:</div>
+<blockquote>
+<pre><code class=\"lang-javascript\">var foo ='foo';
+var bar = 'bar';
+</code></pre>
+</blockquote>
+</aside>`,
           "quotes can have code blocks without leading newline");
+
   assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
-          "<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"><div class=\"title\"><div class=\"quote-controls\"></div>Alice:</div><blockquote><p><pre><code class=\"lang-javascript\">var foo =&#x27;foo&#x27;;\nvar bar = &#x27;bar&#x27;;</code></pre></p></blockquote></aside>",
+`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ Alice:</div>
+<blockquote>
+<pre><code class=\"lang-javascript\">var foo ='foo';
+var bar = 'bar';
+</code></pre>
+</blockquote>
+</aside>`,
           "quotes can have code blocks with leading newline");
 });
 
 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\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"><div class=\"title\">" +
-        "<div class=\"quote-controls\"></div>EvilTrout:</div><blockquote><p>hello</p></blockquote></aside>\n\n<p><em>Test</em></p>",
+`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
+<div class=\"title\">
+<div class=\"quote-controls\"></div>
+ EvilTrout:</div>
+<blockquote>
+<p>hello</p>
+</blockquote>
+</aside>
+<p><em>Test</em></p>`,
         "it allows trailing formatting");
 });
 
 QUnit.test("enable/disable features", assert => {
-  const table = `<table><tr><th>hello</th></tr><tr><td>world</td></tr></table>`;
-  const hasTable = new PrettyText({ features: {table: true}, sanitize: true}).cook(table);
-  assert.equal(hasTable, `<table class="md-table"><tr><th>hello</th></tr><tr><td>world</td></tr></table>`);
 
-  const noTable = new PrettyText({ features: { table: false }, sanitize: true}).cook(table);
-  assert.equal(noTable, `<p></p>`, 'tables are stripped when disabled');
+  assert.cookedOptions('|a|\n--\n|a|', { features: {table: false} }, '');
+  assert.cooked('|a|\n--\n|a|',
+`<table>
+<thead>
+<tr>
+<th>a</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>a</td>
+</tr>
+</tbody>
+</table>`);
 });
 
 QUnit.test("emoji", assert => {
@@ -732,6 +825,6 @@ QUnit.test("emoji", assert => {
 
 QUnit.test("emoji - emojiSet", assert => {
   assert.cookedOptions(":smile:",
-                { emojiSet: 'twitter' },
+                { 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 9902ddf6bf..cc5dcb205c 100644
--- a/test/javascripts/lib/sanitizer-test.js.es6
+++ b/test/javascripts/lib/sanitizer-test.js.es6
@@ -12,15 +12,15 @@ QUnit.test("sanitize", assert => {
   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("<a href='http://disneyland.disney.go.com/'>disney</a> <a href='http://reddit.com'>reddit</a>",
          "<p><a href=\"http://disneyland.disney.go.com/\">disney</a> <a href=\"http://reddit.com\">reddit</a></p>",
          "we can embed proper links");
 
-  cooked("<center>hello</center>", "<p>hello</p>", "it does not allow centering");
-  cooked("<table><tr><td>hello</td></tr></table>\nafter", "<p>after</p>", "it does not allow tables");
-  cooked("<blockquote>a\n</blockquote>\n", "<blockquote>a\n\n<br/>\n\n</blockquote>", "it does not double sanitize");
+  cooked("<center>hello</center>", "hello", "it does not allow centering");
+  cooked("<blockquote>a\n</blockquote>\n", "<blockquote>a\n</blockquote>", "it does not double sanitize");
 
   cooked("<iframe src=\"http://discourse.org\" width=\"100\" height=\"42\"></iframe>", "", "it does not allow most iframes");
 
@@ -38,9 +38,9 @@ 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><a>the answer</a></p>", "it prevents XSS");
+  cooked("[the answer](javascript:alert(42))", "<p>[the answer](javascript:alert(42))</p>", "it prevents XSS");
 
-  cooked("<i class=\"fa fa-bug fa-spin\" style=\"font-size:600%\"></i>\n<!-- -->", "<p><i></i><br/></p>", "it doesn't circumvent XSS with comments");
+  cooked("<i class=\"fa fa-bug fa-spin\" style=\"font-size:600%\"></i>\n<!-- -->", "<p><i></i></p>", "it doesn't circumvent XSS with comments");
 
   cooked("<span class=\"-bbcode-s fa fa-spin\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
   cooked("<span class=\"fa fa-spin -bbcode-s\">a</span>", "<p><span>a</span></p>", "it sanitizes spans");
diff --git a/test/javascripts/lib/utilities-test.js.es6 b/test/javascripts/lib/utilities-test.js.es6
index e8a3a8c93f..e903b97792 100644
--- a/test/javascripts/lib/utilities-test.js.es6
+++ b/test/javascripts/lib/utilities-test.js.es6
@@ -119,7 +119,7 @@ var testUploadMarkdown = function(filename) {
 };
 
 QUnit.test("getUploadMarkdown", assert => {
-  assert.ok(testUploadMarkdown("lolcat.gif") === '<img src="/uploads/123/abcdef.ext" width="100" height="200">');
+  assert.equal(testUploadMarkdown("lolcat.gif"),'![lolcat|100x200](/uploads/123/abcdef.ext)');
   assert.ok(testUploadMarkdown("important.txt") === '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n');
 });
 
@@ -227,4 +227,4 @@ QUnit.test("caretRowCol", assert => {
   assertResult(14, 3, 2);
 
   document.body.removeChild(textarea);
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/lib/white-lister-test.js.es6 b/test/javascripts/lib/white-lister-test.js.es6
new file mode 100644
index 0000000000..e8bb3d8f30
--- /dev/null
+++ b/test/javascripts/lib/white-lister-test.js.es6
@@ -0,0 +1,48 @@
+import WhiteLister from 'pretty-text/white-lister';
+
+QUnit.module("lib:whiteLister");
+
+QUnit.test("whiteLister", assert => {
+  const whiteLister = new WhiteLister();
+
+  assert.ok(Object.keys(whiteLister.getWhiteList().tagList).length > 1, "should have some defaults");
+
+  whiteLister.disable("default");
+
+  assert.ok(Object.keys(whiteLister.getWhiteList().tagList).length === 0, "should have no defaults if disabled");
+
+  whiteLister.whiteListFeature("test", [
+      'custom.foo',
+      'custom.baz',
+      'custom[data-*]',
+      'custom[rel=nofollow]'
+  ]);
+
+  whiteLister.whiteListFeature("test", [
+    'custom[rel=test]'
+  ]);
+
+  whiteLister.enable("test");
+
+  assert.deepEqual(whiteLister.getWhiteList(), {
+    tagList: {
+      custom: []
+    },
+    attrList: {
+      custom: {
+        "class": ["foo", "baz"],
+        "data-*": ["*"],
+        "rel": ["nofollow", "test"]
+      }
+    }
+  }, 'Expecting a correct white list');
+
+
+  whiteLister.disable("test");
+
+  assert.deepEqual(whiteLister.getWhiteList(), {
+    tagList: {},
+    attrList: {}
+  }, 'Expecting an empty white list');
+
+});
diff --git a/test/javascripts/mdtest/fixtures/Amps and angle encoding.text b/test/javascripts/mdtest/fixtures/Amps and angle encoding.text
deleted file mode 100644
index 0e9527f931..0000000000
--- a/test/javascripts/mdtest/fixtures/Amps and angle encoding.text	
+++ /dev/null
@@ -1,21 +0,0 @@
-AT&T has an ampersand in their name.
-
-AT&amp;T is another way to write it.
-
-This & that.
-
-4 < 5.
-
-6 > 5.
-
-Here's a [link] [1] with an ampersand in the URL.
-
-Here's a link with an amersand in the link text: [AT&T] [2].
-
-Here's an inline [link](/script?foo=1&bar=2).
-
-Here's an inline [link](</script?foo=1&bar=2>).
-
-
-[1]: http://example.com/?foo=1&bar=2
-[2]: http://att.com/  "AT&T"
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml b/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml
deleted file mode 100644
index 483f8ffa16..0000000000
--- a/test/javascripts/mdtest/fixtures/Amps and angle encoding.xhtml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<p>AT&amp;T has an ampersand in their name.</p>
-
-<p>AT&amp;T is another way to write it.</p>
-
-<p>This &amp; that.</p>
-
-<p>4 &lt; 5.</p>
-
-<p>6 &gt; 5.</p>
-
-<p>Here's a <a href="http://example.com/?foo=1&amp;bar=2">link</a> with an ampersand in the URL.</p>
-
-<p>Here's a link with an amersand in the link text: <a href="http://att.com/" title="AT&amp;T">AT&amp;T</a>.</p>
-
-<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
-
-<p>Here's an inline <a href="/script?foo=1&amp;bar=2">link</a>.</p>
diff --git a/test/javascripts/mdtest/fixtures/Auto links.text b/test/javascripts/mdtest/fixtures/Auto links.text
deleted file mode 100644
index abbc48869d..0000000000
--- a/test/javascripts/mdtest/fixtures/Auto links.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Link: <http://example.com/>.
-
-With an ampersand: <http://example.com/?foo=1&bar=2>
-
-* In a list?
-* <http://example.com/>
-* It should.
-
-> Blockquoted: <http://example.com/>
-
-Auto-links should not occur here: `<http://example.com/>`
-
-	or here: <http://example.com/>
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Auto links.xhtml b/test/javascripts/mdtest/fixtures/Auto links.xhtml
deleted file mode 100644
index f8df9852c7..0000000000
--- a/test/javascripts/mdtest/fixtures/Auto links.xhtml	
+++ /dev/null
@@ -1,18 +0,0 @@
-<p>Link: <a href="http://example.com/">http://example.com/</a>.</p>
-
-<p>With an ampersand: <a href="http://example.com/?foo=1&amp;bar=2">http://example.com/?foo=1&amp;bar=2</a></p>
-
-<ul>
-<li>In a list?</li>
-<li><a href="http://example.com/">http://example.com/</a></li>
-<li>It should.</li>
-</ul>
-
-<blockquote>
-  <p>Blockquoted: <a href="http://example.com/">http://example.com/</a></p>
-</blockquote>
-
-<p>Auto-links should not occur here: <code>&lt;http://example.com/&gt;</code></p>
-
-<pre><code>or here: &lt;http://example.com/&gt;
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Backslash escapes.text b/test/javascripts/mdtest/fixtures/Backslash escapes.text
deleted file mode 100644
index e30e965489..0000000000
--- a/test/javascripts/mdtest/fixtures/Backslash escapes.text	
+++ /dev/null
@@ -1,120 +0,0 @@
-These should all get escaped:
-
-Backslash: \\
-
-Backtick: \`
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \>
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-
-
-
-These should not, because they occur within a code block:
-
-	Backslash: \\
-
-	Backtick: \`
-
-	Asterisk: \*
-
-	Underscore: \_
-
-	Left brace: \{
-
-	Right brace: \}
-
-	Left bracket: \[
-
-	Right bracket: \]
-
-	Left paren: \(
-
-	Right paren: \)
-
-	Greater-than: \>
-
-	Hash: \#
-
-	Period: \.
-
-	Bang: \!
-
-	Plus: \+
-
-	Minus: \-
-
-
-Nor should these, which occur in code spans:
-
-Backslash: `\\`
-
-Backtick: `\``
-
-Asterisk: `\*`
-
-Underscore: `\_`
-
-Left brace: `\{`
-
-Right brace: `\}`
-
-Left bracket: `\[`
-
-Right bracket: `\]`
-
-Left paren: `\(`
-
-Right paren: `\)`
-
-Greater-than: `\>`
-
-Hash: `\#`
-
-Period: `\.`
-
-Bang: `\!`
-
-Plus: `\+`
-
-Minus: `\-`
-
-
-These should get escaped, even though they're matching pairs for
-other Markdown constructs:
-
-\*asterisks\*
-
-\_underscores\_
-
-\`backticks\`
-
-This is a code span with a literal backslash-backtick sequence: `\``
-
-This is a tag with unescaped backticks <span attr='`ticks`'>bar</span>.
-
-This is a tag with backslashes <span attr='\\backslashes\\'>bar</span>.
diff --git a/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml b/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml
deleted file mode 100644
index 750830e8c9..0000000000
--- a/test/javascripts/mdtest/fixtures/Backslash escapes.xhtml	
+++ /dev/null
@@ -1,118 +0,0 @@
-<p>These should all get escaped:</p>
-
-<p>Backslash: \</p>
-
-<p>Backtick: `</p>
-
-<p>Asterisk: *</p>
-
-<p>Underscore: _</p>
-
-<p>Left brace: {</p>
-
-<p>Right brace: }</p>
-
-<p>Left bracket: [</p>
-
-<p>Right bracket: ]</p>
-
-<p>Left paren: (</p>
-
-<p>Right paren: )</p>
-
-<p>Greater-than: &gt;</p>
-
-<p>Hash: #</p>
-
-<p>Period: .</p>
-
-<p>Bang: !</p>
-
-<p>Plus: +</p>
-
-<p>Minus: -</p>
-
-<p>These should not, because they occur within a code block:</p>
-
-<pre><code>Backslash: \\
-
-Backtick: \&#x60;
-
-Asterisk: \*
-
-Underscore: \_
-
-Left brace: \{
-
-Right brace: \}
-
-Left bracket: \[
-
-Right bracket: \]
-
-Left paren: \(
-
-Right paren: \)
-
-Greater-than: \&gt;
-
-Hash: \#
-
-Period: \.
-
-Bang: \!
-
-Plus: \+
-
-Minus: \-
-</code></pre>
-
-<p>Nor should these, which occur in code spans:</p>
-
-<p>Backslash: <code>\\</code></p>
-
-<p>Backtick: <code>\&#x60;</code></p>
-
-<p>Asterisk: <code>\*</code></p>
-
-<p>Underscore: <code>\_</code></p>
-
-<p>Left brace: <code>\{</code></p>
-
-<p>Right brace: <code>\}</code></p>
-
-<p>Left bracket: <code>\[</code></p>
-
-<p>Right bracket: <code>\]</code></p>
-
-<p>Left paren: <code>\(</code></p>
-
-<p>Right paren: <code>\)</code></p>
-
-<p>Greater-than: <code>\&gt;</code></p>
-
-<p>Hash: <code>\#</code></p>
-
-<p>Period: <code>\.</code></p>
-
-<p>Bang: <code>\!</code></p>
-
-<p>Plus: <code>\+</code></p>
-
-<p>Minus: <code>\-</code></p>
-
-
-<p>These should get escaped, even though they're matching pairs for
-other Markdown constructs:</p>
-
-<p>*asterisks*</p>
-
-<p>_underscores_</p>
-
-<p>`backticks`</p>
-
-<p>This is a code span with a literal backslash-backtick sequence: <code>\&#x60;</code></p>
-
-<p>This is a tag with unescaped backticks <span>bar</span>.</p>
-
-<p>This is a tag with backslashes <span>bar</span>.</p>
diff --git a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text
deleted file mode 100644
index c31d171049..0000000000
--- a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.text	
+++ /dev/null
@@ -1,11 +0,0 @@
-> Example:
-> 
->     sub status {
->         print "working";
->     }
-> 
-> Or:
-> 
->     sub status {
->         return "working";
->     }
diff --git a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml b/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml
deleted file mode 100644
index cb34534995..0000000000
--- a/test/javascripts/mdtest/fixtures/Blockquotes with code blocks.xhtml	
+++ /dev/null
@@ -1,15 +0,0 @@
-<blockquote>
-  <p>Example:</p>
-
-<pre><code>sub status {
-    print &quot;working&quot;;
-}
-</code></pre>
-
-  <p>Or:</p>
-
-<pre><code>sub status {
-    return &quot;working&quot;;
-}
-</code></pre>
-</blockquote>
diff --git a/test/javascripts/mdtest/fixtures/Code Blocks.text b/test/javascripts/mdtest/fixtures/Code Blocks.text
deleted file mode 100644
index b54b09285a..0000000000
--- a/test/javascripts/mdtest/fixtures/Code Blocks.text	
+++ /dev/null
@@ -1,14 +0,0 @@
-	code block on the first line
-	
-Regular text.
-
-    code block indented by spaces
-
-Regular text.
-
-	the lines in this block  
-	all contain trailing spaces  
-
-Regular Text.
-
-	code block on the last line
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Code Blocks.xhtml b/test/javascripts/mdtest/fixtures/Code Blocks.xhtml
deleted file mode 100644
index f6461051af..0000000000
--- a/test/javascripts/mdtest/fixtures/Code Blocks.xhtml	
+++ /dev/null
@@ -1,17 +0,0 @@
-<pre><code>code block on the first line
-</code></pre>
-
-<p>Regular text.</p>
-
-<pre><code>code block indented by spaces
-</code></pre>
-
-<p>Regular text.</p>
-
-<pre><code>the lines in this block  
-all contain trailing spaces</code></pre>
-
-<p>Regular Text.</p>
-
-<pre><code>code block on the last line
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Code Spans.text b/test/javascripts/mdtest/fixtures/Code Spans.text
deleted file mode 100644
index fbef1f5f1d..0000000000
--- a/test/javascripts/mdtest/fixtures/Code Spans.text	
+++ /dev/null
@@ -1,5 +0,0 @@
-`<test a="` content of attribute `">`
-
-Fix for backticks within HTML tag: <span attr='`ticks`'>like this</span>
-
-Here's how you put `` `backticks` `` in a code span.
diff --git a/test/javascripts/mdtest/fixtures/Code Spans.xhtml b/test/javascripts/mdtest/fixtures/Code Spans.xhtml
deleted file mode 100644
index e050061d89..0000000000
--- a/test/javascripts/mdtest/fixtures/Code Spans.xhtml	
+++ /dev/null
@@ -1,5 +0,0 @@
-<p><code>&lt;test a=&quot;</code> content of attribute <code>&quot;&gt;</code></p>
-
-<p>Fix for backticks within HTML tag: <span>like this</span></p>
-
-<p>Here's how you put <code>&#x60;backticks&#x60;</code> in a code span.</p>
diff --git a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text
deleted file mode 100644
index f8a5b27bf4..0000000000
--- a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.text	
+++ /dev/null
@@ -1,8 +0,0 @@
-In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.
-
-Here's one with a bullet.
-* criminey.
diff --git a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml b/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml
deleted file mode 100644
index e21ac79a2e..0000000000
--- a/test/javascripts/mdtest/fixtures/Hard-wrapped paragraphs with list-like lines.xhtml	
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>In Markdown 1.0.0 and earlier. Version
-8. This line turns into a list item.
-Because a hard-wrapped line in the
-middle of a paragraph looked like a
-list item.</p>
-
-<p>Here's one with a bullet.
-* criminey.</p>
diff --git a/test/javascripts/mdtest/fixtures/Horizontal rules.text b/test/javascripts/mdtest/fixtures/Horizontal rules.text
deleted file mode 100644
index 1594bda27b..0000000000
--- a/test/javascripts/mdtest/fixtures/Horizontal rules.text	
+++ /dev/null
@@ -1,67 +0,0 @@
-Dashes:
-
----
-
- ---
- 
-  ---
-
-   ---
-
-	---
-
-- - -
-
- - - -
- 
-  - - -
-
-   - - -
-
-	- - -
-
-
-Asterisks:
-
-***
-
- ***
- 
-  ***
-
-   ***
-
-	***
-
-* * *
-
- * * *
- 
-  * * *
-
-   * * *
-
-	* * *
-
-
-Underscores:
-
-___
-
- ___
- 
-  ___
-
-   ___
-
-    ___
-
-_ _ _
-
- _ _ _
- 
-  _ _ _
-
-   _ _ _
-
-    _ _ _
diff --git a/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml b/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml
deleted file mode 100644
index 2dc2ab6565..0000000000
--- a/test/javascripts/mdtest/fixtures/Horizontal rules.xhtml	
+++ /dev/null
@@ -1,71 +0,0 @@
-<p>Dashes:</p>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>---
-</code></pre>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>- - -
-</code></pre>
-
-<p>Asterisks:</p>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>***
-</code></pre>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>* * *
-</code></pre>
-
-<p>Underscores:</p>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>___
-</code></pre>
-
-<hr />
-
-<hr />
-
-<hr />
-
-<hr />
-
-<pre><code>_ _ _
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Images.text b/test/javascripts/mdtest/fixtures/Images.text
deleted file mode 100644
index 5707590915..0000000000
--- a/test/javascripts/mdtest/fixtures/Images.text
+++ /dev/null
@@ -1,26 +0,0 @@
-![Alt text](/path/to/img.jpg)
-
-![Alt text](/path/to/img.jpg "Optional title")
-
-Inline within a paragraph: [alt text](/url/).
-
-![alt text](/url/  "title preceded by two spaces")
-
-![alt text](/url/  "title has spaces afterward"  )
-
-![alt text](</url/>)
-
-![alt text](</url/> "with a title").
-
-![Empty]()
-
-![this is a stupid URL](http://example.com/(parens).jpg)
-
-
-![alt text][foo]
-
-  [foo]: /url/
-
-![alt text][bar]
-
-  [bar]: /url/ "Title here"
\ No newline at end of file
diff --git a/test/javascripts/mdtest/fixtures/Images.xhtml b/test/javascripts/mdtest/fixtures/Images.xhtml
deleted file mode 100644
index fdec8ebcb6..0000000000
--- a/test/javascripts/mdtest/fixtures/Images.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<p><img src="/path/to/img.jpg" alt="Alt text" /></p>
-
-<p><img src="/path/to/img.jpg" alt="Alt text" title="Optional title" /></p>
-
-<p>Inline within a paragraph: <a href="/url/">alt text</a>.</p>
-
-<p><img src="/url/" alt="alt text" title="title preceded by two spaces" /></p>
-
-<p><img src="/url/" alt="alt text" title="title has spaces afterward" /></p>
-
-<p><img src="/url/" alt="alt text" /></p>
-
-<p><img src="/url/" alt="alt text" title="with a title" />.</p>
-
-<p><img alt="Empty" /></p>
-
-<p><img src="http://example.com/(parens).jpg" alt="this is a stupid URL" /></p>
-
-<p><img src="/url/" alt="alt text" /></p>
-
-<p><img src="/url/" alt="alt text" title="Title here" /></p>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text
deleted file mode 100644
index 0c59e89516..0000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).text	
+++ /dev/null
@@ -1,30 +0,0 @@
-Simple block on one line:
-
-<div>foo</div>
-
-And nested without indentation:
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div style=">"></div>
-</div>
-<div>bar</div>
-</div>
-
-And with attributes:
-
-<div>
-	<div id="foo">
-	</div>
-</div>
-
-This was broken in 1.0.2b7:
-
-<div class="inlinepage">
-<div class="toggleableend">
-foo
-</div>
-</div>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml b/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml
deleted file mode 100644
index fc51e2a27e..0000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Advanced).xhtml	
+++ /dev/null
@@ -1,30 +0,0 @@
-<p>Simple block on one line:</p>
-
-<div>foo</div>
-
-<p>And nested without indentation:</p>
-
-<div>
-<div>
-<div>
-foo
-</div>
-<div></div>
-</div>
-<div>bar</div>
-</div>
-
-<p>And with attributes:</p>
-
-<div>
-    <div>
-    </div>
-</div>
-
-<p>This was broken in 1.0.2b7:</p>
-
-<div>
-<div>
-foo
-</div>
-</div>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text
deleted file mode 100644
index d3e1d4efc7..0000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).text	
+++ /dev/null
@@ -1,54 +0,0 @@
-Here's a simple block:
-
-<div>
-	foo
-</div>
-
-This should be a code block, though:
-
-	<div>
-		foo
-	</div>
-
-As should this:
-
-	<div>foo</div>
-
-Now, nested:
-
-<div>
-	<div>
-		<div>
-			foo
-		</div>
-	</div>
-</div>
-
-This should just be an HTML comment:
-
-<!-- Comment -->
-
-Multiline:
-
-<!--
-Blah
-Blah
--->
-
-Code block:
-
-	<!-- Comment -->
-
-Just plain comment, with trailing spaces on the line:
-
-<!-- foo -->
-
-Code:
-
-	<hr />
-
-Hr's:
-
-<hr>
-
-<hr class="foo" id="bar">
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml b/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml
deleted file mode 100644
index 25067beea3..0000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML (Simple).xhtml	
+++ /dev/null
@@ -1,58 +0,0 @@
-<p>Here's a simple block:</p>
-
-<div>
-    foo
-</div>
-
-<p>This should be a code block, though:</p>
-
-<pre><code>&lt;div&gt;
-    foo
-&lt;/div&gt;
-</code></pre>
-
-<p>As should this:</p>
-
-<pre><code>&lt;div&gt;foo&lt;/div&gt;
-</code></pre>
-
-<p>Now, nested:</p>
-
-<div>
-    <div>
-        <div>
-            foo
-        </div>
-    </div>
-</div>
-
-<p>This should just be an HTML comment:</p>
-
-<!-- Comment -->
-
-<p>Multiline:</p>
-
-<!--
-Blah
-Blah
--->
-
-<p>Code block:</p>
-
-<pre><code>&lt;!-- Comment --&gt;
-</code></pre>
-
-<p>Just plain comment, with trailing spaces on the line:</p>
-
-<!-- foo -->
-
-<p>Code:</p>
-
-<pre><code>&lt;hr /&gt;
-</code></pre>
-
-<p>Hr's:</p>
-
-<hr>
-
-<hr>
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML comments.text b/test/javascripts/mdtest/fixtures/Inline HTML comments.text
deleted file mode 100644
index 41d830d038..0000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML comments.text	
+++ /dev/null
@@ -1,13 +0,0 @@
-Paragraph one.
-
-<!-- This is a simple comment -->
-
-<!--
-	This is another comment.
--->
-
-Paragraph two.
-
-<!-- one comment block -- -- with two comments -->
-
-The end.
diff --git a/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml b/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml
deleted file mode 100644
index 3f167a1610..0000000000
--- a/test/javascripts/mdtest/fixtures/Inline HTML comments.xhtml	
+++ /dev/null
@@ -1,13 +0,0 @@
-<p>Paragraph one.</p>
-
-<!-- This is a simple comment -->
-
-<!--
-    This is another comment.
--->
-
-<p>Paragraph two.</p>
-
-<!-- one comment block -- -- with two comments -->
-
-<p>The end.</p>
diff --git a/test/javascripts/mdtest/fixtures/Links, inline style.text b/test/javascripts/mdtest/fixtures/Links, inline style.text
deleted file mode 100644
index ad5f021fce..0000000000
--- a/test/javascripts/mdtest/fixtures/Links, inline style.text	
+++ /dev/null
@@ -1,24 +0,0 @@
-Just a [LINK](/url/).
-
-[URL and title](/url/ "title").
-
-[URL and title](/url/  "title preceded by two spaces").
-
-[URL and title](/url/	"title preceded by a tab").
-
-[URL and title](/url/ "title has spaces afterward"  ).
-
-[URL wrapped in angle brackets](</url/>).
-
-[URL w/ angle brackets + title](</url/> "Here's the title").
-
-[Empty]().
-
-[With parens in the URL](http://en.wikipedia.org/wiki/WIMP_(computing))
-
-(With outer parens and [parens in url](/foo(bar)))
-
-
-[With parens in the URL](/foo(bar) "and a title")
-
-(With outer parens and [parens in url](/foo(bar) "and a title"))
diff --git a/test/javascripts/mdtest/fixtures/Links, inline style.xhtml b/test/javascripts/mdtest/fixtures/Links, inline style.xhtml
deleted file mode 100644
index 70d02398ec..0000000000
--- a/test/javascripts/mdtest/fixtures/Links, inline style.xhtml	
+++ /dev/null
@@ -1,23 +0,0 @@
-<p>Just a <a href="/url/">LINK</a>.</p>
-
-<p><a href="/url/" title="title">URL and title</a>.</p>
-
-<p><a href="/url/" title="title preceded by two spaces">URL and title</a>.</p>
-
-<p><a href="/url/" title="title preceded by a tab">URL and title</a>.</p>
-
-<p><a href="/url/" title="title has spaces afterward">URL and title</a>.</p>
-
-<p><a href="/url/">URL wrapped in angle brackets</a>.</p>
-
-<p><a href="/url/" title="Here's the title">URL w/ angle brackets + title</a>.</p>
-
-<p><a>Empty</a>.</p>
-
-<p><a href="http://en.wikipedia.org/wiki/WIMP_(computing)">With parens in the URL</a></p>
-
-<p>(With outer parens and <a href="/foo(bar)">parens in url</a>)</p>
-
-<p><a href="/foo(bar)" title="and a title">With parens in the URL</a></p>
-
-<p>(With outer parens and <a href="/foo(bar)" title="and a title">parens in url</a>)</p>
diff --git a/test/javascripts/mdtest/fixtures/Links, reference style.text b/test/javascripts/mdtest/fixtures/Links, reference style.text
deleted file mode 100644
index 96d4470d10..0000000000
--- a/test/javascripts/mdtest/fixtures/Links, reference style.text	
+++ /dev/null
@@ -1,71 +0,0 @@
-Foo [bar] [1].
-
-Foo [bar][1].
-
-Foo [bar]
-[1].
-
-[1]: /url/  "Title"
-
-
-With [embedded [brackets]] [b].
-
-
-Indented [once][].
-
-Indented [twice][].
-
-Indented [thrice][].
-
-Indented [four][] times.
-
- [once]: /url
-
-  [twice]: /url
-
-   [thrice]: /url
-
-    [four]: /url
-
-
-[b]: /url/
-
-* * *
-
-[this] [this] should work
-
-So should [this][this].
-
-And [this] [].
-
-And [this][].
-
-And [this].
-
-But not [that] [].
-
-Nor [that][].
-
-Nor [that].
-
-[Something in brackets like [this][] should work]
-
-[Same with [this].]
-
-In this case, [this](/somethingelse/) points to something else.
-
-Backslashing should suppress \[this] and [this\].
-
-[this]: #foo
-
-
-* * *
-
-Here's one where the [link
-breaks] across lines.
-
-Here's another where the [link 
-breaks] across lines, but with a line-ending space.
-
-
-[link breaks]: /url/
diff --git a/test/javascripts/mdtest/fixtures/Links, reference style.xhtml b/test/javascripts/mdtest/fixtures/Links, reference style.xhtml
deleted file mode 100644
index 9eb8ffe694..0000000000
--- a/test/javascripts/mdtest/fixtures/Links, reference style.xhtml	
+++ /dev/null
@@ -1,52 +0,0 @@
-<p>Foo <a href="/url/" title="Title">bar</a>.</p>
-
-<p>Foo <a href="/url/" title="Title">bar</a>.</p>
-
-<p>Foo <a href="/url/" title="Title">bar</a>.</p>
-
-<p>With <a href="/url/">embedded [brackets]</a>.</p>
-
-<p>Indented <a href="/url">once</a>.</p>
-
-<p>Indented <a href="/url">twice</a>.</p>
-
-<p>Indented <a href="/url">thrice</a>.</p>
-
-<p>Indented [four][] times.</p>
-
-<pre><code>[four]: /url
-</code></pre>
-
-<hr />
-
-<p><a href="#foo">this</a> should work</p>
-
-<p>So should <a href="#foo">this</a>.</p>
-
-<p>And <a href="#foo">this</a>.</p>
-
-<p>And <a href="#foo">this</a>.</p>
-
-<p>And <a href="#foo">this</a>.</p>
-
-<p>But not [that] [].</p>
-
-<p>Nor [that][].</p>
-
-<p>Nor [that].</p>
-
-<p>[Something in brackets like <a href="#foo">this</a> should work]</p>
-
-<p>[Same with <a href="#foo">this</a>.]</p>
-
-<p>In this case, <a href="/somethingelse/">this</a> points to something else.</p>
-
-<p>Backslashing should suppress [this] and [this].</p>
-
-<hr />
-
-<p>Here's one where the <a href="/url/">link
-breaks</a> across lines.</p>
-
-<p>Here's another where the <a href="/url/">link 
-breaks</a> across lines, but with a line-ending space.</p>
diff --git a/test/javascripts/mdtest/fixtures/Links, shortcut references.text b/test/javascripts/mdtest/fixtures/Links, shortcut references.text
deleted file mode 100644
index 8c44c98fee..0000000000
--- a/test/javascripts/mdtest/fixtures/Links, shortcut references.text	
+++ /dev/null
@@ -1,20 +0,0 @@
-This is the [simple case].
-
-[simple case]: /simple
-
-
-
-This one has a [line
-break].
-
-This one has a [line 
-break] with a line-ending space.
-
-[line break]: /foo
-
-
-[this] [that] and the [other]
-
-[this]: /this
-[that]: /that
-[other]: /other
diff --git a/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml b/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml
deleted file mode 100644
index bf81e939f5..0000000000
--- a/test/javascripts/mdtest/fixtures/Links, shortcut references.xhtml	
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>This is the <a href="/simple">simple case</a>.</p>
-
-<p>This one has a <a href="/foo">line
-break</a>.</p>
-
-<p>This one has a <a href="/foo">line 
-break</a> with a line-ending space.</p>
-
-<p><a href="/that">this</a> and the <a href="/other">other</a></p>
diff --git a/test/javascripts/mdtest/fixtures/Literal quotes in titles.text b/test/javascripts/mdtest/fixtures/Literal quotes in titles.text
deleted file mode 100644
index 29d0e4235b..0000000000
--- a/test/javascripts/mdtest/fixtures/Literal quotes in titles.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-Foo [bar][].
-
-Foo [bar](/url/ "Title with "quotes" inside").
-
-
-  [bar]: /url/ "Title with "quotes" inside"
-
diff --git a/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml b/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml
deleted file mode 100644
index 611c1ac61f..0000000000
--- a/test/javascripts/mdtest/fixtures/Literal quotes in titles.xhtml	
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
-
-<p>Foo <a href="/url/" title="Title with &quot;quotes&quot; inside">bar</a>.</p>
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text
deleted file mode 100644
index 01ce740d5e..0000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.text	
+++ /dev/null
@@ -1,306 +0,0 @@
-Markdown: Basics
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a class="selected" title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-Getting the Gist of Markdown's Formatting Syntax
-------------------------------------------------
-
-This page offers a brief overview of what it's like to use Markdown.
-The [syntax page] [s] provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.
-
-It's also helpful to simply try Markdown out; the [Dingus] [d] is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL] [src].
-
-  [s]: /projects/markdown/syntax  "Markdown Syntax"
-  [d]: /projects/markdown/dingus  "Markdown Dingus"
-  [src]: /projects/markdown/basics.text
-
-
-## Paragraphs, Headers, Blockquotes ##
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-Markdown offers two styles of headers: *Setext* and *atx*.
-Setext-style headers for `<h1>` and `<h2>` are created by
-"underlining" with equal signs (`=`) and hyphens (`-`), respectively.
-To create an atx-style header, you put 1-6 hash marks (`#`) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.
-
-Blockquotes are indicated using email-style '`>`' angle brackets.
-
-Markdown:
-
-    A First Level Header
-    ====================
-
-    A Second Level Header
-    ---------------------
-
-    Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.
-
-    The quick brown fox jumped over the lazy
-    dog's back.
-
-    ### Header 3
-
-    > This is a blockquote.
-    >
-    > This is the second paragraph in the blockquote.
-    >
-    > ## This is an H2 in a blockquote
-
-
-Output:
-
-    <h1>A First Level Header</h1>
-
-    <h2>A Second Level Header</h2>
-
-    <p>Now is the time for all good men to come to
-    the aid of their country. This is just a
-    regular paragraph.</p>
-
-    <p>The quick brown fox jumped over the lazy
-    dog's back.</p>
-
-    <h3>Header 3</h3>
-
-    <blockquote>
-        <p>This is a blockquote.</p>
-
-        <p>This is the second paragraph in the blockquote.</p>
-
-        <h2>This is an H2 in a blockquote</h2>
-    </blockquote>
-
-
-
-### Phrase Emphasis ###
-
-Markdown uses asterisks and underscores to indicate spans of emphasis.
-
-Markdown:
-
-    Some of these words *are emphasized*.
-    Some of these words _are emphasized also_.
-
-    Use two asterisks for **strong emphasis**.
-    Or, if you prefer, __use two underscores instead__.
-
-Output:
-
-    <p>Some of these words <em>are emphasized</em>.
-    Some of these words <em>are emphasized also</em>.</p>
-
-    <p>Use two asterisks for <strong>strong emphasis</strong>.
-    Or, if you prefer, <strong>use two underscores instead</strong>.</p>
-
-
-
-## Lists ##
-
-Unordered (bulleted) lists use asterisks, pluses, and hyphens (`*`,
-`+`, and `-`) as list markers. These three markers are
-interchangable; this:
-
-    *   Candy.
-    *   Gum.
-    *   Booze.
-
-this:
-
-    +   Candy.
-    +   Gum.
-    +   Booze.
-
-and this:
-
-    -   Candy.
-    -   Gum.
-    -   Booze.
-
-all produce the same output:
-
-    <ul>
-    <li>Candy.</li>
-    <li>Gum.</li>
-    <li>Booze.</li>
-    </ul>
-
-Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:
-
-    1.  Red
-    2.  Green
-    3.  Blue
-
-Output:
-
-    <ol>
-    <li>Red</li>
-    <li>Green</li>
-    <li>Blue</li>
-    </ol>
-
-If you put blank lines between items, you'll get `<p>` tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:
-
-    *   A list item.
-
-        With multiple paragraphs.
-
-    *   Another item in the list.
-
-Output:
-
-    <ul>
-    <li><p>A list item.</p>
-    <p>With multiple paragraphs.</p></li>
-    <li><p>Another item in the list.</p></li>
-    </ul>
-
-
-
-### Links ###
-
-Markdown supports two styles for creating links: *inline* and
-*reference*. With both styles, you use square brackets to delimit the
-text you want to turn into a link.
-
-Inline-style links use parentheses immediately after the link text.
-For example:
-
-    This is an [example link](http://example.com/).
-
-Output:
-
-    <p>This is an <a href="http://example.com/">
-    example link</a>.</p>
-
-Optionally, you may include a title attribute in the parentheses:
-
-    This is an [example link](http://example.com/ "With a Title").
-
-Output:
-
-    <p>This is an <a href="http://example.com/" title="With a Title">
-    example link</a>.</p>
-
-Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:
-
-    I get 10 times more traffic from [Google][1] than from
-    [Yahoo][2] or [MSN][3].
-
-    [1]: http://google.com/        "Google"
-    [2]: http://search.yahoo.com/  "Yahoo Search"
-    [3]: http://search.msn.com/    "MSN Search"
-
-Output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from <a href="http://search.yahoo.com/"
-    title="Yahoo Search">Yahoo</a> or <a href="http://search.msn.com/"
-    title="MSN Search">MSN</a>.</p>
-
-The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are *not* case sensitive:
-
-    I start my morning with a cup of coffee and
-    [The New York Times][NY Times].
-
-    [ny times]: http://www.nytimes.com/
-
-Output:
-
-    <p>I start my morning with a cup of coffee and
-    <a href="http://www.nytimes.com/">The New York Times</a>.</p>
-
-
-### Images ###
-
-Image syntax is very much like link syntax.
-
-Inline (titles are optional):
-
-    ![alt text](/path/to/img.jpg "Title")
-
-Reference-style:
-
-    ![alt text][id]
-
-    [id]: /path/to/img.jpg "Title"
-
-Both of the above examples produce the same output:
-
-    <img src="/path/to/img.jpg" alt="alt text" title="Title" />
-
-
-
-### Code ###
-
-In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (`&`) and angle brackets (`<` or
-`>`) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:
-
-    I strongly recommend against using any `<blink>` tags.
-
-    I wish SmartyPants used named entities like `&amp;mdash;`
-    instead of decimal-encoded entites like `&amp;#8212;`.
-
-Output:
-
-    <p>I strongly recommend against using any
-    <code>&lt;blink&gt;</code> tags.</p>
-
-    <p>I wish SmartyPants used named entities like
-    <code>&amp;mdash;</code> instead of decimal-encoded
-    entites like <code>&amp;#8212;</code>.</p>
-
-
-To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, `&`, `<`,
-and `>` characters will be escaped automatically.
-
-Markdown:
-
-    If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:
-
-        <blockquote>
-            <p>For example.</p>
-        </blockquote>
-
-Output:
-
-    <p>If you want your page to validate under XHTML 1.0 Strict,
-    you've got to put paragraph tags in your blockquotes:</p>
-
-    <pre><code>&lt;blockquote&gt;
-        &lt;p&gt;For example.&lt;/p&gt;
-    &lt;/blockquote&gt;
-    </code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml b/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml
deleted file mode 100644
index e971a195a4..0000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Basics.xhtml	
+++ /dev/null
@@ -1,314 +0,0 @@
-<h1>Markdown: Basics</h1>
-
-<ul>
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a title="Markdown Basics">Basics</a></li>
-    <li><a href="/projects/markdown/syntax" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-<h2>Getting the Gist of Markdown's Formatting Syntax</h2>
-
-<p>This page offers a brief overview of what it's like to use Markdown.
-The <a href="/projects/markdown/syntax" title="Markdown Syntax">syntax page</a> provides complete, detailed documentation for
-every feature, but Markdown should be very easy to pick up simply by
-looking at a few examples of it in action. The examples on this page
-are written in a before/after style, showing example syntax and the
-HTML output produced by Markdown.</p>
-
-<p>It's also helpful to simply try Markdown out; the <a href="/projects/markdown/dingus" title="Markdown Dingus">Dingus</a> is a
-web application that allows you type your own Markdown-formatted text
-and translate it to XHTML.</p>
-
-<p><strong>Note:</strong> This document is itself written using Markdown; you
-can <a href="/projects/markdown/basics.text">see the source for it by adding '.text' to the URL</a>.</p>
-
-<h2>Paragraphs, Headers, Blockquotes</h2>
-
-<p>A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
-
-<p>Markdown offers two styles of headers: <em>Setext</em> and <em>atx</em>.
-Setext-style headers for <code>&lt;h1&gt;</code> and <code>&lt;h2&gt;</code> are created by
-"underlining" with equal signs (<code>=</code>) and hyphens (<code>-</code>), respectively.
-To create an atx-style header, you put 1-6 hash marks (<code>#</code>) at the
-beginning of the line -- the number of hashes equals the resulting
-HTML header level.</p>
-
-<p>Blockquotes are indicated using email-style '<code>&gt;</code>' angle brackets.</p>
-
-<p>Markdown:</p>
-
-<pre><code>A First Level Header
-====================
-
-A Second Level Header
----------------------
-
-Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.
-
-The quick brown fox jumped over the lazy
-dog&#x27;s back.
-
-### Header 3
-
-&gt; This is a blockquote.
-&gt;
-&gt; This is the second paragraph in the blockquote.
-&gt;
-&gt; ## This is an H2 in a blockquote
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;h1&gt;A First Level Header&lt;/h1&gt;
-
-&lt;h2&gt;A Second Level Header&lt;/h2&gt;
-
-&lt;p&gt;Now is the time for all good men to come to
-the aid of their country. This is just a
-regular paragraph.&lt;/p&gt;
-
-&lt;p&gt;The quick brown fox jumped over the lazy
-dog&#x27;s back.&lt;/p&gt;
-
-&lt;h3&gt;Header 3&lt;/h3&gt;
-
-&lt;blockquote&gt;
-    &lt;p&gt;This is a blockquote.&lt;/p&gt;
-
-    &lt;p&gt;This is the second paragraph in the blockquote.&lt;/p&gt;
-
-    &lt;h2&gt;This is an H2 in a blockquote&lt;/h2&gt;
-&lt;/blockquote&gt;
-</code></pre>
-
-<h3>Phrase Emphasis</h3>
-
-<p>Markdown uses asterisks and underscores to indicate spans of emphasis.</p>
-
-<p>Markdown:</p>
-
-<pre><code>Some of these words *are emphasized*.
-Some of these words _are emphasized also_.
-
-Use two asterisks for **strong emphasis**.
-Or, if you prefer, __use two underscores instead__.
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;Some of these words &lt;em&gt;are emphasized&lt;/em&gt;.
-Some of these words &lt;em&gt;are emphasized also&lt;/em&gt;.&lt;/p&gt;
-
-&lt;p&gt;Use two asterisks for &lt;strong&gt;strong emphasis&lt;/strong&gt;.
-Or, if you prefer, &lt;strong&gt;use two underscores instead&lt;/strong&gt;.&lt;/p&gt;
-</code></pre>
-
-<h2>Lists</h2>
-
-<p>Unordered (bulleted) lists use asterisks, pluses, and hyphens (<code>*</code>,
-<code>+</code>, and <code>-</code>) as list markers. These three markers are
-interchangable; this:</p>
-
-<pre><code>*   Candy.
-*   Gum.
-*   Booze.
-</code></pre>
-
-<p>this:</p>
-
-<pre><code>+   Candy.
-+   Gum.
-+   Booze.
-</code></pre>
-
-<p>and this:</p>
-
-<pre><code>-   Candy.
--   Gum.
--   Booze.
-</code></pre>
-
-<p>all produce the same output:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;Candy.&lt;/li&gt;
-&lt;li&gt;Gum.&lt;/li&gt;
-&lt;li&gt;Booze.&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<p>Ordered (numbered) lists use regular numbers, followed by periods, as
-list markers:</p>
-
-<pre><code>1.  Red
-2.  Green
-3.  Blue
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;ol&gt;
-&lt;li&gt;Red&lt;/li&gt;
-&lt;li&gt;Green&lt;/li&gt;
-&lt;li&gt;Blue&lt;/li&gt;
-&lt;/ol&gt;
-</code></pre>
-
-<p>If you put blank lines between items, you'll get <code>&lt;p&gt;</code> tags for the
-list item text. You can create multi-paragraph list items by indenting
-the paragraphs by 4 spaces or 1 tab:</p>
-
-<pre><code>*   A list item.
-
-    With multiple paragraphs.
-
-*   Another item in the list.
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;&lt;p&gt;A list item.&lt;/p&gt;
-&lt;p&gt;With multiple paragraphs.&lt;/p&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;Another item in the list.&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<h3>Links</h3>
-
-<p>Markdown supports two styles for creating links: <em>inline</em> and
-<em>reference</em>. With both styles, you use square brackets to delimit the
-text you want to turn into a link.</p>
-
-<p>Inline-style links use parentheses immediately after the link text.
-For example:</p>
-
-<pre><code>This is an [example link](http://example.com/).
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;This is an &lt;a href=&quot;http://example.com/&quot;&gt;
-example link&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>Optionally, you may include a title attribute in the parentheses:</p>
-
-<pre><code>This is an [example link](http://example.com/ &quot;With a Title&quot;).
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;This is an &lt;a href=&quot;http://example.com/&quot; title=&quot;With a Title&quot;&gt;
-example link&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>Reference-style links allow you to refer to your links by names, which
-you define elsewhere in your document:</p>
-
-<pre><code>I get 10 times more traffic from [Google][1] than from
-[Yahoo][2] or [MSN][3].
-
-[1]: http://google.com/        &quot;Google&quot;
-[2]: http://search.yahoo.com/  &quot;Yahoo Search&quot;
-[3]: http://search.msn.com/    &quot;MSN Search&quot;
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href=&quot;http://google.com/&quot;
-title=&quot;Google&quot;&gt;Google&lt;/a&gt; than from &lt;a href=&quot;http://search.yahoo.com/&quot;
-title=&quot;Yahoo Search&quot;&gt;Yahoo&lt;/a&gt; or &lt;a href=&quot;http://search.msn.com/&quot;
-title=&quot;MSN Search&quot;&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>The title attribute is optional. Link names may contain letters,
-numbers and spaces, but are <em>not</em> case sensitive:</p>
-
-<pre><code>I start my morning with a cup of coffee and
-[The New York Times][NY Times].
-
-[ny times]: http://www.nytimes.com/
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;I start my morning with a cup of coffee and
-&lt;a href=&quot;http://www.nytimes.com/&quot;&gt;The New York Times&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<h3>Images</h3>
-
-<p>Image syntax is very much like link syntax.</p>
-
-<p>Inline (titles are optional):</p>
-
-<pre><code>![alt text](/path/to/img.jpg &quot;Title&quot;)
-</code></pre>
-
-<p>Reference-style:</p>
-
-<pre><code>![alt text][id]
-
-[id]: /path/to/img.jpg &quot;Title&quot;
-</code></pre>
-
-<p>Both of the above examples produce the same output:</p>
-
-<pre><code>&lt;img src=&quot;/path/to/img.jpg&quot; alt=&quot;alt text&quot; title=&quot;Title&quot; /&gt;
-</code></pre>
-
-<h3>Code</h3>
-
-<p>In a regular paragraph, you can create code span by wrapping text in
-backtick quotes. Any ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> or
-<code>&gt;</code>) will automatically be translated into HTML entities. This makes
-it easy to use Markdown to write about HTML example code:</p>
-
-<pre><code>I strongly recommend against using any &#x60;&lt;blink&gt;&#x60; tags.
-
-I wish SmartyPants used named entities like &#x60;&amp;amp;mdash;&#x60;
-instead of decimal-encoded entites like &#x60;&amp;amp;#8212;&#x60;.
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;I strongly recommend against using any
-&lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-
-&lt;p&gt;I wish SmartyPants used named entities like
-&lt;code&gt;&amp;amp;mdash;&lt;/code&gt; instead of decimal-encoded
-entites like &lt;code&gt;&amp;amp;#8212;&lt;/code&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>To specify an entire block of pre-formatted code, indent every line of
-the block by 4 spaces or 1 tab. Just like with code spans, <code>&amp;</code>, <code>&lt;</code>,
-and <code>&gt;</code> characters will be escaped automatically.</p>
-
-<p>Markdown:</p>
-
-<pre><code>If you want your page to validate under XHTML 1.0 Strict,
-you&#x27;ve got to put paragraph tags in your blockquotes:
-
-    &lt;blockquote&gt;
-        &lt;p&gt;For example.&lt;/p&gt;
-    &lt;/blockquote&gt;
-</code></pre>
-
-<p>Output:</p>
-
-<pre><code>&lt;p&gt;If you want your page to validate under XHTML 1.0 Strict,
-you&#x27;ve got to put paragraph tags in your blockquotes:&lt;/p&gt;
-
-&lt;pre&gt;&lt;code&gt;&amp;lt;blockquote&amp;gt;
-    &amp;lt;p&amp;gt;For example.&amp;lt;/p&amp;gt;
-&amp;lt;/blockquote&amp;gt;
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text
deleted file mode 100644
index cb70921d1e..0000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.text	
+++ /dev/null
@@ -1,888 +0,0 @@
-Markdown: Syntax
-================
-
-<ul id="ProjectSubmenu">
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a class="selected" title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-
-*   [Overview](#overview)
-    *   [Philosophy](#philosophy)
-    *   [Inline HTML](#html)
-    *   [Automatic Escaping for Special Characters](#autoescape)
-*   [Block Elements](#block)
-    *   [Paragraphs and Line Breaks](#p)
-    *   [Headers](#header)
-    *   [Blockquotes](#blockquote)
-    *   [Lists](#list)
-    *   [Code Blocks](#precode)
-    *   [Horizontal Rules](#hr)
-*   [Span Elements](#span)
-    *   [Links](#link)
-    *   [Emphasis](#em)
-    *   [Code](#code)
-    *   [Images](#img)
-*   [Miscellaneous](#misc)
-    *   [Backslash Escapes](#backslash)
-    *   [Automatic Links](#autolink)
-
-
-**Note:** This document is itself written using Markdown; you
-can [see the source for it by adding '.text' to the URL][src].
-
-  [src]: /projects/markdown/syntax.text
-
-* * *
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-Markdown is intended to be as easy-to-read and easy-to-write as is feasible.
-
-Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including [Setext] [1], [atx] [2], [Textile] [3], [reStructuredText] [4],
-[Grutatext] [5], and [EtText] [6] -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.
-
-  [1]: http://docutils.sourceforge.net/mirror/setext.html
-  [2]: http://www.aaronsw.com/2002/atx/
-  [3]: http://textism.com/tools/textile/
-  [4]: http://docutils.sourceforge.net/rst.html
-  [5]: http://www.triptico.com/software/grutatxt.html
-  [6]: http://ettext.taint.org/doc/
-
-To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like \*emphasis\*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.
-
-
-
-<h3 id="html">Inline HTML</h3>
-
-Markdown's syntax is intended for one purpose: to be used as a
-format for *writing* for the web.
-
-Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is *not* to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a *publishing* format; Markdown is a *writing*
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.
-
-For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.
-
-The only restrictions are that block-level HTML elements -- e.g. `<div>`,
-`<table>`, `<pre>`, `<p>`, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) `<p>` tags around HTML block-level tags.
-
-For example, to add an HTML table to a Markdown article:
-
-    This is a regular paragraph.
-
-    <table>
-        <tr>
-            <td>Foo</td>
-        </tr>
-    </table>
-
-    This is another regular paragraph.
-
-Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style `*emphasis*` inside an
-HTML block.
-
-Span-level HTML tags -- e.g. `<span>`, `<cite>`, or `<del>` -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML `<a>` or `<img>` tags instead of Markdown's
-link or image syntax, go right ahead.
-
-Unlike block-level HTML tags, Markdown syntax *is* processed within
-span-level tags.
-
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-In HTML, there are two characters that demand special treatment: `<`
-and `&`. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. `&lt;`, and
-`&amp;`.
-
-Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&T', you need to write '`AT&amp;T`'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:
-
-    http://images.google.com/images?num=30&q=larry+bird
-
-you need to encode the URL as:
-
-    http://images.google.com/images?num=30&amp;q=larry+bird
-
-in your anchor tag `href` attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.
-
-Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into `&amp;`.
-
-So, if you want to include a copyright symbol in your article, you can write:
-
-    &copy;
-
-and Markdown will leave it alone. But if you write:
-
-    AT&T
-
-Markdown will translate it to:
-
-    AT&amp;T
-
-Similarly, because Markdown supports [inline HTML](#html), if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:
-
-    4 < 5
-
-Markdown will translate it to:
-
-    4 &lt; 5
-
-However, inside Markdown code spans and blocks, angle brackets and
-ampersands are *always* encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single `<`
-and `&` in your example code needs to be escaped.)
-
-
-* * *
-
-
-<h2 id="block">Block Elements</h2>
-
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.
-
-The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a `<br />` tag.
-
-When you *do* want to insert a `<br />` break tag using Markdown, you
-end a line with two or more spaces, then type return.
-
-Yes, this takes a tad more effort to create a `<br />`, but a simplistic
-"every line break is a `<br />`" rule wouldn't work for Markdown.
-Markdown's email-style [blockquoting][bq] and multi-paragraph [list items][l]
-work best -- and look better -- when you format them with hard breaks.
-
-  [bq]: #blockquote
-  [l]:  #list
-
-
-
-<h3 id="header">Headers</h3>
-
-Markdown supports two styles of headers, [Setext] [1] and [atx] [2].
-
-Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:
-
-    This is an H1
-    =============
-
-    This is an H2
-    -------------
-
-Any number of underlining `=`'s or `-`'s will work.
-
-Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:
-
-    # This is an H1
-
-    ## This is an H2
-
-    ###### This is an H6
-
-Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :
-
-    # This is an H1 #
-
-    ## This is an H2 ##
-
-    ### This is an H3 ######
-
-
-<h3 id="blockquote">Blockquotes</h3>
-
-Markdown uses email-style `>` characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a `>` before every line:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    > consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    > Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-    >
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    > id sem consectetuer libero luctus adipiscing.
-
-Markdown allows you to be lazy and only put the `>` before the first
-line of a hard-wrapped paragraph:
-
-    > This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-    consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-    Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
-    > Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-    id sem consectetuer libero luctus adipiscing.
-
-Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of `>`:
-
-    > This is the first level of quoting.
-    >
-    > > This is nested blockquote.
-    >
-    > Back to the first level.
-
-Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:
-
-	> ## This is a header.
-	>
-	> 1.   This is the first list item.
-	> 2.   This is the second list item.
-	>
-	> Here's some example code:
-	>
-	>     return shell_exec("echo $input | $markdown_script");
-
-Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.
-
-
-<h3 id="list">Lists</h3>
-
-Markdown supports ordered (numbered) and unordered (bulleted) lists.
-
-Unordered lists use asterisks, pluses, and hyphens -- interchangably
--- as list markers:
-
-    *   Red
-    *   Green
-    *   Blue
-
-is equivalent to:
-
-    +   Red
-    +   Green
-    +   Blue
-
-and:
-
-    -   Red
-    -   Green
-    -   Blue
-
-Ordered lists use numbers followed by periods:
-
-    1.  Bird
-    2.  McHale
-    3.  Parish
-
-It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:
-
-    <ol>
-    <li>Bird</li>
-    <li>McHale</li>
-    <li>Parish</li>
-    </ol>
-
-If you instead wrote the list in Markdown like this:
-
-    1.  Bird
-    1.  McHale
-    1.  Parish
-
-or even:
-
-    3. Bird
-    1. McHale
-    8. Parish
-
-you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.
-
-If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.
-
-List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.
-
-To make lists look nice, you can wrap items with hanging indents:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-        Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-        viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-        Suspendisse id sem consectetuer libero luctus adipiscing.
-
-But if you want to be lazy, you don't have to:
-
-    *   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-    viverra nec, fringilla in, laoreet vitae, risus.
-    *   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-    Suspendisse id sem consectetuer libero luctus adipiscing.
-
-If list items are separated by blank lines, Markdown will wrap the
-items in `<p>` tags in the HTML output. For example, this input:
-
-    *   Bird
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li>Bird</li>
-    <li>Magic</li>
-    </ul>
-
-But this:
-
-    *   Bird
-
-    *   Magic
-
-will turn into:
-
-    <ul>
-    <li><p>Bird</p></li>
-    <li><p>Magic</p></li>
-    </ul>
-
-List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:
-
-    1.  This is a list item with two paragraphs. Lorem ipsum dolor
-        sit amet, consectetuer adipiscing elit. Aliquam hendrerit
-        mi posuere lectus.
-
-        Vestibulum enim wisi, viverra nec, fringilla in, laoreet
-        vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
-        sit amet velit.
-
-    2.  Suspendisse id sem consectetuer libero luctus adipiscing.
-
-It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:
-
-    *   This is a list item with two paragraphs.
-
-        This is the second paragraph in the list item. You're
-    only required to indent the first line. Lorem ipsum dolor
-    sit amet, consectetuer adipiscing elit.
-
-    *   Another item in the same list.
-
-To put a blockquote within a list item, the blockquote's `>`
-delimiters need to be indented:
-
-    *   A list item with a blockquote:
-
-        > This is a blockquote
-        > inside a list item.
-
-To put a code block within a list item, the code block needs
-to be indented *twice* -- 8 spaces or two tabs:
-
-    *   A list item with a code block:
-
-            <code goes here>
-
-
-It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:
-
-    1986. What a great season.
-
-In other words, a *number-period-space* sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:
-
-    1986\. What a great season.
-
-
-
-<h3 id="precode">Code Blocks</h3>
-
-Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both `<pre>` and `<code>` tags.
-
-To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:
-
-    This is a normal paragraph:
-
-        This is a code block.
-
-Markdown will generate:
-
-    <p>This is a normal paragraph:</p>
-
-    <pre><code>This is a code block.
-    </code></pre>
-
-One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:
-
-    Here is an example of AppleScript:
-
-        tell application "Foo"
-            beep
-        end tell
-
-will turn into:
-
-    <p>Here is an example of AppleScript:</p>
-
-    <pre><code>tell application "Foo"
-        beep
-    end tell
-    </code></pre>
-
-A code block continues until it reaches a line that is not indented
-(or the end of the article).
-
-Within a code block, ampersands (`&`) and angle brackets (`<` and `>`)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:
-
-        <div class="footer">
-            &copy; 2004 Foo Corporation
-        </div>
-
-will turn into:
-
-    <pre><code>&lt;div class="footer"&gt;
-        &amp;copy; 2004 Foo Corporation
-    &lt;/div&gt;
-    </code></pre>
-
-Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.
-
-
-
-<h3 id="hr">Horizontal Rules</h3>
-
-You can produce a horizontal rule tag (`<hr />`) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:
-
-    * * *
-
-    ***
-
-    *****
-
-    - - -
-
-    ---------------------------------------
-
-	_ _ _
-
-
-* * *
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-Markdown supports two style of links: *inline* and *reference*.
-
-In both styles, the link text is delimited by [square brackets].
-
-To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an *optional*
-title for the link, surrounded in quotes. For example:
-
-    This is [an example](http://example.com/ "Title") inline link.
-
-    [This link](http://example.net/) has no title attribute.
-
-Will produce:
-
-    <p>This is <a href="http://example.com/" title="Title">
-    an example</a> inline link.</p>
-
-    <p><a href="http://example.net/">This link</a> has no
-    title attribute.</p>
-
-If you're referring to a local resource on the same server, you can
-use relative paths:
-
-    See my [About](/about/) page for details.
-
-Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:
-
-    This is [an example][id] reference-style link.
-
-You can optionally use a space to separate the sets of brackets:
-
-    This is [an example] [id] reference-style link.
-
-Then, anywhere in the document, you define your link label like this,
-on a line by itself:
-
-    [id]: http://example.com/  "Optional Title Here"
-
-That is:
-
-*   Square brackets containing the link identifier (optionally
-    indented from the left margin using up to three spaces);
-*   followed by a colon;
-*   followed by one or more spaces (or tabs);
-*   followed by the URL for the link;
-*   optionally followed by a title attribute for the link, enclosed
-    in double or single quotes.
-
-The link URL may, optionally, be surrounded by angle brackets:
-
-    [id]: <http://example.com/>  "Optional Title Here"
-
-You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:
-
-    [id]: http://example.com/longish/path/to/resource/here
-        "Optional Title Here"
-
-Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.
-
-Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are *not* case sensitive. E.g. these two links:
-
-	[link text][a]
-	[link text][A]
-
-are equivalent.
-
-The *implicit link name* shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:
-
-	[Google][]
-
-And then define the link:
-
-	[Google]: http://google.com/
-
-Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:
-
-	Visit [Daring Fireball][] for more information.
-
-And then define the link:
-
-	[Daring Fireball]: http://daringfireball.net/
-
-Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.
-
-Here's an example of reference links in action:
-
-    I get 10 times more traffic from [Google] [1] than from
-    [Yahoo] [2] or [MSN] [3].
-
-      [1]: http://google.com/        "Google"
-      [2]: http://search.yahoo.com/  "Yahoo Search"
-      [3]: http://search.msn.com/    "MSN Search"
-
-Using the implicit link name shortcut, you could instead write:
-
-    I get 10 times more traffic from [Google][] than from
-    [Yahoo][] or [MSN][].
-
-      [google]: http://google.com/        "Google"
-      [yahoo]:  http://search.yahoo.com/  "Yahoo Search"
-      [msn]:    http://search.msn.com/    "MSN Search"
-
-Both of the above examples will produce the following HTML output:
-
-    <p>I get 10 times more traffic from <a href="http://google.com/"
-    title="Google">Google</a> than from
-    <a href="http://search.yahoo.com/" title="Yahoo Search">Yahoo</a>
-    or <a href="http://search.msn.com/" title="MSN Search">MSN</a>.</p>
-
-For comparison, here is the same paragraph written using
-Markdown's inline link style:
-
-    I get 10 times more traffic from [Google](http://google.com/ "Google")
-    than from [Yahoo](http://search.yahoo.com/ "Yahoo Search") or
-    [MSN](http://search.msn.com/ "MSN Search").
-
-The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.
-
-With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.
-
-
-<h3 id="em">Emphasis</h3>
-
-Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-emphasis. Text wrapped with one `*` or `_` will be wrapped with an
-HTML `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML
-`<strong>` tag. E.g., this input:
-
-    *single asterisks*
-
-    _single underscores_
-
-    **double asterisks**
-
-    __double underscores__
-
-will produce:
-
-    <em>single asterisks</em>
-
-    <em>single underscores</em>
-
-    <strong>double asterisks</strong>
-
-    <strong>double underscores</strong>
-
-You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.
-
-Emphasis can be used in the middle of a word:
-
-    un*fucking*believable
-
-But if you surround an `*` or `_` with spaces, it'll be treated as a
-literal asterisk or underscore.
-
-To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:
-
-    \*this text is surrounded by literal asterisks\*
-
-
-
-<h3 id="code">Code</h3>
-
-To indicate a span of code, wrap it with backtick quotes (`` ` ``).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:
-
-    Use the `printf()` function.
-
-will produce:
-
-    <p>Use the <code>printf()</code> function.</p>
-
-To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:
-
-    ``There is a literal backtick (`) here.``
-
-which will produce this:
-
-    <p><code>There is a literal backtick (`) here.</code></p>
-
-The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:
-
-	A single backtick in a code span: `` ` ``
-
-	A backtick-delimited string in a code span: `` `foo` ``
-
-will produce:
-
-	<p>A single backtick in a code span: <code>`</code></p>
-
-	<p>A backtick-delimited string in a code span: <code>`foo`</code></p>
-
-With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:
-
-    Please don't use any `<blink>` tags.
-
-into:
-
-    <p>Please don't use any <code>&lt;blink&gt;</code> tags.</p>
-
-You can write this:
-
-    `&#8212;` is the decimal-encoded equivalent of `&mdash;`.
-
-to produce:
-
-    <p><code>&amp;#8212;</code> is the decimal-encoded
-    equivalent of <code>&amp;mdash;</code>.</p>
-
-
-
-<h3 id="img">Images</h3>
-
-Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.
-
-Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: *inline* and *reference*.
-
-Inline image syntax looks like this:
-
-    ![Alt text](/path/to/img.jpg)
-
-    ![Alt text](/path/to/img.jpg "Optional title")
-
-That is:
-
-*   An exclamation mark: `!`;
-*   followed by a set of square brackets, containing the `alt`
-    attribute text for the image;
-*   followed by a set of parentheses, containing the URL or path to
-    the image, and an optional `title` attribute enclosed in double
-    or single quotes.
-
-Reference-style image syntax looks like this:
-
-    ![Alt text][id]
-
-Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:
-
-    [id]: url/to/image  "Optional title attribute"
-
-As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML `<img>` tags.
-
-
-* * *
-
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:
-
-    <http://example.com/>
-
-Markdown will turn this into:
-
-    <a href="http://example.com/">http://example.com/</a>
-
-Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:
-
-    <address@example.com>
-
-into something like this:
-
-    <a href="&#x6D;&#x61;i&#x6C;&#x74;&#x6F;:&#x61;&#x64;&#x64;&#x72;&#x65;
-    &#115;&#115;&#64;&#101;&#120;&#x61;&#109;&#x70;&#x6C;e&#x2E;&#99;&#111;
-    &#109;">&#x61;&#x64;&#x64;&#x72;&#x65;&#115;&#115;&#64;&#101;&#120;&#x61;
-    &#109;&#x70;&#x6C;e&#x2E;&#99;&#111;&#109;</a>
-
-which will render in a browser as a clickable link to "address@example.com".
-
-(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)
-
-
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML `<em>` tag), you can backslashes
-before the asterisks, like this:
-
-    \*literal asterisks\*
-
-Markdown provides backslash escapes for the following characters:
-
-    \   backslash
-    `   backtick
-    *   asterisk
-    _   underscore
-    {}  curly braces
-    []  square brackets
-    ()  parentheses
-    #   hash mark
-	+	plus sign
-	-	minus sign (hyphen)
-    .   dot
-    !   exclamation mark
-
diff --git a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml b/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml
deleted file mode 100644
index 41c48857bb..0000000000
--- a/test/javascripts/mdtest/fixtures/Markdown Documentation - Syntax.xhtml	
+++ /dev/null
@@ -1,944 +0,0 @@
-<h1>Markdown: Syntax</h1>
-
-<ul>
-    <li><a href="/projects/markdown/" title="Markdown Project Page">Main</a></li>
-    <li><a href="/projects/markdown/basics" title="Markdown Basics">Basics</a></li>
-    <li><a title="Markdown Syntax Documentation">Syntax</a></li>
-    <li><a href="/projects/markdown/license" title="Pricing and License Information">License</a></li>
-    <li><a href="/projects/markdown/dingus" title="Online Markdown Web Form">Dingus</a></li>
-</ul>
-
-<ul>
-<li><a href="#overview">Overview</a>
-<ul>
-<li><a href="#philosophy">Philosophy</a></li>
-<li><a href="#html">Inline HTML</a></li>
-<li><a href="#autoescape">Automatic Escaping for Special Characters</a></li>
-</ul></li>
-<li><a href="#block">Block Elements</a>
-<ul>
-<li><a href="#p">Paragraphs and Line Breaks</a></li>
-<li><a href="#header">Headers</a></li>
-<li><a href="#blockquote">Blockquotes</a></li>
-<li><a href="#list">Lists</a></li>
-<li><a href="#precode">Code Blocks</a></li>
-<li><a href="#hr">Horizontal Rules</a></li>
-</ul></li>
-<li><a href="#span">Span Elements</a>
-<ul>
-<li><a href="#link">Links</a></li>
-<li><a href="#em">Emphasis</a></li>
-<li><a href="#code">Code</a></li>
-<li><a href="#img">Images</a></li>
-</ul></li>
-<li><a href="#misc">Miscellaneous</a>
-<ul>
-<li><a href="#backslash">Backslash Escapes</a></li>
-<li><a href="#autolink">Automatic Links</a></li>
-</ul></li>
-</ul>
-
-<p><strong>Note:</strong> This document is itself written using Markdown; you
-can <a href="/projects/markdown/syntax.text">see the source for it by adding '.text' to the URL</a>.</p>
-
-<hr />
-
-<h2 id="overview">Overview</h2>
-
-<h3 id="philosophy">Philosophy</h3>
-
-<p>Markdown is intended to be as easy-to-read and easy-to-write as is feasible.</p>
-
-<p>Readability, however, is emphasized above all else. A Markdown-formatted
-document should be publishable as-is, as plain text, without looking
-like it's been marked up with tags or formatting instructions. While
-Markdown's syntax has been influenced by several existing text-to-HTML
-filters -- including <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a>, <a href="http://www.aaronsw.com/2002/atx/">atx</a>, <a href="http://textism.com/tools/textile/">Textile</a>, <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>,
-<a href="http://www.triptico.com/software/grutatxt.html">Grutatext</a>, and <a href="http://ettext.taint.org/doc/">EtText</a> -- the single biggest source of
-inspiration for Markdown's syntax is the format of plain text email.</p>
-
-<p>To this end, Markdown's syntax is comprised entirely of punctuation
-characters, which punctuation characters have been carefully chosen so
-as to look like what they mean. E.g., asterisks around a word actually
-look like *emphasis*. Markdown lists look like, well, lists. Even
-blockquotes look like quoted passages of text, assuming you've ever
-used email.</p>
-
-<h3 id="html">Inline HTML</h3>
-
-<p>Markdown's syntax is intended for one purpose: to be used as a
-format for <em>writing</em> for the web.</p>
-
-<p>Markdown is not a replacement for HTML, or even close to it. Its
-syntax is very small, corresponding only to a very small subset of
-HTML tags. The idea is <em>not</em> to create a syntax that makes it easier
-to insert HTML tags. In my opinion, HTML tags are already easy to
-insert. The idea for Markdown is to make it easy to read, write, and
-edit prose. HTML is a <em>publishing</em> format; Markdown is a <em>writing</em>
-format. Thus, Markdown's formatting syntax only addresses issues that
-can be conveyed in plain text.</p>
-
-<p>For any markup that is not covered by Markdown's syntax, you simply
-use HTML itself. There's no need to preface it or delimit it to
-indicate that you're switching from Markdown to HTML; you just use
-the tags.</p>
-
-<p>The only restrictions are that block-level HTML elements -- e.g. <code>&lt;div&gt;</code>,
-<code>&lt;table&gt;</code>, <code>&lt;pre&gt;</code>, <code>&lt;p&gt;</code>, etc. -- must be separated from surrounding
-content by blank lines, and the start and end tags of the block should
-not be indented with tabs or spaces. Markdown is smart enough not
-to add extra (unwanted) <code>&lt;p&gt;</code> tags around HTML block-level tags.</p>
-
-<p>For example, to add an HTML table to a Markdown article:</p>
-
-<pre><code>This is a regular paragraph.
-
-&lt;table&gt;
-    &lt;tr&gt;
-        &lt;td&gt;Foo&lt;/td&gt;
-    &lt;/tr&gt;
-&lt;/table&gt;
-
-This is another regular paragraph.
-</code></pre>
-
-<p>Note that Markdown formatting syntax is not processed within block-level
-HTML tags. E.g., you can't use Markdown-style <code>*emphasis*</code> inside an
-HTML block.</p>
-
-<p>Span-level HTML tags -- e.g. <code>&lt;span&gt;</code>, <code>&lt;cite&gt;</code>, or <code>&lt;del&gt;</code> -- can be
-used anywhere in a Markdown paragraph, list item, or header. If you
-want, you can even use HTML tags instead of Markdown formatting; e.g. if
-you'd prefer to use HTML <code>&lt;a&gt;</code> or <code>&lt;img&gt;</code> tags instead of Markdown's
-link or image syntax, go right ahead.</p>
-
-<p>Unlike block-level HTML tags, Markdown syntax <em>is</em> processed within
-span-level tags.</p>
-
-<h3 id="autoescape">Automatic Escaping for Special Characters</h3>
-
-<p>In HTML, there are two characters that demand special treatment: <code>&lt;</code>
-and <code>&amp;</code>. Left angle brackets are used to start tags; ampersands are
-used to denote HTML entities. If you want to use them as literal
-characters, you must escape them as entities, e.g. <code>&amp;lt;</code>, and
-<code>&amp;amp;</code>.</p>
-
-<p>Ampersands in particular are bedeviling for web writers. If you want to
-write about 'AT&amp;T', you need to write '<code>AT&amp;amp;T</code>'. You even need to
-escape ampersands within URLs. Thus, if you want to link to:</p>
-
-<pre><code>http://images.google.com/images?num=30&amp;q=larry+bird
-</code></pre>
-
-<p>you need to encode the URL as:</p>
-
-<pre><code>http://images.google.com/images?num=30&amp;amp;q=larry+bird
-</code></pre>
-
-<p>in your anchor tag <code>href</code> attribute. Needless to say, this is easy to
-forget, and is probably the single most common source of HTML validation
-errors in otherwise well-marked-up web sites.</p>
-
-<p>Markdown allows you to use these characters naturally, taking care of
-all the necessary escaping for you. If you use an ampersand as part of
-an HTML entity, it remains unchanged; otherwise it will be translated
-into <code>&amp;amp;</code>.</p>
-
-<p>So, if you want to include a copyright symbol in your article, you can write:</p>
-
-<pre><code>&amp;copy;
-</code></pre>
-
-<p>and Markdown will leave it alone. But if you write:</p>
-
-<pre><code>AT&amp;T
-</code></pre>
-
-<p>Markdown will translate it to:</p>
-
-<pre><code>AT&amp;amp;T
-</code></pre>
-
-<p>Similarly, because Markdown supports <a href="#html">inline HTML</a>, if you use
-angle brackets as delimiters for HTML tags, Markdown will treat them as
-such. But if you write:</p>
-
-<pre><code>4 &lt; 5
-</code></pre>
-
-<p>Markdown will translate it to:</p>
-
-<pre><code>4 &amp;lt; 5
-</code></pre>
-
-<p>However, inside Markdown code spans and blocks, angle brackets and
-ampersands are <em>always</em> encoded automatically. This makes it easy to use
-Markdown to write about HTML code. (As opposed to raw HTML, which is a
-terrible format for writing about HTML syntax, because every single <code>&lt;</code>
-and <code>&amp;</code> in your example code needs to be escaped.)</p>
-
-<hr />
-
-<h2 id="block">Block Elements</h2>
-
-<h3 id="p">Paragraphs and Line Breaks</h3>
-
-<p>A paragraph is simply one or more consecutive lines of text, separated
-by one or more blank lines. (A blank line is any line that looks like a
-blank line -- a line containing nothing but spaces or tabs is considered
-blank.) Normal paragraphs should not be intended with spaces or tabs.</p>
-
-<p>The implication of the "one or more consecutive lines of text" rule is
-that Markdown supports "hard-wrapped" text paragraphs. This differs
-significantly from most other text-to-HTML formatters (including Movable
-Type's "Convert Line Breaks" option) which translate every line break
-character in a paragraph into a <code>&lt;br /&gt;</code> tag.</p>
-
-<p>When you <em>do</em> want to insert a <code>&lt;br /&gt;</code> break tag using Markdown, you
-end a line with two or more spaces, then type return.</p>
-
-<p>Yes, this takes a tad more effort to create a <code>&lt;br /&gt;</code>, but a simplistic
-"every line break is a <code>&lt;br /&gt;</code>" rule wouldn't work for Markdown.
-Markdown's email-style <a href="#blockquote">blockquoting</a> and multi-paragraph <a href="#list">list items</a>
-work best -- and look better -- when you format them with hard breaks.</p>
-
-<h3 id="header">Headers</h3>
-
-<p>Markdown supports two styles of headers, <a href="http://docutils.sourceforge.net/mirror/setext.html">Setext</a> and <a href="http://www.aaronsw.com/2002/atx/">atx</a>.</p>
-
-<p>Setext-style headers are "underlined" using equal signs (for first-level
-headers) and dashes (for second-level headers). For example:</p>
-
-<pre><code>This is an H1
-=============
-
-This is an H2
--------------
-</code></pre>
-
-<p>Any number of underlining <code>=</code>'s or <code>-</code>'s will work.</p>
-
-<p>Atx-style headers use 1-6 hash characters at the start of the line,
-corresponding to header levels 1-6. For example:</p>
-
-<pre><code># This is an H1
-
-## This is an H2
-
-###### This is an H6
-</code></pre>
-
-<p>Optionally, you may "close" atx-style headers. This is purely
-cosmetic -- you can use this if you think it looks better. The
-closing hashes don't even need to match the number of hashes
-used to open the header. (The number of opening hashes
-determines the header level.) :</p>
-
-<pre><code># This is an H1 #
-
-## This is an H2 ##
-
-### This is an H3 ######
-</code></pre>
-
-<h3 id="blockquote">Blockquotes</h3>
-
-<p>Markdown uses email-style <code>&gt;</code> characters for blockquoting. If you're
-familiar with quoting passages of text in an email message, then you
-know how to create a blockquote in Markdown. It looks best if you hard
-wrap the text and put a <code>&gt;</code> before every line:</p>
-
-<pre><code>&gt; This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-&gt; consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-&gt; Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-&gt;
-&gt; Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-&gt; id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>Markdown allows you to be lazy and only put the <code>&gt;</code> before the first
-line of a hard-wrapped paragraph:</p>
-
-<pre><code>&gt; This is a blockquote with two paragraphs. Lorem ipsum dolor sit amet,
-consectetuer adipiscing elit. Aliquam hendrerit mi posuere lectus.
-Vestibulum enim wisi, viverra nec, fringilla in, laoreet vitae, risus.
-
-&gt; Donec sit amet nisl. Aliquam semper ipsum sit amet velit. Suspendisse
-id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>Blockquotes can be nested (i.e. a blockquote-in-a-blockquote) by
-adding additional levels of <code>&gt;</code>:</p>
-
-<pre><code>&gt; This is the first level of quoting.
-&gt;
-&gt; &gt; This is nested blockquote.
-&gt;
-&gt; Back to the first level.
-</code></pre>
-
-<p>Blockquotes can contain other Markdown elements, including headers, lists,
-and code blocks:</p>
-
-<pre><code>&gt; ## This is a header.
-&gt;
-&gt; 1.   This is the first list item.
-
-&gt; 2.   This is the second list item.
-
-&gt;
-&gt; Here&#x27;s some example code:
-&gt;
-&gt;     return shell_exec(&quot;echo $input | $markdown_script&quot;);
-</code></pre>
-
-<p>Any decent text editor should make email-style quoting easy. For
-example, with BBEdit, you can make a selection and choose Increase
-Quote Level from the Text menu.</p>
-
-<h3 id="list">Lists</h3>
-
-<p>Markdown supports ordered (numbered) and unordered (bulleted) lists.</p>
-
-<p>Unordered lists use asterisks, pluses, and hyphens -- interchangably
--- as list markers:</p>
-
-<pre><code>*   Red
-*   Green
-*   Blue
-</code></pre>
-
-<p>is equivalent to:</p>
-
-<pre><code>+   Red
-+   Green
-+   Blue
-</code></pre>
-
-<p>and:</p>
-
-<pre><code>-   Red
--   Green
--   Blue
-</code></pre>
-
-<p>Ordered lists use numbers followed by periods:</p>
-
-<pre><code>1.  Bird
-2.  McHale
-3.  Parish
-</code></pre>
-
-<p>It's important to note that the actual numbers you use to mark the
-list have no effect on the HTML output Markdown produces. The HTML
-Markdown produces from the above list is:</p>
-
-<pre><code>&lt;ol&gt;
-&lt;li&gt;Bird&lt;/li&gt;
-&lt;li&gt;McHale&lt;/li&gt;
-&lt;li&gt;Parish&lt;/li&gt;
-&lt;/ol&gt;
-</code></pre>
-
-<p>If you instead wrote the list in Markdown like this:</p>
-
-<pre><code>1.  Bird
-1.  McHale
-1.  Parish
-</code></pre>
-
-<p>or even:</p>
-
-<pre><code>3. Bird
-1. McHale
-8. Parish
-</code></pre>
-
-<p>you'd get the exact same HTML output. The point is, if you want to,
-you can use ordinal numbers in your ordered Markdown lists, so that
-the numbers in your source match the numbers in your published HTML.
-But if you want to be lazy, you don't have to.</p>
-
-<p>If you do use lazy list numbering, however, you should still start the
-list with the number 1. At some point in the future, Markdown may support
-starting ordered lists at an arbitrary number.</p>
-
-<p>List markers typically start at the left margin, but may be indented by
-up to three spaces. List markers must be followed by one or more spaces
-or a tab.</p>
-
-<p>To make lists look nice, you can wrap items with hanging indents:</p>
-
-<pre><code>*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-    Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-    viverra nec, fringilla in, laoreet vitae, risus.
-*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-    Suspendisse id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>But if you want to be lazy, you don't have to:</p>
-
-<pre><code>*   Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-Aliquam hendrerit mi posuere lectus. Vestibulum enim wisi,
-viverra nec, fringilla in, laoreet vitae, risus.
-*   Donec sit amet nisl. Aliquam semper ipsum sit amet velit.
-Suspendisse id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>If list items are separated by blank lines, Markdown will wrap the
-items in <code>&lt;p&gt;</code> tags in the HTML output. For example, this input:</p>
-
-<pre><code>*   Bird
-*   Magic
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;Bird&lt;/li&gt;
-&lt;li&gt;Magic&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<p>But this:</p>
-
-<pre><code>*   Bird
-
-*   Magic
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;ul&gt;
-&lt;li&gt;&lt;p&gt;Bird&lt;/p&gt;&lt;/li&gt;
-&lt;li&gt;&lt;p&gt;Magic&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-</code></pre>
-
-<p>List items may consist of multiple paragraphs. Each subsequent
-paragraph in a list item must be intended by either 4 spaces
-or one tab:</p>
-
-<pre><code>1.  This is a list item with two paragraphs. Lorem ipsum dolor
-    sit amet, consectetuer adipiscing elit. Aliquam hendrerit
-    mi posuere lectus.
-
-    Vestibulum enim wisi, viverra nec, fringilla in, laoreet
-    vitae, risus. Donec sit amet nisl. Aliquam semper ipsum
-    sit amet velit.
-
-2.  Suspendisse id sem consectetuer libero luctus adipiscing.
-</code></pre>
-
-<p>It looks nice if you indent every line of the subsequent
-paragraphs, but here again, Markdown will allow you to be
-lazy:</p>
-
-<pre><code>*   This is a list item with two paragraphs.
-
-    This is the second paragraph in the list item. You&#x27;re
-only required to indent the first line. Lorem ipsum dolor
-sit amet, consectetuer adipiscing elit.
-
-*   Another item in the same list.
-</code></pre>
-
-<p>To put a blockquote within a list item, the blockquote's <code>&gt;</code>
-delimiters need to be indented:</p>
-
-<pre><code>*   A list item with a blockquote:
-
-    &gt; This is a blockquote
-    &gt; inside a list item.
-</code></pre>
-
-<p>To put a code block within a list item, the code block needs
-to be indented <em>twice</em> -- 8 spaces or two tabs:</p>
-
-<pre><code>*   A list item with a code block:
-
-        &lt;code goes here&gt;
-</code></pre>
-
-<p>It's worth noting that it's possible to trigger an ordered list by
-accident, by writing something like this:</p>
-
-<pre><code>1986. What a great season.
-</code></pre>
-
-<p>In other words, a <em>number-period-space</em> sequence at the beginning of a
-line. To avoid this, you can backslash-escape the period:</p>
-
-<pre><code>1986\. What a great season.
-</code></pre>
-
-<h3 id="precode">Code Blocks</h3>
-
-<p>Pre-formatted code blocks are used for writing about programming or
-markup source code. Rather than forming normal paragraphs, the lines
-of a code block are interpreted literally. Markdown wraps a code block
-in both <code>&lt;pre&gt;</code> and <code>&lt;code&gt;</code> tags.</p>
-
-<p>To produce a code block in Markdown, simply indent every line of the
-block by at least 4 spaces or 1 tab. For example, given this input:</p>
-
-<pre><code>This is a normal paragraph:
-
-    This is a code block.
-</code></pre>
-
-<p>Markdown will generate:</p>
-
-<pre><code>&lt;p&gt;This is a normal paragraph:&lt;/p&gt;
-
-&lt;pre&gt;&lt;code&gt;This is a code block.
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
-
-<p>One level of indentation -- 4 spaces or 1 tab -- is removed from each
-line of the code block. For example, this:</p>
-
-<pre><code>Here is an example of AppleScript:
-
-    tell application &quot;Foo&quot;
-        beep
-    end tell
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;p&gt;Here is an example of AppleScript:&lt;/p&gt;
-
-&lt;pre&gt;&lt;code&gt;tell application &quot;Foo&quot;
-    beep
-end tell
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
-
-<p>A code block continues until it reaches a line that is not indented
-(or the end of the article).</p>
-
-<p>Within a code block, ampersands (<code>&amp;</code>) and angle brackets (<code>&lt;</code> and <code>&gt;</code>)
-are automatically converted into HTML entities. This makes it very
-easy to include example HTML source code using Markdown -- just paste
-it and indent it, and Markdown will handle the hassle of encoding the
-ampersands and angle brackets. For example, this:</p>
-
-<pre><code>    &lt;div class=&quot;footer&quot;&gt;
-        &amp;copy; 2004 Foo Corporation
-    &lt;/div&gt;
-</code></pre>
-
-<p>will turn into:</p>
-
-<pre><code>&lt;pre&gt;&lt;code&gt;&amp;lt;div class=&quot;footer&quot;&amp;gt;
-    &amp;amp;copy; 2004 Foo Corporation
-&amp;lt;/div&amp;gt;
-&lt;/code&gt;&lt;/pre&gt;
-</code></pre>
-
-<p>Regular Markdown syntax is not processed within code blocks. E.g.,
-asterisks are just literal asterisks within a code block. This means
-it's also easy to use Markdown to write about Markdown's own syntax.</p>
-
-<h3 id="hr">Horizontal Rules</h3>
-
-<p>You can produce a horizontal rule tag (<code>&lt;hr /&gt;</code>) by placing three or
-more hyphens, asterisks, or underscores on a line by themselves. If you
-wish, you may use spaces between the hyphens or asterisks. Each of the
-following lines will produce a horizontal rule:</p>
-
-<pre><code>* * *
-
-***
-
-*****
-
-- - -
-
----------------------------------------
-
-_ _ _
-</code></pre>
-
-<hr />
-
-<h2 id="span">Span Elements</h2>
-
-<h3 id="link">Links</h3>
-
-<p>Markdown supports two style of links: <em>inline</em> and <em>reference</em>.</p>
-
-<p>In both styles, the link text is delimited by [square brackets].</p>
-
-<p>To create an inline link, use a set of regular parentheses immediately
-after the link text's closing square bracket. Inside the parentheses,
-put the URL where you want the link to point, along with an <em>optional</em>
-title for the link, surrounded in quotes. For example:</p>
-
-<pre><code>This is [an example](http://example.com/ &quot;Title&quot;) inline link.
-
-[This link](http://example.net/) has no title attribute.
-</code></pre>
-
-<p>Will produce:</p>
-
-<pre><code>&lt;p&gt;This is &lt;a href=&quot;http://example.com/&quot; title=&quot;Title&quot;&gt;
-an example&lt;/a&gt; inline link.&lt;/p&gt;
-
-&lt;p&gt;&lt;a href=&quot;http://example.net/&quot;&gt;This link&lt;/a&gt; has no
-title attribute.&lt;/p&gt;
-</code></pre>
-
-<p>If you're referring to a local resource on the same server, you can
-use relative paths:</p>
-
-<pre><code>See my [About](/about/) page for details.
-</code></pre>
-
-<p>Reference-style links use a second set of square brackets, inside
-which you place a label of your choosing to identify the link:</p>
-
-<pre><code>This is [an example][id] reference-style link.
-</code></pre>
-
-<p>You can optionally use a space to separate the sets of brackets:</p>
-
-<pre><code>This is [an example] [id] reference-style link.
-</code></pre>
-
-<p>Then, anywhere in the document, you define your link label like this,
-on a line by itself:</p>
-
-<pre><code>[id]: http://example.com/  &quot;Optional Title Here&quot;
-</code></pre>
-
-<p>That is:</p>
-
-<ul>
-<li>Square brackets containing the link identifier (optionally
-indented from the left margin using up to three spaces);</li>
-<li>followed by a colon;</li>
-<li>followed by one or more spaces (or tabs);</li>
-<li>followed by the URL for the link;</li>
-<li>optionally followed by a title attribute for the link, enclosed
-in double or single quotes.</li>
-</ul>
-
-<p>The link URL may, optionally, be surrounded by angle brackets:</p>
-
-<pre><code>[id]: &lt;http://example.com/&gt;  &quot;Optional Title Here&quot;
-</code></pre>
-
-<p>You can put the title attribute on the next line and use extra spaces
-or tabs for padding, which tends to look better with longer URLs:</p>
-
-<pre><code>[id]: http://example.com/longish/path/to/resource/here
-    &quot;Optional Title Here&quot;
-</code></pre>
-
-<p>Link definitions are only used for creating links during Markdown
-processing, and are stripped from your document in the HTML output.</p>
-
-<p>Link definition names may constist of letters, numbers, spaces, and punctuation -- but they are <em>not</em> case sensitive. E.g. these two links:</p>
-
-<pre><code>[link text][a]
-[link text][A]
-</code></pre>
-
-<p>are equivalent.</p>
-
-<p>The <em>implicit link name</em> shortcut allows you to omit the name of the
-link, in which case the link text itself is used as the name.
-Just use an empty set of square brackets -- e.g., to link the word
-"Google" to the google.com web site, you could simply write:</p>
-
-<pre><code>[Google][]
-</code></pre>
-
-<p>And then define the link:</p>
-
-<pre><code>[Google]: http://google.com/
-</code></pre>
-
-<p>Because link names may contain spaces, this shortcut even works for
-multiple words in the link text:</p>
-
-<pre><code>Visit [Daring Fireball][] for more information.
-</code></pre>
-
-<p>And then define the link:</p>
-
-<pre><code>[Daring Fireball]: http://daringfireball.net/
-</code></pre>
-
-<p>Link definitions can be placed anywhere in your Markdown document. I
-tend to put them immediately after each paragraph in which they're
-used, but if you want, you can put them all at the end of your
-document, sort of like footnotes.</p>
-
-<p>Here's an example of reference links in action:</p>
-
-<pre><code>I get 10 times more traffic from [Google] [1] than from
-[Yahoo] [2] or [MSN] [3].
-
-  [1]: http://google.com/        &quot;Google&quot;
-  [2]: http://search.yahoo.com/  &quot;Yahoo Search&quot;
-  [3]: http://search.msn.com/    &quot;MSN Search&quot;
-</code></pre>
-
-<p>Using the implicit link name shortcut, you could instead write:</p>
-
-<pre><code>I get 10 times more traffic from [Google][] than from
-[Yahoo][] or [MSN][].
-
-  [google]: http://google.com/        &quot;Google&quot;
-  [yahoo]:  http://search.yahoo.com/  &quot;Yahoo Search&quot;
-  [msn]:    http://search.msn.com/    &quot;MSN Search&quot;
-</code></pre>
-
-<p>Both of the above examples will produce the following HTML output:</p>
-
-<pre><code>&lt;p&gt;I get 10 times more traffic from &lt;a href=&quot;http://google.com/&quot;
-title=&quot;Google&quot;&gt;Google&lt;/a&gt; than from
-&lt;a href=&quot;http://search.yahoo.com/&quot; title=&quot;Yahoo Search&quot;&gt;Yahoo&lt;/a&gt;
-or &lt;a href=&quot;http://search.msn.com/&quot; title=&quot;MSN Search&quot;&gt;MSN&lt;/a&gt;.&lt;/p&gt;
-</code></pre>
-
-<p>For comparison, here is the same paragraph written using
-Markdown's inline link style:</p>
-
-<pre><code>I get 10 times more traffic from [Google](http://google.com/ &quot;Google&quot;)
-than from [Yahoo](http://search.yahoo.com/ &quot;Yahoo Search&quot;) or
-[MSN](http://search.msn.com/ &quot;MSN Search&quot;).
-</code></pre>
-
-<p>The point of reference-style links is not that they're easier to
-write. The point is that with reference-style links, your document
-source is vastly more readable. Compare the above examples: using
-reference-style links, the paragraph itself is only 81 characters
-long; with inline-style links, it's 176 characters; and as raw HTML,
-it's 234 characters. In the raw HTML, there's more markup than there
-is text.</p>
-
-<p>With Markdown's reference-style links, a source document much more
-closely resembles the final output, as rendered in a browser. By
-allowing you to move the markup-related metadata out of the paragraph,
-you can add links without interrupting the narrative flow of your
-prose.</p>
-
-<h3 id="em">Emphasis</h3>
-
-<p>Markdown treats asterisks (<code>*</code>) and underscores (<code>_</code>) as indicators of
-emphasis. Text wrapped with one <code>*</code> or <code>_</code> will be wrapped with an
-HTML <code>&lt;em&gt;</code> tag; double <code>*</code>'s or <code>_</code>'s will be wrapped with an HTML
-<code>&lt;strong&gt;</code> tag. E.g., this input:</p>
-
-<pre><code>*single asterisks*
-
-_single underscores_
-
-**double asterisks**
-
-__double underscores__
-</code></pre>
-
-<p>will produce:</p>
-
-<pre><code>&lt;em&gt;single asterisks&lt;/em&gt;
-
-&lt;em&gt;single underscores&lt;/em&gt;
-
-&lt;strong&gt;double asterisks&lt;/strong&gt;
-
-&lt;strong&gt;double underscores&lt;/strong&gt;
-</code></pre>
-
-<p>You can use whichever style you prefer; the lone restriction is that
-the same character must be used to open and close an emphasis span.</p>
-
-<p>Emphasis can be used in the middle of a word:</p>
-
-<pre><code>un*fucking*believable
-</code></pre>
-
-<p>But if you surround an <code>*</code> or <code>_</code> with spaces, it'll be treated as a
-literal asterisk or underscore.</p>
-
-<p>To produce a literal asterisk or underscore at a position where it
-would otherwise be used as an emphasis delimiter, you can backslash
-escape it:</p>
-
-<pre><code>\*this text is surrounded by literal asterisks\*
-</code></pre>
-
-<h3 id="code">Code</h3>
-
-<p>To indicate a span of code, wrap it with backtick quotes (<code>&#x60;</code>).
-Unlike a pre-formatted code block, a code span indicates code within a
-normal paragraph. For example:</p>
-
-<pre><code>Use the &#x60;printf()&#x60; function.
-</code></pre>
-
-<p>will produce:</p>
-
-<pre><code>&lt;p&gt;Use the &lt;code&gt;printf()&lt;/code&gt; function.&lt;/p&gt;
-</code></pre>
-
-<p>To include a literal backtick character within a code span, you can use
-multiple backticks as the opening and closing delimiters:</p>
-
-<pre><code>&#x60;&#x60;There is a literal backtick (&#x60;) here.&#x60;&#x60;
-</code></pre>
-
-<p>which will produce this:</p>
-
-<pre><code>&lt;p&gt;&lt;code&gt;There is a literal backtick (&#x60;) here.&lt;/code&gt;&lt;/p&gt;
-</code></pre>
-
-<p>The backtick delimiters surrounding a code span may include spaces --
-one after the opening, one before the closing. This allows you to place
-literal backtick characters at the beginning or end of a code span:</p>
-
-<pre><code>A single backtick in a code span: &#x60;&#x60; &#x60; &#x60;&#x60;
-
-A backtick-delimited string in a code span: &#x60;&#x60; &#x60;foo&#x60; &#x60;&#x60;
-</code></pre>
-
-<p>will produce:</p>
-
-<pre><code>&lt;p&gt;A single backtick in a code span: &lt;code&gt;&#x60;&lt;/code&gt;&lt;/p&gt;
-
-&lt;p&gt;A backtick-delimited string in a code span: &lt;code&gt;&#x60;foo&#x60;&lt;/code&gt;&lt;/p&gt;
-</code></pre>
-
-<p>With a code span, ampersands and angle brackets are encoded as HTML
-entities automatically, which makes it easy to include example HTML
-tags. Markdown will turn this:</p>
-
-<pre><code>Please don&#x27;t use any &#x60;&lt;blink&gt;&#x60; tags.
-</code></pre>
-
-<p>into:</p>
-
-<pre><code>&lt;p&gt;Please don&#x27;t use any &lt;code&gt;&amp;lt;blink&amp;gt;&lt;/code&gt; tags.&lt;/p&gt;
-</code></pre>
-
-<p>You can write this:</p>
-
-<pre><code>&#x60;&amp;#8212;&#x60; is the decimal-encoded equivalent of &#x60;&amp;mdash;&#x60;.
-</code></pre>
-
-<p>to produce:</p>
-
-<pre><code>&lt;p&gt;&lt;code&gt;&amp;amp;#8212;&lt;/code&gt; is the decimal-encoded
-equivalent of &lt;code&gt;&amp;amp;mdash;&lt;/code&gt;.&lt;/p&gt;
-</code></pre>
-
-<h3 id="img">Images</h3>
-
-<p>Admittedly, it's fairly difficult to devise a "natural" syntax for
-placing images into a plain text document format.</p>
-
-<p>Markdown uses an image syntax that is intended to resemble the syntax
-for links, allowing for two styles: <em>inline</em> and <em>reference</em>.</p>
-
-<p>Inline image syntax looks like this:</p>
-
-<pre><code>![Alt text](/path/to/img.jpg)
-
-![Alt text](/path/to/img.jpg &quot;Optional title&quot;)
-</code></pre>
-
-<p>That is:</p>
-
-<ul>
-<li>An exclamation mark: <code>!</code>;</li>
-<li>followed by a set of square brackets, containing the <code>alt</code>
-attribute text for the image;</li>
-<li>followed by a set of parentheses, containing the URL or path to
-the image, and an optional <code>title</code> attribute enclosed in double
-or single quotes.</li>
-</ul>
-
-<p>Reference-style image syntax looks like this:</p>
-
-<pre><code>![Alt text][id]
-</code></pre>
-
-<p>Where "id" is the name of a defined image reference. Image references
-are defined using syntax identical to link references:</p>
-
-<pre><code>[id]: url/to/image  &quot;Optional title attribute&quot;
-</code></pre>
-
-<p>As of this writing, Markdown has no syntax for specifying the
-dimensions of an image; if this is important to you, you can simply
-use regular HTML <code>&lt;img&gt;</code> tags.</p>
-
-<hr />
-
-<h2 id="misc">Miscellaneous</h2>
-
-<h3 id="autolink">Automatic Links</h3>
-
-<p>Markdown supports a shortcut style for creating "automatic" links for URLs and email addresses: simply surround the URL or email address with angle brackets. What this means is that if you want to show the actual text of a URL or email address, and also have it be a clickable link, you can do this:</p>
-
-<pre><code>&lt;http://example.com/&gt;
-</code></pre>
-
-<p>Markdown will turn this into:</p>
-
-<pre><code>&lt;a href=&quot;http://example.com/&quot;&gt;http://example.com/&lt;/a&gt;
-</code></pre>
-
-<p>Automatic links for email addresses work similarly, except that
-Markdown will also perform a bit of randomized decimal and hex
-entity-encoding to help obscure your address from address-harvesting
-spambots. For example, Markdown will turn this:</p>
-
-<pre><code>&lt;address@example.com&gt;
-</code></pre>
-
-<p>into something like this:</p>
-
-<pre><code>&lt;a href=&quot;&amp;#x6D;&amp;#x61;i&amp;#x6C;&amp;#x74;&amp;#x6F;:&amp;#x61;&amp;#x64;&amp;#x64;&amp;#x72;&amp;#x65;
-&amp;#115;&amp;#115;&amp;#64;&amp;#101;&amp;#120;&amp;#x61;&amp;#109;&amp;#x70;&amp;#x6C;e&amp;#x2E;&amp;#99;&amp;#111;
-&amp;#109;&quot;&gt;&amp;#x61;&amp;#x64;&amp;#x64;&amp;#x72;&amp;#x65;&amp;#115;&amp;#115;&amp;#64;&amp;#101;&amp;#120;&amp;#x61;
-&amp;#109;&amp;#x70;&amp;#x6C;e&amp;#x2E;&amp;#99;&amp;#111;&amp;#109;&lt;/a&gt;
-</code></pre>
-
-<p>which will render in a browser as a clickable link to "address@example.com".</p>
-
-<p>(This sort of entity-encoding trick will indeed fool many, if not
-most, address-harvesting bots, but it definitely won't fool all of
-them. It's better than nothing, but an address published in this way
-will probably eventually start receiving spam.)</p>
-
-<h3 id="backslash">Backslash Escapes</h3>
-
-<p>Markdown allows you to use backslash escapes to generate literal
-characters which would otherwise have special meaning in Markdown's
-formatting syntax. For example, if you wanted to surround a word with
-literal asterisks (instead of an HTML <code>&lt;em&gt;</code> tag), you can backslashes
-before the asterisks, like this:</p>
-
-<pre><code>\*literal asterisks\*
-</code></pre>
-
-<p>Markdown provides backslash escapes for the following characters:</p>
-
-<pre><code>\   backslash
-&#x60;   backtick
-*   asterisk
-_   underscore
-{}  curly braces
-[]  square brackets
-()  parentheses
-#   hash mark
-+   plus sign
--   minus sign (hyphen)
-.   dot
-!   exclamation mark
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Nested blockquotes.text b/test/javascripts/mdtest/fixtures/Nested blockquotes.text
deleted file mode 100644
index ed3c624ffb..0000000000
--- a/test/javascripts/mdtest/fixtures/Nested blockquotes.text	
+++ /dev/null
@@ -1,5 +0,0 @@
-> foo
->
-> > bar
->
-> foo
diff --git a/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml b/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml
deleted file mode 100644
index d8ec7f8e03..0000000000
--- a/test/javascripts/mdtest/fixtures/Nested blockquotes.xhtml	
+++ /dev/null
@@ -1,9 +0,0 @@
-<blockquote>
-  <p>foo</p>
-  
-  <blockquote>
-    <p>bar</p>
-  </blockquote>
-  
-  <p>foo</p>
-</blockquote>
diff --git a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text
deleted file mode 100644
index 4c7421c07a..0000000000
--- a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.text	
+++ /dev/null
@@ -1,131 +0,0 @@
-## Unordered
-
-Asterisks tight:
-
-*	asterisk 1
-*	asterisk 2
-*	asterisk 3
-
-
-Asterisks loose:
-
-*	asterisk 1
-
-*	asterisk 2
-
-*	asterisk 3
-
-* * *
-
-Pluses tight:
-
-+	Plus 1
-+	Plus 2
-+	Plus 3
-
-
-Pluses loose:
-
-+	Plus 1
-
-+	Plus 2
-
-+	Plus 3
-
-* * *
-
-
-Minuses tight:
-
--	Minus 1
--	Minus 2
--	Minus 3
-
-
-Minuses loose:
-
--	Minus 1
-
--	Minus 2
-
--	Minus 3
-
-
-## Ordered
-
-Tight:
-
-1.	First
-2.	Second
-3.	Third
-
-and:
-
-1. One
-2. Two
-3. Three
-
-
-Loose using tabs:
-
-1.	First
-
-2.	Second
-
-3.	Third
-
-and using spaces:
-
-1. One
-
-2. Two
-
-3. Three
-
-Multiple paragraphs:
-
-1.	Item 1, graf one.
-
-	Item 1. graf two. The quick brown fox jumped over the lazy dog's
-	back.
-
-2.	Item 2.
-
-3.	Item 3.
-
-
-
-## Nested
-
-*	Tab
-	*	Tab
-		*	Tab
-
-Here's another:
-
-1. First
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-3. Third
-
-Same thing but with paragraphs:
-
-1. First
-
-2. Second:
-	* Fee
-	* Fie
-	* Foe
-
-3. Third
-
-
-This was an error in Markdown 1.0.1:
-
-*	this
-
-	*	sub
-
-	that
diff --git a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml b/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml
deleted file mode 100644
index ea55846e6b..0000000000
--- a/test/javascripts/mdtest/fixtures/Ordered and unordered lists.xhtml	
+++ /dev/null
@@ -1,148 +0,0 @@
-<h2>Unordered</h2>
-
-<p>Asterisks tight:</p>
-
-<ul>
-<li>asterisk 1</li>
-<li>asterisk 2</li>
-<li>asterisk 3</li>
-</ul>
-
-<p>Asterisks loose:</p>
-
-<ul>
-<li><p>asterisk 1</p></li>
-<li><p>asterisk 2</p></li>
-<li><p>asterisk 3</p></li>
-</ul>
-
-<hr />
-
-<p>Pluses tight:</p>
-
-<ul>
-<li>Plus 1</li>
-<li>Plus 2</li>
-<li>Plus 3</li>
-</ul>
-
-<p>Pluses loose:</p>
-
-<ul>
-<li><p>Plus 1</p></li>
-<li><p>Plus 2</p></li>
-<li><p>Plus 3</p></li>
-</ul>
-
-<hr />
-
-<p>Minuses tight:</p>
-
-<ul>
-<li>Minus 1</li>
-<li>Minus 2</li>
-<li>Minus 3</li>
-</ul>
-
-<p>Minuses loose:</p>
-
-<ul>
-<li><p>Minus 1</p></li>
-<li><p>Minus 2</p></li>
-<li><p>Minus 3</p></li>
-</ul>
-
-<h2>Ordered</h2>
-
-<p>Tight:</p>
-
-<ol>
-<li>First</li>
-<li>Second</li>
-<li>Third</li>
-</ol>
-
-<p>and:</p>
-
-<ol>
-<li>One</li>
-<li>Two</li>
-<li>Three</li>
-</ol>
-
-<p>Loose using tabs:</p>
-
-<ol>
-<li><p>First</p></li>
-<li><p>Second</p></li>
-<li><p>Third</p></li>
-</ol>
-
-<p>and using spaces:</p>
-
-<ol>
-<li><p>One</p></li>
-<li><p>Two</p></li>
-<li><p>Three</p></li>
-</ol>
-
-<p>Multiple paragraphs:</p>
-
-<ol>
-<li><p>Item 1, graf one.</p>
-
-<p>Item 1. graf two. The quick brown fox jumped over the lazy dog's
-back.</p></li>
-<li><p>Item 2.</p></li>
-<li><p>Item 3.</p></li>
-</ol>
-
-<h2>Nested</h2>
-
-<ul>
-<li>Tab
-<ul>
-<li>Tab
-<ul>
-<li>Tab</li>
-</ul></li>
-</ul></li>
-</ul>
-
-<p>Here's another:</p>
-
-<ol>
-<li>First</li>
-<li>Second:
-<ul>
-<li>Fee</li>
-<li>Fie</li>
-<li>Foe</li>
-</ul></li>
-<li>Third</li>
-</ol>
-
-<p>Same thing but with paragraphs:</p>
-
-<ol>
-<li><p>First</p></li>
-<li><p>Second:</p>
-
-<ul>
-<li>Fee</li>
-<li>Fie</li>
-<li>Foe</li>
-</ul></li>
-<li><p>Third</p></li>
-</ol>
-
-
-<p>This was an error in Markdown 1.0.1:</p>
-
-<ul>
-<li><p>this</p>
-
-<ul><li>sub</li></ul>
-
-<p>that</p></li>
-</ul>
diff --git a/test/javascripts/mdtest/fixtures/Strong and em together.text b/test/javascripts/mdtest/fixtures/Strong and em together.text
deleted file mode 100644
index 95ee690dbe..0000000000
--- a/test/javascripts/mdtest/fixtures/Strong and em together.text	
+++ /dev/null
@@ -1,7 +0,0 @@
-***This is strong and em.***
-
-So is ***this*** word.
-
-___This is strong and em.___
-
-So is ___this___ word.
diff --git a/test/javascripts/mdtest/fixtures/Strong and em together.xhtml b/test/javascripts/mdtest/fixtures/Strong and em together.xhtml
deleted file mode 100644
index 71ec78c709..0000000000
--- a/test/javascripts/mdtest/fixtures/Strong and em together.xhtml	
+++ /dev/null
@@ -1,7 +0,0 @@
-<p><strong><em>This is strong and em.</em></strong></p>
-
-<p>So is <strong><em>this</em></strong> word.</p>
-
-<p><strong><em>This is strong and em.</em></strong></p>
-
-<p>So is <strong><em>this</em></strong> word.</p>
diff --git a/test/javascripts/mdtest/fixtures/Tabs.text b/test/javascripts/mdtest/fixtures/Tabs.text
deleted file mode 100644
index 589d1136e1..0000000000
--- a/test/javascripts/mdtest/fixtures/Tabs.text
+++ /dev/null
@@ -1,21 +0,0 @@
-+	this is a list item
-	indented with tabs
-
-+   this is a list item
-    indented with spaces
-
-Code:
-
-	this code block is indented by one tab
-
-And:
-
-		this code block is indented by two tabs
-
-And:
-
-	+	this is an example list item
-		indented with tabs
-	
-	+   this is an example list item
-	    indented with spaces
diff --git a/test/javascripts/mdtest/fixtures/Tabs.xhtml b/test/javascripts/mdtest/fixtures/Tabs.xhtml
deleted file mode 100644
index 3301ba803b..0000000000
--- a/test/javascripts/mdtest/fixtures/Tabs.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<ul>
-<li><p>this is a list item
-indented with tabs</p></li>
-<li><p>this is a list item
-indented with spaces</p></li>
-</ul>
-
-<p>Code:</p>
-
-<pre><code>this code block is indented by one tab
-</code></pre>
-
-<p>And:</p>
-
-<pre><code>    this code block is indented by two tabs
-</code></pre>
-
-<p>And:</p>
-
-<pre><code>+   this is an example list item
-    indented with tabs
-
-+   this is an example list item
-    indented with spaces
-</code></pre>
diff --git a/test/javascripts/mdtest/fixtures/Tidyness.text b/test/javascripts/mdtest/fixtures/Tidyness.text
deleted file mode 100644
index 5f18b8da21..0000000000
--- a/test/javascripts/mdtest/fixtures/Tidyness.text
+++ /dev/null
@@ -1,5 +0,0 @@
-> A list within a blockquote:
-> 
-> *	asterisk 1
-> *	asterisk 2
-> *	asterisk 3
diff --git a/test/javascripts/mdtest/fixtures/Tidyness.xhtml b/test/javascripts/mdtest/fixtures/Tidyness.xhtml
deleted file mode 100644
index f2a8ce70f5..0000000000
--- a/test/javascripts/mdtest/fixtures/Tidyness.xhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<blockquote>
-<p>A list within a blockquote:</p>
-<ul>
-<li>asterisk 1</li>
-<li>asterisk 2</li>
-<li>asterisk 3</li>
-</ul>
-</blockquote>
diff --git a/test/javascripts/mdtest/mdtest.js.es6.erb b/test/javascripts/mdtest/mdtest.js.es6.erb
deleted file mode 100644
index 416acd1a0a..0000000000
--- a/test/javascripts/mdtest/mdtest.js.es6.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-import { sanitize } from 'pretty-text/sanitizer';
-import { default as PrettyText, buildOptions } from 'pretty-text/pretty-text';
-import { hashString } from 'discourse/lib/hash';
-
-// Run the MDTest spec
-QUnit.module("MDTest");
-
-// This is cheating, but the trivial differences between sanitization
-// do not affect formatting.
-function normalize(str) {
-  return str.replace(/\n\s*/g, '').
-             replace(/ \/\>/g, '>').
-             replace(/    ?/g, "\t").
-             replace(/&#34;/g, '&quot;');
-}
-
-// We use a custom sanitizer for MD test that hoists out comments. In Discourse
-// they are stripped, but to be compliant with the spec they should not be.
-function sanitizer(result, whiteLister) {
-  let hoisted;
-  const m = result.match(/<!--[\s\S]*?-->/g);
-  if (m && m.length) {
-    hoisted = [];
-    for (let i=0; i<m.length; i++) {
-      const c = m[i];
-      const id = hashString("discourse:hoisted-comment:" + i).toString();
-      result = result.replace(c, id);
-      hoisted.push([c, id]);
-    }
-  }
-
-  result = sanitize(result, whiteLister);
-  if (hoisted) {
-    hoisted.forEach(tuple => result = result.replace(tuple[1], tuple[0]));
-  }
-
-  return result;
-}
-
-function md(assert, input, expected, text, settings) {
-
-  const opts = buildOptions({ siteSettings: settings||{} });
-  opts.traditionalMarkdownLinebreaks = true;
-  opts.sanitizer = sanitizer;
-
-  const cooker = new PrettyText(opts);
-  const result = cooker.cook(input);
-  const resultNorm = normalize(result);
-  const expectedNorm = normalize(expected);
-  const same = (result === expected) || (resultNorm === expectedNorm);
-
-  if (same) {
-    assert.ok(same, text);
-  } else {
-    assert.equal(resultNorm, expectedNorm, text);
-  }
-};
-
-<%
-  def mdtest_suite
-    result = ""
-    Dir.glob("#{Rails.root}/test/javascripts/mdtest/fixtures/*.text").each do |f|
-
-      filename_no_ext = f.sub(/\.text$/, '')
-      filename = Pathname.new(filename_no_ext)
-
-      text = File.read(f)
-      html = File.read("#{filename_no_ext}.xhtml");
-      result << "test(\"#{filename}\", function(assert) { md(assert, #{text.to_json}, #{html.to_json}, 'passes MDTest'); });\n"
-    end
-    result
-  end
-%>
-
-<%= mdtest_suite %>
diff --git a/test/javascripts/models/group-test.js.es6 b/test/javascripts/models/group-test.js.es6
index 3a74d635dd..6b1b726dd5 100644
--- a/test/javascripts/models/group-test.js.es6
+++ b/test/javascripts/models/group-test.js.es6
@@ -5,9 +5,9 @@ QUnit.module("model:group");
 QUnit.test('displayName', assert => {
   const group = Group.create({ name: "test", display_name: 'donkey'  });
 
-  assert.ok(group.get('displayName'), "donkey", 'it should return the display name');
+  assert.equal(group.get('displayName'), "donkey", 'it should return the display name');
 
   group.set('display_name', null);
 
-  assert.ok(group.get('displayName'), "test", "it should return the group's name");
-});
\ No newline at end of file
+  assert.equal(group.get('displayName'), "test", "it should return the group's name");
+});
diff --git a/test/javascripts/models/model-test.js.es6 b/test/javascripts/models/model-test.js.es6
index eb4d47b8d1..dba22bd390 100644
--- a/test/javascripts/models/model-test.js.es6
+++ b/test/javascripts/models/model-test.js.es6
@@ -18,4 +18,4 @@ QUnit.test("extractByKey: converts a list of hashes into a hash of instances of
 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");
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/models/post-test.js.es6 b/test/javascripts/models/post-test.js.es6
index f2c487c1b9..22cb0bde24 100644
--- a/test/javascripts/models/post-test.js.es6
+++ b/test/javascripts/models/post-test.js.es6
@@ -64,9 +64,9 @@ QUnit.test('destroy by non-staff', assert => {
       user = Discourse.User.create({username: 'evil trout'}),
       post = buildPost({user: user, cooked: originalCooked});
 
-  post.destroy(user);
-
-  assert.ok(!post.get('can_delete'), "the post can't be deleted again in this session");
-  assert.ok(post.get('cooked') !== originalCooked, "the cooked content changed");
-  assert.equal(post.get('version'), 2, "the version number increased");
-});
\ No newline at end of file
+  return post.destroy(user).then(() => {
+    assert.ok(!post.get('can_delete'), "the post can't be deleted again in this session");
+    assert.ok(post.get('cooked') !== originalCooked, "the cooked content changed");
+    assert.equal(post.get('version'), 2, "the version number increased");
+  });
+});
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 5cb8a3898a..e775197aaa 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -138,11 +138,25 @@ window.asyncTestDiscourse = helpers.asyncTestDiscourse;
 window.controllerFor = helpers.controllerFor;
 window.fixture = helpers.fixture;
 
+function getUrlParameter(name) {
+    name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+    var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
+    var results = regex.exec(location.search);
+    return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
+};
+
+var skipCore = (getUrlParameter('qunit_skip_core') == '1');
+var pluginPath = getUrlParameter('qunit_single_plugin') ? "\/"+getUrlParameter('qunit_single_plugin')+"\/" : "\/plugins\/";
+
 Object.keys(requirejs.entries).forEach(function(entry) {
-  if ((/\-test/).test(entry)) {
+  var isTest = (/\-test/).test(entry);
+  var regex =  new RegExp(pluginPath)
+  var isPlugin = regex.test(entry);
+
+  if (isTest && (!skipCore || isPlugin)) {
     require(entry, null, null, true);
   }
 });
-require('mdtest/mdtest', null, null, true);
+
 resetSite();
 
diff --git a/test/javascripts/widgets/actions-summary-test.js.es6 b/test/javascripts/widgets/actions-summary-test.js.es6
index 4e900f1474..f4eb8b7882 100644
--- a/test/javascripts/widgets/actions-summary-test.js.es6
+++ b/test/javascripts/widgets/actions-summary-test.js.es6
@@ -74,7 +74,7 @@ widgetTest('post deleted', {
     });
   },
   test(assert) {
-    assert.ok(this.$('.post-action .fa-trash-o').length === 1, 'it has the deleted icon');
+    assert.ok(this.$('.post-action .d-icon-trash-o').length === 1, 'it has the deleted icon');
     assert.ok(this.$('.avatar[title=eviltrout]').length === 1, 'it has the deleted by avatar');
   }
 });
diff --git a/test/javascripts/widgets/home-logo-test.js.es6 b/test/javascripts/widgets/home-logo-test.js.es6
index ddc032391e..96bd889f50 100644
--- a/test/javascripts/widgets/home-logo-test.js.es6
+++ b/test/javascripts/widgets/home-logo-test.js.es6
@@ -66,7 +66,7 @@ widgetTest('no logo - minimized', {
   },
 
   test(assert) {
-    assert.ok(this.$('i.fa-home').length === 1);
+    assert.ok(this.$('.d-icon-home').length === 1);
   }
 });
 
diff --git a/test/javascripts/widgets/post-test.js.es6 b/test/javascripts/widgets/post-test.js.es6
index 243290deec..0296c9dcf3 100644
--- a/test/javascripts/widgets/post-test.js.es6
+++ b/test/javascripts/widgets/post-test.js.es6
@@ -436,7 +436,7 @@ widgetTest("reply directly above", {
     click('a.reply-to-tab');
     andThen(() => {
       assert.equal(this.$('section.embedded-posts.top .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts i.fa-arrow-up').length, 1);
+      assert.equal(this.$('section.embedded-posts .d-icon-arrow-up').length, 1);
     });
   }
 });
@@ -673,7 +673,7 @@ widgetTest("replies - one below, not suppressed", {
     click('button.show-replies');
     andThen(() => {
       assert.equal(this.$('section.embedded-posts.bottom .cooked').length, 1);
-      assert.equal(this.$('section.embedded-posts i.fa-arrow-down').length, 1);
+      assert.equal(this.$('section.embedded-posts .d-icon-arrow-down').length, 1);
     });
   }
 });
@@ -760,12 +760,12 @@ widgetTest("topic map - links", {
     click('nav.buttons button');
     andThen(() => {
       assert.equal(this.$('.map.map-collapsed').length, 0);
-      assert.equal(this.$('.topic-map i.fa-chevron-up').length, 1);
+      assert.equal(this.$('.topic-map .d-icon-chevron-up').length, 1);
       assert.equal(this.$('.topic-map-expanded').length, 1);
       assert.equal(this.$('.topic-map-expanded .topic-link').length, 5, 'it limits the links displayed');
     });
 
-    click('.link-summary a');
+    click('.link-summary button');
     andThen(() => {
       assert.equal(this.$('.topic-map-expanded .topic-link').length, 6, 'all links now shown');
     });
diff --git a/test/javascripts/widgets/poster-name-test.js.es6 b/test/javascripts/widgets/poster-name-test.js.es6
index d399e91fef..c8ab8391d7 100644
--- a/test/javascripts/widgets/poster-name-test.js.es6
+++ b/test/javascripts/widgets/poster-name-test.js.es6
@@ -38,7 +38,7 @@ widgetTest('extra classes and glyphs', {
     assert.ok(this.$('span.staff').length);
     assert.ok(this.$('span.admin').length);
     assert.ok(this.$('span.moderator').length);
-    assert.ok(this.$('i.fa-shield').length);
+    assert.ok(this.$('.d-icon-shield').length);
     assert.ok(this.$('span.new-user').length);
     assert.ok(this.$('span.fish').length);
   }
diff --git a/test/stylesheets/test_helper.css b/test/stylesheets/test_helper.css
index f9eddae24d..c42fb810ac 100644
--- a/test/stylesheets/test_helper.css
+++ b/test/stylesheets/test_helper.css
@@ -3,11 +3,3 @@
 .modal-backdrop {
   display: none;
 }
-
-.emoji-modal-wrapper {
-  display: none;
-}
-
-.emoji-modal {
-  position: relative;
-}
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
deleted file mode 100644
index 836b1c7e31..0000000000
--- a/vendor/assets/javascripts/better_markdown.js
+++ /dev/null
@@ -1,1518 +0,0 @@
-/*
-  This is a fork of markdown-js with a few changes to support discourse:
-
-  * We have replaced the strong/em handlers because we prefer them only to work on word
-    boundaries.
-
-  * [MOD]: non-url is fixed
-
-  // Fix code within attrs
-  if (prev && (typeof prev[0] === "string") && prev[0].match(/<[^>]+$/)) { return; }
-
-  // __RAW
-
-  // if ( next_block.match(is_list_re) || (next_block.match(/^ /) && (!next_block.match(/^ *\>/))) ) {
-
-*/
-
-// Released under MIT license
-// Copyright (c) 2009-2010 Dominic Baggott
-// Copyright (c) 2009-2010 Ash Berlin
-// Copyright (c) 2011 Christoph Dorn <christoph@christophdorn.com> (http://www.christophdorn.com)
-
-/*jshint browser:true, devel:true */
-
-(function(expose) {
-
-  var MarkdownHelpers = {};
-
-  // For Spidermonkey based engines
-  function mk_block_toSource() {
-    return "Markdown.mk_block( " +
-            uneval(this.toString()) +
-            ", " +
-            uneval(this.trailing) +
-            ", " +
-            uneval(this.lineNumber) +
-            " )";
-  }
-
-  // node
-  function mk_block_inspect() {
-    var util = require("util");
-    return "Markdown.mk_block( " +
-            util.inspect(this.toString()) +
-            ", " +
-            util.inspect(this.trailing) +
-            ", " +
-            util.inspect(this.lineNumber) +
-            " )";
-
-  }
-
-  MarkdownHelpers.mk_block = function(block, trail, line) {
-    // Be helpful for default case in tests.
-    if ( arguments.length === 1 )
-      trail = "\n\n";
-
-    // We actually need a String object, not a string primitive
-    /* jshint -W053 */
-    var s = new String(block);
-    s.trailing = trail;
-    // To make it clear its not just a string
-    s.inspect = mk_block_inspect;
-    s.toSource = mk_block_toSource;
-
-    if ( line !== undefined )
-      s.lineNumber = line;
-
-    return s;
-  };
-
-  var isArray = MarkdownHelpers.isArray = Array.isArray || function(obj) {
-    return Object.prototype.toString.call(obj) === "[object Array]";
-  };
-
-  // Don't mess with Array.prototype. Its not friendly
-  if ( Array.prototype.forEach ) {
-    MarkdownHelpers.forEach = function forEach( arr, cb, thisp ) {
-      return arr.forEach( cb, thisp );
-    };
-  }
-  else {
-    MarkdownHelpers.forEach = function forEach(arr, cb, thisp) {
-      for (var i = 0; i < arr.length; i++)
-        cb.call(thisp || arr, arr[i], i, arr);
-    };
-  }
-
-  MarkdownHelpers.isEmpty = function isEmpty( obj ) {
-    for ( var key in obj ) {
-      if ( hasOwnProperty.call( obj, key ) )
-        return false;
-    }
-    return true;
-  };
-
-  MarkdownHelpers.extract_attr = function extract_attr( jsonml ) {
-    return isArray(jsonml)
-        && jsonml.length > 1
-        && typeof jsonml[ 1 ] === "object"
-        && !( isArray(jsonml[ 1 ]) )
-        ? jsonml[ 1 ]
-        : undefined;
-  };
-
- /**
-   *  class Markdown
-   *
-   *  Markdown processing in Javascript done right. We have very particular views
-   *  on what constitutes 'right' which include:
-   *
-   *  - produces well-formed HTML (this means that em and strong nesting is
-   *    important)
-   *
-   *  - has an intermediate representation to allow processing of parsed data (We
-   *    in fact have two, both as [JsonML]: a markdown tree and an HTML tree).
-   *
-   *  - is easily extensible to add new dialects without having to rewrite the
-   *    entire parsing mechanics
-   *
-   *  - has a good test suite
-   *
-   *  This implementation fulfills all of these (except that the test suite could
-   *  do with expanding to automatically run all the fixtures from other Markdown
-   *  implementations.)
-   *
-   *  ##### Intermediate Representation
-   *
-   *  *TODO* Talk about this :) Its JsonML, but document the node names we use.
-   *
-   *  [JsonML]: http://jsonml.org/ "JSON Markup Language"
-   **/
-  var Markdown = function(dialect) {
-    switch (typeof dialect) {
-    case "undefined":
-      this.dialect = Markdown.dialects.Gruber;
-      break;
-    case "object":
-      this.dialect = dialect;
-      break;
-    default:
-      if ( dialect in Markdown.dialects )
-        this.dialect = Markdown.dialects[dialect];
-      else
-        throw new Error("Unknown Markdown dialect '" + String(dialect) + "'");
-      break;
-    }
-    this.em_state = [];
-    this.strong_state = [];
-    this.debug_indent = "";
-  };
-
-  /**
-   * Markdown.dialects
-   *
-   * Namespace of built-in dialects.
-   **/
-  Markdown.dialects = {};
-
-  // Imported functions
-  var mk_block = Markdown.mk_block = MarkdownHelpers.mk_block,
-      isArray = MarkdownHelpers.isArray;
-
-  /**
-   *  parse( markdown, [dialect] ) -> JsonML
-   *  - markdown (String): markdown string to parse
-   *  - dialect (String | Dialect): the dialect to use, defaults to gruber
-   *
-   *  Parse `markdown` and return a markdown document as a Markdown.JsonML tree.
-   **/
-  Markdown.parse = function( source, dialect ) {
-    // dialect will default if undefined
-    var md = new Markdown( dialect );
-    return md.toTree( source );
-  };
-
-  /**
-   *  count_lines( str ) -> count
-   *  - str (String): String whose lines we want to count
-   *
-   *  Counts the number of linebreaks in `str`
-   **/
-  function count_lines( str ) {
-    return str.split("\n").length - 1;
-  }
-
-  // Internal - split source into rough blocks
-  Markdown.prototype.split_blocks = function splitBlocks( input ) {
-    input = input.replace(/(\r\n|\n|\r)/g, "\n");
-    // [\s\S] matches _anything_ (newline or space)
-    // [^] is equivalent but doesn't work in IEs.
-    var re = /([\s\S]+?)($|\n#|\n(?:\s*\n|$)+)/g,
-        blocks = [],
-        m;
-
-    var line_no = 1;
-
-    if ( ( m = /^(\s*\n)/.exec(input) ) !== null ) {
-      // skip (but count) leading blank lines
-      line_no += count_lines( m[0] );
-      re.lastIndex = m[0].length;
-    }
-
-    while ( ( m = re.exec(input) ) !== null ) {
-      if (m[2] === "\n#") {
-        m[2] = "\n";
-        re.lastIndex--;
-      }
-      blocks.push( mk_block( m[1], m[2], line_no ) );
-      line_no += count_lines( m[0] );
-    }
-
-    return blocks;
-  };
-
-  /**
-   *  Markdown#processBlock( block, next ) -> undefined | [ JsonML, ... ]
-   *  - block (String): the block to process
-   *  - next (Array): the following blocks
-   *
-   * Process `block` and return an array of JsonML nodes representing `block`.
-   *
-   * It does this by asking each block level function in the dialect to process
-   * the block until one can. Succesful handling is indicated by returning an
-   * array (with zero or more JsonML nodes), failure by a false value.
-   *
-   * Blocks handlers are responsible for calling [[Markdown#processInline]]
-   * themselves as appropriate.
-   *
-   * If the blocks were split incorrectly or adjacent blocks need collapsing you
-   * can adjust `next` in place using shift/splice etc.
-   *
-   * If any of this default behaviour is not right for the dialect, you can
-   * define a `__call__` method on the dialect that will get invoked to handle
-   * the block processing.
-   */
-  Markdown.prototype.processBlock = function processBlock( block, next ) {
-    var cbs = this.dialect.block,
-        ord = cbs.__order__;
-
-    if ( "__call__" in cbs )
-      return cbs.__call__.call(this, block, next);
-
-    for ( var i = 0; i < ord.length; i++ ) {
-      //D:this.debug( "Testing", ord[i] );
-      var res = cbs[ ord[i] ].call( this, block, next );
-      if ( res ) {
-        //D:this.debug("  matched");
-        if ( !isArray(res) || ( res.length > 0 && !( isArray(res[0]) ) && ( typeof res[0] !== "string")) )
-          this.debug(ord[i], "didn't return a proper array");
-        //D:this.debug( "" );
-        return res;
-      }
-    }
-
-    // Uhoh! no match! Should we throw an error?
-    return [];
-  };
-
-  Markdown.prototype.processInline = function processInline( block ) {
-    return this.dialect.inline.__call__.call( this, String( block ) );
-  };
-
-  /**
-   *  Markdown#toTree( source ) -> JsonML
-   *  - source (String): markdown source to parse
-   *
-   *  Parse `source` into a JsonML tree representing the markdown document.
-   **/
-  // custom_tree means set this.tree to `custom_tree` and restore old value on return
-  Markdown.prototype.toTree = function toTree( source, custom_root ) {
-    var blocks = source instanceof Array ? source : this.split_blocks( source );
-
-    // Make tree a member variable so its easier to mess with in extensions
-    var old_tree = this.tree;
-    try {
-      this.tree = custom_root || this.tree || [ "markdown" ];
-
-      blocks_loop:
-      while ( blocks.length ) {
-        var b = this.processBlock( blocks.shift(), blocks );
-
-        // Reference blocks and the like won't return any content
-        if ( !b.length )
-          continue blocks_loop;
-
-        this.tree.push.apply( this.tree, b );
-      }
-      return this.tree;
-    }
-    finally {
-      if ( custom_root )
-        this.tree = old_tree;
-    }
-  };
-
-  // Noop by default
-  Markdown.prototype.debug = function () {
-    var args = Array.prototype.slice.call( arguments);
-    args.unshift(this.debug_indent);
-    if ( typeof print !== "undefined" )
-      print.apply( print, args );
-    if ( typeof console !== "undefined" && typeof console.log !== "undefined" )
-      console.log.apply( null, args );
-  };
-
-  Markdown.prototype.loop_re_over_block = function( re, block, cb ) {
-    // Dont use /g regexps with this
-    var m,
-        b = block.valueOf();
-
-    while ( b.length && (m = re.exec(b) ) !== null ) {
-      b = b.substr( m[0].length );
-      cb.call(this, m);
-    }
-    return b;
-  };
-
-  // Build default order from insertion order.
-  Markdown.buildBlockOrder = function(d) {
-    var ord = [[]];
-    for ( var i in d ) {
-      if ( i === "__order__" || i === "__call__" )
-        continue;
-
-      var priority = d[i].priority || 0;
-      ord[priority] = ord[priority] || [];
-      ord[priority].push( i );
-    }
-
-    var flattend = [];
-    for (i=ord.length-1; i>=0; i--){
-      if (ord[i]) {
-        for (var j=0; j<ord[i].length; j++){
-          flattend.push(ord[i][j]);
-        }
-      }
-    }
-
-    d.__order__ = flattend;
-  };
-
-  // Build patterns for inline matcher
-  Markdown.buildInlinePatterns = function(d) {
-    var patterns = [];
-
-    for ( var i in d ) {
-      // __foo__ is reserved and not a pattern
-      if ( i.match( /^__.*__$/) )
-        continue;
-      var l = i.replace( /([\\.*+?^$|()\[\]{}])/g, "\\$1" )
-               .replace( /\n/, "\\n" );
-      patterns.push( i.length === 1 ? l : "(?:" + l + ")" );
-    }
-
-    patterns = patterns.join("|");
-    d.__patterns__ = patterns;
-    //print("patterns:", uneval( patterns ) );
-
-    var fn = d.__call__;
-    d.__call__ = function(text, pattern) {
-      if ( pattern !== undefined )
-        return fn.call(this, text, pattern);
-      else
-        return fn.call(this, text, patterns);
-    };
-  };
-
-  var extract_attr = MarkdownHelpers.extract_attr;
-
-  /**
-   *  renderJsonML( jsonml[, options] ) -> String
-   *  - jsonml (Array): JsonML array to render to XML
-   *  - options (Object): options
-   *
-   *  Converts the given JsonML into well-formed XML.
-   *
-   *  The options currently understood are:
-   *
-   *  - root (Boolean): wether or not the root node should be included in the
-   *    output, or just its children. The default `false` is to not include the
-   *    root itself.
-   */
-  Markdown.renderJsonML = function( jsonml, options ) {
-    options = options || {};
-    // include the root element in the rendered output?
-    options.root = options.root || false;
-
-    var content = [];
-
-    if ( options.root ) {
-      content.push( render_tree( jsonml ) );
-    }
-    else {
-      jsonml.shift(); // get rid of the tag
-      if ( jsonml.length && typeof jsonml[ 0 ] === "object" && !( jsonml[ 0 ] instanceof Array ) )
-        jsonml.shift(); // get rid of the attributes
-
-      while ( jsonml.length )
-        content.push( render_tree( jsonml.shift() ) );
-    }
-
-    return content.join( "\n\n" );
-  };
-
-  /**
-   *  toHTMLTree( markdown, [dialect] ) -> JsonML
-   *  toHTMLTree( md_tree ) -> JsonML
-   *  - markdown (String): markdown string to parse
-   *  - dialect (String | Dialect): the dialect to use, defaults to gruber
-   *  - md_tree (Markdown.JsonML): parsed markdown tree
-   *
-   *  Turn markdown into HTML, represented as a JsonML tree. If a string is given
-   *  to this function, it is first parsed into a markdown tree by calling
-   *  [[parse]].
-   **/
-  Markdown.toHTMLTree = function toHTMLTree( input, dialect , options ) {
-
-    // convert string input to an MD tree
-    if ( typeof input === "string" )
-      input = this.parse( input, dialect );
-
-    // Now convert the MD tree to an HTML tree
-
-    // remove references from the tree
-    var attrs = extract_attr( input ),
-        refs = {};
-
-    if ( attrs && attrs.references )
-      refs = attrs.references;
-
-
-    var html = convert_tree_to_html( input, refs , options );
-    merge_text_nodes( html );
-    return html;
-  };
-
-  /**
-   *  toHTML( markdown, [dialect]  ) -> String
-   *  toHTML( md_tree ) -> String
-   *  - markdown (String): markdown string to parse
-   *  - md_tree (Markdown.JsonML): parsed markdown tree
-   *
-   *  Take markdown (either as a string or as a JsonML tree) and run it through
-   *  [[toHTMLTree]] then turn it into a well-formated HTML fragment.
-   **/
-  Markdown.toHTML = function toHTML( source , dialect , options ) {
-    var input = this.toHTMLTree( source , dialect , options );
-
-    return this.renderJsonML( input );
-  };
-
-  function escapeHTML( text ) {
-    if (text && text.length > 0) {
-      return text.replace( /&/g, "&amp;" )
-                 .replace( /</g, "&lt;" )
-                 .replace( />/g, "&gt;" )
-                 .replace( /"/g, "&quot;" )
-                 .replace( /'/g, "&#39;" );
-    } else {
-      return "";
-    }
-  }
-
-  function render_tree( jsonml ) {
-    // basic case
-    if ( typeof jsonml === "string" )
-      return jsonml;
-
-    if ( jsonml[0] === "__RAW" ) {
-      return jsonml[1];
-    }
-
-    var tag = jsonml.shift(),
-        attributes = {},
-        content = [];
-
-    if ( jsonml.length && typeof jsonml[ 0 ] === "object" && !( jsonml[ 0 ] instanceof Array ) )
-      attributes = jsonml.shift();
-
-    while ( jsonml.length )
-      content.push( render_tree( jsonml.shift() ) );
-
-    var tag_attrs = "";
-    if (typeof attributes.src !== 'undefined') {
-      tag_attrs += ' src="' + escapeHTML( attributes.src ) + '"';
-      delete attributes.src;
-    }
-
-    for ( var a in attributes ) {
-      var escaped = escapeHTML( attributes[ a ]);
-      if (escaped && escaped.length) {
-        tag_attrs += " " + a + '="' + escaped + '"';
-      }
-    }
-
-    // be careful about adding whitespace here for inline elements
-    if ( tag === "img" || tag === "br" || tag === "hr" )
-      return "<"+ tag + tag_attrs + "/>";
-    else
-      return "<"+ tag + tag_attrs + ">" + content.join( "" ) + "</" + tag + ">";
-  }
-
-  function convert_tree_to_html( tree, references, options ) {
-    var i;
-    options = options || {};
-
-    // shallow clone
-    var jsonml = tree.slice( 0 );
-
-    if ( typeof options.preprocessTreeNode === "function" )
-      jsonml = options.preprocessTreeNode(jsonml, references);
-
-    // Clone attributes if they exist
-    var attrs = extract_attr( jsonml );
-    if ( attrs ) {
-      jsonml[ 1 ] = {};
-      for ( i in attrs ) {
-        jsonml[ 1 ][ i ] = attrs[ i ];
-      }
-      attrs = jsonml[ 1 ];
-    }
-
-    // basic case
-    if ( typeof jsonml === "string" )
-      return jsonml;
-
-    // convert this node
-    switch ( jsonml[ 0 ] ) {
-    case "header":
-      jsonml[ 0 ] = "h" + jsonml[ 1 ].level;
-      delete jsonml[ 1 ].level;
-      break;
-    case "bulletlist":
-      jsonml[ 0 ] = "ul";
-      break;
-    case "numberlist":
-      jsonml[ 0 ] = "ol";
-      break;
-    case "listitem":
-      jsonml[ 0 ] = "li";
-      break;
-    case "para":
-      jsonml[ 0 ] = "p";
-      break;
-    case "markdown":
-      jsonml[ 0 ] = "html";
-      if ( attrs )
-        delete attrs.references;
-      break;
-    case "code_block":
-      jsonml[ 0 ] = "pre";
-      i = attrs ? 2 : 1;
-      var code = [ "code" ];
-      code.push.apply( code, jsonml.splice( i, jsonml.length - i ) );
-      jsonml[ i ] = code;
-      break;
-    case "inlinecode":
-      jsonml[ 0 ] = "code";
-      break;
-    case "img":
-      jsonml[ 1 ].src = jsonml[ 1 ].href;
-      delete jsonml[ 1 ].href;
-      break;
-    case "linebreak":
-      jsonml[ 0 ] = "br";
-      break;
-    case "link":
-      jsonml[ 0 ] = "a";
-      break;
-    case "link_ref":
-      jsonml[ 0 ] = "a";
-
-      // grab this ref and clean up the attribute node
-      var ref = references[ attrs.ref ];
-
-      // if the reference exists, make the link
-      if ( ref ) {
-        delete attrs.ref;
-
-        // add in the href and title, if present
-        attrs.href = ref.href;
-        if ( ref.title )
-          attrs.title = ref.title;
-
-        // get rid of the unneeded original text
-        delete attrs.original;
-      }
-      // the reference doesn't exist, so revert to plain text
-      else {
-        return attrs.original;
-      }
-      break;
-    case "img_ref":
-      jsonml[ 0 ] = "img";
-
-      // grab this ref and clean up the attribute node
-      var ref = references[ attrs.ref ];
-
-      // if the reference exists, make the link
-      if ( ref ) {
-        delete attrs.ref;
-
-        // add in the href and title, if present
-        attrs.src = ref.href;
-        if ( ref.title )
-          attrs.title = ref.title;
-
-        // get rid of the unneeded original text
-        delete attrs.original;
-      }
-      // the reference doesn't exist, so revert to plain text
-      else {
-        return attrs.original;
-      }
-      break;
-    }
-
-    // convert all the children
-    i = 1;
-
-    // deal with the attribute node, if it exists
-    if ( attrs ) {
-      // if there are keys, skip over it
-      for ( var key in jsonml[ 1 ] ) {
-        i = 2;
-        break;
-      }
-      // if there aren't, remove it
-      if ( i === 1 )
-        jsonml.splice( i, 1 );
-    }
-
-    for ( ; i < jsonml.length; ++i ) {
-      jsonml[ i ] = convert_tree_to_html( jsonml[ i ], references, options );
-    }
-
-    return jsonml;
-  }
-
-  // merges adjacent text nodes into a single node
-  function merge_text_nodes( jsonml ) {
-    // skip the tag name and attribute hash
-    var i = extract_attr( jsonml ) ? 2 : 1;
-
-    while ( i < jsonml.length ) {
-      // if it's a string check the next item too
-      if ( typeof jsonml[ i ] === "string" ) {
-        if ( i + 1 < jsonml.length && typeof jsonml[ i + 1 ] === "string" ) {
-          // merge the second string into the first and remove it
-          jsonml[ i ] += jsonml.splice( i + 1, 1 )[ 0 ];
-        }
-        else {
-          ++i;
-        }
-      }
-      // if it's not a string recurse
-      else {
-        merge_text_nodes( jsonml[ i ] );
-        ++i;
-      }
-    }
-  }
-
-  var DialectHelpers = {};
-  DialectHelpers.inline_until_char = function( text, want ) {
-    var consumed = 0,
-        nodes = [],
-        patterns = this.dialect.inline.__patterns__.replace('|_|', '|');
-
-    while ( true ) {
-      if ( text.charAt( consumed ) === want ) {
-        // Found the character we were looking for
-        consumed++;
-        return [ consumed, nodes ];
-      }
-
-      if ( consumed >= text.length ) {
-        // No closing char found. Abort.
-        return [consumed, null, nodes];
-      }
-
-      var res = this.dialect.inline.__oneElement__.call(this, text.substr( consumed ), patterns, [text.substr(0, consumed)]);
-      consumed += res[ 0 ];
-      // Add any returned nodes.
-      nodes.push.apply( nodes, res.slice( 1 ) );
-    }
-  };
-
-  // Helper function to make sub-classing a dialect easier
-  DialectHelpers.subclassDialect = function( d ) {
-    function Block() {}
-    Block.prototype = d.block;
-    function Inline() {}
-    Inline.prototype = d.inline;
-
-    return { block: new Block(), inline: new Inline() };
-  };
-
-  var forEach = MarkdownHelpers.forEach,
-      extract_attr = MarkdownHelpers.extract_attr,
-      mk_block = MarkdownHelpers.mk_block,
-      isEmpty = MarkdownHelpers.isEmpty,
-      inline_until_char = DialectHelpers.inline_until_char;
-
-  // A robust regexp for matching URLs. Thakns: https://gist.github.com/dperini/729294
-  var urlRegexp = /(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?/i.source;
-
-  /**
-   * Gruber dialect
-   *
-   * The default dialect that follows the rules set out by John Gruber's
-   * markdown.pl as closely as possible. Well actually we follow the behaviour of
-   * that script which in some places is not exactly what the syntax web page
-   * says.
-   **/
-  var Gruber = {
-    block: {
-      atxHeader: function atxHeader( block, next ) {
-        var m = block.match( /^(#{1,6})\s*(.*?)\s*#*\s*(?:\n|$)/ );
-
-        if ( !m )
-          return undefined;
-
-        var header = [ "header", { level: m[ 1 ].length } ];
-        Array.prototype.push.apply(header, this.processInline(m[ 2 ]));
-
-        if ( m[0].length < block.length )
-          next.unshift( mk_block( block.substr( m[0].length ), block.trailing, block.lineNumber + 2 ) );
-
-        return [ header ];
-      },
-
-      setextHeader: function setextHeader( block, next ) {
-        var m = block.match( /^(.*)\n([-=])\2\2+(?:\n|$)/ );
-
-        if ( !m )
-          return undefined;
-
-        var level = ( m[ 2 ] === "=" ) ? 1 : 2,
-            header = [ "header", { level : level } ].concat( this.processInline(m[ 1 ]) );
-
-        if ( m[0].length < block.length )
-          next.unshift( mk_block( block.substr( m[0].length ), block.trailing, block.lineNumber + 2 ) );
-
-        return [ header ];
-      },
-
-      code: function code( block, next ) {
-        // |    Foo
-        // |bar
-        // should be a code block followed by a paragraph. Fun
-        //
-        // There might also be adjacent code block to merge.
-
-        var ret = [],
-            re = /^(?: {0,3}\t| {4})(.*)\n?/;
-
-        // 4 spaces + content
-        if ( !block.match( re ) )
-          return undefined;
-
-        block_search:
-        do {
-          // Now pull out the rest of the lines
-          var b = this.loop_re_over_block(
-                    re, block.valueOf(), function( m ) { ret.push( m[1] ); } );
-
-          if ( b.length ) {
-            // Case alluded to in first comment. push it back on as a new block
-            next.unshift( mk_block(b, block.trailing) );
-            break block_search;
-          }
-          else if ( next.length ) {
-            // Check the next block - it might be code too
-            if ( !next[0].match( re ) )
-              break block_search;
-
-            // Pull how how many blanks lines follow - minus two to account for .join
-            ret.push ( block.trailing.replace(/[^\n]/g, "").substring(2) );
-
-            block = next.shift();
-          }
-          else {
-            break block_search;
-          }
-        } while ( true );
-
-        return [ [ "code_block", ret.join("\n") ] ];
-      },
-
-      horizRule: function horizRule( block, next ) {
-        // this needs to find any hr in the block to handle abutting blocks
-        var m = block.match( /^(?:([\s\S]*?)\n)?[ \t]*([-_*])(?:[ \t]*\2){2,}[ \t]*(?:\n([\s\S]*))?$/ );
-
-        if ( !m )
-          return undefined;
-
-        var jsonml = [ [ "hr" ] ];
-
-        // if there's a leading abutting block, process it
-        if ( m[ 1 ] ) {
-          var contained = mk_block( m[ 1 ], "", block.lineNumber );
-          jsonml.unshift.apply( jsonml, this.toTree( contained, [] ) );
-        }
-
-        // if there's a trailing abutting block, stick it into next
-        if ( m[ 3 ] )
-          next.unshift( mk_block( m[ 3 ], block.trailing, block.lineNumber + 1 ) );
-
-        return jsonml;
-      },
-
-      // There are two types of lists. Tight and loose. Tight lists have no whitespace
-      // between the items (and result in text just in the <li>) and loose lists,
-      // which have an empty line between list items, resulting in (one or more)
-      // paragraphs inside the <li>.
-      //
-      // There are all sorts weird edge cases about the original markdown.pl's
-      // handling of lists:
-      //
-      // * Nested lists are supposed to be indented by four chars per level. But
-      //   if they aren't, you can get a nested list by indenting by less than
-      //   four so long as the indent doesn't match an indent of an existing list
-      //   item in the 'nest stack'.
-      //
-      // * The type of the list (bullet or number) is controlled just by the
-      //    first item at the indent. Subsequent changes are ignored unless they
-      //    are for nested lists
-      //
-      lists: (function( ) {
-        // Use a closure to hide a few variables.
-        var any_list = "[*+-]|\\d+\\.",
-            bullet_list = /[*+-]/,
-            // Capture leading indent as it matters for determining nested lists.
-            is_list_re = new RegExp( "^( {0,3})(" + any_list + ")[ \t]+" ),
-            indent_re = "(?: {0,3}\\t| {4})";
-
-        // TODO: Cache this regexp for certain depths.
-        // Create a regexp suitable for matching an li for a given stack depth
-        function regex_for_depth( depth ) {
-          return new RegExp(
-            // m[1] = indent, m[2] = list_type
-            "(?:^(" + indent_re + "{0," + depth + "} {0,3})(" + any_list + ")\\s+)|" +
-            // m[3] = cont
-            "(^" + indent_re + "{0," + (depth-1) + "}[ ]{0,4})"
-          );
-        }
-        function expand_tab( input ) {
-          return input.replace( / {0,3}\t/g, "    " );
-        }
-
-        // Add inline content `inline` to `li`. inline comes from processInline
-        // so is an array of content
-        function add(li, loose, inline, nl) {
-          if ( loose ) {
-            li.push( [ "para" ].concat(inline) );
-            return;
-          }
-          // Hmmm, should this be any block level element or just paras?
-          var add_to = li[li.length -1] instanceof Array && li[li.length - 1][0] === "para"
-                     ? li[li.length -1]
-                     : li;
-
-          // If there is already some content in this list, add the new line in
-          if ( nl && li.length > 1 )
-            inline.unshift(nl);
-
-          for ( var i = 0; i < inline.length; i++ ) {
-            var what = inline[i],
-                is_str = typeof what === "string";
-            if ( is_str && add_to.length > 1 && typeof add_to[add_to.length-1] === "string" )
-              add_to[ add_to.length-1 ] += what;
-            else
-              add_to.push( what );
-          }
-        }
-
-        // contained means have an indent greater than the current one. On
-        // *every* line in the block
-        function get_contained_blocks( depth, blocks ) {
-
-          var re = new RegExp( "^(" + indent_re + "{" + depth + "}.*?\\n?)*$" ),
-              replace = new RegExp("^" + indent_re + "{" + depth + "}", "gm"),
-              ret = [];
-
-
-          while ( blocks.length > 0 ) {
-            // HACK: Fixes a v8 issue
-            test = blocks[0].replace(/^ {8,}/, '        ');
-            if ( re.exec( test ) ) {
-              var b = blocks.shift(),
-                  // Now remove that indent
-                  x = b.replace( replace, "");
-
-              ret.push( mk_block( x, b.trailing, b.lineNumber ) );
-            }
-            else
-              break;
-          }
-          return ret;
-        }
-
-        // passed to stack.forEach to turn list items up the stack into paras
-        function paragraphify(s, i, stack) {
-          var list = s.list;
-          var last_li = list[list.length-1];
-
-          if ( last_li[1] instanceof Array && last_li[1][0] === "para" )
-            return;
-
-          if ( i + 1 === stack.length ) {
-            // Last stack frame
-            // Keep the same array, but replace the contents
-            last_li.push( ["para"].concat( last_li.splice(1, last_li.length - 1) ) );
-          }
-          else {
-            var sublist = last_li.pop();
-            last_li.push( ["para"].concat( last_li.splice(1, last_li.length - 1) ), sublist );
-          }
-        }
-
-        // The matcher function
-        return function( block, next ) {
-          var m = block.match( is_list_re );
-          if ( !m )
-            return undefined;
-
-          function make_list( m ) {
-            var list = bullet_list.exec( m[2] )
-                     ? ["bulletlist"]
-                     : ["numberlist"];
-
-            stack.push( { list: list, indent: m[1] } );
-            return list;
-          }
-
-          var stack = [], // Stack of lists for nesting.
-              list = make_list( m ),
-              last_li,
-              loose = false,
-              ret = [ stack[0].list ],
-              i;
-
-          // Loop to search over block looking for inner block elements and loose lists
-          loose_search:
-          while ( true ) {
-            // Split into lines preserving new lines at end of line
-            var lines = block.split( /(?=\n)/ );
-
-            // We have to grab all lines for a li and call processInline on them
-            // once as there are some inline things that can span lines.
-            var li_accumulate = "", nl = "";
-
-            // Loop over the lines in this block looking for tight lists.
-            tight_search:
-            for ( var line_no = 0; line_no < lines.length; line_no++ ) {
-              nl = "";
-              var l = lines[line_no].replace(/^\n/, function(n) { nl = n; return ""; });
-
-              // TODO: really should cache this
-              var line_re = regex_for_depth( stack.length );
-
-              m = l.match( line_re );
-              //print( "line:", uneval(l), "\nline match:", uneval(m) );
-
-              // We have a list item
-              if ( m[1] !== undefined ) {
-                // Process the previous list item, if any
-                if ( li_accumulate.length ) {
-                  add( last_li, loose, this.processInline( li_accumulate ), nl );
-                  // Loose mode will have been dealt with. Reset it
-                  loose = false;
-                  li_accumulate = "";
-                }
-
-                m[1] = expand_tab( m[1] );
-                var wanted_depth = Math.floor(m[1].length/4)+1;
-                //print( "want:", wanted_depth, "stack:", stack.length);
-                if ( wanted_depth > stack.length ) {
-                  // Deep enough for a nested list outright
-                  //print ( "new nested list" );
-                  list = make_list( m );
-                  last_li.push( list );
-                  last_li = list[1] = [ "listitem" ];
-                }
-                else {
-                  // We aren't deep enough to be strictly a new level. This is
-                  // where Md.pl goes nuts. If the indent matches a level in the
-                  // stack, put it there, else put it one deeper then the
-                  // wanted_depth deserves.
-                  var found = false;
-                  for ( i = 0; i < stack.length; i++ ) {
-                    if ( stack[ i ].indent !== m[1] )
-                      continue;
-
-                    list = stack[ i ].list;
-                    stack.splice( i+1, stack.length - (i+1) );
-                    found = true;
-                    break;
-                  }
-
-                  if (!found) {
-                    //print("not found. l:", uneval(l));
-                    wanted_depth++;
-                    if ( wanted_depth <= stack.length ) {
-                      stack.splice(wanted_depth, stack.length - wanted_depth);
-                      //print("Desired depth now", wanted_depth, "stack:", stack.length);
-                      list = stack[wanted_depth-1].list;
-                      //print("list:", uneval(list) );
-                    }
-                    else {
-                      //print ("made new stack for messy indent");
-                      list = make_list(m);
-                      last_li.push(list);
-                    }
-                  }
-
-                  //print( uneval(list), "last", list === stack[stack.length-1].list );
-                  last_li = [ "listitem" ];
-                  list.push(last_li);
-                } // end depth of shenegains
-                nl = "";
-              }
-
-              // Add content
-              if ( l.length > m[0].length )
-                li_accumulate += nl + l.substr( m[0].length );
-            } // tight_search
-
-            if ( li_accumulate.length ) {
-
-              var contents = this.processBlock(li_accumulate, []),
-                  firstBlock = contents[0];
-
-              if (firstBlock) {
-                firstBlock.shift();
-                contents.splice.apply(contents, [0, 1].concat(firstBlock));
-                add( last_li, loose, contents, nl );
-
-                // Let's not creating a trailing \n after content in the li
-                if(last_li[last_li.length-1] === "\n") {
-                  last_li.pop();
-                }
-
-                // Loose mode will have been dealt with. Reset it
-                loose = false;
-                li_accumulate = "";
-              }
-            }
-
-            // Look at the next block - we might have a loose list. Or an extra
-            // paragraph for the current li
-            var contained = get_contained_blocks( stack.length, next );
-
-            // Deal with code blocks or properly nested lists
-            if ( contained.length > 0 ) {
-              // Make sure all listitems up the stack are paragraphs
-              forEach( stack, paragraphify, this);
-
-              last_li.push.apply( last_li, this.toTree( contained, [] ) );
-            }
-
-            var next_block = next[0] && next[0].valueOf() || "";
-
-            if ( next_block.match(is_list_re) )  {
-              block = next.shift();
-
-              // Check for an HR following a list: features/lists/hr_abutting
-              var hr = this.dialect.block.horizRule.call( this, block, next );
-
-              if ( hr ) {
-                ret.push.apply(ret, hr);
-                break;
-              }
-
-              // Add paragraphs if the indentation level stays the same
-              if (stack[stack.length-1].indent === block.match(/^\s*/)[0]) {
-                forEach( stack, paragraphify, this);
-              }
-
-              loose = true;
-              continue loose_search;
-            }
-            break;
-          } // loose_search
-
-          return ret;
-        };
-      })(),
-
-      blockquote: function blockquote( block, next ) {
-
-        // Handle quotes that have spaces before them
-        var m = /(^|\n) +(\>[\s\S]*)/.exec(block);
-        if (m && m[2] && m[2].length) {
-          var blockContents = block.replace(/(^|\n) +\>/, "$1>");
-          next.unshift(blockContents);
-          return [];
-        }
-
-        if ( !block.match( /^>/m ) )
-          return undefined;
-
-        var jsonml = [];
-
-        // separate out the leading abutting block, if any. I.e. in this case:
-        //
-        //  a
-        //  > b
-        //
-        if ( block[ 0 ] !== ">" ) {
-          var lines = block.split( /\n/ ),
-              prev = [],
-              line_no = block.lineNumber;
-
-          // keep shifting lines until you find a crotchet
-          while ( lines.length && lines[ 0 ][ 0 ] !== ">" ) {
-            prev.push( lines.shift() );
-            line_no++;
-          }
-
-          var abutting = mk_block( prev.join( "\n" ), "\n", block.lineNumber );
-          jsonml.push.apply( jsonml, this.processBlock( abutting, [] ) );
-          // reassemble new block of just block quotes!
-          block = mk_block( lines.join( "\n" ), block.trailing, line_no );
-        }
-
-        // if the next block is also a blockquote merge it in
-        while ( next.length && next[ 0 ][ 0 ] === ">" ) {
-          var b = next.shift();
-          block = mk_block( block + block.trailing + b, b.trailing, block.lineNumber );
-        }
-
-        // Strip off the leading "> " and re-process as a block.
-        var input = block.replace( /^> ?/gm, "" ),
-            old_tree = this.tree,
-            processedBlock = this.toTree( input, [ "blockquote" ] ),
-            attr = extract_attr( processedBlock );
-
-        // If any link references were found get rid of them
-        if ( attr && attr.references ) {
-          delete attr.references;
-          // And then remove the attribute object if it's empty
-          if ( isEmpty( attr ) )
-            processedBlock.splice( 1, 1 );
-        }
-
-        jsonml.push( processedBlock );
-        return jsonml;
-      },
-
-      referenceDefn: function referenceDefn( block, next) {
-        var re = /^\s*\[([^\[\]]+)\]:\s*(\S+)(?:\s+(?:(['"])(.*)\3|\((.*?)\)))?\n?/;
-        // interesting matches are [ , ref_id, url, , title, title ]
-
-        if ( !block.match(re) )
-          return undefined;
-
-        var attrs = create_attrs.call( this );
-
-        var b = this.loop_re_over_block(re, block, function( m ) {
-          create_reference(attrs, m);
-        } );
-
-        if ( b.length )
-          next.unshift( mk_block( b, block.trailing ) );
-
-        return [];
-      },
-
-      para: function para( block ) {
-        // everything's a para!
-        return [ ["para"].concat( this.processInline( block ) ) ];
-      }
-    },
-
-    inline: {
-
-      __oneElement__: function oneElement( text, patterns_or_re, previous_nodes ) {
-
-        // PERF NOTE: rewritten to avoid greedy match regex \([\s\S]*?)(...)\
-        // greedy match performs horribly with large inline blocks, it can be so
-        // slow it will crash chrome
-        patterns_or_re = patterns_or_re || this.dialect.inline.__patterns__;
-
-        var search_re = new RegExp(patterns_or_re.source || patterns_or_re);
-        var pos = text.search(search_re);
-
-        if (pos === -1) {
-          return [ text.length, text ];
-        } else if (pos !== 0) {
-          // Some un-interesting text matched. Return that first
-          return [pos, text.substring(0,pos)];
-        }
-
-        var match_re = new RegExp( "^(" + (patterns_or_re.source || patterns_or_re) + ")" );
-        var m = match_re.exec( text );
-        var res;
-        if ( m[1] in this.dialect.inline ) {
-          res = this.dialect.inline[ m[1] ].call(
-                    this,
-                    text.substr( m.index ), m, previous_nodes || [] );
-
-          // If no inline code executed, fallback
-          if (!res) {
-            var fn = this.dialect.inline[m[1][0]];
-            if (fn) {
-              res = fn.call(
-                    this,
-                    text.substr( m.index ), m, previous_nodes || [] );
-            }
-          }
-        }
-        // Default for now to make dev easier. just slurp special and output it.
-        res = res || [ m[1].length, m[1] ];
-        return res;
-      },
-
-      __call__: function inline( text, patterns ) {
-
-        var out = [],
-            res;
-
-        function add(x) {
-          //D:self.debug("  adding output", uneval(x));
-          if ( typeof x === "string" && typeof out[out.length-1] === "string" )
-            out[ out.length-1 ] += x;
-          else
-            out.push(x);
-        }
-
-        while ( text.length > 0 ) {
-          res = this.dialect.inline.__oneElement__.call(this, text, patterns, out );
-          text = text.substr( res.shift() );
-          forEach(res, add );
-        }
-
-        return out;
-      },
-
-      // These characters are interesting elsewhere, so have rules for them so that
-      // chunks of plain text blocks don't include them
-      "]": function () {},
-      "}": function () {},
-
-      __escape__ : /^\\[\\`\*_{}<>\[\]()#\+.!\-]/,
-
-      "\\": function escaped( text ) {
-        // [ length of input processed, node/children to add... ]
-        // Only esacape: \ ` * _ { } [ ] ( ) # * + - . !
-        if ( this.dialect.inline.__escape__.exec( text ) )
-          return [ 2, text.charAt( 1 ) ];
-        else
-          // Not an esacpe
-          return [ 1, "\\" ];
-      },
-
-      "![": function image( text ) {
-
-        // Without this guard V8 crashes hard on the RegExp
-        if (text.indexOf('(') >= 0 && text.indexOf(')') === -1) { return; }
-
-        // Unlike images, alt text is plain text only. no other elements are
-        // allowed in there
-
-        // ![Alt text](/path/to/img.jpg "Optional title")
-        //      1          2            3       4         <--- captures
-        //
-        // First attempt to use a strong URL regexp to catch things like parentheses. If it misses, use the
-        // old one.
-        var origMatcher = /^!\[(.*?)\][ \t]*\([ \t]*([^")]*?)(?:[ \t]+(["'])(.*?)\3)?[ \t]*\)/;
-            m = text.match(new RegExp("^!\\[(.*?)][ \\t]*\\((" + urlRegexp + ")\\)([ \\t])*([\"'].*[\"'])?")) ||
-                text.match(origMatcher);
-
-        if (m && m[2].indexOf(")]") !== -1) { m = text.match(origMatcher); }
-
-        if ( m ) {
-          if ( m[2] && m[2][0] === "<" && m[2][m[2].length-1] === ">" )
-            m[2] = m[2].substring( 1, m[2].length - 1 );
-
-          m[2] = this.dialect.inline.__call__.call( this, m[2], /\\/ )[0];
-
-          var attrs = { alt: m[1], href: m[2] || "" };
-          if ( m[4] !== undefined)
-            attrs.title = m[4];
-
-          return [ m[0].length, [ "img", attrs ] ];
-        }
-
-        // ![Alt text][id]
-        m = text.match( /^!\[(.*?)\][ \t]*\[(.*?)\]/ );
-
-        if ( m ) {
-          // We can't check if the reference is known here as it likely wont be
-          // found till after. Check it in md tree->hmtl tree conversion
-          return [ m[0].length, [ "img_ref", { alt: m[1], ref: m[2].toLowerCase(), original: m[0] } ] ];
-        }
-
-        // Just consume the '!['
-        return [ 2, "![" ];
-      },
-
-      "[": function link( text ) {
-
-        var open = 1;
-        for (var i=0; i<text.length; i++) {
-          var c = text.charAt(i);
-          if (c === '[') { open++; }
-          if (c === ']') { open--; }
-
-          if (open > 3) { return [1, "["]; }
-        }
-
-        var orig = String(text);
-        // Inline content is possible inside `link text`
-        var res = inline_until_char.call( this, text.substr(1), "]" );
-
-        // No closing ']' found. Just consume the [
-        if ( !res[1] ) {
-          return [ res[0] + 1, text.charAt(0) ].concat(res[2]);
-        }
-
-        if ( res[0] == 1 ) { return [ 2, "[]" ]; } // empty link found.
-
-        var consumed = 1 + res[ 0 ],
-            children = res[ 1 ],
-            link,
-            attrs;
-
-        // At this point the first [...] has been parsed. See what follows to find
-        // out which kind of link we are (reference or direct url)
-        text = text.substr( consumed );
-
-        // [link text](/path/to/img.jpg "Optional title")
-        //                 1            2       3         <--- captures
-        // This will capture up to the last paren in the block. We then pull
-        // back based on if there a matching ones in the url
-        //    ([here](/url/(test))
-        // The parens have to be balanced
-        var m = text.match( /^\s*\([ \t]*([^"'\s]*)(?:[ \t]+(["'])(.*?)\2)?[ \t]*\)/ );
-        if ( m ) {
-          var url = m[1].replace(/\s+$/, '');
-          consumed += m[0].length;
-
-          if ( url && url[0] === "<" && url[url.length-1] === ">" )
-            url = url.substring( 1, url.length - 1 );
-
-          // If there is a title we don't have to worry about parens in the url
-          if ( !m[3] ) {
-            var open_parens = 1; // One open that isn't in the capture
-            for ( var len = 0; len < url.length; len++ ) {
-              switch ( url[len] ) {
-              case "(":
-                open_parens++;
-                break;
-              case ")":
-                if ( --open_parens === 0) {
-                  consumed -= url.length - len;
-                  url = url.substring(0, len);
-                }
-                break;
-              }
-            }
-          }
-
-          // Process escapes only
-          url = this.dialect.inline.__call__.call( this, url, /\\/ )[0];
-
-          attrs = { href: url || "" };
-          if ( m[3] !== undefined)
-            attrs.title = m[3];
-
-          link = [ "link", attrs ].concat( children );
-          return [ consumed, link ];
-        }
-
-        if (text.indexOf('(') === 0 && text.indexOf(')') !== -1) {
-          m = text.match(new RegExp("^\\((" + urlRegexp + ")\\)"));
-          if (m && m[1]) {
-            consumed += m[0].length;
-            link = ["link", {href: m[1]}].concat(children);
-            return [consumed, link];
-          }
-        }
-
-        // [Alt text][id]
-        // [Alt text] [id]
-        m = text.match( /^\s*\[(.*?)\]/ );
-        if ( m ) {
-
-          consumed += m[ 0 ].length;
-
-          // [links][] uses links as its reference
-          attrs = { ref: ( m[ 1 ] || String(children) ).toLowerCase(),  original: orig.substr( 0, consumed ) };
-
-          if (children && children.length > 0) {
-            link = [ "link_ref", attrs ].concat( children );
-
-            // We can't check if the reference is known here as it likely wont be
-            // found till after. Check it in md tree->hmtl tree conversion.
-            // Store the original so that conversion can revert if the ref isn't found.
-            return [ consumed, link ];
-          }
-        }
-
-        // Another check for references
-        m = orig.match(/^\s*\[(.*?)\]:\s*(\S+)(?:\s+(?:(['"])(.*?)\3|\((.*?)\)))?\n?/);
-        if (m &&
-            (/^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]+-?)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/i.test(m[2]) ||
-             /(\/[\w~,;\-\./?%&+#=]*)/.test(m[2]))) {
-          attrs = create_attrs.call(this);
-          create_reference(attrs, m);
-
-          return [ m[0].length ];
-        }
-
-        // [id]
-        // Only if id is plain (no formatting.)
-        if ( children.length === 1 && typeof children[0] === "string" ) {
-
-          var normalized = children[0].toLowerCase().replace(/\s+/, ' ');
-          attrs = { ref: normalized,  original: orig.substr( 0, consumed ) };
-          link = [ "link_ref", attrs, children[0] ];
-          return [ consumed, link ];
-        }
-
-        // Just consume the "["
-        return [ 1, "[" ];
-      },
-
-      "<": function autoLink( text ) {
-        var m;
-
-        if ( ( m = text.match( /^<(?:((https?|ftp|mailto):[^>]+)|(.*?@.*?\.[a-zA-Z]+))>/ ) ) !== null ) {
-          if ( m[3] )
-            return [ m[0].length, [ "link", { href: "mailto:" + m[3] }, m[3] ] ];
-          else if ( m[2] === "mailto" )
-            return [ m[0].length, [ "link", { href: m[1] }, m[1].substr("mailto:".length ) ] ];
-          else
-            return [ m[0].length, [ "link", { href: m[1] }, m[1] ] ];
-        }
-
-        return [ 1, "<" ];
-      },
-
-      "`": function inlineCode( text, match, prev ) {
-
-        // If we're in a tag, don't do it.
-        if (prev && (typeof prev[0] === "string") && prev[0].match(/<[^>]+$/)) { return; }
-
-        // Inline code block. as many backticks as you like to start it
-        // Always skip over the opening ticks.
-        var m = text.match( /(`+)(([\s\S]*?)\1)/ );
-
-        if ( m && m[2] )
-          return [ m[1].length + m[2].length, [ "inlinecode", m[3] ] ];
-        else {
-          // TODO: No matching end code found - warn!
-          return [ 1, "`" ];
-        }
-      },
-
-      "  \n": function lineBreak() {
-        return [ 3, [ "linebreak" ] ];
-      }
-
-    }
-  };
-
-  // A helper function to create attributes
-  function create_attrs() {
-    if ( !extract_attr( this.tree ) ) {
-      this.tree.splice( 1, 0, {} );
-    }
-
-    var attrs = extract_attr( this.tree );
-
-    // make a references hash if it doesn't exist
-    if ( attrs.references === undefined ) {
-      attrs.references = {};
-    }
-
-    return attrs;
-  }
-
-  // Create references for attributes
-  function create_reference(attrs, m) {
-    if ( m[2] && m[2][0] === "<" && m[2][m[2].length-1] === ">" )
-      m[2] = m[2].substring( 1, m[2].length - 1 );
-
-    var ref = attrs.references[ m[1].toLowerCase() ] = {
-      href: m[2]
-    };
-
-    if ( m[4] !== undefined )
-      ref.title = m[4];
-    else if ( m[5] !== undefined )
-      ref.title = m[5];
-  }
-
-  Markdown.dialects.Gruber = Gruber;
-  Markdown.buildBlockOrder ( Markdown.dialects.Gruber.block );
-  Markdown.buildInlinePatterns( Markdown.dialects.Gruber.inline );
-
-// Include all our dependencies and return the resulting library.
-
-  expose.Markdown = Markdown;
-  expose.parse = Markdown.parse;
-  expose.toHTML = Markdown.toHTML;
-  expose.toHTMLTree = Markdown.toHTMLTree;
-  expose.renderJsonML = Markdown.renderJsonML;
-  expose.DialectHelpers = DialectHelpers;
-
-})(function() {
-  window.BetterMarkdown = {};
-  return window.BetterMarkdown;
-}());
diff --git a/vendor/assets/javascripts/div_resizer.js b/vendor/assets/javascripts/div_resizer.js
index 66ddfe9585..9bb7b3ccc2 100644
--- a/vendor/assets/javascripts/div_resizer.js
+++ b/vendor/assets/javascripts/div_resizer.js
@@ -38,6 +38,8 @@ startDrag = function(e, opts) {
 };
 
 performDrag = function(e, opts) {
+  $(div).trigger("div-resizing");
+
   var size, sizePx, thisMousePos;
   thisMousePos = mousePosition(e).y;
   size = originalDivHeight + (originalPos - thisMousePos);
diff --git a/vendor/assets/javascripts/run-qunit.js b/vendor/assets/javascripts/run-qunit.js
index 7f0335fea5..d614ade725 100644
--- a/vendor/assets/javascripts/run-qunit.js
+++ b/vendor/assets/javascripts/run-qunit.js
@@ -36,7 +36,7 @@ page.open(args[0], function(status) {
   } else {
     page.evaluate(logQUnit);
 
-    var timeout = parseInt(args[1] || 200000, 10),
+    var timeout = parseInt(args[1] || 300000, 10),
         start = Date.now();
 
     var interval = setInterval(function() {