diff --git a/.eslintrc b/.eslintrc
index 19d38e35c7..71e21b4381 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -46,6 +46,7 @@
     "expandSelectBox":true,
     "collapseSelectBox":true,
     "selectBoxSelectRow":true,
+    "selectBoxSelectNoneRow":true,
     "selectBoxFillInFilter":true,
     "asyncTestDiscourse":true,
     "fixture":true,
diff --git a/Gemfile b/Gemfile
index 302d22be4c..befe82d775 100644
--- a/Gemfile
+++ b/Gemfile
@@ -172,6 +172,8 @@ gem 'memory_profiler', require: false, platform: :mri
 
 gem 'cppjieba_rb', require: false
 
+gem 'lograge', require: false
+gem 'logstash-logger', require: false
 gem 'logster'
 
 gem 'sassc', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 64a3964df8..506f502ea2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,15 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    logster (1.2.7)
+    lograge (0.7.1)
+      actionpack (>= 4, < 5.2)
+      activesupport (>= 4, < 5.2)
+      railties (>= 4, < 5.2)
+      request_store (~> 1.0)
+    logstash-event (1.2.02)
+    logstash-logger (0.25.1)
+      logstash-event (~> 1.2)
+    logster (1.2.8)
     loofah (2.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -233,7 +241,7 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    parallel (1.11.2)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.20.0)
@@ -290,6 +298,7 @@ GEM
     redis (3.3.5)
     redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
+    request_store (1.3.2)
     rinku (2.0.2)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
@@ -316,11 +325,11 @@ GEM
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
     rtlit (0.0.5)
-    rubocop (0.49.1)
+    rubocop (0.51.0)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-ll (2.1.2)
@@ -328,7 +337,7 @@ GEM
       ast
     ruby-openid (2.7.0)
     ruby-prof (0.16.2)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby-readability (0.7.0)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
@@ -431,6 +440,8 @@ DEPENDENCIES
   htmlentities
   http_accept_language (~> 2.0.5)
   listen
+  lograge
+  logstash-logger
   logster
   lru_redux
   mail
diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index 749ce2492d..faad36798a 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,13 +1,14 @@
 import loadScript from 'discourse/lib/load-script';
 import { observes } from 'ember-addons/ember-computed-decorators';
 
-const LOAD_ASYNC = !Ember.Test;
+const LOAD_ASYNC = !Ember.testing;
 
 export default Ember.Component.extend({
   mode: 'css',
   classNames: ['ace-wrapper'],
   _editor: null,
   _skipContentChangeEvent: null,
+  disabled: false,
 
   @observes('editorId')
   editorIdChanged() {
@@ -30,6 +31,24 @@ export default Ember.Component.extend({
     }
   },
 
+  @observes('disabled')
+  disabledStateChanged() {
+    this.changeDisabledState();
+  },
+
+  changeDisabledState() {
+    const editor = this._editor;
+    if (editor) {
+      const disabled = this.get('disabled');
+      editor.setOptions({
+        readOnly: disabled,
+        highlightActiveLine: !disabled,
+        highlightGutterLine: !disabled
+      });
+      editor.container.parentNode.setAttribute("data-disabled", disabled);
+    }
+  },
+
   _destroyEditor: function() {
     if (this._editor) {
       this._editor.destroy();
@@ -76,6 +95,7 @@ export default Ember.Component.extend({
 
         this.$().data('editor', editor);
         this._editor = editor;
+        this.changeDisabledState();
 
         $(window).off('ace:resize').on('ace:resize', ()=>{
           this.appEvents.trigger('ace:resize');
diff --git a/app/assets/javascripts/admin/components/flag-counts.js.es6 b/app/assets/javascripts/admin/components/flag-counts.js.es6
deleted file mode 100644
index 040207e695..0000000000
--- a/app/assets/javascripts/admin/components/flag-counts.js.es6
+++ /dev/null
@@ -1,10 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-
-export default Ember.Component.extend({
-  classNames: ['flag-counts'],
-
-  @computed('details.flag_type_id')
-  title(id) {
-    return I18n.t(`admin.flags.summary.action_type_${id}`, { count: 1 });
-  }
-});
diff --git a/app/assets/javascripts/admin/components/list-setting.js.es6 b/app/assets/javascripts/admin/components/list-setting.js.es6
index da6c5173d6..9a1d865133 100644
--- a/app/assets/javascripts/admin/components/list-setting.js.es6
+++ b/app/assets/javascripts/admin/components/list-setting.js.es6
@@ -50,5 +50,3 @@ export default Ember.Component.extend({
     });
   }
 });
-
-
diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js.es6 b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
new file mode 100644
index 0000000000..ced180d8bb
--- /dev/null
+++ b/app/assets/javascripts/admin/helpers/post-action-title.js.es6
@@ -0,0 +1,12 @@
+function postActionTitle([id, nameKey]) {
+  let title = I18n.t(`admin.flags.short_names.${nameKey}`, { defaultValue: null });
+
+  // TODO: We can remove this once other translations have been updated
+  if (!title) {
+    return I18n.t(`admin.flags.summary.action_type_${id}`, { count: 1 });
+  }
+
+  return title;
+}
+
+export default Ember.Helper.helper(postActionTitle);
diff --git a/app/assets/javascripts/admin/routes/admin-flags-index.js.es6 b/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
index ae4a2e089d..32b70b9d30 100644
--- a/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-flags-index.js.es6
@@ -1,5 +1,6 @@
 export default Discourse.Route.extend({
   redirect() {
-    this.replaceWith('adminFlags.postsActive');
+    let segment = this.siteSettings.flags_default_topics ? 'topics' : 'postsActive';
+    this.replaceWith(`adminFlags.${segment}`);
   }
 });
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index e40e6bfec0..877b9a8e8e 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -26,9 +26,7 @@
       {{combo-box name="badge_type_id"
                   value=buffered.badge_type_id
                   content=badgeTypes
-                  optionValuePath="content.id"
-                  optionLabelPath="content.name"
-                  disabled=readOnly}}
+                  isDisabled=readOnly}}
     </div>
 
     <div>
@@ -36,8 +34,7 @@
       {{combo-box name="badge_grouping_id"
                   value=buffered.badge_grouping_id
                   content=badgeGroupings
-                  optionValuePath="content.id"
-                  optionLabelPath="content.displayName"}}
+                  nameProperty="name"}}
       &nbsp;<button {{action "editGroupings"}} class='btn'>{{d-icon 'pencil'}}</button>
     </div>
 
@@ -63,7 +60,7 @@
     {{#if siteSettings.enable_badge_sql}}
       <div>
         <label for="query">{{i18n 'admin.badges.query'}}</label>
-        {{textarea name="query" value=buffered.query disabled=readOnly}}
+        {{ace-editor content=buffered.query mode="sql" disabled=readOnly}}
       </div>
 
       {{#if hasQuery}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
index c5620d84ed..419ef0b69c 100644
--- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs
@@ -1,6 +1,6 @@
 {{#if editing}}
   {{#admin-form-row label="admin.user_fields.type"}}
-    {{combo-box content=fieldTypes valueAttribute="id" value=buffered.field_type}}
+    {{combo-box content=fieldTypes value=buffered.field_type}}
   {{/admin-form-row}}
 
   {{#admin-form-row label="admin.user_fields.name"}}
diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
index 88317ecd18..e21685831b 100644
--- a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/templates/components/embeddable-host.hbs
@@ -9,7 +9,7 @@
     {{input value=buffered.path_whitelist placeholder="/blog/.*" enter="save" class="path-whitelist"}}
   </td>
   <td>
-    {{category-select-box value=categoryId class="small"}}
+    {{category-chooser value=categoryId class="small"}}
   </td>
   <td>
     {{d-button icon="check" action="save" class="btn-primary" disabled=cantSave}}
diff --git a/app/assets/javascripts/admin/templates/components/flag-counts.hbs b/app/assets/javascripts/admin/templates/components/flag-counts.hbs
index ff1f011825..e69de29bb2 100644
--- a/app/assets/javascripts/admin/templates/components/flag-counts.hbs
+++ b/app/assets/javascripts/admin/templates/components/flag-counts.hbs
@@ -1,2 +0,0 @@
-<span class='type-name'>{{title}}</span>
-<span class='type-count'>x{{details.count}}</span>
diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
index 98ac4bf5e0..4a832771a8 100644
--- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs
+++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs
@@ -73,7 +73,7 @@
           {{#each flaggedPost.post_actions as |postAction|}}
             {{#flag-user user=postAction.user date=postAction.created_at}}
               <div class='flagger-flag-type'>
-                {{i18n (concat "admin.flags.summary.action_type_" postAction.post_action_type_id) count=1}}
+                {{post-action-title postAction.post_action_type_id postAction.name_key}}
               </div>
             {{/flag-user}}
           {{/each}}
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index 6b02429d77..6f8ac614aa 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -36,8 +36,7 @@
 
   <h3>{{i18n "admin.customize.theme.color_scheme"}}</h3>
   <p>{{i18n "admin.customize.theme.color_scheme_select"}}</p>
-  <p>{{select-box content=colorSchemes
-                  textKey="name"
+  <p>{{combo-box content=colorSchemes
                   filterable=true
                   value=colorSchemeId
                   icon="paint-brush"}}
@@ -123,11 +122,8 @@
     </ul>
     {{/unless}}
     {{#if selectableChildThemes}}
-      <p>{{combo-box content=selectableChildThemes
-                   nameProperty="name"
-                   value=selectedChildThemeId
-                   valueAttribute="id"}}
-
+      <p>
+        {{combo-box content=selectableChildThemes value=selectedChildThemeId}}
         {{#d-button action="addChildTheme" icon="plus"}}{{i18n "admin.customize.theme.add"}}{{/d-button}}
       </p>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/flags-topics-index.hbs b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
index 61ef340129..d9fdf87066 100644
--- a/app/assets/javascripts/admin/templates/flags-topics-index.hbs
+++ b/app/assets/javascripts/admin/templates/flags-topics-index.hbs
@@ -19,7 +19,10 @@
       </td>
       <td>
         {{#each ft.flag_counts as |fc|}}
-          {{flag-counts details=fc}}
+          <div class='flag-counts'>
+            <span class='type-name'>{{post-action-title fc.post_action_type_id fc.name_key}}</span>
+            <span class='type-count'>x{{fc.count}}</span>
+          </div>
         {{/each}}
       </td>
       <td class='flagged-topic-users'>
diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs
index e24c12d8ec..d13ad994bc 100644
--- a/app/assets/javascripts/admin/templates/flags.hbs
+++ b/app/assets/javascripts/admin/templates/flags.hbs
@@ -1,6 +1,12 @@
 {{#admin-nav}}
-  {{nav-item route='adminFlags.postsActive' label='admin.flags.active_posts'}}
-  {{nav-item route='adminFlags.topics' label='admin.flags.topics'}}
+  {{#if siteSettings.flags_default_topics}}
+    {{nav-item route='adminFlags.topics' label='admin.flags.topics'}}
+    {{nav-item route='adminFlags.postsActive' label='admin.flags.active_posts'}}
+  {{else}}
+    {{nav-item route='adminFlags.postsActive' label='admin.flags.active_posts'}}
+    {{nav-item route='adminFlags.topics' label='admin.flags.topics'}}
+  {{/if}}
+
   {{nav-item route='adminFlags.postsOld' label='admin.flags.old_posts' class='right'}}
 {{/admin-nav}}
 
diff --git a/app/assets/javascripts/admin/templates/groups-bulk.hbs b/app/assets/javascripts/admin/templates/groups-bulk.hbs
index baf3a63cda..337ab37cb3 100644
--- a/app/assets/javascripts/admin/templates/groups-bulk.hbs
+++ b/app/assets/javascripts/admin/templates/groups-bulk.hbs
@@ -6,7 +6,7 @@
   </div>
 
   <div class='control'>
-    {{combo-box content=groups valueAttribute="id" value=groupId none="admin.groups.bulk_select"}}
+    {{combo-box filterable=true content=groups value=groupId none="admin.groups.bulk_select"}}
   </div>
 
   <div class='control'>
diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
index 50f02f9f5b..c44edc1a3e 100644
--- a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs
@@ -30,7 +30,7 @@
     {{/if}}
   </div>
   {{else}}
-    {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions nameProperty="name" value=filterActionId none="admin.logs.staff_actions.all"}}
+    {{i18n "admin.logs.staff_actions.filter"}} {{combo-box content=userHistoryActions value=filterActionId none="admin.logs.staff_actions.all"}}
   {{/if}}
 
   <div class="pull-right">
diff --git a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
index d58a63c134..1316942634 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs
@@ -2,7 +2,6 @@
   {{#d-modal-body title="admin.customize.colors.select_base.title"}}
     {{i18n "admin.customize.colors.select_base.description"}}
     {{combo-box content=model
-                   nameProperty="name"
                    value=selectedBaseThemeId
                    valueAttribute="base_scheme_id"}}
   {{/d-modal-body}}
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 cfbd21d4b9..a701cf5045 100644
--- a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs
@@ -7,7 +7,7 @@
           {{future-date-input
             class="suspend-until"
             label="admin.user.suspend_duration"
-            includeForever=true
+            includeFarFuture=true
             input=suspendUntil}}
         </label>
       </div>
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index 57acba8f50..3927d1e384 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -4,10 +4,10 @@
   {{i18n 'admin.dashboard.reports.start_date'}} {{date-picker-past value=startDate defaultDate=startDate}}
   {{i18n 'admin.dashboard.reports.end_date'}} {{date-picker-past value=endDate defaultDate=endDate}}
   {{#if showCategoryOptions}}
-    {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}}
+    {{combo-box filterable=true valueAttribute="value" content=categoryOptions value=categoryId}}
   {{/if}}
   {{#if showGroupOptions}}
-    {{combo-box valueAttribute="value" content=groupOptions value=groupId}}
+    {{combo-box filterable=true valueAttribute="value" content=groupOptions value=groupId}}
   {{/if}}
   {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
   {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 9977aca39d..1f6bae617c 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -16,7 +16,7 @@
     <form class="form-horizontal">
       <div>
       <label>{{i18n 'admin.badges.badge'}}</label>
-      {{combo-box valueAttribute="id" value=selectedBadgeId content=grantableBadges nameProperty="name"}}
+      {{combo-box filterable=true value=selectedBadgeId content=grantableBadges}}
       </div>
       <label>
       <label>{{i18n 'admin.badges.reason'}}</label>
diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs
index fcc9d716f2..ec086e3271 100644
--- a/app/assets/javascripts/admin/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/templates/user-index.hbs
@@ -1,5 +1,4 @@
 <section class="details {{unless model.active 'not-activated'}}">
-
   <div class='user-controls'>
     {{#if model.canViewProfile}}
       {{#link-to 'user' model class="btn"}}
@@ -379,7 +378,7 @@
         <div class='controls'>
           {{#if model.customGroups}}
             {{i18n 'admin.groups.primary'}}
-            {{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
+            {{combo-box content=model.customGroups value=model.primary_group_id none="admin.groups.no_primary"}}
           {{/if}}
           {{#if primaryGroupDirty}}
             {{d-button icon="check" class="ok" action="savePrimaryGroup"}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 9bb578af7d..cd292cb3e0 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -6,15 +6,13 @@
 {{/if}}
 
 <div class="admin-title">
-  <div class="pull-left">
-    <h2>{{title}}</h2>
-  </div>
+  <h2>{{title}}</h2>
 </div>
 <div class='username controls'>
   {{text-field value=listFilter placeholder=searchHint}}
   {{#unless showEmails}}
     <div class="pull-right">
-      <button {{action "showEmails"}} class="btn">{{i18n 'admin.users.show_emails'}}</button>
+      <button {{action "showEmails"}} class="show-emails btn">{{i18n 'admin.users.show_emails'}}</button>
     </div>
   {{/unless}}
 </div>
@@ -28,7 +26,7 @@
         {{/if}}
         <th>&nbsp;</th>
         <th>{{i18n 'username'}}</th>
-        <th>{{i18n 'email'}}</th>
+        <th class='email-heading'>{{i18n 'email'}}</th>
         <th>{{i18n 'admin.users.last_emailed'}}</th>
         {{admin-directory-toggle field="seen" i18nKey='last_seen' order=order ascending=ascending}}
         {{admin-directory-toggle field="topics_viewed" i18nKey="admin.user.topics_entered" order=order ascending=ascending}}
diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
index 8530de5f12..53c0cba146 100644
--- a/app/assets/javascripts/admin/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/templates/web-hooks-show.hbs
@@ -16,8 +16,6 @@
       <label for='content-type'>{{i18n 'admin.web_hooks.content_type'}}</label>
       {{combo-box content=contentTypes
                   name="content-type"
-                  nameProperty="name"
-                  valueAttribute="id"
                   value=model.content_type}}
     </div>
 
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e5d4e93784..280e12954e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -4,6 +4,7 @@
 //= require ./ember-addons/ember-computed-decorators
 //= require ./ember-addons/fmt
 //= require_tree ./discourse-common
+//= require_tree ./select-box-kit
 //= require ./discourse
 //= require ./deprecated
 
diff --git a/app/assets/javascripts/discourse-common/components/combo-box.js.es6 b/app/assets/javascripts/discourse-common/components/combo-box.js.es6
deleted file mode 100644
index 9e8a97e66d..0000000000
--- a/app/assets/javascripts/discourse-common/components/combo-box.js.es6
+++ /dev/null
@@ -1,146 +0,0 @@
-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',
-  attributeBindings: ['tabindex', 'disabled'],
-  classNames: ['combobox'],
-  valueAttribute: 'id',
-  nameProperty: 'name',
-
-  buildBuffer(buffer) {
-    const nameProperty = this.get('nameProperty');
-    const none = this.get('none');
-    let noneValue = null;
-
-    // Add none option if required
-    if (typeof none === "string") {
-      buffer.push('<option value="">' + I18n.t(none) + "</option>");
-    } else if (typeof none === "object") {
-      noneValue = Em.get(none, this.get('valueAttribute'));
-      buffer.push(`<option value="${noneValue}">${Em.get(none, nameProperty)}</option>`);
-    }
-
-    let selected = this.get('value');
-    if (!Em.isNone(selected)) { selected = selected.toString(); }
-
-    let selectedFound = false;
-    let firstVal = undefined;
-    const content = this.get('content');
-
-    if (content) {
-      let first = true;
-      content.forEach(o => {
-        let val = o[this.get('valueAttribute')];
-        if (typeof val === "undefined") { val = o; }
-        if (!Em.isNone(val)) { val = val.toString(); }
-
-        const selectedText = (val === selected) ? "selected" : "";
-        const name = Handlebars.Utils.escapeExpression(Ember.get(o, nameProperty) || o);
-
-        if (val === selected) {
-          selectedFound = true;
-        }
-        if (first) {
-          firstVal = val;
-          first = false;
-        }
-        buffer.push(`<option ${selectedText} value="${val}">${name}</option>`);
-      });
-    }
-
-    if (!selectedFound && !noneValue) {
-      if (none) {
-        this.set('value', null);
-      } else {
-        this.set('value', firstVal);
-      }
-    }
-
-    Ember.run.scheduleOnce('afterRender', this, this._updateSelect2);
-  },
-
-  @observes('value')
-  valueChanged() {
-    const $combo = this.$(),
-          val = this.get('value');
-
-    if (val !== undefined && val !== null) {
-      $combo.select2('val', val.toString());
-    } else {
-      $combo.select2('val', null);
-    }
-  },
-
-  @observes('content.[]')
-  _rerenderOnChange() {
-    this.rerenderBuffer();
-  },
-
-  didInsertElement() {
-    this._super();
-
-    // Workaround for https://github.com/emberjs/ember.js/issues/9813
-    // Can be removed when fixed. Without it, the wrong option is selected
-    this.$('option').each((i, o) => o.selected = !!$(o).attr('selected'));
-
-    // observer for item names changing (optional)
-    if (this.get('nameChanges')) {
-      this.addObserver('content.@each.' + this.get('nameProperty'), this.rerenderBuffer);
-    }
-
-    const $elem = this.$();
-    const caps = this.capabilities;
-    const minimumResultsForSearch = this.get('minimumResultsForSearch') || ((caps && caps.isIOS) ? -1 : 5);
-
-    if (!this.get("selectionTemplate") && this.get("selectionIcon")) {
-      this.selectionTemplate = (item) => {
-        let name = Em.get(item, 'text');
-        name = Handlebars.escapeExpression(name);
-        return iconHTML(this.get('selectionIcon')) + name;
-      };
-    }
-
-    const options = {
-      minimumResultsForSearch,
-      width: this.get('width') || 'resolve',
-      allowClear: true
-    };
-
-    if (this.comboTemplate) {
-      options.formatResult = this.comboTemplate.bind(this);
-    }
-
-    if (this.selectionTemplate) {
-      options.formatSelection = this.selectionTemplate.bind(this);
-    }
-
-    $elem.select2(options);
-
-    const castInteger = this.get('castInteger');
-    $elem.on("change", e => {
-      let val = $(e.target).val();
-      if (val && val.length && castInteger) {
-        val = parseInt(val, 10);
-      }
-      Ember.run(() => this.set('value', val));
-    });
-
-    Ember.run.scheduleOnce('afterRender', this, this._triggerChange);
-  },
-
-  _updateSelect2() {
-    this.$().trigger('change.select2');
-  },
-
-  _triggerChange() {
-    this.$().trigger('change');
-  },
-
-  @on('willDestroyElement')
-  _destroyDropdown() {
-    this.$().select2('destroy');
-  }
-
-}));
diff --git a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6 b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
index 96f08fd76d..aa0fae4002 100644
--- a/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
+++ b/app/assets/javascripts/discourse/components/bulk-select-button.js.es6
@@ -1,6 +1,8 @@
 import showModal from 'discourse/lib/show-modal';
 
 export default Ember.Component.extend({
+  classNames: ['bulk-select-container'],
+
   actions: {
     showBulkActions() {
       const controller = showModal('topic-bulk-actions', {
diff --git a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
deleted file mode 100644
index 1e5cb05748..0000000000
--- a/app/assets/javascripts/discourse/components/categories-admin-dropdown.js.es6
+++ /dev/null
@@ -1,49 +0,0 @@
-import DropdownSelectBoxComponent from "discourse/components/dropdown-select-box";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import computed from "ember-addons/ember-computed-decorators";
-
-export default DropdownSelectBoxComponent.extend({
-  classNames: ["categories-admin-dropdown"],
-
-  icon: `${iconHTML('bars')}${iconHTML('caret-down')}`.htmlSafe(),
-
-  generatedHeadertext: null,
-
-  @computed
-  content() {
-    const items = [
-      {
-        id: "create",
-        text: I18n.t("category.create"),
-        description: I18n.t("category.create_long"),
-        icon: "plus"
-      }
-    ];
-
-    const includeReorder = this.get("siteSettings.fixed_category_positions");
-    if (includeReorder) {
-      items.push({
-        id: "reorder",
-        text: I18n.t("categories.reorder.title"),
-        description: I18n.t("categories.reorder.title_long"),
-        icon: "random"
-      });
-    }
-
-    return items;
-  },
-
-  actionNames: {
-    create: "createCategory",
-    reorder: "reorderCategories"
-  },
-
-  actions: {
-    onSelectRow(content) {
-      this._super(content);
-
-      this.sendAction(`actionNames.${this.get("value")}`);
-      this.set("value", null);
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6
deleted file mode 100644
index dfc7cf5180..0000000000
--- a/app/assets/javascripts/discourse/components/category-chooser.js.es6
+++ /dev/null
@@ -1,88 +0,0 @@
-import Combobox from 'discourse-common/components/combo-box';
-import { categoryBadgeHTML } from 'discourse/helpers/category-link';
-import computed from 'ember-addons/ember-computed-decorators';
-import { observes, on } from 'ember-addons/ember-computed-decorators';
-import PermissionType from 'discourse/models/permission-type';
-import Category from 'discourse/models/category';
-
-export default Combobox.extend({
-  classNames: ['combobox category-combobox'],
-  dataAttributes: ['id', 'description_text'],
-  overrideWidths: true,
-  castInteger: true,
-
-  @computed("scopedCategoryId", "categories")
-  content(scopedCategoryId, categories) {
-    // Always scope to the parent of a category, if present
-    if (scopedCategoryId) {
-      const scopedCat = Category.findById(scopedCategoryId);
-      scopedCategoryId = scopedCat.get('parent_category_id') || scopedCat.get('id');
-    }
-
-    const excludeCategoryId = this.get('excludeCategoryId');
-
-    return categories.filter(c => {
-      const categoryId = c.get('id');
-      if (scopedCategoryId && categoryId !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; }
-      if (c.get('isUncategorizedCategory') || excludeCategoryId === categoryId) { return false; }
-      return c.get('permission') === PermissionType.FULL;
-    });
-  },
-
-  @on("init")
-  @observes("site.sortedCategories")
-  _updateCategories() {
-    if (!this.get('categories')) {
-      const categories = Discourse.SiteSettings.fixed_category_positions_on_create ?
-                           Category.list() :
-                           Category.listByActivity();
-      this.set('categories', categories);
-    }
-  },
-
-  @computed("rootNone", "rootNoneLabel")
-  none(rootNone, rootNoneLabel) {
-    if (this.siteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) {
-      if (rootNone) {
-        return rootNoneLabel || "category.none";
-      } else {
-        return Category.findUncategorized();
-      }
-    } else {
-      return 'category.choose';
-    }
-  },
-
-  comboTemplate(item) {
-    let category;
-
-    // If we have no id, but text with the uncategorized name, we can use that badge.
-    if (Ember.isEmpty(item.id)) {
-      const uncat = Category.findUncategorized();
-      if (uncat && uncat.get('name') === item.text) {
-        category = uncat;
-      }
-    } else {
-      category = Category.findById(parseInt(item.id,10));
-    }
-
-    if (!category) return item.text;
-    let result = categoryBadgeHTML(category, {link: false, allowUncategorized: true, hideParent: true});
-    const parentCategoryId = category.get('parent_category_id');
-
-    if (parentCategoryId) {
-      result = categoryBadgeHTML(Category.findById(parentCategoryId), {link: false}) + "&nbsp;" + result;
-    }
-
-    result += ` <span class='topic-count'>&times; ${category.get('topic_count')}</span>`;
-
-    const description = category.get('description');
-    // TODO wtf how can this be null?;
-    if (description && description !== 'null') {
-      result += `<div class="category-desc">${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}</div>`;
-    }
-
-    return result;
-  }
-
-});
diff --git a/app/assets/javascripts/discourse/components/category-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/category-notifications-button.js.es6
deleted file mode 100644
index 0595b116fb..0000000000
--- a/app/assets/javascripts/discourse/components/category-notifications-button.js.es6
+++ /dev/null
@@ -1,28 +0,0 @@
-import NotificationOptionsComponent from "discourse/components/notifications-button";
-import computed from "ember-addons/ember-computed-decorators";
-import { iconHTML } from "discourse-common/lib/icon-library";
-
-export default NotificationOptionsComponent.extend({
-  classNames: ["category-notifications-button"],
-
-  hidden: Ember.computed.or("category.deleted", "site.isMobileDevice"),
-
-  i18nPrefix: "category.notifications",
-
-  value: Em.computed.alias("category.notification_level"),
-
-  @computed("value")
-  icon() {
-    return `${this._super()}${iconHTML("caret-down")}`.htmlSafe();
-  },
-
-  generatedHeadertext: null,
-
-  actions: {
-    onSelectRow(content) {
-      this._super(content);
-
-      this.get("category").setNotification(this.get("value"));
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/category-select-box.js.es6 b/app/assets/javascripts/discourse/components/category-select-box.js.es6
deleted file mode 100644
index e725a7cb1d..0000000000
--- a/app/assets/javascripts/discourse/components/category-select-box.js.es6
+++ /dev/null
@@ -1,162 +0,0 @@
-import SelectBoxComponent from "discourse/components/select-box";
-import { categoryBadgeHTML } from "discourse/helpers/category-link";
-import { observes, on } from "ember-addons/ember-computed-decorators";
-import PermissionType from "discourse/models/permission-type";
-import Category from "discourse/models/category";
-
-export default SelectBoxComponent.extend({
-  classNames: ["category-select-box"],
-
-  selectBoxRowComponent: "category-select-box/category-select-box-row",
-
-  textKey: "name",
-
-  filterable: true,
-
-  castInteger: true,
-
-  clearable: true,
-
-  allowUncategorized: null,
-
-  init() {
-    this._super();
-
-    if (!Ember.isNone(this.get("categories"))) {
-      this.set("content", this.get("categories"));
-      this._scopeCategories();
-    }
-
-    if (Ember.isNone(this.get("value"))) {
-      if (this.siteSettings.allow_uncategorized_topics && this.get("allowUncategorized") !== false) {
-        this.set("value", Category.findUncategorized().id);
-      }
-    }
-  },
-
-  filterFunction: function(content) {
-    const _matchFunction = (filter, text) => {
-      return text.toLowerCase().indexOf(filter) > -1;
-    };
-
-    return (selectBox) => {
-      const filter = selectBox.get("filter").toLowerCase();
-      return _.filter(content, (c) => {
-        const category = Category.findById(c[selectBox.get("idKey")]);
-        const text = c[selectBox.get("textKey")];
-        if (category && category.get("parentCategory")) {
-          const categoryName = category.get("parentCategory.name");
-          return _matchFunction(filter, text) || _matchFunction(filter, categoryName);
-        } else {
-          return _matchFunction(filter, text);
-        }
-      });
-    };
-  },
-
-  @on("init")
-  @observes("selectedContent")
-  _setHeaderText: function() {
-    let headerText;
-
-    if (Ember.isNone(this.get("selectedContent"))) {
-      if (this.siteSettings.allow_uncategorized_topics) {
-        headerText = Ember.get(Category.findUncategorized(), this.get("textKey"));
-      } else {
-        headerText = I18n.t("category.choose").htmlSafe();
-      }
-    } else {
-      headerText = this.get("selectedContent.text");
-    }
-
-    this.set("headerText", headerText);
-  },
-
-  templateForRow: function() {
-    return (rowComponent) => this.rowContentTemplate(rowComponent.get("content"));
-  }.property(),
-
-  @observes("scopedCategoryId", "categories")
-  _scopeCategories() {
-    let scopedCategoryId = this.get("scopedCategoryId");
-    const categories = this.get("categories");
-
-    // Always scope to the parent of a category, if present
-    if (scopedCategoryId) {
-      const scopedCat = Category.findById(scopedCategoryId);
-      scopedCategoryId = scopedCat.get("parent_category_id") || scopedCat.get("id");
-    }
-
-    const excludeCategoryId = this.get("excludeCategoryId");
-
-    const filteredCategories = categories.filter(c => {
-      const categoryId = c.get("id");
-      if (scopedCategoryId && categoryId !== scopedCategoryId && c.get("parent_category_id") !== scopedCategoryId) { return false; }
-      if (excludeCategoryId === categoryId) { return false; }
-      if (this.get("allowUncategorized") === false && c.get("isUncategorizedCategory")) { return false; }
-      if (this.get("allowUncategorized") !== true) {
-        if (!this.siteSettings.allow_uncategorized_topics && c.get("isUncategorizedCategory")) {
-          return false;
-        }
-      }
-      return c.get("permission") === PermissionType.FULL;
-    });
-
-    this.set("content", filteredCategories);
-  },
-
-  @on("didRender")
-  _bindComposerResizing() {
-    this.appEvents.on("composer:resized", this, this.applyDirection);
-  },
-
-  @on("willDestroyElement")
-  _unbindComposerResizing() {
-    this.appEvents.off("composer:resized");
-  },
-
-  @on("init")
-  @observes("site.sortedCategories")
-  _updateCategories() {
-    if (!this.get("categories")) {
-      const categories = Discourse.SiteSettings.fixed_category_positions_on_create ?
-                        Category.list() :
-                        Category.listByActivity();
-      this.set("categories", categories);
-    }
-  },
-
-  rowContentTemplate(item) {
-    let category;
-
-    // If we have no id, but text with the uncategorized name, we can use that badge.
-    if (Ember.isEmpty(item.id)) {
-      const uncat = Category.findUncategorized();
-      if (uncat && uncat.get("name") === item.text) {
-        category = uncat;
-      }
-    } else {
-      category = Category.findById(parseInt(item.id,10));
-    }
-
-    if (!category) return item.text;
-    let result = categoryBadgeHTML(category, {link: false, allowUncategorized: true, hideParent: true});
-    const parentCategoryId = category.get("parent_category_id");
-
-    if (parentCategoryId) {
-      result = `<div class="category-status">${categoryBadgeHTML(Category.findById(parentCategoryId), {link: false})}&nbsp;${result}`;
-    } else {
-      result = `<div class="category-status">${result}`;
-    }
-
-    result += ` <span class="topic-count">&times; ${category.get("topic_count")}</span></div>`;
-
-    const description = category.get("description");
-    // TODO wtf how can this be null?;
-    if (description && description !== "null") {
-      result += `<div class="category-desc">${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}</div>`;
-    }
-
-    return result;
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/category-select-box/category-select-box-row.js.es6 b/app/assets/javascripts/discourse/components/category-select-box/category-select-box-row.js.es6
deleted file mode 100644
index e676df0881..0000000000
--- a/app/assets/javascripts/discourse/components/category-select-box/category-select-box-row.js.es6
+++ /dev/null
@@ -1,13 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import SelectBoxRowComponent from "discourse/components/select-box/select-box-row";
-import Category from "discourse/models/category";
-
-export default SelectBoxRowComponent.extend({
-  classNameBindings: ["isUncategorized"],
-
-  @computed("content")
-  isUncategorized(content) {
-    const category = Category.findById(content.id);
-    return category.get("isUncategorizedCategory");
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index d661b26a21..313bfea7a4 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -101,24 +101,6 @@ class Toolbar {
       perform: e => e.applyList(i => !i ? "1. " : `${parseInt(i) + 1}. `, 'list_item')
     });
 
-    this.addButton({
-      id: 'heading',
-      group: 'extras',
-      icon: 'header',
-      label: getButtonLabel('composer.heading_label', 'H'),
-      shortcut: 'Alt+1',
-      perform: e => e.applyList('## ', 'heading_text')
-    });
-
-    this.addButton({
-      id: 'rule',
-      group: 'extras',
-      icon: 'minus',
-      shortcut: 'Alt+R',
-      title: 'composer.hr_title',
-      perform: e => e.addText("\n\n----------\n")
-    });
-
     if (site.mobileView) {
       this.groups.push({group: 'mobileExtras', buttons: []});
     }
@@ -233,7 +215,7 @@ export default Ember.Component.extend({
     const shortcuts = this.get('toolbar.shortcuts');
 
     // for some reason I am having trouble bubbling this so hack it in
-    mouseTrap.bind(['ctrl+shift+s','command+shift+s'], (event) =>{
+    mouseTrap.bind(['ctrl+alt+f'], (event) =>{
       this.appEvents.trigger('header:keyboard-trigger', {type: 'search', event});
       return true;
     });
diff --git a/app/assets/javascripts/discourse/components/dropdown-select-box.js.es6 b/app/assets/javascripts/discourse/components/dropdown-select-box.js.es6
deleted file mode 100644
index b268da2aa8..0000000000
--- a/app/assets/javascripts/discourse/components/dropdown-select-box.js.es6
+++ /dev/null
@@ -1,33 +0,0 @@
-import computed from "ember-addons/ember-computed-decorators";
-import SelectBoxComponent from "discourse/components/select-box";
-
-export default SelectBoxComponent.extend({
-  classNames: ["dropdown-select-box"],
-  wrapper: false,
-  verticalOffset: 3,
-  collectionHeight: "auto",
-  fullWidthOnMobile: true,
-  selectBoxHeaderComponent: "dropdown-select-box/dropdown-header",
-
-  @computed
-  templateForRow: function() {
-    return (rowComponent) => {
-      let template = "";
-      const content = rowComponent.get("content");
-
-      const icon = rowComponent.icon();
-      if (icon) {
-        template += `<div class="icons">${icon}</div>`;
-      }
-
-      template += `
-        <div class="texts">
-          <span class="title">${Handlebars.escapeExpression(Ember.get(content, this.get("textKey")))}</span>
-          <span class="desc">${Handlebars.escapeExpression(content.description)}</span>
-        </div>
-      `;
-
-      return template;
-    };
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/dropdown-select-box/dropdown-header.js.es6 b/app/assets/javascripts/discourse/components/dropdown-select-box/dropdown-header.js.es6
deleted file mode 100644
index 9e6499c04f..0000000000
--- a/app/assets/javascripts/discourse/components/dropdown-select-box/dropdown-header.js.es6
+++ /dev/null
@@ -1,7 +0,0 @@
-import SelectBoxHeaderComponent from "discourse/components/select-box/select-box-header";
-
-export default SelectBoxHeaderComponent.extend({
-  layoutName: "components/dropdown-select-box/dropdown-header",
-
-  classNames: ["dropdown-header"]
-});
diff --git a/app/assets/javascripts/discourse/components/edit-category-security.js.es6 b/app/assets/javascripts/discourse/components/edit-category-security.js.es6
index 05b1f02515..83d658564d 100644
--- a/app/assets/javascripts/discourse/components/edit-category-security.js.es6
+++ b/app/assets/javascripts/discourse/components/edit-category-security.js.es6
@@ -20,6 +20,8 @@ export default buildCategoryPanel('security', {
           permission: PermissionType.create({ id: parseInt(id) })
         });
       }
+
+      this.set('selectedGroup', this.get('category.availableGroups.firstObject'));
     },
 
     removePermission(permission) {
diff --git a/app/assets/javascripts/discourse/components/flag-action-type.js.es6 b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
index 0598ffa8e8..7f0ffb70ed 100644
--- a/app/assets/javascripts/discourse/components/flag-action-type.js.es6
+++ b/app/assets/javascripts/discourse/components/flag-action-type.js.es6
@@ -2,6 +2,7 @@ import { MAX_MESSAGE_LENGTH } from 'discourse/models/post-action-type';
 import computed from 'ember-addons/ember-computed-decorators';
 
 export default Ember.Component.extend({
+  classNames: ['flag-action-type'],
 
   @computed('flag.name_key')
   customPlaceholder(nameKey) {
diff --git a/app/assets/javascripts/discourse/components/future-date-input-selector.js.es6 b/app/assets/javascripts/discourse/components/future-date-input-selector.js.es6
deleted file mode 100644
index df1b2e871c..0000000000
--- a/app/assets/javascripts/discourse/components/future-date-input-selector.js.es6
+++ /dev/null
@@ -1,207 +0,0 @@
-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';
-
-const LATER_TODAY = 'later_today';
-const TOMORROW = 'tomorrow';
-const LATER_THIS_WEEK = 'later_this_week';
-const THIS_WEEKEND = 'this_weekend';
-const NEXT_WEEK = 'next_week';
-const TWO_WEEKS = 'two_weeks';
-const NEXT_MONTH = 'next_month';
-const FOREVER = 'forever';
-
-export const PICK_DATE_AND_TIME = 'pick_date_and_time';
-export const SET_BASED_ON_LAST_POST = 'set_based_on_last_post';
-
-export const FORMAT = 'YYYY-MM-DD HH:mm';
-
-export default Combobox.extend({
-  classNames: ['future-date-input-selector'],
-  isCustom: Ember.computed.equal("value", PICK_DATE_AND_TIME),
-
-  @computed()
-  content() {
-    const selections = [];
-    const now = moment();
-    const canScheduleToday = (24 - now.hour()) > 6;
-    const day = now.day();
-
-    if (canScheduleToday) {
-      selections.push({
-        id: LATER_TODAY,
-        name: I18n.t('topic.auto_update_input.later_today')
-      });
-    }
-
-    selections.push({
-      id: TOMORROW,
-      name: I18n.t('topic.auto_update_input.tomorrow')
-    });
-
-    if (!canScheduleToday && day < 4) {
-      selections.push({
-        id: LATER_THIS_WEEK,
-        name: I18n.t('topic.auto_update_input.later_this_week')
-      });
-    }
-
-    if (day < 5 && this.get('includeWeekend')) {
-      selections.push({
-        id: THIS_WEEKEND,
-        name: I18n.t('topic.auto_update_input.this_weekend')
-      });
-    }
-
-    if (day !== 7)  {
-      selections.push({
-        id: NEXT_WEEK,
-        name: I18n.t('topic.auto_update_input.next_week')
-      });
-    }
-
-    selections.push({
-      id: TWO_WEEKS,
-      name: I18n.t('topic.auto_update_input.two_weeks')
-    });
-
-    if (moment().endOf('month').date() !== now.date()) {
-      selections.push({
-        id: NEXT_MONTH,
-        name: I18n.t('topic.auto_update_input.next_month')
-      });
-    }
-
-    if (this.get('includeForever')) {
-      selections.push({
-        id: FOREVER,
-        name: I18n.t('topic.auto_update_input.forever')
-      });
-    }
-
-    selections.push({
-      id: PICK_DATE_AND_TIME,
-      name: I18n.t('topic.auto_update_input.pick_date_and_time')
-    });
-
-    if (this.get('statusType') === CLOSE_STATUS_TYPE) {
-      selections.push({
-        id: SET_BASED_ON_LAST_POST,
-        name: I18n.t('topic.auto_update_input.set_based_on_last_post')
-      });
-    }
-
-    return selections;
-  },
-
-  @observes('value')
-  _updateInput() {
-    if (this.get('isCustom')) return;
-    let input = null;
-    const { time } = this.get('updateAt');
-
-    if (time && !Ember.isEmpty(this.get('value'))) {
-      input = time.format(FORMAT);
-    }
-
-    this.set('input', input);
-  },
-
-  @computed('value')
-  updateAt(value) {
-    return this._updateAt(value);
-  },
-
-  comboTemplate(state) {
-    return this._format(state);
-  },
-
-  selectionTemplate(state) {
-    return this._format(state);
-  },
-
-  _format(state) {
-    let { time, icon } = this._updateAt(state.id);
-    let icons;
-
-    if (icon) {
-      icons = icon.split(',').map(i => iconHTML(i)).join(" ");
-    }
-
-    if (time) {
-      if (state.id === LATER_TODAY) {
-        time = time.format('h a');
-      } else if (state.id === NEXT_MONTH || state.id === TWO_WEEKS) {
-        time = time.format('MMM D');
-      } else {
-        time = time.format('ddd, h a');
-      }
-    }
-
-    let output = "";
-
-    if (!Ember.isEmpty(icons)) {
-      output += `<span class='future-date-input-selector-icons'>${icons}</span>`;
-    }
-
-    output += `<span>${state.text}</span>`;
-
-    if (time && state.id !== FOREVER) {
-      output += `<span class='future-date-input-selector-datetime'>${time}</span>`;
-    }
-
-    return output;
-  },
-
-  _updateAt(selection) {
-    let time = moment();
-    let icon;
-    const timeOfDay = this.get('statusType') !== CLOSE_STATUS_TYPE ? 8 : 18;
-
-    switch(selection) {
-      case LATER_TODAY:
-        time = time.hour(18).minute(0);
-        icon = 'moon-o';
-        break;
-      case TOMORROW:
-        time = time.add(1, 'day').hour(timeOfDay).minute(0);
-        icon = 'sun-o';
-        break;
-      case LATER_THIS_WEEK:
-        time = time.add(2, 'day').hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case THIS_WEEKEND:
-        time = time.day(6).hour(timeOfDay).minute(0);
-        icon = 'bed';
-        break;
-      case NEXT_WEEK:
-        time = time.add(1, 'week').day(1).hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case TWO_WEEKS:
-        time = time.add(2, 'week').hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case NEXT_MONTH:
-        time = time.add(1, 'month').startOf('month').hour(timeOfDay).minute(0);
-        icon = 'briefcase';
-        break;
-      case FOREVER:
-        time = time.add(1000, 'year').hour(timeOfDay).minute(0);
-        icon = 'gavel';
-        break;
-      case PICK_DATE_AND_TIME:
-        time = null;
-        icon = 'calendar-plus-o';
-        break;
-      case SET_BASED_ON_LAST_POST:
-        time = null;
-        icon = 'clock-o';
-        break;
-    }
-
-    return { time, icon };
-  },
-});
diff --git a/app/assets/javascripts/discourse/components/future-date-input.js.es6 b/app/assets/javascripts/discourse/components/future-date-input.js.es6
index c7f63d528d..97b8738787 100644
--- a/app/assets/javascripts/discourse/components/future-date-input.js.es6
+++ b/app/assets/javascripts/discourse/components/future-date-input.js.es6
@@ -1,9 +1,7 @@
 import { default as computed, observes } from "ember-addons/ember-computed-decorators";
 import {
   FORMAT,
-  PICK_DATE_AND_TIME,
-  SET_BASED_ON_LAST_POST
-} from "discourse/components/future-date-input-selector";
+} from "select-box-kit/components/future-date-input-selector";
 
 import { PUBLISH_TO_CATEGORY_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
 
@@ -11,8 +9,8 @@ export default Ember.Component.extend({
   selection: null,
   date: null,
   time: null,
-  isCustom: Ember.computed.equal('selection', PICK_DATE_AND_TIME),
-  isBasedOnLastPost: Ember.computed.equal('selection', SET_BASED_ON_LAST_POST),
+  isCustom: Ember.computed.equal('selection', 'pick_date_and_time'),
+  isBasedOnLastPost: Ember.computed.equal('selection', 'set_based_on_last_post'),
   displayLabel: null,
 
   init() {
@@ -22,9 +20,9 @@ export default Ember.Component.extend({
 
     if (input) {
       if (this.get('basedOnLastPost')) {
-        this.set('selection', SET_BASED_ON_LAST_POST);
+        this.set('selection', 'set_based_on_last_post');
       } else {
-        this.set('selection', PICK_DATE_AND_TIME);
+        this.set('selection', 'pick_date_and_time');
         const datetime = moment(input);
         this.set('date', datetime.toDate());
         this.set('time', datetime.format("HH:mm"));
diff --git a/app/assets/javascripts/discourse/components/group-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
deleted file mode 100644
index 3d597f8b56..0000000000
--- a/app/assets/javascripts/discourse/components/group-notifications-button.js.es6
+++ /dev/null
@@ -1,17 +0,0 @@
-import NotificationOptionsComponent from "discourse/components/notifications-button";
-
-export default NotificationOptionsComponent.extend({
-  classNames: ["group-notifications-button"],
-
-  value: Em.computed.alias("group.group_user.notification_level"),
-
-  i18nPrefix: "groups.notifications",
-
-  actions: {
-    onSelectRow(content) {
-      this._super(content);
-
-      this.get("group").setNotification(this.get("value"), this.get("user.id"));
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/notifications-button.js.es6 b/app/assets/javascripts/discourse/components/notifications-button.js.es6
deleted file mode 100644
index 2c54defb29..0000000000
--- a/app/assets/javascripts/discourse/components/notifications-button.js.es6
+++ /dev/null
@@ -1,68 +0,0 @@
-import DropdownSelectBoxComponent from "discourse/components/dropdown-select-box";
-import { iconHTML } from "discourse-common/lib/icon-library";
-import computed from "ember-addons/ember-computed-decorators";
-import { buttonDetails } from "discourse/lib/notification-levels";
-import { allLevels } from "discourse/lib/notification-levels";
-
-export default DropdownSelectBoxComponent.extend({
-  classNames: ["notifications-button"],
-
-  i18nPrefix: "",
-  i18nPostfix: "",
-  textKey: "key",
-  showFullTitle: true,
-  fullWidthOnMobile: true,
-  content: allLevels,
-
-  value: Em.computed.alias("notificationLevel"),
-
-  @computed("selectedDetails")
-  icon(details) {
-    return iconHTML(details.icon, {class: details.key}).htmlSafe();
-  },
-
-  @computed("selectedDetails.key", "i18nPrefix")
-  selectedTitle(key, prefix) {
-    return I18n.t(`${prefix}.${key}.title`);
-  },
-
-  @computed("value")
-  selectedDetails(value) {
-    return buttonDetails(value);
-  },
-
-  @computed("selectedTitle", "showFullTitle")
-  generatedHeadertext(selectedTitle, showFullTitle) {
-    return showFullTitle ? selectedTitle : null;
-  },
-
-  @computed
-  titleForRow: function() {
-    return (rowComponent) => {
-      const notificationLevel = rowComponent.get(`content.${this.get("idKey")}`);
-      const details = buttonDetails(notificationLevel);
-      return I18n.t(`${this.get("i18nPrefix")}.${details.key}.title`);
-    };
-  },
-
-  @computed
-  templateForRow: function() {
-    return (rowComponent) => {
-      const content = rowComponent.get("content");
-      const start = `${this.get("i18nPrefix")}.${content.key}${this.get("i18nPostfix")}`;
-      const title = I18n.t(`${start}.title`);
-      const description = I18n.t(`${start}.description`);
-
-      return `
-        <div class="icons">
-          <span class="selection-indicator"></span>
-          ${iconHTML(content.icon, { class: content.key.dasherize() })}
-        </div>
-        <div class="texts">
-          <span class="title">${Handlebars.escapeExpression(title)}</span>
-          <span class="desc">${Handlebars.escapeExpression(description)}</span>
-        </div>
-      `;
-    };
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/pinned-options.js.es6 b/app/assets/javascripts/discourse/components/pinned-options.js.es6
deleted file mode 100644
index 2daf5bea98..0000000000
--- a/app/assets/javascripts/discourse/components/pinned-options.js.es6
+++ /dev/null
@@ -1,73 +0,0 @@
-import DropdownSelectBoxComponent from "discourse/components/dropdown-select-box";
-import computed from "ember-addons/ember-computed-decorators";
-import { observes } from "ember-addons/ember-computed-decorators";
-import { iconHTML } from "discourse-common/lib/icon-library";
-
-export default DropdownSelectBoxComponent.extend({
-  classNames: ["pinned-options"],
-
-  @computed("topic.pinned")
-  value(pinned) {
-    return pinned ? "pinned" : "unpinned";
-  },
-
-  @observes("topic.pinned")
-  _pinnedChanged() {
-    this.set("value", this.get("topic.pinned") ? "pinned" : "unpinned");
-  },
-
-  @computed("topic.pinned_globally")
-  content(pinnedGlobally) {
-    const globally = pinnedGlobally ? "_globally" : "";
-
-    return [
-      {
-        id: "pinned",
-        text: I18n.t("topic_statuses.pinned" + globally + ".title"),
-        description: I18n.t('topic_statuses.pinned' + globally + '.help'),
-        icon: "thumb-tack"
-      },
-      {
-        id: "unpinned",
-        text: I18n.t("topic_statuses.unpinned.title"),
-        icon: "thumb-tack",
-        description: I18n.t('topic_statuses.unpinned.help'),
-        iconClass: "unpinned"
-      }
-    ];
-  },
-
-  @computed("topic.pinned", "topic.pinned_globally")
-  icon(pinned, pinnedGlobally) {
-    const globally = pinnedGlobally ? "_globally" : "";
-    const state = pinned ? `pinned${globally}` : "unpinned";
-
-    return iconHTML(
-      "thumb-tack",
-      { class: (state === "unpinned" ? "unpinned" : null) }
-    );
-  },
-
-  @computed("topic.pinned", "topic.pinned_globally")
-  generatedHeadertext(pinned, pinnedGlobally) {
-    const globally = pinnedGlobally ? "_globally" : "";
-    const state = pinned ? `pinned${globally}` : "unpinned";
-    const title = I18n.t(`topic_statuses.${state}.title`);
-
-    return `${title}${iconHTML("caret-down")}`.htmlSafe();
-  },
-
-  actions: {
-    onSelectRow(content) {
-      this._super(content);
-
-      const topic = this.get("topic");
-
-      if (this.get("value") === "unpinned") {
-        topic.clearPin();
-      } else {
-        topic.rePin();
-      }
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/select-box.js.es6 b/app/assets/javascripts/discourse/components/select-box.js.es6
deleted file mode 100644
index 1a05f39807..0000000000
--- a/app/assets/javascripts/discourse/components/select-box.js.es6
+++ /dev/null
@@ -1,485 +0,0 @@
-import { on, observes } from "ember-addons/ember-computed-decorators";
-import computed from "ember-addons/ember-computed-decorators";
-
-export default Ember.Component.extend({
-  layoutName: "components/select-box",
-  classNames: "select-box",
-  classNameBindings: ["expanded:is-expanded", "hidden:is-hidden"],
-
-  expanded: false,
-  focused: false,
-  filterFocused: false,
-  renderBody: false,
-  wrapper: true,
-  hidden: false,
-  tabindex: 0,
-  scrollableParentSelector: ".modal-body",
-
-  caretUpIcon: "caret-up",
-  caretDownIcon: "caret-down",
-  headerText: I18n.t("select_box.default_header_text"),
-  dynamicHeaderText: true,
-  icon: null,
-  clearable: false,
-
-  value: null,
-  highlightedValue: null,
-  selectedContent: null,
-  noContentLabel: I18n.t("select_box.no_content"),
-  clearSelectionLabel: null,
-
-  idKey: "id",
-  textKey: "text",
-  iconKey: "icon",
-
-  filterable: false,
-  filter: "",
-  filterPlaceholder: I18n.t("select_box.filter_placeholder"),
-  filterIcon: "search",
-
-  selectBoxRowComponent: "select-box/select-box-row",
-  selectBoxFilterComponent: "select-box/select-box-filter",
-  selectBoxHeaderComponent: "select-box/select-box-header",
-  selectBoxCollectionComponent: "select-box/select-box-collection",
-
-  collectionHeight: 200,
-  verticalOffset: 0,
-  horizontalOffset: 0,
-  fullWidthOnMobile: false,
-
-  castInteger: false,
-
-  click(event) {
-    event.stopPropagation();
-  },
-
-  filterFunction: function(content) {
-    return (selectBox) => {
-      const filter = selectBox.get("filter").toLowerCase();
-      return _.filter(content, (c) => {
-        return c[selectBox.get("textKey")].toLowerCase().indexOf(filter) > -1;
-      });
-    };
-  },
-
-  @computed("textKey")
-  titleForRow(textKey) {
-    return (rowComponent) => {
-      return rowComponent.get(`content.${textKey}`);
-    };
-  },
-
-  @computed("idKey")
-  idForRow(idKey) {
-    return (rowComponent) => {
-      return rowComponent.get(`content.${idKey}`);
-    };
-  },
-
-  @computed
-  shouldHighlightRow: function() {
-    return (rowComponent) => {
-      const id = this._castInteger(rowComponent.get(`content.${this.get("idKey")}`));
-      return id === this.get("highlightedValue");
-    };
-  },
-
-  @computed("value", "idKey")
-  shouldSelectRow(value, idKey) {
-    return (rowComponent) => {
-      const id = this._castInteger(rowComponent.get(`content.${idKey}`));
-      return id === value;
-    };
-  },
-
-  @computed
-  templateForRow: function() {
-    return (rowComponent) => {
-      let template = "";
-
-      const icon = rowComponent.icon();
-      if (icon) {
-        template += icon;
-      }
-
-      const text = rowComponent.get(`content.${this.get("textKey")}`);
-      template += `<p class="text">${Handlebars.escapeExpression(text)}</p>`;
-
-      return template;
-    };
-  },
-
-  applyDirection() {
-    this.$().removeClass("is-above is-below is-left-aligned is-right-aligned");
-    let options = { left: "auto", bottom: "auto", left: "auto", top: "auto" };
-    const headerHeight = this.$(".select-box-header").outerHeight(false);
-    const filterHeight = this.$(".select-box-filter").outerHeight(false);
-    const bodyHeight = this.$(".select-box-body").outerHeight(false);
-    const windowWidth = $(window).width();
-    const windowHeight = $(window).height();
-    const boundingRect = this.$()[0].getBoundingClientRect();
-    const offsetTop = boundingRect.top;
-
-    if (this.get("fullWidthOnMobile") && this.site.isMobileDevice) {
-      const margin = 10;
-      const relativeLeft = this.$().offset().left - $(window).scrollLeft();
-      options.left = margin - relativeLeft;
-      options.width = windowWidth - margin * 2;
-      options.maxWidth = options.minWidth = "unset";
-    } else {
-      const offsetLeft = boundingRect.left;
-      const bodyWidth = this.$(".select-box-body").outerWidth(false);
-      const hasRightSpace = (windowWidth - (this.get("horizontalOffset") + offsetLeft + filterHeight + bodyWidth) > 0);
-
-      if (hasRightSpace) {
-        this.$().addClass("is-left-aligned");
-        options.left = this.get("horizontalOffset");
-      } else {
-        this.$().addClass("is-right-aligned");
-        options.right = this.get("horizontalOffset");
-      }
-    }
-
-    const componentHeight = this.get("verticalOffset") + bodyHeight + headerHeight;
-    const hasBelowSpace = windowHeight - offsetTop - componentHeight > 0;
-    if (hasBelowSpace) {
-      this.$().addClass("is-below");
-      options.top = headerHeight + this.get("verticalOffset");
-    } else {
-      this.$().addClass("is-above");
-      options.bottom = headerHeight + this.get("verticalOffset");
-    }
-
-    this.$(".select-box-body").css(options);
-  },
-
-  init() {
-    this._super();
-
-    const content = this.getWithDefault("content", []);
-    this.set("content", content);
-
-    if (this.site.isMobileDevice) {
-      this.set("filterable", false);
-    }
-
-    this.setProperties({
-      value: this._castInteger(this.get("value")),
-      componentId: this.elementId
-    });
-  },
-
-  @on("willDestroyElement")
-  _removeDocumentListeners: function() {
-    $(document).off("click.select-box");
-    $(window).off("resize.select-box");
-  },
-
-  @on("willDestroyElement")
-  _unbindEvents: function() {
-    this.$(".select-box-offscreen").off(
-      "focusin.select-box",
-      "focusout.select-box",
-      "keydown.select-box"
-    );
-    this.$(".filter-query").off("focusin.select-box", "focusout.select-box");
-  },
-
-  @on("didRender")
-  _configureSelectBoxDOM: function() {
-    if (this.get("scrollableParent").length === 1) {
-      this._removeFixedPosition();
-    }
-
-    const computedWidth = this.$().outerWidth(false);
-    const computedHeight = this.$().outerHeight(false);
-
-    this.$(".select-box-filter").css("height", computedHeight);
-
-    if (this.get("expanded")) {
-      if (this.get("scrollableParent").length === 1) {
-        this._applyFixedPosition(computedWidth, computedHeight);
-      }
-
-      this.$(".select-box-collection").css("max-height", this.get("collectionHeight"));
-
-      Ember.run.schedule("afterRender", () => {
-        this.applyDirection();
-        if (this.get("wrapper")) {
-          this._positionSelectBoxWrapper();
-        }
-      });
-    } else {
-      if (this.get("wrapper")) {
-        this.$(".select-box-wrapper").hide();
-      }
-    }
-  },
-
-  keyDown(event) {
-    const keyCode = event.keyCode || event.which;
-
-    if (this.get("expanded")) {
-      if ((keyCode === 13 || keyCode === 9) && Ember.isPresent(this.get("highlightedValue"))) {
-        event.preventDefault();
-        this.send("onSelectRow", this.get("highlightedContent"));
-      }
-
-      if (keyCode === 9) {
-        this.set("expanded", false);
-      }
-
-      if (keyCode === 27) {
-        this.set("expanded", false);
-        event.stopPropagation();
-      }
-
-      if (keyCode === 38) {
-        event.preventDefault();
-        const self = this;
-        Ember.run.throttle(self, this._handleUpArrow, 50);
-      }
-
-      if (keyCode === 40) {
-        event.preventDefault();
-        const self = this;
-        Ember.run.throttle(self, this._handleDownArrow, 50);
-      }
-    }
-  },
-
-  @on("didRender")
-  _setupDocumentListeners: function() {
-    $(document).off("click.select-box");
-
-    $(document)
-      .on("click.select-box", (event) => {
-        if (this.isDestroying || this.isDestroyed) { return; }
-
-        const $element = this.$();
-        const $target = $(event.target);
-
-        if (!$target.closest($element).length) {
-          this.set("expanded", false);
-        }
-      });
-
-    $(window).on("resize.select-box", () => this.set("expanded", false) );
-  },
-
-  @on("didInsertElement")
-  _bindEvents: function() {
-    this.$(".select-box-offscreen")
-      .on("focusin.select-box", () => this.set("focused", true) )
-      .on("focusout.select-box", () => this.set("focused", false) );
-
-    this.$(".filter-query")
-      .on("focusin.select-box", () => this.set("filterFocused", true) )
-      .on("focusout.select-box", () => this.set("filterFocused", false) );
-
-    this.$(".select-box-offscreen").on("keydown.select-box", (event) => {
-      const keyCode = event.keyCode || event.which;
-
-      if (keyCode === 13 || keyCode === 40) {
-        this.setProperties({ expanded: true, focused: false });
-        event.stopPropagation();
-      }
-
-      if (keyCode >= 65 && keyCode <= 90) {
-        this.setProperties({ expanded: true, focused: false });
-        Ember.run.schedule("afterRender", () => {
-          this.$(".filter-query").focus().val(String.fromCharCode(keyCode));
-        });
-      }
-    });
-  },
-
-  @observes("expanded")
-  _expandedChanged: function() {
-    if (this.get("expanded")) {
-      this.setProperties({ highlightedValue: null, renderBody: true, focused: false });
-
-      if (this.get("filterable")) {
-        Ember.run.schedule("afterRender", () => this.$(".filter-query").focus());
-      }
-    };
-  },
-
-  @computed("value", "content.[]", "idKey")
-  selectedContent(value, content, idKey) {
-    if (Ember.isNone(value)) {
-      return null;
-    }
-
-    return content.find((c) => {
-      return this._castInteger(Ember.get(c, idKey)) === value;
-    });
-  },
-
-  @computed("highlightedValue", "content.[]", "idKey")
-  highlightedContent(highlightedValue, content, idKey) {
-    if (Ember.isNone(highlightedValue)) {
-      return null;
-    }
-
-    return content.find((c) => {
-      return this._castInteger(Ember.get(c, idKey)) === highlightedValue;
-    });
-  },
-
-  @computed("headerText", "selectedContent", "textKey")
-  selectedTitle(headerText, selectedContent, textKey) {
-    if (Ember.isNone(selectedContent)) {
-      return headerText;
-    }
-
-    return selectedContent[textKey];
-  },
-
-  @computed("headerText", "dynamicHeaderText", "selectedContent", "textKey", "clearSelectionLabel")
-  generatedHeadertext(headerText, dynamic, selectedContent, textKey, clearSelectionLabel) {
-    if (dynamic && !Ember.isNone(selectedContent)) {
-      return selectedContent[textKey];
-    }
-
-    if (dynamic && Ember.isNone(selectedContent) && !Ember.isNone(clearSelectionLabel)) {
-      return I18n.t(clearSelectionLabel);
-    }
-
-    return headerText;
-  },
-
-  @computed("content.[]", "filter", "idKey")
-  filteredContent(content, filter, idKey) {
-    let filteredContent;
-
-    if (Ember.isEmpty(filter)) {
-      filteredContent = content;
-    } else {
-      filteredContent = this.filterFunction(content)(this);
-
-      if (!Ember.isEmpty(filteredContent)) {
-        this.set("highlightedValue", filteredContent[0][idKey]);
-      }
-    }
-
-    return filteredContent;
-  },
-
-  @computed("scrollableParentSelector")
-  scrollableParent(scrollableParentSelector) {
-    return this.$().parents(scrollableParentSelector).first();
-  },
-
-  actions: {
-    onToggle() {
-      this.toggleProperty("expanded");
-    },
-
-    onFilterChange(filter) {
-      this.set("filter", filter);
-    },
-
-    onHoverRow(content) {
-      const id = this._castInteger(Ember.get(content, this.get("idKey")));
-      this.set("highlightedValue", id);
-    },
-
-    onSelectRow(content) {
-      this.setProperties({
-        value: this._castInteger(Ember.get(content, this.get("idKey"))),
-        expanded: false
-      });
-    },
-
-    onClearSelection() {
-      this.setProperties({ value: null, expanded: false });
-    }
-  },
-
-  _positionSelectBoxWrapper() {
-    const headerHeight = this.$(".select-box-header").outerHeight(false);
-
-    this.$(".select-box-wrapper").css({
-      width: this.$().width(),
-      display: "block",
-      height: headerHeight + this.$(".select-box-body").outerHeight(false)
-    });
-  },
-
-  _castInteger(id) {
-    if (this.get("castInteger") === true && Ember.isPresent(id)) {
-      return parseInt(id, 10);
-    }
-
-    return id;
-  },
-
-  _applyFixedPosition(width, height) {
-    const $placeholder = $(`<div class='select-box-fixed-placeholder-${this.get("componentId")}' style='vertical-align: middle; height: ${height}px; width: ${width}px; line-height: ${height}px;display:inline-block'></div>`);
-
-    this.$()
-      .before($placeholder)
-      .css({
-        width,
-        position: "fixed",
-        "margin-top": -this.get("scrollableParent").scrollTop(),
-        "margin-left": -width
-      });
-
-    this.get("scrollableParent").on("scroll.select-box", () => this.set("expanded", false) );
-  },
-
-  _removeFixedPosition() {
-    $(`.select-box-fixed-placeholder-${this.get("componentId")}`).remove();
-    this.$().css({
-      top: "auto",
-      left: "auto",
-      "margin-left": "auto",
-      "margin-top": "auto",
-      position: "relative"
-    });
-
-    this.get("scrollableParent").off("scroll.select-box");
-  },
-
-  _handleDownArrow() {
-    this._handleArrow("down");
-  },
-
-  _handleUpArrow() {
-    this._handleArrow("up");
-  },
-
-  _handleArrow(direction) {
-    const content = this.get("filteredContent");
-    const idKey = this.get("idKey");
-    const selectedContent = content.findBy(idKey, this.get("highlightedValue"));
-    const currentIndex = content.indexOf(selectedContent);
-
-    if (direction === "down") {
-      if (currentIndex < 0) {
-        this.set("highlightedValue", this._castInteger(Ember.get(content[0], idKey)));
-      } else if(currentIndex + 1 < content.length) {
-        this.set("highlightedValue", this._castInteger(Ember.get(content[currentIndex + 1], idKey)));
-      }
-    } else {
-      if (currentIndex <= 0) {
-        this.set("highlightedValue", this._castInteger(Ember.get(content[0], idKey)));
-      } else if(currentIndex - 1 < content.length) {
-        this.set("highlightedValue", this._castInteger(Ember.get(content[currentIndex - 1], idKey)));
-      }
-    }
-
-    Ember.run.schedule("afterRender", () => {
-      const $highlightedRow = this.$(".select-box-row.is-highlighted");
-
-      if ($highlightedRow.length === 0) { return; }
-
-      const $collection = this.$(".select-box-collection");
-      const rowOffset = $highlightedRow.offset();
-      const bodyOffset = $collection.offset();
-      $collection.scrollTop(rowOffset.top - bodyOffset.top);
-    });
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/select-box/select-box-collection.js.es6 b/app/assets/javascripts/discourse/components/select-box/select-box-collection.js.es6
deleted file mode 100644
index 4b5fea95d5..0000000000
--- a/app/assets/javascripts/discourse/components/select-box/select-box-collection.js.es6
+++ /dev/null
@@ -1,9 +0,0 @@
-export default Ember.Component.extend({
-  classNames: "select-box-collection",
-
-  actions: {
-    onClearSelection() {
-      this.sendAction("onClearSelection");
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/select-box/select-box-filter.js.es6 b/app/assets/javascripts/discourse/components/select-box/select-box-filter.js.es6
deleted file mode 100644
index 50c8474e5b..0000000000
--- a/app/assets/javascripts/discourse/components/select-box/select-box-filter.js.es6
+++ /dev/null
@@ -1,5 +0,0 @@
-export default Ember.Component.extend({
-  classNames: "select-box-filter",
-
-  classNameBindings: ["focused:is-focused"]
-});
diff --git a/app/assets/javascripts/discourse/components/select-box/select-box-header.js.es6 b/app/assets/javascripts/discourse/components/select-box/select-box-header.js.es6
deleted file mode 100644
index 033af31237..0000000000
--- a/app/assets/javascripts/discourse/components/select-box/select-box-header.js.es6
+++ /dev/null
@@ -1,24 +0,0 @@
-export default Ember.Component.extend({
-  classNames: "select-box-header",
-
-  classNameBindings: ["focused:is-focused"],
-
-  didReceiveAttrs() {
-    this._super();
-
-    this._setCaretIcon();
-  },
-
-  click(event) {
-    this.sendAction("onToggle");
-    event.stopPropagation();
-  },
-
-  _setCaretIcon() {
-    if(this.get("expanded")) {
-      this.set("caretIcon", this.get("caretUpIcon"));
-    } else {
-      this.set("caretIcon", this.get("caretDownIcon"));
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/select-box/select-box-row.js.es6 b/app/assets/javascripts/discourse/components/select-box/select-box-row.js.es6
deleted file mode 100644
index 247b95f573..0000000000
--- a/app/assets/javascripts/discourse/components/select-box/select-box-row.js.es6
+++ /dev/null
@@ -1,47 +0,0 @@
-import computed from 'ember-addons/ember-computed-decorators';
-import { iconHTML } from "discourse-common/lib/icon-library";
-
-export default Ember.Component.extend({
-  layoutName: "components/select-box/select-box-row",
-
-  classNames: "select-box-row",
-
-  tagName: "li",
-
-  attributeBindings: ["title", "id:data-id"],
-
-  classNameBindings: ["isHighlighted:is-highlighted", "isSelected:is-selected"],
-
-  @computed("titleForRow")
-  title(titleForRow) { return titleForRow(this); },
-
-  @computed("idForRow")
-  id(idForRow) { return idForRow(this); },
-
-  @computed("templateForRow")
-  template(templateForRow) { return templateForRow(this); },
-
-  @computed("shouldHighlightRow", "highlightedValue")
-  isHighlighted(shouldHighlightRow) { return shouldHighlightRow(this); },
-
-  @computed("shouldSelectRow", "value")
-  isSelected(shouldSelectRow) { return shouldSelectRow(this); },
-
-  icon() {
-    if (this.get("content.icon")) {
-      const iconName = this.get("content.icon");
-      const iconClass = this.get("content.iconClass");
-      return iconHTML(iconName, { class: iconClass });
-    }
-
-    return null;
-  },
-
-  mouseEnter() {
-    this.sendAction("onHover", this.get("content"));
-  },
-
-  click() {
-    this.sendAction("onSelect", this.get("content"));
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6
deleted file mode 100644
index 267c40d3ee..0000000000
--- a/app/assets/javascripts/discourse/components/tag-notifications-button.js.es6
+++ /dev/null
@@ -1,24 +0,0 @@
-import NotificationOptionsComponent from "discourse/components/notifications-button";
-import computed from "ember-addons/ember-computed-decorators";
-import { iconHTML } from "discourse-common/lib/icon-library";
-
-export default NotificationOptionsComponent.extend({
-  classNames: ["tag-notifications-button"],
-
-  i18nPrefix: "tagging.notifications",
-
-  @computed("value")
-  icon() {
-    return `${this._super()}${iconHTML("caret-down")}`.htmlSafe();
-  },
-
-  generatedHeadertext: null,
-
-  actions: {
-    onSelectRow(content) {
-      this._super(content);
-
-      this.sendAction("action", this.get("value"));
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
deleted file mode 100644
index 2395e43c78..0000000000
--- a/app/assets/javascripts/discourse/components/topic-footer-mobile-dropdown.js.es6
+++ /dev/null
@@ -1,78 +0,0 @@
-import { observes } from 'ember-addons/ember-computed-decorators';
-import SelectBoxComponent from "discourse/components/select-box";
-
-export default SelectBoxComponent.extend({
-  textKey: "name",
-
-  headerText: I18n.t("topic.controls"),
-
-  dynamicHeaderText: false,
-
-  collectionHeight: 300,
-
-  init() {
-    this._super();
-
-    this._createContent();
-  },
-
-  _createContent() {
-    const content = [];
-    const topic = this.get('topic');
-    const details = topic.get('details');
-
-    if (details.get('can_invite_to')) {
-      content.push({ id: 'invite', icon: 'users', name: I18n.t('topic.invite_reply.title') });
-    }
-
-    if (topic.get('bookmarked')) {
-      content.push({ id: 'bookmark', icon: 'bookmark', name: I18n.t('bookmarked.clear_bookmarks') });
-    } else {
-      content.push({ id: 'bookmark', icon: 'bookmark', name: I18n.t('bookmarked.title') });
-    }
-
-    content.push({ id: 'share', icon: 'link', name: I18n.t('topic.share.title') });
-
-    if (details.get('can_flag_topic')) {
-      content.push({ id: 'flag', icon: 'flag', name: I18n.t('topic.flag_topic.title') });
-    }
-
-    this.set('content', content);
-  },
-
-  @observes('value')
-  _valueChanged() {
-    this._super();
-
-    const value = this.get('value');
-    const topic = this.get('topic');
-
-    // In case it's not a valid topic
-    if (!topic.get('id')) {
-      return;
-    }
-
-    const refresh = () => {
-      this._createContent();
-      this.set('value', null);
-    };
-
-    switch(value) {
-      case 'invite':
-        this.attrs.showInvite();
-        refresh();
-        break;
-      case 'bookmark':
-        topic.toggleBookmark().then(() => refresh());
-        break;
-      case 'share':
-        this.appEvents.trigger('share:url', topic.get('shareUrl'), $('#topic-footer-buttons'));
-        refresh();
-        break;
-      case 'flag':
-        this.attrs.showFlagTopic();
-        refresh();
-        break;
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/topic-notifications-button.js.es6 b/app/assets/javascripts/discourse/components/topic-notifications-button.js.es6
deleted file mode 100644
index c174495ba7..0000000000
--- a/app/assets/javascripts/discourse/components/topic-notifications-button.js.es6
+++ /dev/null
@@ -1,9 +0,0 @@
-export default Ember.Component.extend({
-  layoutName: "components/topic-notifications-button",
-
-  classNames: ["topic-notifications-button"],
-
-  showFullTitle: true,
-
-  appendReason: true,
-});
diff --git a/app/assets/javascripts/discourse/components/topic-notifications-options.js.es6 b/app/assets/javascripts/discourse/components/topic-notifications-options.js.es6
deleted file mode 100644
index 03b4a17534..0000000000
--- a/app/assets/javascripts/discourse/components/topic-notifications-options.js.es6
+++ /dev/null
@@ -1,52 +0,0 @@
-import NotificationOptionsComponent from "discourse/components/notifications-button";
-import { on } from "ember-addons/ember-computed-decorators";
-import computed from "ember-addons/ember-computed-decorators";
-import { topicLevels, buttonDetails } from "discourse/lib/notification-levels";
-
-export default NotificationOptionsComponent.extend({
-  classNames: ["topic-notifications-options"],
-
-  content: topicLevels,
-
-  i18nPrefix: "topic.notifications",
-
-  value: Ember.computed.alias("topic.details.notification_level"),
-
-  @on("didInsertElement")
-  _bindGlobalLevelChanged() {
-    this.appEvents.on("topic-notifications-button:changed", (msg) => {
-      if (msg.type === "notification") {
-        if (this.get("value") !== msg.id) {
-          this.get("topic.details").updateNotifications(msg.id);
-        }
-      }
-    });
-  },
-
-  @on("willDestroyElement")
-  _unbindGlobalLevelChanged() {
-    this.appEvents.off("topic-notifications-button:changed");
-  },
-
-  @computed("value", "showFullTitle")
-  generatedHeadertext(value, showFullTitle) {
-    if (showFullTitle) {
-      const details = buttonDetails(value);
-      return I18n.t(`topic.notifications.${details.key}.title`);
-    } else {
-      return null;
-    }
-  },
-
-  actions: {
-    onSelectRow(content) {
-      const notificationLevelId = Ember.get(content, this.get("idKey"));
-
-      if (notificationLevelId !== this.get("value")) {
-        this.get("topic.details").updateNotifications(notificationLevelId);
-      }
-
-      this._super(content);
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/user-stat.js.es6 b/app/assets/javascripts/discourse/components/user-stat.js.es6
index 290aae5a97..8931501e3e 100644
--- a/app/assets/javascripts/discourse/components/user-stat.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stat.js.es6
@@ -1,3 +1,5 @@
 export default Ember.Component.extend({
-  classNames: ['user-stat']
+  classNames: ['user-stat'],
+  type: 'number',
+  isNumber: Ember.computed.equal('type', 'number')
 });
diff --git a/app/assets/javascripts/discourse/components/user-summary-section.js.es6 b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
new file mode 100644
index 0000000000..bc13ab3644
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-section.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  classNames: ['top-sub-section']
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-topic.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
new file mode 100644
index 0000000000..d100e27e25
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-topic.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'li'
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6 b/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
new file mode 100644
index 0000000000..ccdf6ef0f9
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-topics-list.js.es6
@@ -0,0 +1,13 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+// should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
+const MAX_SUMMARY_RESULTS = 6;
+
+export default Ember.Component.extend({
+  tagName: '',
+
+  @computed('items.length')
+  hasMore(length) {
+    return length >= MAX_SUMMARY_RESULTS;
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/user-summary-user.js.es6 b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
new file mode 100644
index 0000000000..d100e27e25
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/user-summary-user.js.es6
@@ -0,0 +1,3 @@
+export default Ember.Component.extend({
+  tagName: 'li'
+});
diff --git a/app/assets/javascripts/discourse/controllers/badges/show.js.es6 b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
index 5904def6c9..11d01f32a7 100644
--- a/app/assets/javascripts/discourse/controllers/badges/show.js.es6
+++ b/app/assets/javascripts/discourse/controllers/badges/show.js.es6
@@ -25,9 +25,9 @@ export default Ember.Controller.extend(BadgeSelectController, {
     return username ? userCount : modelCount;
   },
 
-  @computed("model.has_title_badges")
-  canSelectTitle(hasTitleBadges) {
-    return this.siteSettings.enable_badges && hasTitleBadges;
+  @computed("model.allow_title", "model.has_badge", "model")
+  canSelectTitle(hasTitleBadges, hasBadge) {
+    return this.siteSettings.enable_badges && hasTitleBadges && hasBadge;
   },
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/flag.js.es6 b/app/assets/javascripts/discourse/controllers/flag.js.es6
index b5f823500a..00627a2ef8 100644
--- a/app/assets/javascripts/discourse/controllers/flag.js.es6
+++ b/app/assets/javascripts/discourse/controllers/flag.js.es6
@@ -1,4 +1,3 @@
-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';
@@ -54,19 +53,17 @@ export default Ember.Controller.extend(ModalFunctionality, {
       return flagsAvailable;
     } else {
       // flagging topic
-      const self = this,
-          lookup = Em.Object.create();
-
-      _.each(this.get("model.actions_summary"),function(a) {
-        a.flagTopic = self.get('model');
-        a.actionType = self.site.topicFlagTypeById(a.id);
-        const actionSummary = ActionSummary.create(a);
-        lookup.set(a.actionType.get('name_key'), actionSummary);
+      let lookup = Em.Object.create();
+      let model = this.get('model');
+      model.get('actions_summary').forEach(a => {
+        a.flagTopic = model;
+        a.actionType = this.site.topicFlagTypeById(a.id);
+        lookup.set(a.actionType.get('name_key'), ActionSummary.create(a));
       });
       this.set('topicActionByName', lookup);
 
-      return this.site.get('topic_flag_types').filter(function(item) {
-        return _.any(self.get("model.actions_summary"), function(a) {
+      return this.site.get('topic_flag_types').filter(item => {
+        return _.any(this.get("model.actions_summary"), a => {
           return (a.id === item.get('id') && a.can_act);
         });
       });
@@ -97,13 +94,18 @@ export default Ember.Controller.extend(ModalFunctionality, {
     return !flagTopic && !isCustomFlag && this.currentUser.get('staff');
   },
 
-  submitText: function(){
-    if (this.get('selected.is_custom_flag')) {
-      return iconHTML('envelope') + (I18n.t(this.get('flagTopic') ? "flagging_topic.notify_action" : "flagging.notify_action"));
-    } else {
-      return iconHTML('flag') + (I18n.t(this.get('flagTopic') ? "flagging_topic.action" : "flagging.action"));
+  @computed('selected.is_custom_flag')
+  submitIcon(isCustomFlag) {
+    return isCustomFlag ? "envelope" : "flag";
+  },
+
+  @computed('selected.is_custom_flag', 'flagTopic')
+  submitLabel(isCustomFlag, flagTopic) {
+    if (isCustomFlag) {
+      return flagTopic ? "flagging_topic.notify_action" : "flagging.notify_action";
     }
-  }.property('selected.is_custom_flag'),
+    return flagTopic ? "flagging_topic.action" : "flagging.action";
+  },
 
   actions: {
     deleteSpammer() {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index d49a6ffd6c..002eaba949 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -13,7 +13,7 @@ export default Ember.Controller.extend(PreferencesTabController, {
       'dynamic_favicon',
       'enable_quoting',
       'disable_jump_reply',
-      'automatically_unpin_topics'
+      'automatically_unpin_topics',
     ];
 
     if (makeDefault) {
diff --git a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
index 8129641b5d..bd9609b09a 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
@@ -10,7 +10,8 @@ export default Ember.Controller.extend(PreferencesTabController, {
     'new_topic_duration_minutes',
     'auto_track_topics_after_msecs',
     'notification_level_when_replying',
-    'like_notification_frequency'
+    'like_notification_frequency',
+    'allow_private_messages',
   ],
 
   @computed("model.watchedCategories", "model.trackedCategories", "model.mutedCategories")
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index bb8500f08d..fe2a3f4fb0 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -231,7 +231,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     removeAllowedUser(user) {
-      return this.get('model.details').removeAllowedUser(user);
+      return this.get('model.details').removeAllowedUser(user).then(() => {
+        if (this.currentUser.id === user.id) {
+          this.transitionToRoute("userPrivateMessages", user);
+        }
+      });
     },
 
     removeAllowedGroup(group) {
@@ -536,7 +540,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
     },
 
     expandHidden(post) {
-      post.expandHidden();
+      return post.expandHidden();
     },
 
     toggleVisibility() {
diff --git a/app/assets/javascripts/discourse/controllers/user-summary.js.es6 b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
index c40014854c..bb4bec2077 100644
--- a/app/assets/javascripts/discourse/controllers/user-summary.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-summary.js.es6
@@ -1,7 +1,5 @@
 import computed from 'ember-addons/ember-computed-decorators';
 
-// should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
-const MAX_SUMMARY_RESULTS = 6;
 // should be kept in sync with 'UserSummary::MAX_BADGES'
 const MAX_BADGES = 6;
 
@@ -9,12 +7,6 @@ export default Ember.Controller.extend({
   userController: Ember.inject.controller('user'),
   user: Ember.computed.alias('userController.model'),
 
-  @computed("model.topics.length")
-  moreTopics(topicsLength) { return topicsLength >= MAX_SUMMARY_RESULTS; },
-
-  @computed("model.replies.length")
-  moreReplies(repliesLength) { return repliesLength >= MAX_SUMMARY_RESULTS; },
-
   @computed("model.badges.length")
   moreBadges(badgesLength) { return badgesLength >= MAX_BADGES; },
 });
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index 2a85136b0c..a477463d95 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -33,7 +33,7 @@ export default {
       }
 
       bus.subscribe(`/notification/${user.get('id')}`, data => {
-        const store = container.lookup('store:main');
+        const store = container.lookup('service:store');
 
         const oldUnread = user.get('unread_notifications');
         const oldPM = user.get('unread_private_messages');
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 6ae50d0475..b011f8bab0 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -6,8 +6,7 @@ const bindings = {
   '!':               {postAction: 'showFlags'},
   '#':               {handler: 'goToPost', anonymous: true},
   '/':               {handler: 'toggleSearch', anonymous: true},
-  'ctrl+shift+s':    {handler: 'toggleSearch', anonymous: true},
-  'command+shift+s': {handler: 'toggleSearch', anonymous: true},
+  'ctrl+alt+f':      {handler: 'toggleSearch', anonymous: true},
   '=':               {handler: 'toggleHamburgerMenu', anonymous: true},
   '?':               {handler: 'showHelpModal', anonymous: true},
   '.':               {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics
diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
index 081a1286e8..38772203ae 100644
--- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6
+++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6
@@ -441,7 +441,7 @@ class PluginApi {
    * will issue a request to `/mice.json`
    **/
   addStorePluralization(thing, plural) {
-    this.container.lookup("store:main").addPluralization(thing, plural);
+    this.container.lookup("service:store").addPluralization(thing, plural);
   }
 
   /**
diff --git a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6 b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
index 43c70615f0..42777ed4f1 100644
--- a/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
+++ b/app/assets/javascripts/discourse/lib/safari-hacks.js.es6
@@ -147,7 +147,7 @@ function positioningWorkaround($fixedElement) {
 
     fixedElement.style.top = '0px';
 
-    composingTopic = $('#reply-control .category-select-box').length > 0;
+    composingTopic = $('#reply-control .category-chooser').length > 0;
 
     const height = calcHeight(composingTopic);
     fixedElement.style.height = height + "px";
diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6
index 5faac346ec..ac81e64e68 100644
--- a/app/assets/javascripts/discourse/lib/transform-post.js.es6
+++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6
@@ -127,6 +127,7 @@ export default function transformPost(currentUser, site, post, prevPost, nextPos
     postAtts.allowedGroups = details.allowed_groups;
     postAtts.allowedUsers = details.allowed_users;
     postAtts.canRemoveAllowedUsers = details.can_remove_allowed_users;
+    postAtts.canRemoveSelfId = details.can_remove_self_id;
     postAtts.canInvite = details.can_invite_to;
   }
 
diff --git a/app/assets/javascripts/discourse/models/nav-item.js.es6 b/app/assets/javascripts/discourse/models/nav-item.js.es6
index c41f33b544..f71842cd6e 100644
--- a/app/assets/javascripts/discourse/models/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -122,7 +122,7 @@ NavItem.reopenClass({
       _.merge(args, extra);
     });
 
-    const store = Discourse.__container__.lookup('store:main');
+    const store = Discourse.__container__.lookup('service:store');
     return store.createRecord('nav-item', args);
   },
 
diff --git a/app/assets/javascripts/discourse/models/post-action-type.js.es6 b/app/assets/javascripts/discourse/models/post-action-type.js.es6
index 94a82ff5cb..fb3125f0fa 100644
--- a/app/assets/javascripts/discourse/models/post-action-type.js.es6
+++ b/app/assets/javascripts/discourse/models/post-action-type.js.es6
@@ -1,9 +1,7 @@
 import RestModel from 'discourse/models/rest';
 
-const PostActionType = RestModel.extend({
-  notCustomFlag: Em.computed.not('is_custom_flag')
-});
-
 export const MAX_MESSAGE_LENGTH = 500;
 
-export default PostActionType;
+export default RestModel.extend({
+  notCustomFlag: Em.computed.not('is_custom_flag')
+});
diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6
index 7dff27171e..6c267a0e15 100644
--- a/app/assets/javascripts/discourse/models/rest.js.es6
+++ b/app/assets/javascripts/discourse/models/rest.js.es6
@@ -84,7 +84,7 @@ RestModel.reopenClass({
     if (!args.store) {
       const container = Discourse.__container__;
       // Ember.warn('Use `store.createRecord` to create records instead of `.create()`');
-      args.store = container.lookup('store:main');
+      args.store = container.lookup('service:store');
     }
 
     args.__munge = this.munge;
diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6
index 5b421c46be..ace9f7176c 100644
--- a/app/assets/javascripts/discourse/models/site.js.es6
+++ b/app/assets/javascripts/discourse/models/site.js.es6
@@ -94,7 +94,7 @@ Site.reopenClass(Singleton, {
 
   // The current singleton will retrieve its attributes from the `PreloadStore`.
   createCurrent() {
-    const store = Discourse.__container__.lookup('store:main');
+    const store = Discourse.__container__.lookup('service:store');
     return store.createRecord('site', PreloadStore.get('site'));
   },
 
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index b9076f078d..3e39ae5c89 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -140,7 +140,7 @@ TopicList.reopenClass({
   },
 
   find(filter, params) {
-    const store = Discourse.__container__.lookup('store:main');
+    const store = Discourse.__container__.lookup('service:store');
     return store.findFiltered('topicList', {filter, params});
   },
 
diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6
index 10a822a4e9..17e7f9bfc1 100644
--- a/app/assets/javascripts/discourse/models/user.js.es6
+++ b/app/assets/javascripts/discourse/models/user.js.es6
@@ -11,7 +11,6 @@ import UserBadge from 'discourse/models/user-badge';
 import UserActionStat from 'discourse/models/user-action-stat';
 import UserAction from 'discourse/models/user-action';
 import Group from 'discourse/models/group';
-import Topic from 'discourse/models/topic';
 import { emojiUnescape } from 'discourse/lib/text';
 import PreloadStore from 'preload-store';
 import { defaultHomepage } from 'discourse/lib/utilities';
@@ -248,7 +247,8 @@ const User = RestModel.extend({
       'notification_level_when_replying',
       'like_notification_frequency',
       'include_tl0_in_digests',
-      'theme_key'
+      'theme_key',
+      'allow_private_messages',
     ];
 
     if (fields) {
@@ -492,38 +492,39 @@ const User = RestModel.extend({
   },
 
   summary() {
-    return ajax(userPath(`${this.get("username_lower")}/summary.json`))
-           .then(json => {
-              const summary = json["user_summary"];
-              const topicMap = {};
-              const badgeMap = {};
+    let { store } = this;
 
-              json.topics.forEach(t => topicMap[t.id] = Topic.create(t));
-              Badge.createFromJson(json).forEach(b => badgeMap[b.id] = b );
+    return ajax(userPath(`${this.get("username_lower")}/summary.json`)).then(json => {
+      const summary = json.user_summary;
+      const topicMap = {};
+      const badgeMap = {};
 
-              summary.topics = summary.topic_ids.map(id => topicMap[id]);
+      json.topics.forEach(t => topicMap[t.id] = store.createRecord('topic', t));
+      Badge.createFromJson(json).forEach(b => badgeMap[b.id] = b );
 
-              summary.replies.forEach(r => {
-                r.topic = topicMap[r.topic_id];
-                r.url = r.topic.urlForPostNumber(r.post_number);
-                r.createdAt = new Date(r.created_at);
-              });
+      summary.topics = summary.topic_ids.map(id => topicMap[id]);
 
-              summary.links.forEach(l => {
-                l.topic = topicMap[l.topic_id];
-                l.post_url = l.topic.urlForPostNumber(l.post_number);
-              });
+      summary.replies.forEach(r => {
+        r.topic = topicMap[r.topic_id];
+        r.url = r.topic.urlForPostNumber(r.post_number);
+        r.createdAt = new Date(r.created_at);
+      });
 
-              if (summary.badges) {
-                summary.badges = summary.badges.map(ub => {
-                  const badge = badgeMap[ub.badge_id];
-                  badge.count = ub.count;
-                  return badge;
-                });
-              }
+      summary.links.forEach(l => {
+        l.topic = topicMap[l.topic_id];
+        l.post_url = l.topic.urlForPostNumber(l.post_number);
+      });
 
-              return summary;
-           });
+      if (summary.badges) {
+        summary.badges = summary.badges.map(ub => {
+          const badge = badgeMap[ub.badge_id];
+          badge.count = ub.count;
+          return badge;
+        });
+      }
+
+      return summary;
+    });
   },
 
   canManageGroup(group) {
@@ -543,7 +544,7 @@ User.reopenClass(Singleton, {
   createCurrent() {
     const userJson = PreloadStore.get('currentUser');
     if (userJson) {
-      const store = Discourse.__container__.lookup('store:main');
+      const store = Discourse.__container__.lookup('service:store');
       return store.createRecord('user', userJson);
     }
     return null;
diff --git a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6 b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
index 34181e46b4..ca60c3c311 100644
--- a/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
+++ b/app/assets/javascripts/discourse/pre-initializers/inject-discourse-objects.js.es6
@@ -8,17 +8,7 @@ import SearchService from 'discourse/services/search';
 import { startTracking, default as TopicTrackingState } from 'discourse/models/topic-tracking-state';
 import ScreenTrack from 'discourse/lib/screen-track';
 
-function inject() {
-  const app = arguments[0],
-        name = arguments[1],
-        singletonName = Ember.String.underscore(name).replace(/_/g, '-') + ':main';
-
-  Array.prototype.slice.call(arguments, 2).forEach(dest => app.inject(dest, name, singletonName));
-}
-
-function injectAll(app, name) {
-  inject(app, name, 'controller', 'component', 'route', 'model', 'adapter');
-}
+const ALL_TARGETS = ['controller', 'component', 'route', 'model', 'adapter'];
 
 export default {
   name: "inject-discourse-objects",
@@ -26,51 +16,62 @@ export default {
   initialize(container, app) {
     const appEvents = AppEvents.create();
     app.register('app-events:main', appEvents, { instantiate: false });
-    injectAll(app, 'appEvents');
+    ALL_TARGETS.forEach(t => app.inject(t, 'appEvents', 'app-events:main'));
     DiscourseURL.appEvents = appEvents;
 
+    // backwards compatibility: remove when plugins have updated
     app.register('store:main', Store);
-    inject(app, 'store', 'route', 'controller', 'service');
+
+    app.register('service:store', Store);
+    ALL_TARGETS.forEach(t => app.inject(t, 'store', 'service:store'));
 
     const messageBus = window.MessageBus;
     app.register('message-bus:main', messageBus, { instantiate: false });
-    injectAll(app, 'messageBus');
+    ALL_TARGETS.forEach(t => app.inject(t, 'messageBus', 'message-bus:main'));
 
     const currentUser = Discourse.User.current();
     app.register('current-user:main', currentUser, { instantiate: false });
 
     const topicTrackingState = TopicTrackingState.create({ messageBus, currentUser });
     app.register('topic-tracking-state:main', topicTrackingState, { instantiate: false });
-    injectAll(app, 'topicTrackingState');
+    ALL_TARGETS.forEach(t => app.inject(t, 'topicTrackingState', 'topic-tracking-state:main'));
 
     const site = Discourse.Site.current();
     app.register('site:main', site, { instantiate: false });
-    injectAll(app, 'site');
+    ALL_TARGETS.forEach(t => app.inject(t, 'site', 'site:main'));
 
     const siteSettings = Discourse.SiteSettings;
     app.register('site-settings:main', siteSettings, { instantiate: false });
-    injectAll(app, 'siteSettings');
+    ALL_TARGETS.forEach(t => app.inject(t, 'siteSettings', 'site-settings:main'));
 
     app.register('search-service:main', SearchService);
-    injectAll(app, 'searchService');
+    ALL_TARGETS.forEach(t => app.inject(t, 'searchService', 'search-service:main'));
 
     const session = Session.current();
     app.register('session:main', session, { instantiate: false });
-    injectAll(app, 'session');
+    ALL_TARGETS.forEach(t => app.inject(t, 'session', 'session:main'));
+
+    const screenTrack = new ScreenTrack(
+      topicTrackingState,
+      siteSettings,
+      session,
+      currentUser
+    );
 
-    const screenTrack = new ScreenTrack(topicTrackingState, siteSettings, session, currentUser);
     app.register('screen-track:main', screenTrack, { instantiate: false });
-    inject(app, 'screenTrack', 'component', 'route');
+    ['component', 'route'].forEach(t => app.inject(t, 'screenTrack', 'screen-track:main'));
 
     if (currentUser) {
-      inject(app, 'currentUser', 'component', 'route', 'controller');
+      ['component', 'route', 'controller'].forEach(t => {
+        app.inject(t, 'currentUser', 'current-user:main');
+      });
     }
 
     app.register('location:discourse-location', DiscourseLocation);
 
     const keyValueStore = new KeyValueStore("discourse_");
     app.register('key-value-store:main', keyValueStore, { instantiate: false });
-    injectAll(app, 'keyValueStore');
+    ALL_TARGETS.forEach(t => app.inject(t, 'keyValueStore', 'key-value-store:main'));
 
     startTracking(topicTrackingState);
   }
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 427120bb6d..73598c948e 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -2,12 +2,13 @@ import { ajax } from 'discourse/lib/ajax';
 import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
 import PreloadStore from 'preload-store';
 import { getTransient, setTransient } from 'discourse/lib/page-tracker';
+import { escapeExpression } from 'discourse/lib/utilities';
 
 export default Discourse.Route.extend({
   queryParams: { q: {}, expanded: false, context_id: {}, context: {}, skip_context: {} },
 
   titleToken() {
-    return I18n.t('search.results_page');
+    return I18n.t('search.results_page', { term: escapeExpression(this.controllerFor("full-page-search").get('searchTerm')) });
   },
 
   model(params) {
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index b834a798c6..fab3e9a5aa 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -9,17 +9,13 @@
     {{badge-card badge=model size="large" count=userBadges.grant_count}}
     <div class='badge-grant-info {{if hiddenSetTitle '' 'hidden'}}'>
       <div>
-        {{#if model.allow_title}}
+        {{#if canSelectTitle}}
           <div class='grant-info-item'>
             {{i18n 'badges.allow_title'}}
-            {{#if userBadges}}
-              {{#if model.allow_title}}
-                {{d-button
+            {{d-button
                     class='btn btn-small pad-left no-text'
                     action='toggleSetUserTitle'
                     icon='pencil'}}
-              {{/if}}
-            {{/if}}
           </div>
         {{/if}}
         {{#if model.multiple_grant}}
@@ -29,10 +25,13 @@
         {{/if}}
       </div>
     </div>
-    <div class='badge-set-title {{if hiddenSetTitle 'hidden' ''}}'>
-      {{badge-title selectableUserBadges=selectableUserBadges user=user}}
-      <button class='btn btn-default close-btn' {{action "toggleSetUserTitle"}}>{{i18n 'close'}}</button>
-    </div>
+
+    {{#if canSelectTitle}}
+      <div class='badge-set-title {{if hiddenSetTitle 'hidden' ''}}'>
+        {{badge-title selectableUserBadges=selectableUserBadges user=user}}
+        <button class='btn btn-default close-btn' {{action "toggleSetUserTitle"}}>{{i18n 'close'}}</button>
+      </div>
+    {{/if}}
   </div>
 
   {{#if userBadges}}
diff --git a/app/assets/javascripts/discourse/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
index f212e7c7f0..8101829c4d 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-title.hbs
@@ -10,7 +10,7 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-        {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
+        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/dropdown-select-box/dropdown-header.hbs b/app/assets/javascripts/discourse/templates/components/dropdown-select-box/dropdown-header.hbs
deleted file mode 100644
index be525a9fd7..0000000000
--- a/app/assets/javascripts/discourse/templates/components/dropdown-select-box/dropdown-header.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<button
-  class="btn {{if text 'btn-icon-text' 'no-text btn-icon'}}"
-  aria-label="{{selectedTitle}}"
-  type="button"
-  title="{{selectedTitle}}">
-
-  {{{icon}}}
-
-  {{#if text}}
-    <span class="d-button-label">{{{text}}}</span>
-  {{/if}}
-</button>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
index 2e0918becc..c988d53869 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-general.hbs
@@ -19,8 +19,8 @@
         {{/each}}
       {{else}}
         <label>{{i18n 'category.parent'}}</label>
-        {{category-select-box
-          clearSelectionLabel="category.none"
+        {{category-chooser
+          none="category.none"
           value=category.parent_category_id
           categories=parentCategories
           allowUncategorized=false}}
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 05f70e3b27..f209d17af2 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -61,11 +61,13 @@
 <section class="field">
   <label>
     {{i18n "category.sort_order"}}
-    {{combo-box valueAttribute="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
-    {{#unless isDefaultSortOrder}}
-      {{combo-box valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
-    {{/unless}}
   </label>
+  <div class="controls">
+  {{combo-box valueAttribute="value" content=availableSorts value=category.sort_order none="category.sort_options.default"}}
+  {{#unless isDefaultSortOrder}}
+    {{combo-box valueAttribute="value" content=sortAscendingOptions value=category.sort_ascending none="category.sort_options.default"}}
+  {{/unless}}
+    </div>
 </section>
 
 <section class="field num-featured-topics-fields">
diff --git a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
index e231080081..c7929241b8 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-topic-timer-form.hbs
@@ -13,7 +13,7 @@
     {{else if publishToCategory}}
       <div class="control-group">
         <label>{{i18n 'topic.topic_status_update.publish_to'}}</label>
-        {{category-select-box
+        {{category-chooser
           value=topicTimer.category_id
           excludeCategoryId=excludeCategoryId}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
index 8138a72954..8802d1c9b2 100644
--- a/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/templates/components/flag-action-type.hbs
@@ -1,11 +1,17 @@
 {{#if isNotifyUser}}
   <h3>{{formattedName}}</h3>
   <div class='controls'>
-    <label class='radio'><input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'> <span class='description'>{{{flag.description}}}</span></label>
-    {{#if showMessageInput}}
-      {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
-      <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
-    {{/if}}
+    <label class='radio'>
+      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+
+      <div class='flag-action-type-details'>
+        <span class='description'>{{{flag.description}}}</span>
+        {{#if showMessageInput}}
+          {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
+          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        {{/if}}
+      </div>
+    </label>
   </div>
   {{#if staffFlagsAvailable}}
     <hr>
@@ -14,14 +20,17 @@
 {{else}}
   <div class='controls'>
     <label class='radio'>
-      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'> <strong>{{formattedName}}</strong>
-      {{#if showDescription}}
-        <div class='description'>{{{description}}}</div>
-      {{/if}}
+      <input type='radio' id="radio_{{unbound flag.name_key}}" {{action "changePostActionType" flag}} name='post_action_type_index'>
+      <div class='flag-action-type-details'>
+        <strong>{{formattedName}}</strong>
+        {{#if showDescription}}
+          <div class='description'>{{{description}}}</div>
+        {{/if}}
+        {{#if showMessageInput}}
+          {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
+          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        {{/if}}
+      </div>
     </label>
-    {{#if showMessageInput}}
-      {{textarea name="message" class="flag-message" placeholder=customPlaceholder value=message}}
-      <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
-    {{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
index 62dd978281..b509f19d76 100644
--- a/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/templates/components/future-date-input.hbs
@@ -1,16 +1,13 @@
 <div class="future-date-input">
   <div class="control-group">
     <label>{{displayLabel}}</label>
-
     {{future-date-input-selector
-        valueAttribute="id"
         minimumResultsForSearch=-1
         statusType=statusType
         value=selection
         input=input
         includeWeekend=includeWeekend
-        includeForever=includeForever
-        width="50%"
+        includeFarFuture=includeFarFuture
         none="topic.auto_update_input.none"}}
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/components/queued-post.hbs b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
index 172275ce09..e0bbe42ac7 100644
--- a/app/assets/javascripts/discourse/templates/components/queued-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/queued-post.hbs
@@ -24,7 +24,7 @@
       <span class="edit-title">
         {{text-field value=buffered.title maxlength=siteSettings.max_topic_title_length}}
       </span>
-      {{category-select-box value=buffered.category_id}}
+      {{category-chooser value=buffered.category_id}}
     {{else}}
       <span class='post-title'>
         {{i18n "queue.topic"}}
diff --git a/app/assets/javascripts/discourse/templates/components/select-box.hbs b/app/assets/javascripts/discourse/templates/components/select-box.hbs
deleted file mode 100644
index 129be62639..0000000000
--- a/app/assets/javascripts/discourse/templates/components/select-box.hbs
+++ /dev/null
@@ -1,55 +0,0 @@
-<input
-  class="select-box-offscreen"
-  type="text"
-  aria-haspopup="true"
-  role="button"
-  aria-labelledby="select-box-input-{{componentId}}"
-  tabindex={{tabindex}}
-/>
-
-{{component selectBoxHeaderComponent
-  text=generatedHeadertext
-  selectedTitle=selectedTitle
-  focused=focused
-  caretUpIcon=caretUpIcon
-  caretDownIcon=caretDownIcon
-  onToggle=(action "onToggle")
-  icon=icon
-  expanded=expanded
-  value=value
-}}
-
-<div class="select-box-body">
-  {{#if renderBody}}
-    {{#if filterable}}
-      {{component selectBoxFilterComponent
-        onFilterChange=(action "onFilterChange")
-        icon=filterIcon
-        focused=filterFocused
-        placeholder=filterPlaceholder
-        tabindex=tabindex
-      }}
-    {{/if}}
-
-    {{component selectBoxCollectionComponent
-      clearSelectionLabel=clearSelectionLabel
-      filteredContent=filteredContent
-      selectBoxRowComponent=selectBoxRowComponent
-      templateForRow=templateForRow
-      shouldHighlightRow=shouldHighlightRow
-      shouldSelectRow=shouldSelectRow
-      titleForRow=titleForRow
-      idForRow=idForRow
-      onSelectRow=(action "onSelectRow")
-      onHoverRow=(action "onHoverRow")
-      onClearSelection=(action "onClearSelection")
-      noContentLabel=noContentLabel
-      highlightedValue=highlightedValue
-      value=value
-    }}
-  {{/if}}
-</div>
-
-{{#if wrapper}}
-  <div class="select-box-wrapper"></div>
-{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/select-box/select-box-collection.hbs b/app/assets/javascripts/discourse/templates/components/select-box/select-box-collection.hbs
deleted file mode 100644
index f6adcdf1ac..0000000000
--- a/app/assets/javascripts/discourse/templates/components/select-box/select-box-collection.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-<ul class="collection">
-  {{#if clearSelectionLabel}}
-    <li {{action "onClearSelection" on="click"}} class="select-box-row clear-selection">
-      {{i18n clearSelectionLabel}}
-    </li>
-  {{/if}}
-
-  {{#each filteredContent as |content|}}
-    {{component selectBoxRowComponent
-      content=content
-      templateForRow=templateForRow
-      idForRow=idForRow
-      titleForRow=titleForRow
-      shouldHighlightRow=shouldHighlightRow
-      shouldSelectRow=shouldSelectRow
-      highlightedValue=highlightedValue
-      onSelect=onSelectRow
-      onHover=onHoverRow
-      value=value
-    }}
-  {{else}}
-    {{#if noContentLabel}}
-      <li class="select-box-row no-content">
-        {{noContentLabel}}
-      </li>
-    {{/if}}
-  {{/each}}
-</ul>
diff --git a/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs b/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs
deleted file mode 100644
index b07be58017..0000000000
--- a/app/assets/javascripts/discourse/templates/components/select-box/select-box-header.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-{{#if icon}}
-  {{d-icon icon class="icon"}}
-{{/if}}
-
-<span class="current-selection" title={{selectedTitle}}>
-  {{text}}
-</span>
-
-{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/discourse/templates/components/select-box/select-box-row.hbs b/app/assets/javascripts/discourse/templates/components/select-box/select-box-row.hbs
deleted file mode 100644
index fc329967e5..0000000000
--- a/app/assets/javascripts/discourse/templates/components/select-box/select-box-row.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{{template}}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-stat.hbs b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
index 72bfaedac6..19c62e09d9 100644
--- a/app/assets/javascripts/discourse/templates/components/user-stat.hbs
+++ b/app/assets/javascripts/discourse/templates/components/user-stat.hbs
@@ -1,5 +1,11 @@
 <span class='value'>
-  {{#if icon}}{{d-icon icon}}{{/if}}
-  {{number value}}
+  {{#if isNumber}}
+    {{number value}}
+  {{else}}
+    {{value}}
+  {{/if}}
+</span>
+<span class='label'>
+  {{#if icon}}{{d-icon icon}}{{/if}}
+  {{{i18n label count=value}}}
 </span>
-<span class='label'>{{{i18n label count=value}}}</span>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
new file mode 100644
index 0000000000..28bdf9d7b8
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-section.hbs
@@ -0,0 +1,2 @@
+<h3 class='stats-title'>{{i18n (concat "user.summary." title)}}</h3>
+{{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
new file mode 100644
index 0000000000..056b9cf088
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topic.hbs
@@ -0,0 +1,9 @@
+<span class='topic-info'>
+  {{format-date createdAt format="tiny" noTitle="true"}}
+  {{#if likes}}
+    &middot;
+    {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number likes}}</span>
+  {{/if}}
+</span>
+<br>
+<a href="{{unbound url}}">{{{topic.fancyTitle}}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
new file mode 100644
index 0000000000..a74e5d6a23
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-topics-list.hbs
@@ -0,0 +1,16 @@
+{{#if items}}
+  <ul>
+    {{#each items as |item|}}
+      {{yield item}}
+    {{/each}}
+  </ul>
+  {{#if hasMore}}
+    <p>
+      {{#link-to (concat "userActivity." type) user class="more"}}
+        {{i18n (concat "user.summary.more_" type)}}
+      {{/link-to}}
+    </p>
+  {{/if}}
+{{else}}
+  <p>{{i18n (concat "user.summary.no_" type)}}</p>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
new file mode 100644
index 0000000000..876702f195
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-user.hbs
@@ -0,0 +1,4 @@
+{{#user-info user=user}}
+  {{d-icon icon}}
+  <span class={{countClass}}>{{number user.count}}</span>
+{{/user-info}}
diff --git a/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
new file mode 100644
index 0000000000..1b291b638a
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/user-summary-users-list.hbs
@@ -0,0 +1,9 @@
+{{#if users}}
+  <ul>
+    {{#each users as |user|}}
+      {{yield user}}
+    {{/each}}
+  </ul>
+{{else}}
+  <p>{{i18n (concat "user.summary." none)}}</p>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index c9e32dceaf..98ad6257f1 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -72,7 +72,7 @@
 
                   {{#if model.showCategoryChooser}}
                     <div class="category-input">
-                      {{category-select-box value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
+                      {{category-chooser value=model.categoryId scopedCategoryId=scopedCategoryId tabindex="3"}}
                       {{popup-input-tip validation=categoryValidation}}
                     </div>
                     {{#if model.archetype.hasOptions}}
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index d138f8ea43..1ce6a3f4c8 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -57,7 +57,7 @@
         <span class='desc'>
           {{i18n "search.sort_by"}}
         </span>
-        {{combo-box value=sortOrder content=sortOrders castInteger="true"}}
+        {{combo-box value=sortOrder content=sortOrders castInteger=true}}
       </div>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
index fd12a91835..cc96a49d6f 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk-change-category.hbs
@@ -1,6 +1,6 @@
 <p>{{i18n "topics.bulk.choose_new_category"}}</p>
 
-<p>{{category-select-box value=newCategoryId}}</p>
+<p>{{category-chooser value=newCategoryId}}</p>
 
 {{#conditional-loading-spinner condition=loading}}
   {{d-button action="changeCategory" label="topics.bulk.change_category"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index da2f218cbd..d24d2e0e46 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -18,7 +18,8 @@
     action=(action "createFlag")
     disabled=submitDisabled
     title="flagging.submit_tooltip"
-    translatedLabel=submitText}}
+    icon=submitIcon
+    label=submitLabel}}
 
   {{#if canSendWarning}}
     {{d-button
diff --git a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
index 84ffc1d00c..219584343f 100644
--- a/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
@@ -6,7 +6,7 @@
     {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
 
     <label>{{i18n 'categories.category'}}</label>
-    {{category-select-box value=categoryId class="small"}}
+    {{category-chooser value=categoryId class="small"}}
   </form>
 {{/d-modal-body}}
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
index d23c2682a4..12f06094ea 100644
--- a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
@@ -10,7 +10,7 @@
     <div class="control-group">
       <label class="control-label"></label>
       <div class="controls">
-      {{combo-box valueAttribute="id" value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
+        {{combo-box value=selectedUserBadgeId nameProperty="badge.name" content=selectableUserBadges}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
index 72e2f9a18a..9d5f3b5766 100644
--- a/app/assets/javascripts/discourse/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/emails.hbs
@@ -2,7 +2,7 @@
   <label class="control-label">{{i18n 'user.email_settings'}}</label>
   <div class='controls controls-dropdown'>
     <label>{{i18n 'user.email_previous_replies.title'}}</label>
-    {{select-box idKey="value" textKey="name" content=previousRepliesOptions value=model.user_option.email_previous_replies}}
+    {{combo-box valueAttribute="value" content=previousRepliesOptions value=model.user_option.email_previous_replies}}
   </div>
   {{preference-checkbox labelKey="user.email_in_reply_to" checked=model.user_option.email_in_reply_to}}
   {{preference-checkbox labelKey="user.email_private_messages" checked=model.user_option.email_private_messages}}
@@ -25,7 +25,7 @@
     {{preference-checkbox labelKey="user.email_digests.title" disabled=model.user_option.mailing_list_mode checked=model.user_option.email_digests}}
     {{#if model.user_option.email_digests}}
       <div class='controls controls-dropdown'>
-        {{select-box idKey="value" filterable=true textKey="name" content=digestFrequencies value=model.user_option.digest_after_minutes}}
+        {{combo-box valueAttribute="value" filterable=true content=digestFrequencies value=model.user_option.digest_after_minutes}}
       </div>
       {{preference-checkbox labelKey="user.include_tl0_in_digests" disabled=model.user_option.mailing_list_mode checked=model.user_option.include_tl0_in_digests}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 99ad7891fe..8e8d5852e9 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -2,7 +2,7 @@
 <div class="control-group theme">
   <label class="control-label">{{i18n 'user.theme'}}</label>
   <div class="controls">
-    {{select-box textKey="name" content=userSelectableThemes value=themeKey}}
+    {{combo-box content=userSelectableThemes value=themeKey}}
   </div>
   <div class="controls">
     {{preference-checkbox labelKey="user.theme_default_on_all_devices" checked=makeThemeDefault}}
@@ -14,7 +14,7 @@
   <div class="control-group pref-locale">
     <label class="control-label">{{i18n 'user.locale.title'}}</label>
     <div class="controls">
-      {{combo-box valueAttribute="value" content=availableLocales value=model.locale none="user.locale.default"}}
+      {{combo-box filterable=true valueAttribute="value" content=availableLocales value=model.locale none="user.locale.default"}}
     </div>
     <div class='instructions'>
       {{i18n 'user.locale.instructions'}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
index 0ddeefe998..987a9c1386 100644
--- a/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/notifications.hbs
@@ -26,6 +26,16 @@
   <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
 </div>
 
+<div class="control-group private-messages">
+  <label class="control-label">{{i18n 'user.private_messages'}}</label>
+
+  <div class="controls">
+    {{preference-checkbox
+        labelKey="user.allow_private_messages"
+        checked=model.user_option.allow_private_messages}}
+  </div>
+</div>
+
 <div class="control-group muting">
   <label class="control-label">{{i18n 'user.users'}}</label>
   <div class="controls category-controls">
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b35d45d2d6..f26c41d641 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -19,7 +19,7 @@
           {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
           {{#if showCategoryChooser}}
             <br>
-            {{category-select-box class="small" value=buffered.category_id}}
+            {{category-chooser class="small" value=buffered.category_id}}
           {{/if}}
 
           {{#if canEditTags}}
diff --git a/app/assets/javascripts/discourse/templates/user/summary.hbs b/app/assets/javascripts/discourse/templates/user/summary.hbs
index d28eef4a30..97c7cf9c4e 100644
--- a/app/assets/javascripts/discourse/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/templates/user/summary.hbs
@@ -6,15 +6,14 @@
         {{user-stat value=model.days_visited label="user.summary.days_visited"}}
       </li>
       <li>
-        <span class='value'>{{model.time_read}}</span>
-        <span class='label'>{{{i18n "user.summary.time_read"}}}</span>
+        {{user-stat value=model.time_read label="user.summary.time_read" type="string"}}
       </li>
       <li>
         {{user-stat value=model.posts_read_count label="user.summary.posts_read"}}
       </li>
       <li class="linked-stat">
         {{#link-to 'userActivity.likesGiven'}}
-          {{user-stat value=model.likes_given label="user.summary.likes_given"}}
+          {{user-stat value=model.likes_given icon="heart" label="user.summary.likes_given"}}
         {{/link-to}}
       </li>
       {{#if model.bookmark_count}}
@@ -35,70 +34,36 @@
         {{/link-to}}
       </li>
       <li>
-          {{user-stat value=model.likes_received label="user.summary.likes_received"}}
+        {{user-stat value=model.likes_received icon="heart" label="user.summary.likes_received"}}
       </li>
-      {{plugin-outlet name="user-summary-stat"
-                      connectorTagName="li"
-                      args=(hash model=model)}}
+      {{plugin-outlet name="user-summary-stat" connectorTagName="li" args=(hash model=model)}}
     </ul>
   </div>
 
   <div class='top-section'>
-    <div class='top-sub-section replies-section pull-left'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_replies"}}</h3>
-      {{#if model.replies.length}}
-        <ul>
-          {{#each model.replies as |reply|}}
-            <li>
-              <span class='topic-info'>
-                {{format-date reply.createdAt format="tiny" noTitle="true"}}
-                {{#if reply.like_count}}
-                  &middot;
-                  {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number reply.like_count}}</span>
-                {{/if}}
-              </span>
-              <br>
-              <a href="{{unbound reply.url}}">{{{reply.topic.fancyTitle}}}</a>
-            </li>
-          {{/each}}
-        </ul>
-        {{#if moreReplies}}
-          <p>{{#link-to "userActivity.replies" user class="more"}}{{i18n "user.summary.more_replies"}}{{/link-to}}</p>
-        {{/if}}
-      {{else}}
-        <p>{{i18n "user.summary.no_replies"}}</p>
-      {{/if}}
-    </div>
-    <div class='top-sub-section topics-section pull-right'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_topics"}}</h3>
-      {{#if model.topics.length}}
-        <ul>
-          {{#each model.topics as |topic|}}
-            <li>
-              <span class='topic-info'>
-                {{format-date topic.createdAt format="tiny" noTitle="true"}}
-                {{#if topic.like_count}}
-                  &middot;
-                  {{d-icon 'heart'}}&nbsp;<span class='like-count'>{{number topic.like_count}}</span>
-                {{/if}}
-              </span>
-              <br>
-              <a href="{{unbound topic.url}}">{{{topic.fancyTitle}}}</a>
-            </li>
-          {{/each}}
-        </ul>
-        {{#if moreTopics}}
-          <p>{{#link-to "userActivity.topics" user class="more"}}{{i18n "user.summary.more_topics"}}{{/link-to}}</p>
-        {{/if}}
-      {{else}}
-        <p>{{i18n "user.summary.no_topics"}}</p>
-      {{/if}}
-    </div>
+    {{#user-summary-section title="top_replies" class="replies-section pull-left"}}
+      {{#user-summary-topics-list type="replies" items=model.replies user=user as |reply|}}
+        {{user-summary-topic
+          createdAt=reply.createdAt
+          topic=reply.topic
+          likes=reply.like_count
+          url=reply.url}}
+      {{/user-summary-topics-list}}
+    {{/user-summary-section}}
+
+    {{#user-summary-section title="top_topics" class="topics-section pull-right"}}
+      {{#user-summary-topics-list type="topics" items=model.topics user=user as |topic|}}
+        {{user-summary-topic
+          createdAt=topic.created_at
+          topic=topic
+          likes=topic.like_count
+          url=topic.url}}
+      {{/user-summary-topics-list}}
+    {{/user-summary-section}}
   </div>
 
   <div class='top-section'>
-    <div class='top-sub-section links-section pull-left'>
-      <h3 class='stats-title'>{{i18n "user.summary.top_links"}}</h3>
+    {{#user-summary-section title="top_links" class="links-section pull-left"}}
       {{#if model.links.length}}
         <ul>
           {{#each model.links as |link|}}
@@ -119,61 +84,27 @@
       {{else}}
         <p>{{i18n "user.summary.no_links"}}</p>
       {{/if}}
-    </div>
-    <div class='top-sub-section likes-section pull-right'>
-    <h3 class='stats-title'>{{i18n "user.summary.most_replied_to_users"}}</h3>
-      {{#if model.most_replied_to_users.length}}
-        <ul>
-          {{#each model.most_replied_to_users as |user|}}
-            <li>
-              {{#user-info user=user}}
-                {{d-icon "reply"}}
-                <span class='replies'>{{number user.count}}</span>
-              {{/user-info}}
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_replies"}}</p>
-      {{/if}}
-    </div>
+    {{/user-summary-section}}
+
+    {{#user-summary-section title="most_replied_to_users" class="summary-user-list replied-section pull-right"}}
+      {{#user-summary-users-list none="no_replies" users=model.most_replied_to_users as |user|}}
+        {{user-summary-user user=user icon="reply" countClass="replies"}}
+      {{/user-summary-users-list}}
+    {{/user-summary-section}}
   </div>
 
   <div class='top-section most-liked-section'>
-    <div class='top-sub-section likes-section pull-left'>
-      <h3 class='stats-title'>{{i18n "user.summary.most_liked_by"}}</h3>
-      {{#if model.most_liked_by_users.length}}
-        <ul>
-          {{#each model.most_liked_by_users as |user|}}
-            <li>
-              {{#user-info user=user}}
-                {{d-icon "heart"}}
-                <span class='likes'>{{number user.count}}</span>
-              {{/user-info}}
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_likes"}}</p>
-      {{/if}}
-    </div>
-    <div class='top-sub-section likes-section pull-right'>
-      <h3 class='stats-title'>{{i18n "user.summary.most_liked_users"}}</h3>
-      {{#if model.most_liked_users.length}}
-        <ul>
-          {{#each model.most_liked_users as |user|}}
-            <li>
-              {{#user-info user=user}}
-                {{d-icon "heart"}}
-                <span class='likes'>{{number user.count}}</span>
-              {{/user-info}}
-            </li>
-          {{/each}}
-        </ul>
-      {{else}}
-        <p>{{i18n "user.summary.no_likes"}}</p>
-      {{/if}}
-    </div>
+    {{#user-summary-section title="most_liked_by" class="summary-user-list liked-by-section pull-left"}}
+      {{#user-summary-users-list none="no_likes" users=model.most_liked_by_users as |user|}}
+        {{user-summary-user user=user icon="heart" countClass="likes"}}
+      {{/user-summary-users-list}}
+    {{/user-summary-section}}
+
+    {{#user-summary-section title="most_liked_users" class="summary-user-list liked-section pull-right"}}
+      {{#user-summary-users-list none="no_likes" users=model.most_liked_users as |user|}}
+        {{user-summary-user user=user icon="heart" countClass="likes"}}
+      {{/user-summary-users-list}}
+    {{/user-summary-section}}
   </div>
 
   {{#if siteSettings.enable_badges}}
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index b5835b3c19..2058a4b882 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -39,16 +39,21 @@ export default createWidget('hamburger-menu', {
   },
 
   adminLinks() {
-    const { currentUser } = this;
+    const { currentUser, siteSettings } = this;
+    let flagsPath = siteSettings.flags_default_topics ? 'topics' : 'active';
 
-    const links = [{ route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' },
-                   { href: '/admin/flags/active',
-                     className: 'flagged-posts-link',
-                     icon: 'flag',
-                     label: 'flags_title',
-                     badgeClass: 'flagged-posts',
-                     badgeTitle: 'notifications.total_flagged',
-                     badgeCount: 'site_flagged_posts_count' }];
+    const links = [
+      { route: 'admin', className: 'admin-link', icon: 'wrench', label: 'admin_title' },
+      {
+        href: `/admin/flags/${flagsPath}`,
+        className: 'flagged-posts-link',
+        icon: 'flag',
+        label: 'flags_title',
+        badgeClass: 'flagged-posts',
+        badgeTitle: 'notifications.total_flagged',
+        badgeCount: 'site_flagged_posts_count'
+      }
+    ];
 
     if (currentUser.show_queued_posts) {
       links.push({ route: 'queued-posts',
diff --git a/app/assets/javascripts/discourse/widgets/link.js.es6 b/app/assets/javascripts/discourse/widgets/link.js.es6
index a762a1e74d..611c41ac39 100644
--- a/app/assets/javascripts/discourse/widgets/link.js.es6
+++ b/app/assets/javascripts/discourse/widgets/link.js.es6
@@ -33,7 +33,7 @@ export default createWidget('link', {
   buildAttributes(attrs) {
     return {
       href: this.href(attrs),
-      title: attrs.title ? I18n.t(attrs.title) : this.label(attrs)
+      title: attrs.title ? I18n.t(attrs.title, attrs.titleOptions) : this.label(attrs)
     };
   },
 
diff --git a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6 b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
index b9ffee9585..6e8f82c167 100644
--- a/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-cooked.js.es6
@@ -159,10 +159,11 @@ export default class PostCooked {
   _updateQuoteElements($aside, desc) {
     let navLink = "";
     const quoteTitle = I18n.t("post.follow_quote");
-    const postNumber = $aside.data('post');
+    let postNumber = $aside.data('post');
+    let topicNumber = $aside.data('topic');
 
     // If we have a post reference
-    if (postNumber) {
+    if (topicNumber && topicNumber === this.attrs.topicId && postNumber) {
       let icon = iconHTML('arrow-up');
       navLink = `<a href='${this._urlForPostNumber(postNumber)}' title='${quoteTitle}' class='back'>${icon}</a>`;
     }
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 2f26fac098..8f7113727d 100644
--- a/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post-small-action.js.es6
@@ -48,6 +48,7 @@ const icons = {
   'split_topic': 'sign-out',
   'invited_user': 'plus-circle',
   'invited_group': 'plus-circle',
+  'user_left': 'minus-circle',
   'removed_user': 'minus-circle',
   'removed_group': 'minus-circle',
   'public_topic': 'comment',
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 fc8b505c28..788ed58be0 100644
--- a/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/widgets/private-message-map.js.es6
@@ -18,17 +18,17 @@ createWidget('pm-remove-group-link', {
 createWidget('pm-map-user-group', {
   tagName: 'div.user.group',
 
-  html(attrs) {
-    const link = h('a', { attributes: { href: Discourse.getURL(`/groups/${attrs.group.name}`) } }, attrs.group.name);
-    const result = [iconNode('users'), ' ', link];
+  transform(attrs) {
+    return { href: Discourse.getURL(`/groups/${attrs.group.name}`) };
+  },
 
-    if (attrs.canRemoveAllowedUsers) {
-      result.push(' ');
-      result.push(this.attach('pm-remove-group-link', attrs.group));
-    }
-
-    return result;
-  }
+  template: hbs`
+    {{fa-icon 'users'}}
+    <a href={{transformed.href}}>{{attrs.group.name}}</a>
+    {{#if attrs.canRemoveAllowedUsers}}
+      {{attach widget="pm-remove-group-link" attrs=attrs.group}}
+    {{/if}}
+  `
 });
 
 createWidget('pm-remove-link', {
@@ -36,8 +36,12 @@ createWidget('pm-remove-link', {
   template: hbs`{{d-icon "times"}}`,
 
   click() {
-    bootbox.confirm(I18n.t("private_message_info.remove_allowed_user", {name: this.attrs.username}), (confirmed) => {
-      if (confirmed) { this.sendWidgetAction('removeAllowedUser', this.attrs); }
+    const messageKey = this.attrs.isCurrentUser ? 'leave_message' : 'remove_allowed_user';
+
+    bootbox.confirm(I18n.t(`private_message_info.${messageKey}`, { name: this.attrs.user.username }), confirmed => {
+      if (confirmed) {
+        this.sendWidgetAction('removeAllowedUser', this.attrs.user);
+      }
     });
   }
 });
@@ -49,11 +53,12 @@ createWidget('pm-map-user', {
     const user = attrs.user;
     const avatar = avatarFor('small', { template: user.avatar_template, username: user.username });
     const link = h('a', { attributes: { href: user.get('path') } }, [ avatar, ' ', user.username ]);
-
     const result = [link];
-    if (attrs.canRemoveAllowedUsers) {
+    const isCurrentUser = attrs.canRemoveSelfId === user.get('id');
+
+    if (attrs.canRemoveAllowedUsers || isCurrentUser) {
       result.push(' ');
-      result.push(this.attach('pm-remove-link', user));
+      result.push(this.attach('pm-remove-link', { user, isCurrentUser } ));
     }
 
     return result;
@@ -67,12 +72,23 @@ export default createWidget('private-message-map', {
     const participants = [];
 
     if (attrs.allowedGroups.length) {
-      participants.push(attrs.allowedGroups.map(ag => this.attach('pm-map-user-group', {group: ag, canRemoveAllowedUsers: attrs.canRemoveAllowedUsers})));
+      participants.push(attrs.allowedGroups.map(group => {
+        return this.attach('pm-map-user-group', {
+          group,
+          canRemoveAllowedUsers: attrs.canRemoveAllowedUsers
+        });
+      }));
     }
 
-    if (attrs.allowedUsers.length) {
+    const allowedUsersLength = attrs.allowedUsers.length;
+
+    if (allowedUsersLength) {
       participants.push(attrs.allowedUsers.map(au => {
-        return this.attach('pm-map-user', { user: au, canRemoveAllowedUsers: attrs.canRemoveAllowedUsers });
+        return this.attach('pm-map-user', {
+          user: au,
+          canRemoveAllowedUsers: attrs.canRemoveAllowedUsers,
+          canRemoveSelfId: attrs.canRemoveSelfId
+        });
       }));
     }
 
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
index b4cd572c96..05aa2d705b 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -5,6 +5,7 @@ import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { iconNode } from 'discourse-common/lib/icon-library';
 import highlightText from 'discourse/lib/highlight-text';
+import { escapeExpression } from 'discourse/lib/utilities';
 
 class Highlighted extends RawHtml {
   constructor(html, term) {
@@ -95,7 +96,7 @@ createSearchResult({
   type: 'tag',
   linkField: 'url',
   builder(t) {
-    const tag = Handlebars.Utils.escapeExpression(t.get('id'));
+    const tag = escapeExpression(t.get('id'));
     return h('a', { attributes: { href: t.get('url') }, className: `tag-${tag} discourse-tag ${Discourse.SiteSettings.tag_style}`}, tag);
   }
 });
diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
index 31df484fe0..367cf9661c 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6
@@ -71,6 +71,7 @@ const SearchHelper = {
 
 export default createWidget('search-menu', {
   tagName: 'div.search-menu',
+  searchData,
 
   fullSearchUrl(opts) {
     const contextEnabled = searchData.contextEnabled;
diff --git a/app/assets/javascripts/discourse/widgets/widget.js.es6 b/app/assets/javascripts/discourse/widgets/widget.js.es6
index d81b2b5395..022625168f 100644
--- a/app/assets/javascripts/discourse/widgets/widget.js.es6
+++ b/app/assets/javascripts/discourse/widgets/widget.js.es6
@@ -153,7 +153,7 @@ export default class Widget {
     this.siteSettings = register.lookup('site-settings:main');
     this.currentUser = register.lookup('current-user:main');
     this.capabilities = register.lookup('capabilities:main');
-    this.store = register.lookup('store:main');
+    this.store = register.lookup('service:store');
     this.appEvents = register.lookup('app-events:main');
     this.keyValueStore = register.lookup('key-value-store:main');
 
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 0472216a65..522edbe766 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6
@@ -240,4 +240,6 @@ export function setup(helper) {
       state, (c,s)=>applyEmoji(c,s,md.options.discourse.emojiUnicodeReplacer))
     );
   });
+
+  helper.whiteList(['img[class=emoji]','img[class=emoji emoji-custom]']);
 }
diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
index 06de98068f..70ce99c6fc 100644
--- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
+++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quotes.js.es6
@@ -130,4 +130,6 @@ export function setup(helper) {
   helper.registerPlugin(md=>{
      md.block.bbcode.ruler.push('quotes', rule);
   });
+
+  helper.whiteList(['img[class=avatar]']);
 }
diff --git a/app/assets/javascripts/pretty-text/sanitizer.js.es6 b/app/assets/javascripts/pretty-text/sanitizer.js.es6
index f62df9d4bb..512e332846 100644
--- a/app/assets/javascripts/pretty-text/sanitizer.js.es6
+++ b/app/assets/javascripts/pretty-text/sanitizer.js.es6
@@ -98,6 +98,14 @@ export function sanitize(text, whiteLister) {
           return "-STRIP-";
         }
 
+        // Heading ids must begin with `heading--`
+        if (
+          ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].indexOf(tag) !== -1 &&
+          value.match(/^heading\-\-[a-zA-Z0-9\-\_]+$/)
+        ) {
+          return attr(name, value);
+        }
+
         const custom = whiteLister.getCustom();
         for (let i=0; i<custom.length; i++) {
           const fn = custom[i];
diff --git a/app/assets/javascripts/pretty-text/white-lister.js.es6 b/app/assets/javascripts/pretty-text/white-lister.js.es6
index cc022a827f..4fd6e36295 100644
--- a/app/assets/javascripts/pretty-text/white-lister.js.es6
+++ b/app/assets/javascripts/pretty-text/white-lister.js.es6
@@ -141,12 +141,12 @@ const DEFAULT_LIST = [
   'dl',
   'dt',
   'em',
-  'h1[id]',
-  'h2[id]',
-  'h3[id]',
-  'h4[id]',
-  'h5[id]',
-  'h6[id]',
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5',
+  'h6',
   'hr',
   'i',
   'iframe',
@@ -156,7 +156,6 @@ const DEFAULT_LIST = [
   'iframe[marginwidth]',
   'iframe[width]',
   'img[alt]',
-  'img[class]',
   'img[height]',
   'img[title]',
   'img[width]',
diff --git a/app/assets/javascripts/select-box-kit/components/categories-admin-dropdown.js.es6 b/app/assets/javascripts/select-box-kit/components/categories-admin-dropdown.js.es6
new file mode 100644
index 0000000000..f39d219db6
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/categories-admin-dropdown.js.es6
@@ -0,0 +1,50 @@
+import DropdownSelectBoxComponent from "select-box-kit/components/dropdown-select-box";
+import { iconHTML } from "discourse-common/lib/icon-library";
+import computed from "ember-addons/ember-computed-decorators";
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: "categories-admin-dropdown",
+  actionNames: { create: "createCategory", reorder: "reorderCategories" },
+
+  @on("didReceiveAttrs")
+  _setComponentOptions() {
+    this.set("headerComponentOptions", Ember.Object.create({
+      shouldDisplaySelectedName: false,
+      icon: `${iconHTML('bars')}${iconHTML('caret-down')}`.htmlSafe(),
+    }));
+  },
+
+  @computed
+  content() {
+    const items = [
+      {
+        id: "create",
+        name: I18n.t("category.create"),
+        description: I18n.t("category.create_long"),
+        icon: "plus"
+      }
+    ];
+
+    const includeReorder = this.get("siteSettings.fixed_category_positions");
+    if (includeReorder) {
+      items.push({
+        id: "reorder",
+        name: I18n.t("categories.reorder.title"),
+        description: I18n.t("categories.reorder.title_long"),
+        icon: "random"
+      });
+    }
+
+    return items;
+  },
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+
+      this.sendAction(`actionNames.${value}`);
+      this.set("value", null);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/category-chooser.js.es6 b/app/assets/javascripts/select-box-kit/components/category-chooser.js.es6
new file mode 100644
index 0000000000..ee6e9b158a
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/category-chooser.js.es6
@@ -0,0 +1,131 @@
+import ComboBoxComponent from "select-box-kit/components/combo-box";
+import { categoryBadgeHTML } from "discourse/helpers/category-link";
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+import PermissionType from "discourse/models/permission-type";
+import Category from "discourse/models/category";
+const { get, isNone, isEmpty } = Ember;
+
+export default ComboBoxComponent.extend({
+  classNames: "category-chooser",
+  filterable: true,
+  castInteger: true,
+  allowUncategorized: null,
+
+  filterFunction(computedContent) {
+    const _matchFunction = (filter, text) => {
+      return text.toLowerCase().indexOf(filter) > -1;
+    };
+
+    return (selectBox) => {
+      const filter = selectBox.get("filter").toLowerCase();
+      return _.filter(computedContent, c => {
+        const category = Category.findById(get(c, "value"));
+        const text = get(c, "name");
+        if (category && category.get("parentCategory")) {
+          const categoryName = category.get("parentCategory.name");
+          return _matchFunction(filter, text) || _matchFunction(filter, categoryName);
+        } else {
+          return _matchFunction(filter, text);
+        }
+      });
+    };
+  },
+
+  @computed("rootNone", "rootNoneLabel")
+  none(rootNone, rootNoneLabel) {
+    if (this.siteSettings.allow_uncategorized_topics || this.get("allowUncategorized")) {
+      if (!isNone(rootNone)) {
+        return rootNoneLabel || "category.none";
+      } else {
+        return Category.findUncategorized();
+      }
+    } else {
+      return "category.choose";
+    }
+  },
+
+  @computed
+  templateForRow() {
+    return rowComponent => this._rowContentTemplate(rowComponent.get("content"));
+  },
+
+  @computed
+  templateForNoneRow() {
+    return rowComponent => this._rowContentTemplate(rowComponent.get("content"));
+  },
+
+  @computed("scopedCategoryId", "content.[]")
+  computedContent(scopedCategoryId, categories) {
+    // Always scope to the parent of a category, if present
+    if (scopedCategoryId) {
+      const scopedCat = Category.findById(scopedCategoryId);
+      scopedCategoryId = scopedCat.get("parent_category_id") || scopedCat.get("id");
+    }
+
+    const excludeCategoryId = this.get("excludeCategoryId");
+
+    return categories.filter(c => {
+      const categoryId = get(c, "value");
+      if (scopedCategoryId && categoryId !== scopedCategoryId && get(c, "originalContent.parent_category_id") !== scopedCategoryId) {
+        return false;
+      }
+      if (get(c, 'originalContent.isUncategorizedCategory') || excludeCategoryId === categoryId) {
+        return false;
+      }
+      return get(c, 'originalContent.permission') === PermissionType.FULL;
+    });
+  },
+
+  @on("didRender")
+  _bindComposerResizing() {
+    this.appEvents.on("composer:resized", this, this.applyDirection);
+  },
+
+  @on("willDestroyElement")
+  _unbindComposerResizing() {
+    this.appEvents.off("composer:resized");
+  },
+
+  @computed("site.sortedCategories")
+  content() {
+    const categories =  Discourse.SiteSettings.fixed_category_positions_on_create ?
+                          Category.list() :
+                          Category.listByActivity();
+    return this.formatContents(categories);
+  },
+
+  _rowContentTemplate(content) {
+    let category;
+
+    // If we have no id, but text with the uncategorized name, we can use that badge.
+    if (isEmpty(get(content, "value"))) {
+      const uncat = Category.findUncategorized();
+      if (uncat && uncat.get("name") === get(content, "name")) {
+        category = uncat;
+      }
+    } else {
+      category = Category.findById(parseInt(get(content, "value"), 10));
+    }
+
+    if (!category) return get(content, "name");
+    let result = categoryBadgeHTML(category, {link: false, allowUncategorized: true, hideParent: true});
+    const parentCategoryId = category.get("parent_category_id");
+
+    if (parentCategoryId) {
+      result = `<div class="category-status">${categoryBadgeHTML(Category.findById(parentCategoryId), {link: false})}&nbsp;${result}`;
+    } else {
+      result = `<div class="category-status">${result}`;
+    }
+
+    result += ` <span class="topic-count">&times; ${category.get("topic_count")}</span></div>`;
+
+    const description = category.get("description");
+    // TODO wtf how can this be null?;
+    if (description && description !== "null") {
+      result += `<div class="category-desc">${description.substr(0, 200)}${description.length > 200 ? '&hellip;' : ''}</div>`;
+    }
+
+    return result;
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/category-notifications-button.js.es6 b/app/assets/javascripts/select-box-kit/components/category-notifications-button.js.es6
new file mode 100644
index 0000000000..d022c3c64c
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/category-notifications-button.js.es6
@@ -0,0 +1,17 @@
+import NotificationOptionsComponent from "select-box-kit/components/notifications-button";
+
+export default NotificationOptionsComponent.extend({
+  classNames: "category-notifications-button",
+  isHidden: Ember.computed.or("category.deleted", "site.isMobileDevice"),
+  i18nPrefix: "category.notifications",
+  value: Ember.computed.alias("category.notification_level"),
+  headerComponent: "category-notifications-button/category-notifications-button-header",
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+      this.get("category").setNotification(value);
+      this.blur();
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/category-notifications-button/category-notifications-button-header.js.es6 b/app/assets/javascripts/select-box-kit/components/category-notifications-button/category-notifications-button-header.js.es6
new file mode 100644
index 0000000000..8c5ef82fe3
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/category-notifications-button/category-notifications-button-header.js.es6
@@ -0,0 +1,13 @@
+import NotificationButtonHeader from "select-box-kit/components/notifications-button/notifications-button-header";
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default NotificationButtonHeader.extend({
+  classNames: "category-notifications-button-header",
+  shouldDisplaySelectedName: false,
+
+  @computed("_selectedDetails.icon", "_selectedDetails.key")
+  icon() {
+    return `${this._super()}${iconHTML("caret-down")}`.htmlSafe();
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-box-kit/components/combo-box.js.es6
new file mode 100644
index 0000000000..f5ff7d0305
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/combo-box.js.es6
@@ -0,0 +1,21 @@
+import SelectBoxKitComponent from "select-box-kit/components/select-box-kit";
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default SelectBoxKitComponent.extend({
+  classNames: "combobox combo-box",
+  autoFilterable: true,
+  headerComponent: "combo-box/combo-box-header",
+
+  caretUpIcon: "caret-up",
+  caretDownIcon: "caret-down",
+  clearable: false,
+
+  @on("didReceiveAttrs")
+  _setComboBoxOptions() {
+    this.set("headerComponentOptions", Ember.Object.create({
+      caretUpIcon: this.get("caretUpIcon"),
+      caretDownIcon: this.get("caretDownIcon"),
+      clearable: this.get("clearable"),
+    }));
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/combo-box/combo-box-header.js.es6 b/app/assets/javascripts/select-box-kit/components/combo-box/combo-box-header.js.es6
new file mode 100644
index 0000000000..996ca1f472
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/combo-box/combo-box-header.js.es6
@@ -0,0 +1,39 @@
+import SelectBoxKitHeaderComponent from "select-box-kit/components/select-box-kit/select-box-kit-header";
+import { default as computed } from "ember-addons/ember-computed-decorators";
+
+export default SelectBoxKitHeaderComponent.extend({
+  layoutName: "select-box-kit/templates/components/combo-box/combo-box-header",
+  classNames: "combo-box-header",
+
+  clearable: Ember.computed.alias("options.clearable"),
+  caretUpIcon: Ember.computed.alias("options.caretUpIcon"),
+  caretDownIcon: Ember.computed.alias("options.caretDownIcon"),
+  selectedName: Ember.computed.alias("options.selectedName"),
+
+  @computed("isExpanded", "caretUpIcon", "caretDownIcon")
+  caretIcon(isExpanded, caretUpIcon, caretDownIcon) {
+    return isExpanded === true ? caretUpIcon : caretDownIcon;
+  },
+
+  @computed("clearable", "selectedContent")
+  shouldDisplayClearableButton(clearable, selectedContent) {
+    return clearable === true && !Ember.isEmpty(selectedContent);
+  },
+
+  @computed("options.selectedName", "selectedContent.firstObject.name", "none.name")
+  selectedName(selectedName, name, noneName) {
+    if (Ember.isPresent(selectedName)) {
+      return selectedName;
+    }
+
+    if (Ember.isNone(name)) {
+      if (Ember.isNone(noneName)) {
+        return this._super();
+      } else {
+        return noneName;
+      }
+    } else {
+      return name;
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/dropdown-select-box.js.es6 b/app/assets/javascripts/select-box-kit/components/dropdown-select-box.js.es6
new file mode 100644
index 0000000000..8e2789aa1d
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/dropdown-select-box.js.es6
@@ -0,0 +1,24 @@
+import SelectBoxKitComponent from "select-box-kit/components/select-box-kit";
+
+export default SelectBoxKitComponent.extend({
+  classNames: "dropdown-select-box",
+  verticalOffset: 3,
+  fullWidthOnMobile: true,
+  filterable: false,
+  autoFilterable: false,
+  headerComponent: "dropdown-select-box/dropdown-select-box-header",
+  rowComponent: "dropdown-select-box/dropdown-select-box-row",
+
+  clickOutside() {
+    this.close();
+  },
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+      this.set("value", value);
+
+      this.blur();
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6 b/app/assets/javascripts/select-box-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
new file mode 100644
index 0000000000..53dc082bdc
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/dropdown-select-box/dropdown-select-box-header.js.es6
@@ -0,0 +1,6 @@
+import SelectBoxKitHeaderComponent from "select-box-kit/components/select-box-kit/select-box-kit-header";
+
+export default SelectBoxKitHeaderComponent.extend({
+  layoutName: "select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-header",
+  classNames: "dropdown-select-box-header",
+});
diff --git a/app/assets/javascripts/select-box-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6 b/app/assets/javascripts/select-box-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
new file mode 100644
index 0000000000..38ce2a7aa0
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/dropdown-select-box/dropdown-select-box-row.js.es6
@@ -0,0 +1,9 @@
+import SelectBoxKitRowComponent from "select-box-kit/components/select-box-kit/select-box-kit-row";
+
+export default SelectBoxKitRowComponent.extend({
+  layoutName: "select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-row",
+  classNames: "dropdown-select-box-row",
+
+  name: Ember.computed.alias("content.name"),
+  description: Ember.computed.alias("content.originalContent.description")
+});
diff --git a/app/assets/javascripts/select-box-kit/components/future-date-input-selector.js.es6 b/app/assets/javascripts/select-box-kit/components/future-date-input-selector.js.es6
new file mode 100644
index 0000000000..b344f2080e
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/future-date-input-selector.js.es6
@@ -0,0 +1,158 @@
+import { default as computed, observes } from "ember-addons/ember-computed-decorators";
+import ComboBoxComponent from "select-box-kit/components/combo-box";
+import { CLOSE_STATUS_TYPE } from "discourse/controllers/edit-topic-timer";
+import DatetimeMixin from "select-box-kit/components/future-date-input-selector/mixin";
+
+const TIMEFRAME_BASE = {
+  enabled: () => true,
+  when: () => null,
+  icon: 'briefcase',
+  displayWhen: true,
+};
+
+function buildTimeframe(opts) {
+  return jQuery.extend({}, TIMEFRAME_BASE, opts);
+}
+
+export const TIMEFRAMES = [
+  buildTimeframe({
+    id: 'later_today',
+    format: "h a",
+    enabled: opts => opts.canScheduleToday,
+    when: (time) => time.hour(18).minute(0),
+    icon: 'moon-o'
+  }),
+  buildTimeframe({
+    id: "tomorrow",
+    format: "ddd, h a",
+    when: (time, timeOfDay) => time.add(1, 'day').hour(timeOfDay).minute(0),
+    icon: 'sun-o'
+  }),
+  buildTimeframe({
+    id: "later_this_week",
+    format: "ddd, h a",
+    enabled: opts => !opts.canScheduleToday && opts.day < 4,
+    when: (time, timeOfDay) => time.add(2, 'day').hour(timeOfDay).minute(0),
+  }),
+  buildTimeframe({
+    id: "this_weekend",
+    format: "ddd, h a",
+    enabled: opts => opts.day < 5 && opts.includeWeekend,
+    when: (time, timeOfDay) => time.day(6).hour(timeOfDay).minute(0),
+    icon: 'bed'
+  }),
+  buildTimeframe({
+    id: "next_week",
+    format: "ddd, h a",
+    enabled: opts => opts.day !== 7,
+    when: (time, timeOfDay) => time.add(1, 'week').day(1).hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "two_weeks",
+    format: "MMM D",
+    when: (time, timeOfDay) => time.add(2, 'week').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "next_month",
+    format: "MMM D",
+    enabled: opts => opts.now.date() !== moment().endOf("month").date(),
+    when: (time, timeOfDay) => time.add(1, 'month').startOf('month').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "three_months",
+    format: "MMM D",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(3, 'month').startOf('month').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "six_months",
+    format: "MMM D",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(6, 'month').startOf('month').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "one_year",
+    format: "MMM D",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(1, 'year').startOf('day').hour(timeOfDay).minute(0),
+    icon: 'briefcase'
+  }),
+  buildTimeframe({
+    id: "forever",
+    enabled: opts => opts.includeFarFuture,
+    when: (time, timeOfDay) => time.add(1000, 'year').hour(timeOfDay).minute(0),
+    icon: 'gavel',
+    displayWhen: false
+  }),
+  buildTimeframe({
+    id: "pick_date_and_time",
+    icon: 'calendar-plus-o'
+  }),
+  buildTimeframe({
+    id: "set_based_on_last_post",
+    enabled: opts => opts.includeBasedOnLastPost,
+    icon: 'clock-o'
+  }),
+];
+
+let _timeframeById = null;
+export function timeframeDetails(id) {
+  if (!_timeframeById) {
+    _timeframeById = {};
+    TIMEFRAMES.forEach(t => _timeframeById[t.id] = t);
+  }
+  return _timeframeById[id];
+}
+
+export const FORMAT = "YYYY-MM-DD HH:mm";
+
+export default ComboBoxComponent.extend(DatetimeMixin, {
+  classNames: ["future-date-input-selector"],
+  isCustom: Ember.computed.equal("value", "pick_date_and_time"),
+  clearable: true,
+  rowComponent: "future-date-input-selector/future-date-input-selector-row",
+  headerComponent: "future-date-input-selector/future-date-input-selector-header",
+
+  @computed
+  content() {
+    let now = moment();
+    let opts = {
+      now,
+      day: now.day(),
+      includeWeekend: this.get('includeWeekend'),
+      includeFarFuture: this.get('includeFarFuture'),
+      includeBasedOnLastPost: this.get("statusType") === CLOSE_STATUS_TYPE,
+      canScheduleToday: (24 - now.hour()) > 6,
+    };
+
+    return TIMEFRAMES.filter(tf => tf.enabled(opts)).map(tf => {
+      return {
+        id: tf.id,
+        name: I18n.t(`topic.auto_update_input.${tf.id}`)
+      };
+    });
+  },
+
+  @observes("value")
+  _updateInput() {
+    if (this.get("isCustom")) return;
+    let input = null;
+    const { time } = this.get("updateAt");
+
+    if (time && !Ember.isEmpty(this.get("value"))) {
+      input = time.format(FORMAT);
+    }
+
+    this.set("input", input);
+  },
+
+  @computed("value")
+  updateAt(value) {
+    return this._updateAt(value);
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6 b/app/assets/javascripts/select-box-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6
new file mode 100644
index 0000000000..e62e127625
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/future-date-input-selector/future-date-input-selector-header.js.es6
@@ -0,0 +1,14 @@
+import ComboBoxHeaderComponent from "select-box-kit/components/combo-box/combo-box-header";
+import DatetimeMixin from "select-box-kit/components/future-date-input-selector/mixin";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default ComboBoxHeaderComponent.extend(DatetimeMixin, {
+  layoutName: "select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-header",
+  classNames: "future-date-input-selector-header",
+
+  @computed("selectedContent.firstObject.value")
+  datetime(value) { return this._computeDatetimeForValue(value); },
+
+  @computed("selectedContent.firstObject.value")
+  icon(value) { return this._computeIconForValue(value); }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6 b/app/assets/javascripts/select-box-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6
new file mode 100644
index 0000000000..be35212a76
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/future-date-input-selector/future-date-input-selector-row.js.es6
@@ -0,0 +1,14 @@
+import SelectBoxKitRowComponent from "select-box-kit/components/select-box-kit/select-box-kit-row";
+import DatetimeMixin from "select-box-kit/components/future-date-input-selector/mixin";
+import computed from "ember-addons/ember-computed-decorators";
+
+export default SelectBoxKitRowComponent.extend(DatetimeMixin, {
+  layoutName: "select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-row",
+  classNames: "future-date-input-selector-row",
+
+  @computed("content.value")
+  datetime(value) { return this._computeDatetimeForValue(value); },
+
+  @computed("content.value")
+  icon(value) { return this._computeIconForValue(value); }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/future-date-input-selector/mixin.js.es6 b/app/assets/javascripts/select-box-kit/components/future-date-input-selector/mixin.js.es6
new file mode 100644
index 0000000000..d69b38a566
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/future-date-input-selector/mixin.js.es6
@@ -0,0 +1,46 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import { CLOSE_STATUS_TYPE } from 'discourse/controllers/edit-topic-timer';
+import { timeframeDetails } from 'select-box-kit/components/future-date-input-selector';
+
+export default Ember.Mixin.create({
+  _computeIconForValue(value) {
+    let {icon} = this._updateAt(value);
+
+    if (icon) {
+      return icon.split(",").map(i => iconHTML(i)).join(" ");
+    }
+
+    return null;
+  },
+
+  _computeDatetimeForValue(value) {
+    if (Ember.isNone(value)) {
+      return null;
+    }
+
+    let {time} = this._updateAt(value);
+    if (time) {
+
+      let details = timeframeDetails(value);
+      if (!details.displayWhen) {
+        time = null;
+      }
+      if (time && details.format) {
+        return time.format(details.format);
+      }
+    }
+    return time;
+  },
+
+  _updateAt(selection) {
+    let details = timeframeDetails(selection);
+    if (details) {
+      return {
+        time: details.when(moment(), this.get('statusType') !== CLOSE_STATUS_TYPE ? 8 : 18),
+        icon: details.icon
+      };
+    }
+
+    return { time: moment() };
+  },
+});
diff --git a/app/assets/javascripts/select-box-kit/components/group-notifications-button.js.es6 b/app/assets/javascripts/select-box-kit/components/group-notifications-button.js.es6
new file mode 100644
index 0000000000..81477d2e47
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/group-notifications-button.js.es6
@@ -0,0 +1,14 @@
+import NotificationOptionsComponent from "select-box-kit/components/notifications-button";
+
+export default NotificationOptionsComponent.extend({
+  classNames: ["group-notifications-button"],
+  value: Ember.computed.alias("group.group_user.notification_level"),
+  i18nPrefix: "groups.notifications",
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+      this.get("group").setNotification(value, this.get("user.id"));
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/multi-combo-box.js.es6 b/app/assets/javascripts/select-box-kit/components/multi-combo-box.js.es6
new file mode 100644
index 0000000000..6ce70b4e8e
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/multi-combo-box.js.es6
@@ -0,0 +1,99 @@
+// Experimental
+import SelectBoxKitComponent from "select-box-kit/components/select-box-kit";
+import computed from "ember-addons/ember-computed-decorators";
+const { get, isNone } = Ember;
+
+export default SelectBoxKitComponent.extend({
+  classNames: "multi-combobox",
+  headerComponent: "multi-combo-box/multi-combo-box-header",
+  filterComponent: null,
+  headerText: "select_box.default_header_text",
+  value: [],
+  allowAny: true,
+
+  @computed("filter")
+  templateForCreateRow() {
+    return (rowComponent) => {
+      return `Create: ${rowComponent.get("content.name")}`;
+    };
+  },
+
+  keyDown(event) {
+    const keyCode = event.keyCode || event.which;
+    const $filterInput = this.$filterInput();
+
+    if (keyCode === 8) {
+      let $lastSelectedValue = $(this.$(".choices .selected-name").last());
+
+      if ($lastSelectedValue.is(":focus") || $(document.activeElement).is($lastSelectedValue)) {
+        this.send("onDeselect", $lastSelectedValue.data("value"));
+        $filterInput.focus();
+        return;
+      }
+
+      if ($filterInput.val() === "") {
+        if ($filterInput.is(":focus")) {
+          if ($lastSelectedValue.length > 0) {
+            $lastSelectedValue.focus();
+          }
+        } else {
+          if ($lastSelectedValue.length > 0) {
+            $lastSelectedValue.focus();
+          } else {
+            $filterInput.focus();
+          }
+        }
+      }
+    } else {
+      $filterInput.focus();
+      this._super(event);
+    }
+  },
+
+  @computed("none")
+  computedNone(none) {
+    if (!isNone(none)) {
+      this.set("none", { name: I18n.t(none), value: "" });
+    }
+  },
+
+  @computed("value.[]")
+  computedValue(value) {
+    return value.map(v => this._castInteger(v));
+  },
+
+  @computed("computedValue.[]", "computedContent.[]")
+  selectedContent(computedValue, computedContent) {
+    const contents = [];
+    computedValue.forEach(cv => {
+      contents.push(computedContent.findBy("value", cv));
+    });
+    return contents;
+  },
+
+  filterFunction(content) {
+    return (selectBox, computedValue) => {
+      const filter = selectBox.get("filter").toLowerCase();
+      return _.filter(content, c => {
+        return !computedValue.includes(get(c, "value")) &&
+          get(c, "name").toLowerCase().indexOf(filter) > -1;
+      });
+    };
+  },
+
+  actions: {
+    onClearSelection() {
+      this.send("onSelect", []);
+    },
+
+    onSelect(value) {
+      this.setProperties({ filter: "", highlightedValue: null });
+      this.get("value").pushObject(value);
+    },
+
+    onDeselect(value) {
+      this.defaultOnDeselect(value);
+      this.get("value").removeObject(value);
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/multi-combo-box/multi-combo-box-header.js.es6 b/app/assets/javascripts/select-box-kit/components/multi-combo-box/multi-combo-box-header.js.es6
new file mode 100644
index 0000000000..0b5f302e7b
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/multi-combo-box/multi-combo-box-header.js.es6
@@ -0,0 +1,40 @@
+import { on } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+import SelectBoxKitHeaderComponent from "select-box-kit/components/select-box-kit/select-box-kit-header";
+
+export default SelectBoxKitHeaderComponent.extend({
+  attributeBindings: ["names:data-name"],
+  classNames: "multi-combobox-header",
+  layoutName: "select-box-kit/templates/components/multi-combo-box/multi-combo-box-header",
+
+  @computed("filter", "selectedContent.[]", "isFocused", "selectBoxIsExpanded")
+  shouldDisplayFilterPlaceholder(filter, selectedContent, isFocused) {
+    if (Ember.isEmpty(selectedContent)) {
+      if (filter.length > 0) { return false; }
+      if (isFocused === true) { return false; }
+      return true;
+    }
+
+    return false;
+  },
+
+  @on("didRender")
+  _positionFilter() {
+    this.$(".filter").width(0);
+
+    const leftHeaderOffset = this.$().offset().left;
+    const leftFilterOffset = this.$(".filter").offset().left;
+    const offset = leftFilterOffset - leftHeaderOffset;
+    const width = this.$().outerWidth(false);
+    const availableSpace = width - offset;
+
+    // TODO: avoid magic number 8
+    // TODO: make sure the filter doesn’t end up being very small
+    this.$(".filter").width(availableSpace - 8);
+  },
+
+  @computed("selectedContent.[]")
+  names(selectedContent) {
+    return selectedContent.map(sc => sc.name).join(",");
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/notifications-button.js.es6 b/app/assets/javascripts/select-box-kit/components/notifications-button.js.es6
new file mode 100644
index 0000000000..88a1e71e98
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/notifications-button.js.es6
@@ -0,0 +1,40 @@
+import DropdownSelectBoxComponent from "select-box-kit/components/dropdown-select-box";
+import { default as computed, on } from "ember-addons/ember-computed-decorators";
+import { buttonDetails } from "discourse/lib/notification-levels";
+import { allLevels } from "discourse/lib/notification-levels";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: "notifications-button",
+  nameProperty: "key",
+  fullWidthOnMobile: true,
+  content: allLevels,
+  collectionHeight: "auto",
+  value: Ember.computed.alias("notificationLevel"),
+  castInteger: true,
+  autofilterable: false,
+  filterable: false,
+  rowComponent: "notifications-button/notifications-button-row",
+  headerComponent: "notifications-button/notifications-button-header",
+
+  i18nPrefix: "",
+  i18nPostfix: "",
+  showFullTitle: true,
+
+  @on("didReceiveAttrs", "didUpdateAttrs")
+  _setComponentOptions() {
+    this.set("headerComponentOptions", Ember.Object.create({
+      i18nPrefix: this.get("i18nPrefix"),
+      showFullTitle: this.get("showFullTitle"),
+    }));
+
+    this.set("rowComponentOptions", Ember.Object.create({
+      i18nPrefix: this.get("i18nPrefix"),
+      i18nPostfix: this.get("i18nPostfix")
+    }));
+  },
+
+  @computed("computedValue")
+  selectedDetails(computedValue) {
+    return buttonDetails(computedValue);
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/notifications-button/notifications-button-header.js.es6 b/app/assets/javascripts/select-box-kit/components/notifications-button/notifications-button-header.js.es6
new file mode 100644
index 0000000000..96b1553492
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/notifications-button/notifications-button-header.js.es6
@@ -0,0 +1,24 @@
+import DropdownSelectBoxHeaderComponent from "select-box-kit/components/dropdown-select-box/dropdown-select-box-header";
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import { buttonDetails } from "discourse/lib/notification-levels";
+
+export default DropdownSelectBoxHeaderComponent.extend({
+  classNames: "notifications-button-header",
+
+  i18nPrefix: Ember.computed.alias("options.i18nPrefix"),
+  shouldDisplaySelectedName: Ember.computed.alias("options.showFullTitle"),
+
+  @computed("_selectedDetails.icon", "_selectedDetails.key")
+  icon(icon, key) {
+    return iconHTML(icon, {class: key}).htmlSafe();
+  },
+
+  @computed("_selectedDetails.key", "i18nPrefix")
+  selectedName(key, prefix) {
+    return I18n.t(`${prefix}.${key}.title`);
+  },
+
+  @computed("selectedContent.firstObject.value")
+  _selectedDetails(value) { return buttonDetails(value); }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/notifications-button/notifications-button-row.js.es6 b/app/assets/javascripts/select-box-kit/components/notifications-button/notifications-button-row.js.es6
new file mode 100644
index 0000000000..6f3f257b43
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/notifications-button/notifications-button-row.js.es6
@@ -0,0 +1,37 @@
+import DropdownSelectBoxRoxComponent from "select-box-kit/components/dropdown-select-box/dropdown-select-box-row";
+import { buttonDetails } from "discourse/lib/notification-levels";
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default DropdownSelectBoxRoxComponent.extend({
+  classNames: "notifications-button-row",
+
+  i18nPrefix: Ember.computed.alias("options.i18nPrefix"),
+  i18nPostfix: Ember.computed.alias("options.i18nPostfix"),
+
+  @computed("content.value", "i18nPrefix")
+  title(value, prefix) {
+    const key = buttonDetails(value).key;
+    return I18n.t(`${prefix}.${key}.title`);
+  },
+
+  @computed("content.name", "content.originalContent.icon")
+  icon(contentName, icon) {
+    return iconHTML(icon, { class: contentName.dasherize() });
+  },
+
+  @computed("_start")
+  description(_start) {
+    return Handlebars.escapeExpression(I18n.t(`${_start}.description`));
+  },
+
+  @computed("_start")
+  name(_start) {
+    return Handlebars.escapeExpression(I18n.t(`${_start}.title`));
+  },
+
+  @computed("i18nPrefix", "i18nPostfix", "content.name")
+  _start(prefix, postfix, contentName) {
+    return `${prefix}.${contentName}${postfix}`;
+  },
+});
diff --git a/app/assets/javascripts/discourse/components/pinned-button.js.es6 b/app/assets/javascripts/select-box-kit/components/pinned-button.js.es6
similarity index 75%
rename from app/assets/javascripts/discourse/components/pinned-button.js.es6
rename to app/assets/javascripts/select-box-kit/components/pinned-button.js.es6
index 3d287deb2a..c36d53c236 100644
--- a/app/assets/javascripts/discourse/components/pinned-button.js.es6
+++ b/app/assets/javascripts/select-box-kit/components/pinned-button.js.es6
@@ -2,10 +2,9 @@ import computed from "ember-addons/ember-computed-decorators";
 
 export default Ember.Component.extend({
   descriptionKey: "help",
-
-  classNames: ["pinned-button"],
-
-  classNameBindings: ["hidden:is-hidden"],
+  classNames: "pinned-button",
+  classNameBindings: ["isHidden"],
+  layoutName: "select-box-kit/templates/components/pinned-button",
 
   @computed("topic.pinned_globally", "topic.pinned")
   reasonText(pinnedGlobally, pinned) {
@@ -16,7 +15,7 @@ export default Ember.Component.extend({
   },
 
   @computed("topic.pinned", "topic.deleted", "topic.unpinned")
-  hidden(pinned, deleted, unpinned) {
+  isHidden(pinned, deleted, unpinned) {
     return deleted || (!pinned && !unpinned);
   }
 });
diff --git a/app/assets/javascripts/select-box-kit/components/pinned-options.js.es6 b/app/assets/javascripts/select-box-kit/components/pinned-options.js.es6
new file mode 100644
index 0000000000..c1be2e6ab3
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/pinned-options.js.es6
@@ -0,0 +1,64 @@
+import DropdownSelectBoxComponent from "select-box-kit/components/dropdown-select-box";
+import computed from "ember-addons/ember-computed-decorators";
+import { observes } from "ember-addons/ember-computed-decorators";
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default DropdownSelectBoxComponent.extend({
+  classNames: "pinned-options",
+
+  headerComponent: "pinned-options/pinned-options-header",
+
+  @on("didReceiveAttrs")
+  _setComponentOptions() {
+    this.set("headerComponentOptions", Ember.Object.create({
+      pinned: this.get("topic.pinned"),
+      pinnedGlobally: this.get("topic.pinned_globally")
+    }));
+  },
+
+  @computed("topic.pinned")
+  value(pinned) {
+    return pinned ? "pinned" : "unpinned";
+  },
+
+  @observes("topic.pinned")
+  _pinStateChanged() {
+    this.set("value", this.get("topic.pinned") ? "pinned" : "unpinned");
+    this._setComponentOptions();
+  },
+
+  @computed("topic.pinned_globally")
+  content(pinnedGlobally) {
+    const globally = pinnedGlobally ? "_globally" : "";
+
+    return [
+      {
+        id: "pinned",
+        name: I18n.t("topic_statuses.pinned" + globally + ".title"),
+        description: I18n.t('topic_statuses.pinned' + globally + '.help'),
+        icon: "thumb-tack"
+      },
+      {
+        id: "unpinned",
+        name: I18n.t("topic_statuses.unpinned.title"),
+        icon: "thumb-tack",
+        description: I18n.t('topic_statuses.unpinned.help'),
+        iconClass: "unpinned"
+      }
+    ];
+  },
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+
+      const topic = this.get("topic");
+
+      if (value === "unpinned") {
+        topic.clearPin();
+      } else {
+        topic.rePin();
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/pinned-options/pinned-options-header.js.es6 b/app/assets/javascripts/select-box-kit/components/pinned-options/pinned-options-header.js.es6
new file mode 100644
index 0000000000..3f83e8bffd
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/pinned-options/pinned-options-header.js.es6
@@ -0,0 +1,30 @@
+import DropdownSelectBoxHeaderComponent from "select-box-kit/components/dropdown-select-box/dropdown-select-box-header";
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default DropdownSelectBoxHeaderComponent.extend({
+  classNames: "pinned-options-header",
+
+  pinnedGlobally: Ember.computed.alias("options.pinnedGlobally"),
+  pinned: Ember.computed.alias("options.pinned"),
+
+  @computed("pinned", "pinnedGlobally")
+  icon(pinned, pinnedGlobally) {
+    const globally = pinnedGlobally ? "_globally" : "";
+    const state = pinned ? `pinned${globally}` : "unpinned";
+
+    return iconHTML(
+      "thumb-tack",
+      { class: (state === "unpinned" ? "unpinned" : null) }
+    );
+  },
+
+  @computed("pinned", "pinnedGlobally")
+  selectedName(pinned, pinnedGlobally) {
+    const globally = pinnedGlobally ? "_globally" : "";
+    const state = pinned ? `pinned${globally}` : "unpinned";
+    const title = I18n.t(`topic_statuses.${state}.title`);
+
+    return `${title}${iconHTML("caret-down")}`.htmlSafe();
+  },
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit.js.es6
new file mode 100644
index 0000000000..486b39bd70
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit.js.es6
@@ -0,0 +1,494 @@
+const { get, isNone, isEmpty, isPresent } = Ember;
+import { on, observes } from "ember-addons/ember-computed-decorators";
+import computed from "ember-addons/ember-computed-decorators";
+import UtilsMixin from "select-box-kit/mixins/utils";
+import DomHelpersMixin from "select-box-kit/mixins/dom-helpers";
+import KeyboardMixin from "select-box-kit/mixins/keyboard";
+
+export default Ember.Component.extend(UtilsMixin, DomHelpersMixin, KeyboardMixin, {
+  layoutName: "select-box-kit/templates/components/select-box-kit",
+  classNames: "select-box-kit",
+  classNameBindings: [
+    "isFocused",
+    "isExpanded",
+    "isDisabled",
+    "isHidden",
+    "isAbove",
+    "isBelow",
+    "isLeftAligned",
+    "isRightAligned"
+  ],
+  isDisabled: false,
+  isExpanded: false,
+  isFocused: false,
+  isHidden: false,
+  renderBody: false,
+  tabindex: 0,
+  scrollableParentSelector: ".modal-body",
+  value: null,
+  none: null,
+  highlightedValue: null,
+  noContentLabel: "select_box.no_content",
+  valueAttribute: "id",
+  nameProperty: "name",
+  autoFilterable: false,
+  filterable: false,
+  filter: "",
+  filterPlaceholder: "select_box.filter_placeholder",
+  filterIcon: "search",
+  rowComponent: "select-box-kit/select-box-kit-row",
+  noneRowComponent: "select-box-kit/select-box-kit-none-row",
+  createRowComponent: "select-box-kit/select-box-kit-create-row",
+  filterComponent: "select-box-kit/select-box-kit-filter",
+  headerComponent: "select-box-kit/select-box-kit-header",
+  collectionComponent: "select-box-kit/select-box-kit-collection",
+  collectionHeight: 200,
+  verticalOffset: 0,
+  horizontalOffset: 0,
+  fullWidthOnMobile: false,
+  castInteger: false,
+  allowAny: false,
+  allowValueMutation: true,
+  autoSelectFirst: true,
+
+  init() {
+    this._super();
+
+    if ($(window).outerWidth(false) <= 420) {
+      this.setProperties({ filterable: false, autoFilterable: false });
+    }
+
+    this._previousScrollParentOverflow = "auto";
+    this._previousCSSContext = {};
+  },
+
+  click(event) {
+    event.stopPropagation();
+  },
+
+  close() {
+    this.setProperties({ isExpanded: false, isFocused: false });
+  },
+
+  focus() {
+    Ember.run.schedule("afterRender", () => this.$offscreenInput().select() );
+  },
+
+  blur() {
+    Ember.run.schedule("afterRender", () => this.$offscreenInput().blur() );
+  },
+
+  clickOutside(event) {
+    if ($(event.target).parents(".select-box-kit").length === 1) {
+      this.close();
+      return;
+    }
+
+    if (this.get("isExpanded") === true) {
+      this.set("isExpanded", false);
+      this.focus();
+    } else {
+      this.close();
+    }
+  },
+
+  createFunction(input) {
+    return (selectedBox) => {
+      const formatedContent = selectedBox.formatContent(input);
+      formatedContent.meta.generated = true;
+      return formatedContent;
+    };
+  },
+
+  filterFunction(content) {
+    return selectBox => {
+      const filter = selectBox.get("filter").toLowerCase();
+      return _.filter(content, c => {
+        return get(c, "name").toLowerCase().indexOf(filter) > -1;
+      });
+    };
+  },
+
+  nameForContent(content) {
+    if (isNone(content)) {
+      return null;
+    }
+
+    if (typeof content === "object") {
+      return get(content, this.get("nameProperty"));
+    }
+
+    return content;
+  },
+
+  valueForContent(content) {
+    switch (typeof content) {
+    case "string":
+    case "number":
+      return this._castInteger(content);
+    default:
+      return this._castInteger(get(content, this.get("valueAttribute")));
+    }
+  },
+
+  formatContent(content) {
+    return {
+      value: this.valueForContent(content),
+      name: this.nameForContent(content),
+      originalContent: content,
+      meta: { generated: false }
+    };
+  },
+
+  formatContents(contents) {
+    return contents.map(content => this.formatContent(content));
+  },
+
+  @computed("filter", "filterable", "autoFilterable")
+  computedFilterable(filter, filterable, autoFilterable) {
+    if (filterable === true) {
+      return true;
+    }
+
+    if (filter.length > 0 && autoFilterable === true) {
+      return true;
+    }
+
+    return false;
+  },
+
+  @computed("computedFilterable", "filter", "allowAny")
+  shouldDisplayCreateRow(computedFilterable, filter, allow) {
+    return computedFilterable === true && filter.length > 0 && allow === true;
+  },
+
+  @computed("filter", "allowAny")
+  createRowContent(filter, allow) {
+    if (allow === true) {
+      return Ember.Object.create({ value: filter, name: filter });
+    }
+  },
+
+  @computed("content.[]")
+  computedContent(content) {
+    this._mutateValue();
+    return this.formatContents(content || []);
+  },
+
+  @computed("value", "none", "computedContent.firstObject.value")
+  computedValue(value, none, firstContentValue) {
+    if (isNone(value) && isNone(none) && this.get("autoSelectFirst") === true) {
+      return this._castInteger(firstContentValue);
+    }
+
+    return this._castInteger(value);
+  },
+
+  @computed
+  templateForRow() { return () => null; },
+
+  @computed
+  templateForNoneRow() { return () => null; },
+
+  @computed
+  templateForCreateRow() { return () => null; },
+
+  @computed("none")
+  computedNone(none) {
+    if (isNone(none)) {
+      return null;
+    }
+
+    switch (typeof none) {
+    case "string":
+      return Ember.Object.create({ name: I18n.t(none), value: "" });
+    default:
+      return this.formatContent(none);
+    }
+  },
+
+  @computed("computedValue", "computedContent.[]")
+  selectedContent(computedValue, computedContent) {
+    if (isNone(computedValue)) {
+      return [];
+    }
+
+    return [ computedContent.findBy("value", this._castInteger(computedValue)) ];
+  },
+
+  @on("didRender")
+  _configureSelectBoxDOM() {
+    if (this.get("isExpanded") === true) {
+      Ember.run.schedule("afterRender", () => {
+        this.$collection().css("max-height", this.get("collectionHeight"));
+        this._applyDirection();
+        this._positionWrapper();
+      });
+    }
+  },
+
+  @on("willDestroyElement")
+  _cleanHandlers() {
+    $(window).off("resize.select-box-kit");
+    this._removeFixedPosition();
+  },
+
+  @on("didInsertElement")
+  _setupResizeListener() {
+    $(window).on("resize.select-box-kit", () => this.set("isExpanded", false) );
+  },
+
+  @observes("filter", "filteredContent.[]", "shouldDisplayCreateRow")
+  _setHighlightedValue() {
+    const filteredContent = this.get("filteredContent");
+    const display = this.get("shouldDisplayCreateRow");
+    const none = this.get("computedNone");
+
+    if (isNone(this.get("highlightedValue")) && !isEmpty(filteredContent)) {
+      this.set("highlightedValue", get(filteredContent, "firstObject.value"));
+      return;
+    }
+
+    if (display === true && isEmpty(filteredContent)) {
+      this.set("highlightedValue", this.get("filter"));
+    }
+    else if (!isEmpty(filteredContent)) {
+      this.set("highlightedValue", get(filteredContent, "firstObject.value"));
+    }
+    else if (isEmpty(filteredContent) && isPresent(none) && display === false) {
+      this.set("highlightedValue", get(none, "value"));
+    }
+  },
+
+  @observes("isExpanded")
+  _isExpandedChanged() {
+    if (this.get("isExpanded") === true) {
+      this._applyFixedPosition();
+
+      this.setProperties({
+        highlightedValue: this.get("computedValue"),
+        renderBody: true,
+        isFocused: true
+      });
+    } else {
+      this._removeFixedPosition();
+    }
+  },
+
+  @computed("filter", "computedFilterable", "computedContent.[]", "computedValue.[]")
+  filteredContent(filter, computedFilterable, computedContent, computedValue) {
+    if (computedFilterable === false) { return computedContent; }
+    return this.filterFunction(computedContent)(this, computedValue);
+  },
+
+  @computed("scrollableParentSelector")
+  scrollableParent(scrollableParentSelector) {
+    return this.$().parents(scrollableParentSelector).first();
+  },
+
+  actions: {
+    onToggle() {
+      this.toggleProperty("isExpanded");
+
+      if (this.get("isExpanded") === true) { this.focus(); }
+    },
+
+    onCreateContent(input) {
+      const content = this.createFunction(input)(this);
+      this.get("computedContent").pushObject(content);
+      this.send("onSelect", content.value);
+    },
+
+    onFilterChange(filter) {
+      this.set("filter", filter);
+    },
+
+    onHighlight(value) {
+      this.set("highlightedValue", value);
+    },
+
+    onClearSelection() {
+      this.send("onSelect", null);
+    },
+
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+      this.set("value", value);
+    },
+
+    onDeselect() {
+      this.defaultOnDeselect();
+      this.set("value", null);
+    }
+  },
+
+  defaultOnSelect(value) {
+    if (value === "") { value = null; }
+
+    this.setProperties({
+      highlightedValue: null,
+      isExpanded: false,
+      filter: ""
+    });
+
+    this.focus();
+
+    return value;
+  },
+
+  defaultOnDeselect(value) {
+    const content = this.get("computedContent").findBy("value", value);
+    if (!isNone(content) && get(content, "meta.generated") === true) {
+      this.get("computedContent").removeObject(content);
+    }
+  },
+
+  _applyDirection() {
+    let options = { left: "auto", bottom: "auto", top: "auto" };
+
+    const dHeader = $(".d-header")[0];
+    const dHeaderBounds = dHeader ? dHeader.getBoundingClientRect() : {top: 0, height: 0};
+    const dHeaderHeight = dHeaderBounds.top + dHeaderBounds.height;
+    const headerHeight = this.$header().outerHeight(false);
+    const headerWidth = this.$header().outerWidth(false);
+    const bodyHeight = this.$body().outerHeight(false);
+    const windowWidth = $(window).width();
+    const windowHeight = $(window).height();
+    const boundingRect = this.get("element").getBoundingClientRect();
+    const offsetTop = boundingRect.top;
+    const offsetBottom = boundingRect.bottom;
+
+    if (this.get("fullWidthOnMobile") && windowWidth <= 420) {
+      const margin = 10;
+      const relativeLeft = this.$().offset().left - $(window).scrollLeft();
+      options.left = margin - relativeLeft;
+      options.width = windowWidth - margin * 2;
+      options.maxWidth = options.minWidth = "unset";
+    } else {
+      const bodyWidth = this.$body().outerWidth(false);
+
+      if ($("html").css("direction") === "rtl") {
+        const horizontalSpacing = boundingRect.right;
+        const hasHorizontalSpace = horizontalSpacing - (this.get("horizontalOffset") + bodyWidth) > 0;
+        if (hasHorizontalSpace) {
+          this.setProperties({ isLeftAligned: true, isRightAligned: false });
+          options.left = bodyWidth + this.get("horizontalOffset");
+        } else {
+          this.setProperties({ isLeftAligned: false, isRightAligned: true });
+          options.right = - (bodyWidth - headerWidth + this.get("horizontalOffset"));
+        }
+      } else {
+        const horizontalSpacing = boundingRect.left;
+        const hasHorizontalSpace = (windowWidth - (this.get("horizontalOffset") + horizontalSpacing + bodyWidth) > 0);
+        if (hasHorizontalSpace) {
+          this.setProperties({ isLeftAligned: true, isRightAligned: false });
+          options.left = this.get("horizontalOffset");
+        } else {
+          this.setProperties({ isLeftAligned: false, isRightAligned: true });
+          options.right = this.get("horizontalOffset");
+        }
+      }
+    }
+
+    const componentHeight = this.get("verticalOffset") + bodyHeight + headerHeight;
+    const hasBelowSpace = windowHeight - offsetBottom - componentHeight > 0;
+    const hasAboveSpace = offsetTop - componentHeight - dHeaderHeight > 0;
+    if (hasBelowSpace || (!hasBelowSpace && !hasAboveSpace)) {
+      this.setProperties({ isBelow: true, isAbove: false });
+      options.top = headerHeight + this.get("verticalOffset");
+    } else {
+      this.setProperties({ isBelow: false, isAbove: true });
+      options.bottom = headerHeight + this.get("verticalOffset");
+    }
+
+    this.$body().css(options);
+  },
+
+  _applyFixedPosition() {
+    const width = this.$().outerWidth(false);
+    const height = this.$header().outerHeight(false);
+
+    if (this.get("scrollableParent").length === 0) { return; }
+
+    const $placeholder = $(`<div class='select-box-kit-fixed-placeholder-${this.elementId}'></div>`);
+
+    this._previousScrollParentOverflow = this.get("scrollableParent").css("overflow");
+    this.get("scrollableParent").css({ overflow: "hidden" });
+
+    this._previousCSSContext = {
+      minWidth: this.$().css("min-width"),
+      maxWidth: this.$().css("max-width")
+    };
+
+    const componentStyles = {
+      position: "fixed",
+      "margin-top": -this.get("scrollableParent").scrollTop(),
+      width,
+      minWidth: "unset",
+      maxWidth: "unset"
+    };
+
+    if ($("html").css("direction") === "rtl") {
+      componentStyles.marginRight = -width;
+    } else {
+      componentStyles.marginLeft = -width;
+    }
+
+    $placeholder.css({ display: "inline-block", width, height, "vertical-align": "middle" });
+
+    this.$().before($placeholder).css(componentStyles);
+  },
+
+  _removeFixedPosition() {
+    if (this.get("scrollableParent").length === 0) {
+      return;
+    }
+
+    $(`.select-box-kit-fixed-placeholder-${this.elementId}`).remove();
+
+    const css = _.extend(
+      this._previousCSSContext,
+      {
+        top: "auto",
+        left: "auto",
+        "margin-left": "auto",
+        "margin-right": "auto",
+        "margin-top": "auto",
+        position: "relative"
+      }
+    );
+    this.$().css(css);
+
+    this.get("scrollableParent").css({
+      overflow: this._previousScrollParentOverflow
+    });
+  },
+
+  _positionWrapper() {
+    const headerHeight = this.$header().outerHeight(false);
+
+    this.$(".select-box-kit-wrapper").css({
+      width: this.$().width(),
+      height: headerHeight + this.$body().outerHeight(false)
+    });
+  },
+
+  @on("didReceiveAttrs")
+  _mutateValue() {
+    if (this.get("allowValueMutation") !== true) {
+      return;
+    }
+
+    const none = isNone(this.get("none"));
+    const emptyValue = isEmpty(this.get("value"));
+
+    if (none && emptyValue) {
+      Ember.run.scheduleOnce("sync", () => {
+        if (!isEmpty(this.get("computedContent"))) {
+          const firstValue = this.get("computedContent.firstObject.value");
+          this.set("value", firstValue);
+        }
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-collection.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-collection.js.es6
new file mode 100644
index 0000000000..ca378f5ef9
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-collection.js.es6
@@ -0,0 +1,5 @@
+export default Ember.Component.extend({
+  layoutName: "select-box-kit/templates/components/select-box-kit/select-box-kit-collection",
+  classNames: "select-box-kit-collection",
+  tagName: "ul"
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-create-row.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-create-row.js.es6
new file mode 100644
index 0000000000..fd686080ec
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-create-row.js.es6
@@ -0,0 +1,10 @@
+import SelectBoxKitRowComponent from "select-box-kit/components/select-box-kit/select-box-kit-row";
+
+export default SelectBoxKitRowComponent.extend({
+  layoutName: "select-box-kit/templates/components/select-box-kit/select-box-kit-row",
+  classNames: "create",
+
+  click() {
+    this.sendAction("onCreateContent", this.get("content.name"));
+  },
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-filter.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-filter.js.es6
new file mode 100644
index 0000000000..9717b59f78
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-filter.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+  layoutName: "select-box-kit/templates/components/select-box-kit/select-box-kit-filter",
+  classNames: "select-box-kit-filter",
+  classNameBindings: ["isFocused", "isHidden"],
+  isHidden: Ember.computed.not("filterable"),
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-header.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-header.js.es6
new file mode 100644
index 0000000000..b7797571ae
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-header.js.es6
@@ -0,0 +1,28 @@
+import computed from 'ember-addons/ember-computed-decorators';
+
+export default Ember.Component.extend({
+  layoutName: "select-box-kit/templates/components/select-box-kit/select-box-kit-header",
+  classNames: "select-box-kit-header",
+  classNameBindings: ["isFocused"],
+  attributeBindings: ["selectedName:data-name"],
+  shouldDisplaySelectedName: true,
+
+  @computed("options.shouldDisplaySelectedName")
+  shouldDisplaySelectedName(should) {
+    if (Ember.isNone(should)) { return true; }
+    return should;
+  },
+
+  @computed("options.selectedName", "selectedContent.firstObject.name")
+  selectedName(optionsSelectedName, firstSelectedContentName) {
+    if (Ember.isNone(optionsSelectedName)) {
+      return firstSelectedContentName;
+    }
+    return optionsSelectedName;
+  },
+
+  @computed("options.icon")
+  icon(optionsIcon) { return optionsIcon; },
+
+  click() { this.sendAction("onToggle"); }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-none-row.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-none-row.js.es6
new file mode 100644
index 0000000000..fbc07b312c
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-none-row.js.es6
@@ -0,0 +1,10 @@
+import SelectBoxKitRowComponent from "select-box-kit/components/select-box-kit/select-box-kit-row";
+
+export default SelectBoxKitRowComponent.extend({
+  layoutName: "select-box-kit/templates/components/select-box-kit/select-box-kit-row",
+  classNames: "none",
+
+  click() {
+    this.sendAction("onClearSelection");
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-row.js.es6 b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-row.js.es6
new file mode 100644
index 0000000000..efdb299a56
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/select-box-kit/select-box-kit-row.js.es6
@@ -0,0 +1,59 @@
+import { iconHTML } from 'discourse-common/lib/icon-library';
+import { on } from 'ember-addons/ember-computed-decorators';
+import computed from 'ember-addons/ember-computed-decorators';
+const { run, isPresent } = Ember;
+import UtilsMixin from "select-box-kit/mixins/utils";
+
+export default Ember.Component.extend(UtilsMixin, {
+  layoutName: "select-box-kit/templates/components/select-box-kit/select-box-kit-row",
+  classNames: "select-box-kit-row",
+  tagName: "li",
+  attributeBindings: [
+    "title",
+    "content.value:data-value",
+    "content.name:data-name"
+  ],
+  classNameBindings: ["isHighlighted", "isSelected"],
+
+  title: Ember.computed.alias("content.name"),
+
+  @computed("templateForRow")
+  template(templateForRow) { return templateForRow(this); },
+
+  @on("didReceiveAttrs")
+  _setSelectionState() {
+    const contentValue = this.get("content.value");
+    this.set("isSelected", this.get("value") === contentValue);
+    this.set("isHighlighted", this._castInteger(this.get("highlightedValue")) === this._castInteger(contentValue));
+  },
+
+  @on("willDestroyElement")
+  _clearDebounce() {
+    const hoverDebounce = this.get("hoverDebounce");
+
+    if (isPresent(hoverDebounce)) {
+      run.cancel(hoverDebounce);
+    }
+  },
+
+  @computed("content.originalContent.icon", "content.originalContent.iconClass")
+  icon(icon, cssClass) {
+    if (icon) {
+      return iconHTML(icon, { class: cssClass });
+    }
+
+    return null;
+  },
+
+  mouseEnter() {
+    this.set("hoverDebounce", run.debounce(this, this._sendOnHighlightAction, 32));
+  },
+
+  click() {
+    this.sendAction("onSelect", this.get("content.value"));
+  },
+
+  _sendOnHighlightAction() {
+    this.sendAction("onHighlight", this.get("content.value"));
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/tag-notifications-button.js.es6 b/app/assets/javascripts/select-box-kit/components/tag-notifications-button.js.es6
new file mode 100644
index 0000000000..2ab3ed375b
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/tag-notifications-button.js.es6
@@ -0,0 +1,16 @@
+import NotificationOptionsComponent from "select-box-kit/components/notifications-button";
+
+export default NotificationOptionsComponent.extend({
+  classNames: "tag-notifications-button",
+  i18nPrefix: "tagging.notifications",
+  showFullTitle: false,
+  headerComponent: "tag-notifications-button/tag-notifications-button-header",
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+      this.sendAction("action", value);
+      this.blur();
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/tag-notifications-button/tag-notifications-button-header.js.es6 b/app/assets/javascripts/select-box-kit/components/tag-notifications-button/tag-notifications-button-header.js.es6
new file mode 100644
index 0000000000..524c8b8585
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/tag-notifications-button/tag-notifications-button-header.js.es6
@@ -0,0 +1,13 @@
+import NotificationButtonHeader from "select-box-kit/components/notifications-button/notifications-button-header";
+import computed from "ember-addons/ember-computed-decorators";
+import { iconHTML } from 'discourse-common/lib/icon-library';
+
+export default NotificationButtonHeader.extend({
+  classNames: "tag-notifications-button-header",
+  shouldDisplaySelectedName: false,
+
+  @computed("_selectedDetails.icon", "_selectedDetails.key")
+  icon() {
+    return `${this._super()}${iconHTML("caret-down")}`.htmlSafe();
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/topic-footer-mobile-dropdown.js.es6 b/app/assets/javascripts/select-box-kit/components/topic-footer-mobile-dropdown.js.es6
new file mode 100644
index 0000000000..2fb8f3e317
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/topic-footer-mobile-dropdown.js.es6
@@ -0,0 +1,76 @@
+import computed from "ember-addons/ember-computed-decorators";
+import ComboBoxComponent from "select-box-kit/components/combo-box";
+import { on } from "ember-addons/ember-computed-decorators";
+
+export default ComboBoxComponent.extend({
+  headerText: "topic.controls",
+  classNames: "topic-footer-mobile-dropdown",
+  filterable: false,
+  autoFilterable: false,
+  allowValueMutation: false,
+  autoSelectFirst: false,
+
+  @on("didReceiveAttrs")
+  _setTopicFooterMobileDropdownOptions() {
+    this.get("headerComponentOptions")
+        .set("selectedName", I18n.t(this.get("headerText")));
+  },
+
+  @computed("topic", "topic.details", "value")
+  content(topic, details) {
+    const content = [];
+
+    if (details.get("can_invite_to")) {
+      content.push({ id: "invite", icon: "users", name: I18n.t("topic.invite_reply.title") });
+    }
+
+    if (topic.get("bookmarked")) {
+      content.push({ id: "bookmark", icon: "bookmark", name: I18n.t("bookmarked.clear_bookmarks") });
+    } else {
+      content.push({ id: "bookmark", icon: "bookmark", name: I18n.t("bookmarked.title") });
+    }
+
+    content.push({ id: "share", icon: "link", name: I18n.t("topic.share.title") });
+
+    if (details.get("can_flag_topic")) {
+      content.push({ id: "flag", icon: "flag", name: I18n.t("topic.flag_topic.title") });
+    }
+
+    return content;
+  },
+
+  actions: {
+    onSelect(value) {
+      value = this.defaultOnSelect(value);
+
+      const topic = this.get("topic");
+
+      // In case it"s not a valid topic
+      if (!topic.get("id")) {
+        return;
+      }
+
+      this.set("value", value);
+
+      const refresh = () => this.set("value", null);
+
+      switch(value) {
+        case "invite":
+          this.attrs.showInvite();
+          refresh();
+          break;
+        case "bookmark":
+          topic.toggleBookmark().then(() => refresh() );
+          break;
+        case "share":
+          this.appEvents.trigger("share:url", topic.get("shareUrl"), $("#topic-footer-buttons"));
+          refresh();
+          break;
+        case "flag":
+          this.attrs.showFlagTopic();
+          refresh();
+          break;
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/components/topic-notifications-button.js.es6 b/app/assets/javascripts/select-box-kit/components/topic-notifications-button.js.es6
new file mode 100644
index 0000000000..3aeb9a9d98
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/topic-notifications-button.js.es6
@@ -0,0 +1,6 @@
+export default Ember.Component.extend({
+  layoutName: "select-box-kit/templates/components/topic-notifications-button",
+  classNames: "topic-notifications-button",
+  showFullTitle: true,
+  appendReason: true
+});
diff --git a/app/assets/javascripts/select-box-kit/components/topic-notifications-options.js.es6 b/app/assets/javascripts/select-box-kit/components/topic-notifications-options.js.es6
new file mode 100644
index 0000000000..d1da27684a
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/components/topic-notifications-options.js.es6
@@ -0,0 +1,40 @@
+import NotificationOptionsComponent from "select-box-kit/components/notifications-button";
+import { on } from "ember-addons/ember-computed-decorators";
+import { topicLevels } from "discourse/lib/notification-levels";
+
+export default NotificationOptionsComponent.extend({
+  classNames: "topic-notifications-options",
+  content: topicLevels,
+  i18nPrefix: "topic.notifications",
+  value: Ember.computed.alias("topic.details.notification_level"),
+
+  @on("didInsertElement")
+  _bindGlobalLevelChanged() {
+    this.appEvents.on("topic-notifications-button:changed", (msg) => {
+      if (msg.type === "notification") {
+        if (this.get("computedValue") !== msg.id) {
+          this.get("topic.details").updateNotifications(msg.id);
+        }
+      }
+    });
+  },
+
+  @on("willDestroyElement")
+  _unbindGlobalLevelChanged() {
+    this.appEvents.off("topic-notifications-button:changed");
+  },
+
+  actions: {
+    onSelect(value) {
+      if (value !== this.get("computedValue")) {
+        this.get("topic.details").updateNotifications(value);
+      }
+
+      this.set("value", value);
+
+      this.defaultOnSelect(value);
+
+      this.blur();
+    }
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/mixins/dom-helpers.js.es6 b/app/assets/javascripts/select-box-kit/mixins/dom-helpers.js.es6
new file mode 100644
index 0000000000..d8caacb501
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/mixins/dom-helpers.js.es6
@@ -0,0 +1,53 @@
+export default Ember.Mixin.create({
+  init() {
+    this._super();
+
+    this.offscreenInputSelector = ".select-box-kit-offscreen";
+    this.filterInputSelector = ".select-box-kit-filter-input";
+    this.rowSelector = ".select-box-kit-row";
+    this.collectionSelector = ".select-box-kit-collection";
+    this.headerSelector = ".select-box-kit-header";
+    this.bodySelector = ".select-box-kit-body";
+  },
+
+  $findRowByValue(value) {
+    return this.$(`${this.rowSelector}[data-value='${value}']`);
+  },
+
+  $header() {
+    return this.$(this.headerSelector);
+  },
+
+  $body() {
+    return this.$(this.bodySelector);
+  },
+
+  $collection() {
+    return this.$(this.collectionSelector);
+  },
+
+  $rows() {
+    return this.$(this.rowSelector);
+  },
+
+  $highlightedRow() {
+    return this.$rows().filter(".is-highlighted");
+  },
+
+  $selectedRow() {
+    return this.$rows().filter(".is-selected");
+  },
+
+  $offscreenInput() {
+    return this.$(this.offscreenInputSelector);
+  },
+
+  $filterInput() {
+    return this.$(this.filterInputSelector);
+  },
+
+  _killEvent(event) {
+    event.preventDefault();
+    event.stopPropagation();
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/mixins/keyboard.js.es6 b/app/assets/javascripts/select-box-kit/mixins/keyboard.js.es6
new file mode 100644
index 0000000000..0de89dbb2e
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/mixins/keyboard.js.es6
@@ -0,0 +1,203 @@
+const { isEmpty } = Ember;
+
+export default Ember.Mixin.create({
+  init() {
+    this._super();
+
+    this.keys = {
+      TAB: 9,
+      ENTER: 13,
+      ESC: 27,
+      SPACE: 32,
+      LEFT: 37,
+      UP: 38,
+      RIGHT: 39,
+      DOWN: 40,
+      SHIFT: 16,
+      CTRL: 17,
+      ALT: 18,
+      PAGE_UP: 33,
+      PAGE_DOWN: 34,
+      HOME: 36,
+      END: 35,
+      BACKSPACE: 8
+    };
+  },
+
+  willDestroyElement() {
+    this._super();
+
+    $(document)
+      .off("mousedown.select-box-kit")
+      .off("touchstart.select-box-kit");
+
+    this.$offscreenInput()
+      .off("focus.select-box-kit")
+      .off("focusin.select-box-kit")
+      .off("blur.select-box-kit")
+      .off("keydown.select-box-kit");
+
+    this.$filterInput().off("keydown.select-box-kit");
+  },
+
+  didInsertElement() {
+    this._super();
+
+    $(document)
+      .on("mousedown.select-box-kit, touchstart.select-box-kit", event => {
+        if (Ember.isNone(this.get("element"))) {
+          return;
+        }
+
+        if (this.get("element").contains(event.target)) { return; }
+        this.clickOutside(event);
+    });
+
+    this.$offscreenInput()
+      .on("blur.select-box-kit", () => {
+        if (this.get("isExpanded") === false && this.get("isFocused") === true) {
+          this.close();
+        }
+      })
+      .on("focus.select-box-kit", (event) => {
+        this.set("isFocused", true);
+        this._killEvent(event);
+      })
+      .on("focusin.select-box-kit", (event) => {
+        this.set("isFocused", true);
+        this._killEvent(event);
+      })
+      .on("keydown.select-box-kit", (event) => {
+        const keyCode = event.keyCode || event.which;
+
+        switch (keyCode) {
+          case this.keys.UP:
+          case this.keys.DOWN:
+            if (this.get("isExpanded") === false) {
+              this.set("isExpanded", true);
+            }
+
+            Ember.run.schedule("actions", () => {
+              this._handleArrowKey(keyCode);
+            });
+
+            this._killEvent(event);
+
+            return;
+          case this.keys.ENTER:
+            if (this.get("isExpanded") === false) {
+              this.set("isExpanded", true);
+            } else {
+              this.send("onSelect", this.$highlightedRow().data("value"));
+            }
+
+            this._killEvent(event);
+
+            return;
+          case this.keys.TAB:
+            if (this.get("isExpanded") === false) {
+              return true;
+            } else {
+              this.send("onSelect", this.$highlightedRow().data("value"));
+              return;
+            }
+          case this.keys.ESC:
+            this.close();
+            this._killEvent(event);
+            return;
+          case this.keys.BACKSPACE:
+            this._killEvent(event);
+            return;
+        }
+
+        if (this._isSpecialKey(keyCode) === false && event.metaKey === false) {
+          this.setProperties({
+            isExpanded: true,
+            filter: String.fromCharCode(keyCode)
+          });
+
+          Ember.run.schedule("afterRender", () => this.$filterInput().focus() );
+        }
+      });
+
+    this.$filterInput()
+      .on(`keydown.select-box-kit`, (event) => {
+        const keyCode = event.keyCode || event.which;
+
+        if ([
+            this.keys.RIGHT,
+            this.keys.LEFT,
+            this.keys.BACKSPACE,
+            this.keys.SPACE,
+          ].includes(keyCode) || event.metaKey === true) {
+          return true;
+        }
+
+        if (this._isSpecialKey(keyCode) === true) {
+          this.$offscreenInput().focus().trigger(event);
+        }
+
+        return true;
+      });
+  },
+
+  _handleArrowKey(keyCode) {
+    if (isEmpty(this.get("filteredContent"))) {
+      return;
+    }
+
+    Ember.run.schedule("afterRender", () => {
+      switch (keyCode) {
+        case 38:
+          Ember.run.throttle(this, this._handleUpArrow, 32);
+          break;
+        default:
+          Ember.run.throttle(this, this._handleDownArrow, 32);
+      }
+    });
+  },
+
+  _moveHighlight(direction) {
+    const $rows = this.$rows();
+    const currentIndex = $rows.index(this.$highlightedRow());
+
+    let nextIndex = 0;
+
+    if (currentIndex < 0) {
+      nextIndex = 0;
+    } else if (currentIndex + direction < $rows.length) {
+      nextIndex = currentIndex + direction;
+    }
+
+    this._rowSelection($rows, nextIndex);
+  },
+
+  _handleDownArrow() { this._moveHighlight(1); },
+
+  _handleUpArrow() { this._moveHighlight(-1); },
+
+  _rowSelection($rows, nextIndex) {
+    const highlightableValue = $rows.eq(nextIndex).data("value");
+    const $highlightableRow = this.$findRowByValue(highlightableValue);
+    this.send("onHighlight", highlightableValue);
+
+    Ember.run.schedule("afterRender", () => {
+      const $collection = this.$collection();
+      const currentOffset = $collection.offset().top +
+                            $collection.outerHeight(false);
+      const nextBottom = $highlightableRow.offset().top +
+                         $highlightableRow.outerHeight(false);
+      const nextOffset = $collection.scrollTop() + nextBottom - currentOffset;
+
+      if (nextIndex === 0) {
+        $collection.scrollTop(0);
+      } else if (nextBottom > currentOffset) {
+        $collection.scrollTop(nextOffset);
+      }
+    });
+  },
+
+  _isSpecialKey(keyCode) {
+    return _.values(this.keys).includes(keyCode);
+  },
+});
diff --git a/app/assets/javascripts/select-box-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
new file mode 100644
index 0000000000..05d896a832
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
@@ -0,0 +1,9 @@
+export default Ember.Mixin.create({
+  _castInteger(value) {
+    if (this.get("castInteger") === true && Ember.isPresent(value)) {
+      return parseInt(value, 10);
+    }
+
+    return Ember.isNone(value) ? value : value.toString();
+  }
+});
diff --git a/app/assets/javascripts/select-box-kit/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-box-kit/templates/components/combo-box/combo-box-header.hbs
new file mode 100644
index 0000000000..38e070fa34
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/combo-box/combo-box-header.hbs
@@ -0,0 +1,15 @@
+{{#if icon}}
+  {{{icon}}}
+{{/if}}
+
+<span class="selected-name" title={{selectedName}}>
+  {{{selectedName}}}
+</span>
+
+{{#if shouldDisplayClearableButton}}
+  <button class="btn-clear" {{action onClearSelection bubbles=false}}>
+    {{d-icon 'times'}}
+  </button>
+{{/if}}
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
new file mode 100644
index 0000000000..0ffbeb4f86
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -0,0 +1,17 @@
+<button
+  class="btn {{if shouldDisplaySelectedName 'btn-icon-text' 'no-text btn-icon'}}"
+  aria-label="{{selectedName}}"
+  type="button"
+  tabindex="-1"
+  title="{{selectedName}}">
+
+  {{#if icon}}
+    {{{icon}}}
+  {{/if}}
+
+  {{#if shouldDisplaySelectedName}}
+    <span class="d-button-label selected-name">
+      {{selectedName}}
+    </span>
+  {{/if}}
+</button>
diff --git a/app/assets/javascripts/select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
new file mode 100644
index 0000000000..0fe1813c8a
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -0,0 +1,15 @@
+{{#if template}}
+  {{{template}}}
+{{else}}
+  {{#if icon}}
+    <div class="icons">
+      <span class="selection-indicator"></span>
+      {{{icon}}}
+    </div>
+  {{/if}}
+
+  <div class="texts">
+    <span class="name">{{{name}}}</span>
+    <span class="desc">{{{description}}}</span>
+  </div>
+{{/if}}
diff --git a/app/assets/javascripts/select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
new file mode 100644
index 0000000000..5e175c5ee7
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
@@ -0,0 +1,23 @@
+{{#if icon}}
+  <div class="future-date-input-selector-icons">
+    {{{icon}}}
+  </div>
+{{/if}}
+
+<span class="selected-name" title={{selectedName}}>
+  {{{selectedName}}}
+</span>
+
+{{#if datetime}}
+  <span class="future-date-input-selector-datetime">
+    {{datetime}}
+  </span>
+{{/if}}
+
+{{#if shouldDisplayClearableButton}}
+  <button class="btn-clear" {{action onClearSelection bubbles=false}}>
+    {{d-icon 'times'}}
+  </button>
+{{/if}}
+
+{{d-icon caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
new file mode 100644
index 0000000000..dc936cbe69
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
@@ -0,0 +1,13 @@
+{{#if icon}}
+  <div class="future-date-input-selector-icons">
+    {{{icon}}}
+  </div>
+{{/if}}
+
+<span class="name">{{content.name}}</span>
+
+{{#if datetime}}
+  <span class="future-date-input-selector-datetime">
+    {{datetime}}
+  </span>
+{{/if}}
diff --git a/app/assets/javascripts/select-box-kit/templates/components/multi-combo-box/multi-combo-box-header.hbs b/app/assets/javascripts/select-box-kit/templates/components/multi-combo-box/multi-combo-box-header.hbs
new file mode 100644
index 0000000000..13cf6c3f6d
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/multi-combo-box/multi-combo-box-header.hbs
@@ -0,0 +1,30 @@
+<ul class="choices">
+  {{#each selectedContent as |selectedContent|}}
+    <li tabindex="-1" data-value={{selectedContent.value}} data-name={{selectedContent.name}} class="selected-name">
+      <span class="delete-icon" {{action onDeselect selectedContent.value bubbles=false}}>
+        {{d-icon "times"}}
+      </span>
+      <span class="name">
+        {{selectedContent.name}}
+      </span>
+    </li>
+  {{else}}
+    {{#if shouldDisplayFilterPlaceholder}}
+      <li class="choice-placeholder">
+        {{text}}
+      </li>
+    {{/if}}
+  {{/each}}
+
+  <li class="filter">
+    {{input
+      class="select-box-kit-filter-input"
+      key-up=onFilterChange
+      autocomplete="off"
+      autocorrect="off"
+      autocapitalize="off"
+      spellcheck=false
+      value=filter
+    }}
+  </li>
+</ul>
diff --git a/app/assets/javascripts/discourse/templates/components/pinned-button.hbs b/app/assets/javascripts/select-box-kit/templates/components/pinned-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/pinned-button.hbs
rename to app/assets/javascripts/select-box-kit/templates/components/pinned-button.hbs
diff --git a/app/assets/javascripts/select-box-kit/templates/components/select-box-kit.hbs b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit.hbs
new file mode 100644
index 0000000000..6575daf884
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit.hbs
@@ -0,0 +1,65 @@
+<input
+  class="select-box-kit-offscreen"
+  type="text"
+  aria-haspopup="true"
+  role="button"
+  aria-labelledby="select-box-kit-offscreen-{{elementId}}"
+  tabindex={{tabindex}}
+  name={{name}}
+  value={{computedValue}}
+  readonly=true
+/>
+
+{{component headerComponent
+  none=computedNone
+  isFocused=isFocused
+  isExpanded=isExpanded
+  selectedContent=selectedContent
+  onDeselect=(action "onDeselect")
+  onToggle=(action "onToggle")
+  onFilterChange=(action "onFilterChange")
+  onClearSelection=(action "onClearSelection")
+  options=headerComponentOptions
+}}
+
+<div class="select-box-kit-body">
+  {{component filterComponent
+    onFilterChange=(action "onFilterChange")
+    icon=filterIcon
+    filter=filter
+    filterable=computedFilterable
+    isFocused=isFocused
+    placeholder=(i18n filterPlaceholder)
+    tabindex=tabindex
+  }}
+
+  {{#if renderBody}}
+    {{component collectionComponent
+      shouldDisplayCreateRow=shouldDisplayCreateRow
+      none=computedNone
+      createRowContent=createRowContent
+      selectedContent=selectedContent
+      filteredContent=filteredContent
+      rowComponent=rowComponent
+      noneRowComponent=noneRowComponent
+      createRowComponent=createRowComponent
+      iconForRow=iconForRow
+      templateForRow=templateForRow
+      templateForNoneRow=templateForNoneRow
+      templateForCreateRow=templateForCreateRow
+      shouldHighlightRow=shouldHighlightRow
+      shouldSelectRow=shouldSelectRow
+      titleForRow=titleForRow
+      onClearSelection=(action "onClearSelection")
+      onSelect=(action "onSelect")
+      onHighlight=(action "onHighlight")
+      onCreateContent=(action "onCreateContent")
+      noContentLabel=noContentLabel
+      highlightedValue=highlightedValue
+      computedValue=computedValue
+      rowComponentOptions=rowComponentOptions
+    }}
+  {{/if}}
+</div>
+
+<div class="select-box-kit-wrapper"></div>
diff --git a/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-collection.hbs b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-collection.hbs
new file mode 100644
index 0000000000..73f80e2608
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-collection.hbs
@@ -0,0 +1,49 @@
+{{#if none}}
+  {{#if selectedContent}}
+    {{component noneRowComponent
+      content=none
+      templateForRow=templateForNoneRow
+      titleForRow=titleForRow
+      iconForRow=iconForRow
+      highlightedValue=highlightedValue
+      onClearSelection=onClearSelection
+      onHighlight=onHighlight
+      value=computedValue
+      options=rowComponentOptions
+    }}
+  {{/if}}
+{{/if}}
+
+{{#if shouldDisplayCreateRow}}
+  {{component createRowComponent
+    content=createRowContent
+    templateForRow=templateForCreateRow
+    titleForRow=titleForRow
+    iconForRow=iconForRow
+    highlightedValue=highlightedValue
+    onHighlight=onHighlight
+    onCreateContent=onCreateContent
+    value=computedValue
+    options=rowComponentOptions
+  }}
+{{/if}}
+
+{{#each filteredContent as |content|}}
+  {{component rowComponent
+    content=content
+    templateForRow=templateForRow
+    titleForRow=titleForRow
+    iconForRow=iconForRow
+    highlightedValue=highlightedValue
+    onSelect=onSelect
+    onHighlight=onHighlight
+    value=computedValue
+    options=rowComponentOptions
+  }}
+{{else}}
+  {{#if noContentLabel}}
+    <li class="select-box-kit-row no-content">
+      {{i18n noContentLabel}}
+    </li>
+  {{/if}}
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/select-box/select-box-filter.hbs b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-filter.hbs
similarity index 71%
rename from app/assets/javascripts/discourse/templates/components/select-box/select-box-filter.hbs
rename to app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-filter.hbs
index c9a06c3fc5..74d1288074 100644
--- a/app/assets/javascripts/discourse/templates/components/select-box/select-box-filter.hbs
+++ b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-filter.hbs
@@ -1,12 +1,13 @@
 {{input
   tabindex=tabindex
-  class="filter-query"
+  class="select-box-kit-filter-input"
   placeholder=placeholder
-  key-up=onFilterChange
+  key-down=onFilterChange
   autocomplete="off"
   autocorrect="off"
   autocapitalize="off"
   spellcheck=false
+  value=filter
 }}
 
 {{#if icon}}
diff --git a/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-header.hbs b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-header.hbs
new file mode 100644
index 0000000000..b0cea9f913
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-header.hbs
@@ -0,0 +1,7 @@
+{{#if icon}}
+  {{{icon}}}
+{{/if}}
+
+<span class="selected-name" title={{selectedName}}>
+  {{{selectedName}}}
+</span>
diff --git a/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-row.hbs b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-row.hbs
new file mode 100644
index 0000000000..1786cfb553
--- /dev/null
+++ b/app/assets/javascripts/select-box-kit/templates/components/select-box-kit/select-box-kit-row.hbs
@@ -0,0 +1,9 @@
+{{#if template}}
+  {{{template}}}
+{{else}}
+  {{#if icon}}
+    {{{icon}}}
+  {{/if}}
+
+  <span class="name">{{content.name}}</span>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-box-kit/templates/components/topic-notifications-button.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/topic-notifications-button.hbs
rename to app/assets/javascripts/select-box-kit/templates/components/topic-notifications-button.hbs
diff --git a/app/assets/javascripts/wizard-application.js b/app/assets/javascripts/wizard-application.js
index e69ccaf616..9baf2c224b 100644
--- a/app/assets/javascripts/wizard-application.js
+++ b/app/assets/javascripts/wizard-application.js
@@ -3,6 +3,7 @@
 //= require ./ember-addons/macro-alias
 //= require ./ember-addons/ember-computed-decorators
 //= require_tree ./discourse-common
+//= require_tree ./select-box-kit
 //= require wizard/router
 //= require wizard/wizard
 //= require_tree ./wizard/templates
diff --git a/app/assets/javascripts/wizard/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
index 718ef5bd16..7fec1dcfa1 100644
--- a/app/assets/javascripts/wizard/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/templates/components/invite-list.hbs
@@ -12,7 +12,7 @@
     {{input class="invite-email wizard-focusable" value=inviteEmail placeholder="user@example.com" tabindex="9"}}
   </div>
 
-  {{combo-box value=inviteRole content=roles nameProperty="label" width="200px"}}
+  {{combo-box value=inviteRole content=roles nameProperty="label"}}
 
   <button class="wizard-btn small add-user" {{action "addUser"}}>
     {{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
diff --git a/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs b/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
index 06e7034c14..f95625b7a8 100644
--- a/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
+++ b/app/assets/javascripts/wizard/templates/components/wizard-field-dropdown.hbs
@@ -3,5 +3,4 @@
             value=field.value
             content=field.choices
             nameProperty="label"
-            width="400px"
             tabindex="9"}}
diff --git a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6 b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
index 3ea019a062..3154e426ab 100644
--- a/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
+++ b/app/assets/javascripts/wizard/test/acceptance/wizard-test.js.es6
@@ -56,7 +56,7 @@ test("Going back and forth in steps", assert => {
     assert.ok(!exists('.wizard-step-title'));
     assert.ok(!exists('.wizard-step-description'));
 
-    assert.ok(exists('select.field-snack'), "went to the next step");
+    assert.ok(exists('.select-box-kit.field-snack'), "went to the next step");
     assert.ok(exists('.preview-area'), "renders the component field");
 
     assert.ok(!exists('.wizard-btn.next'));
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index abb6e9bfa8..b4d00edc0c 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -6,6 +6,7 @@
 @import "vendor/select2";
 @import "common/foundation/mixins";
 @import "common/foundation/variables";
+@import "common/select-box-kit/*";
 @import "common/components/*";
 @import "common/input_tip";
 @import "common/topic-entrance";
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 63f4f97fbc..2f418ddad3 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -211,6 +211,14 @@ $mobile-breakpoint: 700px;
 
 .admin-container {
   margin-top: 20px;
+
+  .select-box-kit {
+    width: 350px;
+  }
+
+  .select-box-kit-header {
+    height: 28px;
+  }
 }
 
 .admin-container .controls {
@@ -222,7 +230,7 @@ $mobile-breakpoint: 700px;
 }
 
 .admin-title {
-  height: 45px;
+  margin-bottom: 0.5em;
 }
 
 .admin-controls {
@@ -442,7 +450,7 @@ $mobile-breakpoint: 700px;
         width: 100%;
         padding-right: 0;
       }
-      .select2-container {
+      .select-box-kit {
         width: 100% !important; // Needs !important to override hard-coded value
         @media (max-width: $mobile-breakpoint) {
           width: 100% !important; // !important overrides hard-coded mobile width of 68px
@@ -512,7 +520,7 @@ $mobile-breakpoint: 700px;
     }
 
     .desc {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     h3 {
@@ -545,7 +553,7 @@ section.details {
 }
 
 #selected-controls {
-  background-color: scale-color($tertiary, $lightness: 75%);
+  background-color: $tertiary-low;
   padding: 8px;
   min-height: 27px;
   position: fixed;
@@ -581,7 +589,7 @@ section.details {
     border-top: 0;
   }
   &.highlight-danger {
-    background-color: scale-color($danger, $lightness: 50%);
+    background-color: $danger-low;
   }
   border-top: 1px solid $primary-low;
   &:before, &:after {
@@ -651,7 +659,7 @@ section.details {
       font-weight: normal;
       padding: 0 6px;
       color: $secondary;
-      background-color: scale-color($tertiary, $lightness: 50%);
+      background-color: $tertiary-medium;
       border-radius: 3px;
     }
   }
@@ -661,12 +669,45 @@ section.details {
 
     p.help {
       margin: 0;
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       font-size: 0.9em;
     }
   }
 
   .form-horizontal {
+    .ace-wrapper {
+      position: relative;
+      height: 270px;
+      margin-bottom: 10px;
+
+      .ace_editor {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        border: 1px solid #e9e9e9;
+        border-radius: 3px;
+
+        .ace_gutter {
+          border-right: 1px solid #e9e9e9;
+          background: #f4f4f4;
+        }
+      }
+
+      &[data-disabled="true"] {
+        cursor: not-allowed;
+        opacity: 0.5;
+
+        .ace_editor {
+          pointer-events:none;
+          
+          .ace_cursor {
+            visibility: hidden;
+          }
+        }
+      }
+    }
     .delete-link {
       margin-left: 15px;
       margin-top: 5px;
@@ -679,7 +720,7 @@ section.details {
   .current-badge-actions {
     margin: 10px;
     padding: 10px;
-    border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 80%), scale-color($secondary, $lightness: 20%));
+    border-top: 1px solid dark-light-choose($primary-low, $secondary-high);
   }
 
   .buttons {
@@ -732,7 +773,7 @@ section.details {
 .groups {
   .ac-wrap {
     width: 100% !important;
-    border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    border-color: dark-light-choose($primary-low-mid, $secondary-high);
     .item {
       margin-right: 10px;
     }
@@ -754,7 +795,7 @@ section.details {
   }
   .select2-choices {
     width: 100%;
-    border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    border-color: dark-light-choose($primary-low-mid, $secondary-high);
   }
 
   .content-list {
@@ -1250,7 +1291,7 @@ table.api-keys {
   margin: 0 0 20px 6px;
   a.filter {
     display: inline-block;
-    background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    background-color: dark-light-choose($primary-low-mid, $secondary-high);
     padding: 3px 10px;
     border-radius: 3px;
 
@@ -1283,7 +1324,7 @@ table.api-keys {
 
 .staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks, .web-hook-events {
 
-  border-bottom: dotted 1px dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+  border-bottom: dotted 1px dark-light-choose($primary-low-mid, $secondary);
 
   .heading-container {
     width: 100%;
@@ -1607,7 +1648,7 @@ table#user-badges {
   }
 
   p.description {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     margin-bottom: 1em;
     max-width: 700px;
   }
@@ -1629,7 +1670,7 @@ table#user-badges {
   .reply-key {
     display: block;
     font-size: 12px;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
   .username div {
     max-width: 180px;
diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss
index 1ba3bbc507..bbcb624aa2 100644
--- a/app/assets/stylesheets/common/admin/customize.scss
+++ b/app/assets/stylesheets/common/admin/customize.scss
@@ -35,7 +35,7 @@
   .select2-chosen, .color-schemes li {
     .fa {
       margin-right: 6px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
   .show-current-style {
@@ -173,7 +173,7 @@
     td.actions     { width: 200px; }
     .hex-input     { width: 80px; margin-bottom: 0; }
     .hex           { text-align: center; }
-    .description   { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+    .description   { color: dark-light-choose($primary-medium, $secondary-medium); }
 
     .invalid .hex input {
       background-color: white;
diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss
index b1cce63b51..7cac376c71 100644
--- a/app/assets/stylesheets/common/admin/flagging.scss
+++ b/app/assets/stylesheets/common/admin/flagging.scss
@@ -6,7 +6,7 @@
 
 .flagged-post.deleted {
   .flagged-post-excerpt, .flagged-post-avatar {
-    background-color: scale-color($danger, $lightness: 70%);
+    background-color: $danger-low;
   }
 }
 
@@ -122,7 +122,7 @@
     }
 
     &:hover {
-      background-color: $highlight-low;
+      background-color: dark-light-choose($highlight-low, $highlight-medium);
     }
   }
 
@@ -182,7 +182,6 @@
 
 .delete-flag-modal, .agree-flag-modal {
   button {
-    display: block;
     margin: 10px 0 10px 10px;
     padding: 10px 15px;
   }
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 3a015867a6..241494a1d9 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -15,7 +15,7 @@
     }
   }
 
-  .select-box {
+  .select-box-kit {
     align-self: center;
 
     &.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
@@ -74,7 +74,7 @@
     border: none;
 
     td {
-      border-bottom: 1px solid scale-color($danger, $lightness: 60%);
+      border-bottom: 1px solid $danger-low;
       line-height: 0.1em;
       padding: 0px;
       text-align: center;
@@ -82,7 +82,7 @@
 
     td span {
       background-color: $secondary;
-      color: scale-color($danger, $lightness: 60%);
+      color: $danger-low;
       padding: 0px 8px;
       font-size: 0.929em;
     }
@@ -100,14 +100,14 @@
 
   }
   th {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 1em;
-    button .d-icon {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));}
+    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium);}
 
   }
   td {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-size: 1em;
   }
 
@@ -122,7 +122,7 @@
   .topic-excerpt {
     font-size: 0.929em;
     margin-top: 8px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     word-wrap: break-word;
     line-height: 1.4;
     padding-right: 20px;
@@ -167,7 +167,7 @@
 
   .category .badge-notification {
     background-color:transparent;
-    color: scale-color($primary, $lightness: 50%);
+    color: $primary-medium;
   }
 
   .subcategories .badge {
@@ -224,7 +224,7 @@
     background-color: transparent;
     padding: 0;
     border: 0;
-    color: scale-color($danger, $lightness: 20%);
+    color: $danger-medium;
     font-size: 0.929em;
     cursor: default;
   }
@@ -309,7 +309,7 @@ ol.category-breadcrumb {
   }
 
   .top-date-string {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     font-weight: normal;
     text-transform: uppercase;
   }
@@ -369,12 +369,12 @@ ol.category-breadcrumb {
 }
 
 div.education {
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 .list-cell {
   padding: 12px 5px;
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+  color: dark-light-choose($primary-medium, $secondary-high);
 }
 
 .table-heading {
diff --git a/app/assets/stylesheets/common/base/alert.scss b/app/assets/stylesheets/common/base/alert.scss
index 892151a3b2..397c7c9da8 100644
--- a/app/assets/stylesheets/common/base/alert.scss
+++ b/app/assets/stylesheets/common/base/alert.scss
@@ -1,6 +1,6 @@
 .alert {
   padding: 8px 35px 8px 14px;
-  background-color: scale-color($danger, $lightness: 75%);
+  background-color: $danger-low;
   color: #c09853;
 
   .close {
@@ -30,7 +30,7 @@
     -webkit-appearance: none;
   }
   &.alert-success {
-    background-color:  $success-low;
+    background-color:  $success-medium;
     color: $primary;
   }
   &.alert-error {
diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 0626f26704..c38bfe61c7 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -76,7 +76,7 @@
     padding: 0 1em 1em 1em;
     text-align: center;
     font-size: 1.05em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     .overflow {
       max-height: 6em;
       overflow: hidden;
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 10b5c88311..35bac3fdca 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -35,7 +35,7 @@
           background-color: $tertiary-low;
         }
         @include hover {
-          background-color: $highlight-low;
+          background-color: dark-light-choose($highlight-low, $highlight-medium);
           text-decoration: none;
         }
       }
@@ -92,8 +92,8 @@ div.ac-wrap div.item a.remove, .remove-link {
   display: inline-block;
   border: 1px solid $primary-low; 
   &:hover {
-    background-color: scale-color($danger, $lightness: 75%);
-    border: 1px solid scale-color($danger, $lightness: 30%);
+    background-color: $danger-low;
+    border: 1px solid $danger-medium;
     text-decoration: none;
     color: $danger;
   }
@@ -162,7 +162,7 @@ div.ac-wrap {
 }
 
 #draft-status, #file-uploading {
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 .composer-bottom-right {
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 8a31885b8c..7b5f7bdc6c 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -36,10 +36,10 @@
 
     tr.me {
       td {
-        background-color: $highlight-low;
+        background-color: dark-light-choose($highlight-low, $highlight-medium);
 
         .username a, .name, .title, .number, .time-read {
-          color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%));
+          color: dark-light-choose(scale-color($highlight, $lightness: -50%), $highlight-medium);
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 2cca6788a5..077acd0c68 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -132,7 +132,7 @@ input {
   }
 
   &.invalid {
-    background-color: dark-light-choose(scale-color($danger, $lightness: 80%), scale-color($danger, $lightness: -60%));
+    background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%));
   }
 
   .radio &[type="radio"],
@@ -191,19 +191,19 @@ input {
 }
 
 // the default for table cells in topic list
-// is scale-color($primary, $lightness: 50%)
+// is $primary-medium
 // numbers get dimmer as they get colder
 .coldmap {
   &-high {
-    color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important;
+  color: dark-light-choose($primary-low-mid, $secondary-high) !important;
   }
 
   &-med {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)) !important;
+    color: dark-light-choose($primary-medium, $secondary-high) !important;
   }
 
   &-low {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important;
+    color: dark-light-choose($primary-medium, $secondary-medium) !important;
   }
 }
 
diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
index 3a9424ca47..f535f9a3f7 100644
--- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
+++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss
@@ -3,6 +3,10 @@
     max-height: none;
   }
 
+  .select-box-kit {
+    width: 50%;
+  }
+
   input.date-picker, input[type="time"] {
     width: 150px;
     text-align: left;
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index f20fd3dae2..1e10fd422e 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -76,7 +76,7 @@ img.emoji {
 .emoji-picker .section-header .clear-recent .fa{
   margin: 0;
   padding: 0;
-  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  color: dark-light-choose($header_primary-medium, $header_primary);
 
   &:hover {
     color: $primary;
@@ -197,7 +197,7 @@ img.emoji {
 }
 
 .emoji-picker .filter .d-icon-search {
-  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  color: dark-light-choose($header_primary-medium, $header_primary);
   font-size: 16px;
   margin-left: 5px;
   margin-right: 5px;
@@ -239,7 +239,7 @@ img.emoji {
   top: 12px;
   border: 0;
   background: none;
-  color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
+  color: dark-light-choose($header_primary-medium, $header_primary);
   outline: none;
   display: none;
 
diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss
index c08de36782..c476e892da 100644
--- a/app/assets/stylesheets/common/base/group.scss
+++ b/app/assets/stylesheets/common/base/group.scss
@@ -15,7 +15,7 @@
 
   .group-info-full-name {
     font-size: 1.2em;
-    color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
 
   span {
@@ -93,7 +93,7 @@ table.group-members {
     border-bottom: 3px solid $primary-low;
     text-align: center;
     padding: 5px 0px 5px 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
   }
 
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 6dae404db0..c6e7791ab8 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -8,7 +8,7 @@
   width: 100%;
 
   th {
-    border-bottom: 1px solid $primary-low; 
+    border-bottom: 1px solid $primary-low;
     padding: 5px 0px;
     text-align: left;
   }
@@ -30,16 +30,16 @@
     .groups-info-name {
       font-weight: bold;
       color: $primary;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
     }
 
     .groups-info-full-name {
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
     }
 
     .groups-info-title {
       font-size: 0.9em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     span {
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 57c776bf7a..ac9feaa0a8 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -151,7 +151,7 @@
   .unread-notifications {
     left: auto;
     right: 0;
-    background-color: scale-color($tertiary, $lightness: 50%);
+    background-color: dark-light-choose($tertiary-medium, $tertiary);
   }
   .unread-private-messages, .ring {
     left: auto;
diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss
index 0de3abad17..138784a737 100644
--- a/app/assets/stylesheets/common/base/history.scss
+++ b/app/assets/stylesheets/common/base/history.scss
@@ -40,11 +40,11 @@
   }
   .diff-ins {
     color: dark-light-choose($primary, $secondary);
-    background: scale-color($success, $lightness: 90%);
+    background: $success-low;
   }
   ins {
     color: $success;
-    background: scale-color($success, $lightness: 90%);
+    background: $success-low;
   }
   del, .diff-del {
     code, img {
@@ -67,11 +67,11 @@
     filter: alpha(opacity=50);
   }
   .diff-del {
-    background: scale-color($danger, $lightness: 60%);
+    background: $danger-low;
   }
   del {
     color: $danger;
-    background: scale-color($danger, $lightness: 60%);
+    background: $danger-low;
   }
   span.date {
     font-weight: bold;
diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss
index 01b2f82510..c45ce027bf 100644
--- a/app/assets/stylesheets/common/base/login.scss
+++ b/app/assets/stylesheets/common/base/login.scss
@@ -29,7 +29,7 @@ $input-width: 220px;
 
   .disclaimer {
     font-size: 0.9em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     clear: both;
   }
 
@@ -56,7 +56,7 @@ $input-width: 220px;
         float: auto;
       }
       .instructions {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
         margin: 0;
         font-size: 0.929em;
         font-weight: normal;
@@ -70,7 +70,7 @@ $input-width: 220px;
 .password-reset {
   .instructions {
     label {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 }
@@ -98,7 +98,7 @@ $input-width: 220px;
       margin-bottom: 10px;
     }
     .instructions {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin: 0;
       font-size: 0.929em;
       font-weight: normal;
@@ -113,5 +113,5 @@ $input-width: 220px;
 button#login-link, button#new-account-link
 {
   background: transparent;
-  color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+  color: dark-light-choose($primary-high, $secondary-low);
 }
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index c70c7eb12a..99397a8da3 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -67,7 +67,7 @@
     .new {
       font-size: 0.8em;
       margin-left: 0.5em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
   }
@@ -79,7 +79,7 @@
     margin: 5px 5px 0 8px;
     .box {margin-top: 0;}
     .badge-notification {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       background-color: transparent;
       display: inline;
       padding: 0;
@@ -88,7 +88,7 @@
 
   // note these topic counts only appear for anons in the category hamburger drop down
   b.topics-count {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 11px;
   }
@@ -161,7 +161,7 @@
     .topic-statuses {
       float: none;
       display: inline-block;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin: 0;
       .fa {
         margin: 0;
@@ -178,12 +178,14 @@
     }
 
     a {
-      display: block;
-      padding: 5px;
+      &:not(.discourse-tag) {
+        display: block;
+        padding: 5px;
+      }
       transition: all linear .15s;
 
       .user-results {
-        color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+        color: dark-light-choose($primary-high, $secondary-low);
       }
     }
 
@@ -204,8 +206,8 @@
       margin: 0.5em 0;
     }
 
-    .fa { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
-    .icon { color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); }
+    .fa { color: dark-light-choose($primary-medium, $secondary-medium); }
+    .icon { color: dark-light-choose($primary-high, $secondary-low); }
     li {
       background-color: $tertiary-low;
       padding: 0.25em 0.5em;
@@ -299,7 +301,7 @@ div.menu-links-header {
     text-align: right;
   }
   .fa, a {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   a {
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index 67be235c9b..b9f3e8b217 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: $secondary-medium;
+  color: $secondary-high;
 }
 
 .modal-header {
-  border-bottom: 1px solid $primary-low; 
+  border-bottom: 1px solid $primary-low;
 }
 
 .modal-backdrop {
@@ -74,6 +74,10 @@
   margin: 0 auto;
   background-color: $secondary;
   background-clip: padding-box;
+
+  .select-box-kit {
+    width: 220px;
+  }
 }
 
 .create-account.in .modal-inner-container,
@@ -102,7 +106,7 @@
 }
 .modal-footer {
   padding: 14px 15px 15px;
-  border-top: 1px solid $primary-low; 
+  border-top: 1px solid $primary-low;
 }
 .modal-footer:before,
 .modal-footer:after {
@@ -128,7 +132,7 @@
     li > a {
       font-size: 1em;
     }
-    border-bottom: 1px solid $primary-low; 
+    border-bottom: 1px solid $primary-low;
 
   }
 
@@ -327,8 +331,8 @@
 
     .cannot_delete_reason {
       position: absolute;
-      background: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 10%));
-      color: dark-light-choose(scale-color($primary, $lightness: 100%), scale-color($secondary, $lightness: 0%));
+      background: dark-light-choose($primary, $secondary);
+      color: dark-light-choose($secondary, $secondary);
       text-align: center;
       border-radius: 2px;
       padding: 12px 8px;
@@ -339,7 +343,7 @@
         border: solid transparent;
         content: " ";
         position: absolute;
-        border-top-color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 10%));
+        border-top-color: dark-light-choose($primary, $secondary);
         border-width: 8px;
       }
     }
@@ -359,7 +363,7 @@
       font-weight: bold;
     }
     &:focus {
-      outline: 2px solid $primary-low; 
+      outline: 2px solid $primary-low;
     }
   }
   .incoming-email-tabs {
@@ -370,7 +374,7 @@
     textarea, .incoming-email-html-part {
       height: 95%;
       border: none;
-      border-top: 1px solid $primary-low; 
+      border-top: 1px solid $primary-low;
       padding-top: 10px;
     }
     textarea {
diff --git a/app/assets/stylesheets/common/base/notifications-button.scss b/app/assets/stylesheets/common/base/notifications-button.scss
index 63d3c2cf13..12e8252a82 100644
--- a/app/assets/stylesheets/common/base/notifications-button.scss
+++ b/app/assets/stylesheets/common/base/notifications-button.scss
@@ -1,6 +1,6 @@
-.notifications-button.notifications-button.notifications-button {
+.notifications-button, .dropdown-select-box .select-box-kit-row .icons {
   .d-icon.regular, .d-icon.muted, .d-icon.watching-first-post {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   .d-icon.tracking, .d-icon.watching {
     color: $tertiary;
diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 86e505e622..b89a3efc78 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -97,7 +97,7 @@ aside.onebox {
   header {
     margin-bottom: 8px;
     a[href] {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       text-decoration: none;
     }
   }
@@ -123,12 +123,12 @@ aside.onebox {
     }
 
     a[href] {
-      color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary);
+      color: dark-light-choose($tertiary, $tertiary);
       text-decoration: none;
     }
 
     a[href]:visited {
-      color: dark-light-choose(scale-color($tertiary, $lightness: -20%), $tertiary);
+      color: dark-light-choose($tertiary, $tertiary);
     }
 
     img {
@@ -364,7 +364,7 @@ aside.onebox.stackexchange .onebox-body {
 }
 
 .onebox-metadata {
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 .onebox.xkcd .onebox-body {
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index a8a81759f4..cd3e92688f 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -10,7 +10,7 @@
   }
 
   .like-count {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     .fa { color: $love; font-size: 12px; }
   }
 
@@ -32,7 +32,7 @@
     margin-right: 14px;
   }
   a.search-link:visited .topic-title {
-    color: scale-color($tertiary, $lightness: 15%);
+    color: $tertiary-high;
   }
   .search-link {
     .topic-statuses, .topic-title {
@@ -43,7 +43,7 @@
     .topic-statuses {
       float: none;
       display: inline-block;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       font-size: 1.0em;
     }
   }
@@ -52,13 +52,13 @@
     line-height: 20px;
     word-wrap: break-word;
     max-width: 640px;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     .date {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .search-highlight {
-      color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 90%));
+      color: dark-light-choose($primary, $secondary-low);
     }
   }
 
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index 0f74cb0e76..10ba75d110 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -55,7 +55,7 @@
     float: right;
     font-size: 1.429em;
     a {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
@@ -67,7 +67,7 @@
   .date {
     float: right;
     margin: 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   input[type=text] {
diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss
index 65c06c6f8e..623b4369bc 100644
--- a/app/assets/stylesheets/common/base/tagging.scss
+++ b/app/assets/stylesheets/common/base/tagging.scss
@@ -83,7 +83,7 @@
   margin: 0;
 }
 
-$tag-color: scale-color($primary, $lightness: 40%);
+$tag-color: $primary-medium;
 
 .discourse-tag-count {
   font-size: 0.8em;
@@ -109,18 +109,18 @@ $tag-color: scale-color($primary, $lightness: 40%);
   }
 
   &.box {
-    background-color: scale-color($primary, $lightness: 90%);
-    color: scale-color($primary, $lightness: 30%);
+    background-color: $primary-low;
+    color: $primary-high;
     padding: 2px 8px;
     .extra-info-wrapper & {
-      background-color: scale-color($header-primary, $lightness: 90%);
-      color: scale-color($header-primary, $lightness: 30%);
+      background-color: $header_primary-low;
+      color: $header_primary-medium;
     }
   }
 
   &.simple, &.simple:visited, &.simple:hover {
     margin-right: 0px;
-    color: scale-color($primary, $lightness: 30%);
+    color: $primary-high;
   }
 }
 
@@ -183,7 +183,7 @@ $tag-color: scale-color($primary, $lightness: 40%);
 .discourse-tag.bullet:before {
   content: "\f04d";
   font-family: FontAwesome;
-  color: scale-color($primary, $lightness: 70%);
+  color: $primary-low-mid;
   margin-right: 5px;
   font-size: 0.7em;
   position:relative;
@@ -226,7 +226,7 @@ header .discourse-tag {color: $tag-color }
 
 .autocomplete {
   .d-icon-tag {
-   color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
+   color: dark-light-choose($primary, $primary-low-mid);
    padding-right: 5px;
   }
 
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 4f8dd185db..84b7aeac1c 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -30,16 +30,16 @@
    overflow: hidden;
    text-overflow: ellipsis;
    a {
-     color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+     color: dark-light-choose($primary-high, $secondary-low);
    }
  }
  .fa {
    font-size: 11px;
    margin-left: 3px;
-   color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+   color: dark-light-choose($primary-medium, $secondary-medium);
  }
   .new_user a, .user-title, .user-title a {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
  }
 }
 
@@ -49,8 +49,8 @@
   h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; }
   h1 { line-height: 1em; } /* normalize.css sets h1 font size but not line height */
   a { word-wrap: break-word; }
-  ins { background-color: dark-light-choose(scale-color($success, $lightness: 90%), scale-color($success, $lightness: -60%)); }
-  del { background-color: dark-light-choose(scale-color($danger, $lightness: 90%), scale-color($danger, $lightness: -60%)); }
+  ins { background-color: dark-light-choose($success-low, scale-color($success, $lightness: -60%)); }
+  del { background-color: dark-light-choose($danger-low, scale-color($danger, $lightness: -60%)); }
 }
 
 
@@ -72,7 +72,7 @@ aside.quote {
   .title {
     @include post-aside;
 
-    color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+    color: dark-light-choose($primary-high, $secondary-low);
     // IE will screw up the blockquote underneath if bottom padding is 0px
     padding: 12px 12px 1px 12px;
     // blockquote is underneath this and has top margin
@@ -88,7 +88,7 @@ aside.quote {
 }
 
 .quote-controls, .quote-controls .d-icon {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
 .cooked .highlight {
@@ -238,7 +238,7 @@ aside.quote {
   }
 
   &.via-email {
-    color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
   }
   &.raw-email {
     cursor: pointer;
@@ -287,7 +287,7 @@ blockquote > *:last-child {
 
 .gap {
   padding: 0.25em 0 0.5em 4.3em;
-  color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+  color: dark-light-choose($primary-medium, $secondary-high);
   cursor: pointer;
   text-transform: uppercase;
   font-weight: bold;
@@ -329,12 +329,12 @@ blockquote > *:last-child {
       font-size: 35px;
       width: 45px;
       text-align: center;
-      color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+      color: dark-light-choose($primary-low-mid, $secondary-high);
     }
   }
 
   .small-action-desc.timegap {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
   }
   .small-action-desc {
     padding: 0.25em 0 0.5em 4.3em;
@@ -342,7 +342,7 @@ blockquote > *:last-child {
     text-transform: uppercase;
     font-weight: bold;
     font-size: 0.9em;
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
 
     .custom-message {
       text-transform: none;
@@ -388,7 +388,7 @@ blockquote > *:last-child {
 
 a.mention, a.mention-group {
   padding: 2px 4px;
-  color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+  color: dark-light-choose($primary-high, $secondary-low);
   background: $primary-low;
   border-radius: 8px;
   font-weight: bold;
@@ -408,7 +408,7 @@ a.mention, a.mention-group {
 }
 
 .broken-image, .large-image {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
   border: 1px solid $primary-low;
   font-size: 32px;
   padding: 16px;
diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss
index ed3784cf54..57c1cce9d2 100644
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@@ -149,7 +149,7 @@
   }
 
   .expand-links {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .track-link {
@@ -165,7 +165,7 @@
     li {
       margin-bottom: 0.5em;
       a[href] {
-        color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
       .clicks {
         margin-left: 0.5em;
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index cdcfc202ad..4c275a0598 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -196,7 +196,7 @@
 
 .badge-groups {
   margin: 20px 0;
-  color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
   h3 {
     margin-bottom: 1.0em;
   }
@@ -222,7 +222,7 @@
   }
   .grant-info-item {
     margin-bottom: 1em;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .badge-title .form-horizontal .controls {
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index bf2a27c58f..4719c6c446 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -198,7 +198,7 @@
     }
 
     a {
-      color: $secondary;
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .active {
@@ -253,7 +253,7 @@
       }
 
       .instructions {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
         margin-top: 5px;
         margin-bottom: 10px;
         font-size: 80%;
@@ -343,7 +343,7 @@
   padding-top: 10px;
 
   li a {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
@@ -397,6 +397,12 @@
   }
 
   .label {
+    // TODO: Remove once all languages have been translated to remove icons from
+    // their user-stat labels
+    .fa:nth-of-type(2) {
+      display: none;
+    }
+
     color: blend-primary-secondary(50%);
   }
 }
@@ -415,7 +421,7 @@
   }
 
   .topic-info {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 
   @media all and (max-width : 600px) {
@@ -435,11 +441,11 @@
 .links-section {
   .domain {
     font-size: 0.714em;
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 }
 
-.likes-section {
+.summary-user-list {
   li {
     height: 40px;
   }
@@ -462,7 +468,7 @@
   }
 
   .instructions {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     margin-bottom: 10px;
     font-size: 80%;
     line-height: 1.4em;
@@ -477,7 +483,7 @@
   }
 
   .warning {
-    background-color: scale-color($danger, $lightness: 30%);
+    background-color: $danger-medium;
     padding: 5px 8px;
     color: $secondary;
     width: 520px;
diff --git a/app/assets/stylesheets/common/components/badges.scss b/app/assets/stylesheets/common/components/badges.scss
index 6c05df9ebd..c9ccb9fecf 100644
--- a/app/assets/stylesheets/common/components/badges.scss
+++ b/app/assets/stylesheets/common/components/badges.scss
@@ -254,7 +254,7 @@
   font-size: 11px;
   line-height: 1;
   text-align: center;
-  background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 70%));
+  background-color: dark-light-choose($primary-low-mid, $secondary-low);
   &[href] {
     color: $secondary;
   }
@@ -266,14 +266,14 @@
   // New posts
 
   &.new-posts, &.unread-posts {
-    background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), $tertiary);
+    background-color: dark-light-choose($tertiary-medium, $tertiary);
     color: dark-light-choose($secondary, $secondary);
     font-weight: dark-light-choose(normal, bold);
   }
 
   &.new-topic {
     background-color: transparent;
-    color: scale-color($tertiary, $lightness: 20%);
+    color: $tertiary-high;
     font-weight: normal;
     font-size: 0.929em;
   }
@@ -304,7 +304,7 @@
   font-size: 1em;
   line-height: 1;
   &[href] {
-    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
diff --git a/app/assets/stylesheets/common/components/banner.scss b/app/assets/stylesheets/common/components/banner.scss
index 5fe427df04..096c01e02a 100644
--- a/app/assets/stylesheets/common/components/banner.scss
+++ b/app/assets/stylesheets/common/components/banner.scss
@@ -4,10 +4,9 @@
 
 #banner {
   padding: 10px;
-  border-radius: 5px;
-  background: scale-color($tertiary, $lightness: 90%);
-  box-shadow: 0 1px 2px scale-color($tertiary, $lightness: 70%);
-  color: darken($tertiary, 45%);
+  background: $tertiary-low;
+  box-shadow: 0 2px 4px -1px rgba(0,0,0, .25);
+  color: $primary;
   z-index: 1001;
   overflow: auto;
 
@@ -18,7 +17,7 @@
   .close {
     font-size: 1.786em;
     margin-top: -5px;
-    color: scale-color($tertiary, $lightness: 70%);
+    color: dark-light-choose($primary-low-mid, $secondary-medium);
     padding-left: 5px;
     float: right;
   }
diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss
index d15030ce26..e14f7bda0f 100644
--- a/app/assets/stylesheets/common/components/buttons.scss
+++ b/app/assets/stylesheets/common/components/buttons.scss
@@ -56,7 +56,7 @@
   }
   &[disabled], &.disabled {
     background: $primary-low; 
-    &:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); }
+    &:hover { color: dark-light-choose($primary-low-mid, $secondary-high); }
     cursor: not-allowed;
   }
 
@@ -74,7 +74,7 @@
 .btn-primary {
   border: none;
   font-weight: normal;
-  color: dark-light-choose(#fff, scale-color($primary, $lightness: 60%));
+  color: dark-light-choose(#fff, $primary-medium);
   background: $tertiary;
 
   &[href] {
@@ -82,10 +82,10 @@
   }
   &:hover, &.btn-hover {
     color: #fff;
-    background: dark-light-choose(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -20%));
+    background: dark-light-choose($tertiary, $tertiary);
   }
   &:active, &.btn-active {
-    @include linear-gradient(scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: -10%));
+    @include linear-gradient($tertiary, $tertiary);
     color: $secondary;
   }
   &[disabled], &.disabled {
diff --git a/app/assets/stylesheets/common/components/categories-admin-dropdown.scss b/app/assets/stylesheets/common/components/categories-admin-dropdown.scss
deleted file mode 100644
index de32ec0a6f..0000000000
--- a/app/assets/stylesheets/common/components/categories-admin-dropdown.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.categories-admin-dropdown.categories-admin-dropdown.categories-admin-dropdown {
-  .select-box-body {
-    min-width: auto;
-    width: 250px;
-  }
-}
diff --git a/app/assets/stylesheets/common/components/category-select-box.scss b/app/assets/stylesheets/common/components/category-select-box.scss
deleted file mode 100644
index 58d303ac76..0000000000
--- a/app/assets/stylesheets/common/components/category-select-box.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-.category-select-box.category-select-box {
-  .select-box-row {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-align: flex-start;
-        -ms-flex-align: flex-start;
-            align-items: flex-start;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-
-    &.is-uncategorized {
-      .topic-count {
-        display: none;
-      }
-    }
-
-    .topic-count {
-      font-size: 11px;
-      color: $primary;
-    }
-
-    .category-status {
-      color: $primary;
-      -webkit-box-flex: 0;
-          -ms-flex: 1 1 auto;
-              flex: 1 1 auto;
-    }
-
-    .category-desc {
-      -webkit-box-flex: 0;
-          -ms-flex: 1 1 auto;
-              flex: 1 1 auto;
-      color: #919191;
-      font-size: 0.857em;
-      line-height: 16px;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/common/components/dropdown-select-box.scss b/app/assets/stylesheets/common/components/dropdown-select-box.scss
deleted file mode 100644
index 8691886546..0000000000
--- a/app/assets/stylesheets/common/components/dropdown-select-box.scss
+++ /dev/null
@@ -1,103 +0,0 @@
-.dropdown-select-box.dropdown-select-box {
-  display: inline-flex;
-  height: 30px;
-  min-width: auto;
-
-  &.is-expanded {
-    .collection,
-    .select-box-collection,
-    .select-box-body {
-      border-radius: 0;
-    }
-  }
-
-  .select-box-body {
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    background-clip: padding-box;
-    box-shadow: 0 1px 5px rgba(0,0,0,0.4);
-    max-width: 300px;
-    width: 300px;
-  }
-
-  .select-box-row {
-    margin: 0;
-    padding: 10px 5px;
-
-    .icons {
-      display: flex;
-      align-items: flex-start;
-      justify-content: center;
-      align-self: flex-start;
-      margin-right: 10px;
-      margin-top: 2px;
-      width: 30px;
-
-      .d-icon {
-        font-size: 1.286em;
-        align-self: center;
-        margin-right: 0;
-        opacity: 1;
-        color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
-      }
-    }
-
-    .texts {
-      line-height: 18px;
-      flex: 1;
-      align-items: flex-start;
-      display: flex;
-      flex-wrap: wrap;
-      flex-direction: column;
-
-      .title {
-        flex: 1;
-        font-weight: bold;
-        display: block;
-        font-size: 1em;
-        color: $primary;
-        padding: 0;
-      }
-
-      .desc {
-        flex: 1;
-        font-size: 0.857em;
-        font-weight: normal;
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
-        white-space: normal;
-      }
-    }
-
-    &.is-highlighted {
-      background: $tertiary-low;
-    }
-
-    &:hover {
-      background: $highlight-medium;
-    }
-  }
-
-  .select-box-collection {
-    padding: 0;
-  }
-
-  .dropdown-header {
-    padding: 0;
-    border: 0;
-    outline: 0;
-    justify-content: flex-start;
-    background: none;
-
-    .d-icon + .d-icon {
-      margin-left: 5px;
-    }
-
-    .btn {
-      align-items: center;
-      justify-content: space-between;
-      flex-direction: row;
-      display: inline-flex;
-      height: 100%;
-      margin: 0;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/common/components/future-date-input-selector.scss b/app/assets/stylesheets/common/components/future-date-input-selector.scss
deleted file mode 100644
index 60bab06f26..0000000000
--- a/app/assets/stylesheets/common/components/future-date-input-selector.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.future-date-input-selector-datetime {
-  float: right;
-  color: lighten($primary, 40%);
-  font-size: 13px;
-}
-
-.future-date-input-selector-icons {
-  margin-right: 10px;
-}
diff --git a/app/assets/stylesheets/common/components/hashtag.scss b/app/assets/stylesheets/common/components/hashtag.scss
index f3ae1052a5..4cf0903d44 100644
--- a/app/assets/stylesheets/common/components/hashtag.scss
+++ b/app/assets/stylesheets/common/components/hashtag.scss
@@ -1,9 +1,9 @@
 a.hashtag {
-  color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
+  color: dark-light-choose($primary, $primary-low-mid);
   font-weight: bold;
 
   &:visited, &:hover {
-    color: dark-light-choose($primary, scale-color($primary, $lightness: 70%));
+    color: dark-light-choose($primary, $primary-low-mid);
   }
 
   &:hover {
diff --git a/app/assets/stylesheets/common/components/notifications-button.scss b/app/assets/stylesheets/common/components/notifications-button.scss
deleted file mode 100644
index df613a7a04..0000000000
--- a/app/assets/stylesheets/common/components/notifications-button.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.notifications-button.notifications-button.notifications-button {
-  .select-box-body {
-    min-width: 550px;
-    max-width: 550px;
-  }
-
-  .select-box-row {
-    .icons {
-      align-self: flex-start;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/common/components/user-info.scss b/app/assets/stylesheets/common/components/user-info.scss
index 8c274f7b5f..63bdc88280 100644
--- a/app/assets/stylesheets/common/components/user-info.scss
+++ b/app/assets/stylesheets/common/components/user-info.scss
@@ -23,17 +23,17 @@
 
     .username a {
       font-weight: bold;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
     }
 
     .name {
       margin-left: 5px;
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
     }
 
     .title {
       margin-top: 3px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
@@ -56,7 +56,7 @@
       min-height: 80px;
 
       .granted-on {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
 
       .post-link {
diff --git a/app/assets/stylesheets/common/components/user-stream-item.scss b/app/assets/stylesheets/common/components/user-stream-item.scss
index 42c6e1ca38..fbdcc97e66 100644
--- a/app/assets/stylesheets/common/components/user-stream-item.scss
+++ b/app/assets/stylesheets/common/components/user-stream-item.scss
@@ -70,7 +70,7 @@
   }
 
   .edit-reason {
-    background-color: dark-light-choose(scale-color($highlight, $lightness: 25%), scale-color($highlight, $lightness: -50%));
+    background-color: dark-light-choose($highlight-medium, scale-color($highlight, $lightness: -50%));
     padding: 3px 5px 5px 5px;
   }
 
@@ -100,7 +100,7 @@
 
     // common/base/header.scss
     .fa, .icon {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       font-size: 1.714em;
     }
   }
@@ -116,13 +116,13 @@
     .name {
       display: inline-block;
       margin-top: 5px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium,$secondary-medium);
     }
 
     .title {
       display: inline-block;
       margin-top: 5px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 }
diff --git a/app/assets/stylesheets/common/foundation/helpers.scss b/app/assets/stylesheets/common/foundation/helpers.scss
index 2b540dca04..883c8926cf 100644
--- a/app/assets/stylesheets/common/foundation/helpers.scss
+++ b/app/assets/stylesheets/common/foundation/helpers.scss
@@ -81,6 +81,6 @@
 // Buttons
 // ---------------------------------------------------
 .disable-no-hover:hover {
-  background: dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 60%));;
+  background: dark-light-choose($primary-low, $secondary-medium);;
   color: $primary;
 }
diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss
index ed55c8f522..60942e808b 100644
--- a/app/assets/stylesheets/common/foundation/mixins.scss
+++ b/app/assets/stylesheets/common/foundation/mixins.scss
@@ -88,10 +88,14 @@
 
 // Unselectable (avoids unwanted selections with iPad, touch laptops, etc)
 
+@mixin user-select($mode) {
+  -webkit-user-select: $mode;
+     -moz-user-select: $mode;
+      -ms-user-select: $mode;
+}
+
 @mixin unselectable {
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
+  @include user-select(none);
 }
 
 
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 08988f1a71..118725aab6 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -83,14 +83,25 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
 
 //primary
 $primary-low: dark-light-diff($primary, $secondary, 90%, -65%);
+$primary-low-mid: dark-light-diff($primary, $secondary, 70%, -45%);
 $primary-medium: dark-light-diff($primary, $secondary, 50%, -20%);
+$primary-high: dark-light-diff($primary, $secondary, 30%, -10%);
+
+//header_primary
+$header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -65%);
+$header_primary-medium: dark-light-diff($header_primary, $secondary, 50%, -20%);
+$header_primary-high: dark-light-diff($header_primary, $secondary, 20%, 20%);
+
 
 //secondary
-$secondary-low: dark-light-diff($secondary, $primary, 50%, -50%);
-$secondary-medium: dark-light-diff($secondary, $primary, 30%, -35%);
+$secondary-low: dark-light-diff($secondary, $primary, 70%, -70%);
+$secondary-medium: dark-light-diff($secondary, $primary, 50%, -50%);
+$secondary-high: dark-light-diff($secondary, $primary, 30%, -35%);
 
 //tertiary
 $tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%);
+$tertiary-medium: dark-light-diff($tertiary, $secondary, 50%, -45%);
+$tertiary-high: dark-light-diff($tertiary, $secondary, 20%, -25%);
 
 //quaternary
 $quaternary-low: dark-light-diff($quaternary, $secondary, 70%, -70%);
@@ -104,7 +115,8 @@ $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%);
+$success-low: dark-light-diff($success, $secondary, 80%, -60%);
+$success-medium: dark-light-diff($success, $secondary, 50%, -40%);
 
 //love
 $love-low: dark-light-diff($love, $secondary, 85%, -60%);
diff --git a/app/assets/stylesheets/common/select-box-kit/categories-admin-dropdown.scss b/app/assets/stylesheets/common/select-box-kit/categories-admin-dropdown.scss
new file mode 100644
index 0000000000..9a7a2e522e
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/categories-admin-dropdown.scss
@@ -0,0 +1,12 @@
+.select-box-kit {
+  &.categories-admin-dropdown {
+    .select-box-kit-select-box-kit-body {
+      min-width: auto;
+      width: 250px;
+    }
+
+    .select-box-kit-header .d-icon {
+      justify-content: space-between;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-box-kit/category-chooser.scss b/app/assets/stylesheets/common/select-box-kit/category-chooser.scss
new file mode 100644
index 0000000000..e5f30989c0
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/category-chooser.scss
@@ -0,0 +1,46 @@
+.select-box-kit {
+  &.combo-box {
+    &.category-chooser {
+      width: 300px;
+      .select-box-kit-row {
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-box-align: flex-start;
+            -ms-flex-align: flex-start;
+                align-items: flex-start;
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+                flex-direction: column;
+
+        &.none {
+          .topic-count {
+            display: none;
+          }
+        }
+
+        .topic-count {
+          font-size: 11px;
+          color: $primary;
+        }
+
+        .category-status {
+          color: $primary;
+          -webkit-box-flex: 0;
+              -ms-flex: 1 1 auto;
+                  flex: 1 1 auto;
+        }
+
+        .category-desc {
+          -webkit-box-flex: 0;
+              -ms-flex: 1 1 auto;
+                  flex: 1 1 auto;
+          color: #919191;
+          font-size: 0.857em;
+          line-height: 16px;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-box-kit/combo-box.scss b/app/assets/stylesheets/common/select-box-kit/combo-box.scss
new file mode 100644
index 0000000000..2c93026e4b
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/combo-box.scss
@@ -0,0 +1,85 @@
+.select-box-kit {
+  &.combo-box {
+    border-radius: 3px;
+
+    .select-box-kit-body {
+      width: 100%;
+    }
+
+    .select-box-kit-row {
+      margin: 5px;
+      min-height: 1px;
+      padding: 5px;
+    }
+
+    .select-box-kit-filter {
+      line-height: 18px;
+      padding: 5px 10px;
+      border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+
+      .select-box-kit-filter-input {
+        margin-right: 5px;
+      }
+    }
+
+    .select-box-kit-header {
+      background: $secondary;
+      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      border-radius: 3px;
+      padding: 5px 10px;
+      font-weight: 500;
+      font-size: 1em;
+      line-height: 18px;
+
+      &.is-focused {
+        border: 1px solid $tertiary;
+        border-radius: 3px;
+        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+    }
+
+    &.is-disabled {
+      .select-box-kit-header {
+        background: #e9e9e9;
+        border-color: #ddd;
+      }
+    }
+
+    &.is-highlighted {
+      .select-box-kit-header {
+        border: 1px solid $tertiary;
+        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+    }
+
+    &.is-expanded {
+      .select-box-kit-wrapper {
+        display: block;
+        border: 1px solid $tertiary;
+        border-radius: 3px;
+        -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                box-shadow: $tertiary 0px 0px 6px 0px;
+      }
+
+      .select-box-kit-header {
+        border-radius: 3px 3px 0 0;
+        border-color: transparent;
+        -webkit-box-shadow: none;
+                box-shadow: none;
+      }
+
+      .select-box-kit-body {
+        border-radius: 3px 3px 0 0;
+      }
+    }
+
+    &.is-expanded.is-above {
+      .select-box-kit-header {
+        border-radius: 0 0 3px 3px;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-box-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-box-kit/dropdown-select-box.scss
new file mode 100644
index 0000000000..363af0d795
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/dropdown-select-box.scss
@@ -0,0 +1,153 @@
+.select-box-kit {
+  &.dropdown-select-box {
+    display: -webkit-inline-box;
+    display: -ms-inline-flexbox;
+    display: inline-flex;
+    min-width: auto;
+
+    &.is-expanded {
+      .select-box-kit-collection,
+      .select-box-kit-body {
+        border-radius: 0;
+      }
+    }
+
+    .select-box-kit-body {
+      border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+      background-clip: padding-box;
+      -webkit-box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+              box-shadow: 0 1px 5px rgba(0,0,0,0.4);
+      max-width: 300px;
+      width: 300px;
+    }
+
+    .select-box-kit-row {
+      margin: 0;
+      padding: 10px 5px;
+
+      .icons {
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-box-align: start;
+            -ms-flex-align: start;
+                align-items: flex-start;
+        -webkit-box-pack: center;
+            -ms-flex-pack: center;
+                justify-content: center;
+        -ms-flex-item-align: start;
+            align-self: flex-start;
+        margin-right: 10px;
+        margin-top: 2px;
+        width: 30px;
+
+        .d-icon {
+          font-size: 1.286em;
+          -ms-flex-item-align: center;
+              align-self: center;
+          margin-right: 0;
+          opacity: 1;
+          color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+        }
+      }
+
+      .texts {
+        line-height: 18px;
+        -webkit-box-flex: 1;
+            -ms-flex: 1;
+                flex: 1;
+        -webkit-box-align: start;
+            -ms-flex-align: start;
+                align-items: flex-start;
+        display: -webkit-box;
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-wrap: wrap;
+            flex-wrap: wrap;
+        -webkit-box-orient: vertical;
+        -webkit-box-direction: normal;
+            -ms-flex-direction: column;
+                flex-direction: column;
+
+        .name {
+          -webkit-box-flex: 1;
+              -ms-flex: 1;
+                  flex: 1;
+          font-weight: bold;
+          font-size: 1em;
+          color: $primary;
+          padding: 0;
+        }
+
+        .desc {
+          -webkit-box-flex: 1;
+              -ms-flex: 1;
+                  flex: 1;
+          font-size: 0.857em;
+          font-weight: normal;
+          color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));;
+          white-space: normal;
+        }
+      }
+
+      &.is-highlighted {
+        background: $tertiary-low;
+      }
+
+      &:hover {
+        background: $highlight-medium;
+      }
+    }
+
+    .select-box-kit-collection {
+      padding: 0;
+    }
+
+    .dropdown-select-box-header {
+      -webkit-box-sizing: border-box;
+         -moz-box-sizing: border-box;
+              box-sizing: border-box;
+      padding: 0;
+      border: 0;
+      outline: 0;
+      -webkit-box-pack: start;
+          -ms-flex-pack: start;
+              justify-content: flex-start;
+      background: none;
+      height: 30px;
+
+      &.is-focused {
+        .btn {
+          border: 1px solid $tertiary;
+          -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
+                  box-shadow: $tertiary 0px 0px 6px 0px;
+        }
+      }
+
+      .d-icon + .d-icon {
+        margin-left: 5px;
+        font-size: 1.143em;
+        line-height: 18px;
+      }
+
+      .btn {
+        -webkit-box-align: center;
+            -ms-flex-align: center;
+                align-items: center;
+        -webkit-box-pack: justify;
+            -ms-flex-pack: justify;
+                justify-content: space-between;
+        -webkit-box-orient: horizontal;
+        -webkit-box-direction: normal;
+            -ms-flex-direction: row;
+                flex-direction: row;
+        display: -webkit-inline-box;
+        display: -ms-inline-flexbox;
+        display: inline-flex;
+        height: 100%;
+        margin: 0;
+        border: 1px solid transparent
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-box-kit/future-date-input-selector.scss b/app/assets/stylesheets/common/select-box-kit/future-date-input-selector.scss
new file mode 100644
index 0000000000..60683bddc4
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/future-date-input-selector.scss
@@ -0,0 +1,22 @@
+.select-box-kit {
+  &.combobox {
+    &.future-date-input-selector {
+      min-width: 50%;
+
+      .future-date-input-selector-datetime {
+        color: lighten($primary, 40%);
+        font-size: 13px;
+      }
+
+      .future-date-input-selector-icons {
+        width: 25px;
+      }
+
+      .future-date-input-selector-row {
+        .future-date-input-selector-icons {
+          color: lighten($primary, 40%);
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/select-box-kit/legacy-combo-box.scss
similarity index 90%
rename from app/assets/stylesheets/common/base/combobox.scss
rename to app/assets/stylesheets/common/select-box-kit/legacy-combo-box.scss
index 4c80abc5c6..842ae00484 100644
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/select-box-kit/legacy-combo-box.scss
@@ -1,10 +1,11 @@
+// DO NOT MODIFY
+// TODO: remove when all select2 instances are gone
 .select2-results .select2-highlighted {
     background: $highlight-medium;
     color: $primary;
 }
 
-.category-combobox, .select2-drop {
-
+.select2-drop {
   .badge-category {
     display: inline-block;
   }
@@ -26,7 +27,7 @@
 .select2-drop {
   background: $secondary;
   .d-icon {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
@@ -36,7 +37,7 @@
 
 .select2-container {
   border-radius: 3px;
-  border: 1px solid $primary-low; 
+  border: 1px solid $primary-low;
   min-width: 200px;
 
   &.select2-dropdown-open {
diff --git a/app/assets/stylesheets/common/select-box-kit/multi-combobox.scss b/app/assets/stylesheets/common/select-box-kit/multi-combobox.scss
new file mode 100644
index 0000000000..87235fa8f3
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/multi-combobox.scss
@@ -0,0 +1,131 @@
+.multi-combobox {
+  width: 300px;
+  background: $secondary;
+  border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+
+  .select-box-kit-body {
+    width: 100%;
+  }
+
+  .select-box-kit-row {
+    margin: 5px;
+    min-height: 1px;
+    padding: 5px;
+  }
+
+  .select-box-kit-filter {
+    border-top: 1px solid $primary-low;
+  }
+
+  .select-box-kit-header {
+    background: $secondary;
+    border-bottom: 1px solid transparent;
+
+    &.is-focused {
+      border-bottom: 1px solid $primary-low;
+      box-shadow: $tertiary 0px 0px 6px 0px;
+    }
+  }
+
+  &.is-disabled {
+    .select-box-kit-header {
+      background: #e9e9e9;
+      border-color: #ddd;
+    }
+  }
+
+  &.is-highlighted {
+    .select-box-kit-header {
+      border: 1px solid $tertiary;
+      box-shadow: $tertiary 0px 0px 6px 0px;
+    }
+  }
+
+  &.is-expanded {
+    .select-box-kit-wrapper {
+      display: block;
+      border: 1px solid $tertiary;
+      box-shadow: $tertiary 0px 0px 6px 0px;
+    }
+
+    .select-box-kit-header {
+      border-radius: 3px 3px 0 0;
+    }
+
+    .select-box-kit-body {
+      border-radius: 3px 3px 0 0;
+    }
+  }
+
+  .choices {
+    list-style: none;
+    margin: 0;
+    padding: 5px;
+  }
+
+  .choice-placeholder {
+    padding: 0 5px;
+    margin: 2px 0;
+    border: 1px solid transparent;
+    display: inline-flex;
+    flex: 1;
+  }
+
+  .filter {
+    display: inline-flex;
+    align-items: center;
+    justify-content: flex-start;
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+  }
+
+  .select-box-kit-filter-input, .select-box-kit-filter-input:focus {
+    border: none;
+    background: none;
+    display: inline-block;
+    width: 100%;
+    outline: none;
+    min-width: auto;
+    padding: 0;
+    margin: 0;
+    outline: 0;
+    border: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    border-radius: 0;
+  }
+
+  .selected-name {
+    display: inline-flex;
+    align-items: center;
+    justify-content: flex-start;
+    padding: 0 5px;
+    margin: 2px 0;
+    color: $primary;
+    cursor: default;
+    border: 1px solid $primary-medium;
+    border-radius: 3px;
+    box-shadow: 0 0 2px $secondary inset, 0 1px 0 rgba(0,0,0,0.05);
+    background-clip: padding-box;
+    -webkit-touch-callout: none;
+    user-select: none;
+    background-color: $primary-low;
+
+    &:focus {
+      border-color: $primary;
+      outline: none;
+    }
+
+    .d-icon {
+      margin-right: 5px;
+      color: $primary-medium;
+      cursor: pointer;
+      font-size: 12px;
+
+      &:hover {
+        color: $primary;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/select-box-kit/notifications-button.scss b/app/assets/stylesheets/common/select-box-kit/notifications-button.scss
new file mode 100644
index 0000000000..877cf815ab
--- /dev/null
+++ b/app/assets/stylesheets/common/select-box-kit/notifications-button.scss
@@ -0,0 +1,17 @@
+.select-box-kit {
+  &.dropdown-select-box {
+    &.notifications-button {
+      .select-box-kit-body {
+        min-width: 550px;
+        max-width: 550px;
+      }
+
+      .select-box-kit-row {
+        .icons {
+          -ms-flex-item-align: start;
+              align-self: flex-start;
+        }
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/common/components/pinned-button.scss b/app/assets/stylesheets/common/select-box-kit/pinned-button.scss
similarity index 56%
rename from app/assets/stylesheets/common/components/pinned-button.scss
rename to app/assets/stylesheets/common/select-box-kit/pinned-button.scss
index 642db6e483..a75a596c6a 100644
--- a/app/assets/stylesheets/common/components/pinned-button.scss
+++ b/app/assets/stylesheets/common/select-box-kit/pinned-button.scss
@@ -19,18 +19,26 @@
 }
 
 .pinned-button {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
-  justify-content: flex-start;
-  align-items: center;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin: 0;
   min-width: auto;
 
   .pinned-options {
+    display: -webkit-inline-box;
+    display: -ms-inline-flexbox;
     display: inline-flex;
   }
 
-  .pinned-options.pinned-options.pinned-options {
-    .select-box-body {
+  .pinned-options {
+    .select-box-kit-body {
       min-width: unset;
       max-width: unset;
       width: 550px;
diff --git a/app/assets/stylesheets/common/components/select-box.scss b/app/assets/stylesheets/common/select-box-kit/select-box-kit.scss
similarity index 60%
rename from app/assets/stylesheets/common/components/select-box.scss
rename to app/assets/stylesheets/common/select-box-kit/select-box-kit.scss
index 026dd0ed97..56ccf609ab 100644
--- a/app/assets/stylesheets/common/components/select-box.scss
+++ b/app/assets/stylesheets/common/select-box-kit/select-box-kit.scss
@@ -1,9 +1,9 @@
-.mobile-view .select-box.is-expanded {
+.mobile-view .select-box-kit.is-expanded {
   z-index: 1000;
 }
 
-.select-box {
-  border-radius: 3px;
+.select-box-kit {
+  min-width: 220px;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
   display: inline-block;
@@ -12,29 +12,25 @@
       -ms-flex-direction: column;
           flex-direction: column;
   position: relative;
-  height: 34px;
-  min-width: 220px;
+  vertical-align: middle;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
 
   &.is-hidden {
     display: none;
   }
 
-  &.small {
-    height: 28px;
+  &.is-disabled {
+    pointer-events: none;
   }
 
   &.is-expanded {
     z-index: 999;
 
-    .select-box-wrapper {
-      border: 1px solid $tertiary;
-      border-radius: 3px;
-      -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-              box-shadow: $tertiary 0px 0px 6px 0px;
-    }
-
-    .select-box-body {
-      border-radius: 3px 3px 0 0;
+    .select-box-kit-body {
       display: -webkit-box;
       display: -ms-flexbox;
       display: flex;
@@ -47,36 +43,18 @@
       top: 0;
     }
 
-    .collection, {
+    .select-box-kit-collection, {
       border-radius: inherit;
     }
-
-    .select-box-header {
-      border-radius: 3px 3px 0 0;
-    }
-
-    &.is-above {
-      .select-box-header {
-        border-radius: 0 0 3px 3px;
-      }
-    }
-  }
-
-  &.is-highlighted {
-    .select-box-header {
-      border: 1px solid $tertiary;
-      -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-              box-shadow: $tertiary 0px 0px 6px 0px;
-    }
   }
 
   &.is-above {
-    .select-box-body {
+    .select-box-kit-body {
       bottom: 0;
       top: auto;
     }
 
-    .select-box-wrapper {
+    .select-box-kit-wrapper {
       bottom: 0;
       top: auto;
     }
@@ -86,14 +64,14 @@
     opacity: 0.7;
   }
 
-  .select-box-header {
-    background: $secondary;
-    border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-    border-radius: 3px;
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
+  .select-box-kit-header {
+    -webkit-transition: all .25s;
+    -o-transition: all .25s;
+    transition: all .25s;
     cursor: pointer;
     outline: none;
+    display: -webkit-box;
+    display: -ms-flexbox;
     display: flex;
     -webkit-box-align: center;
         -ms-flex-align: center;
@@ -106,28 +84,25 @@
     -webkit-box-pack: justify;
         -ms-flex-pack: justify;
             justify-content: space-between;
-    padding-left: 10px;
-    padding-right: 10px;
-    height: inherit;
 
-    &.is-focused {
-      border: 1px solid $tertiary;
-      border-radius: 3px;
-      -webkit-box-shadow: $tertiary 0px 0px 6px 0px;
-              box-shadow: $tertiary 0px 0px 6px 0px;
-    }
-
-    .current-selection {
+    .selected-name {
       text-align: left;
-      -webkit-box-flex: 1;
-          -ms-flex: 1;
-              flex: 1;
-      text-overflow: ellipsis;
+      -webkit-box-flex: 10;
+          -ms-flex: 10;
+              flex: 10;
+      -o-text-overflow: ellipsis;
+         text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
       color: inherit;
     }
 
+    .btn-clear {
+      padding: 0px 10px;
+      border: 0;
+      background: none;
+    }
+
     .icon {
       margin-right: 5px;
     }
@@ -138,8 +113,12 @@
     }
 
     .d-button-label {
+      display: -webkit-box;
+      display: -ms-flexbox;
       display: flex;
-      align-items: center;
+      -webkit-box-align: center;
+          -ms-flex-align: center;
+              align-items: center;
       white-space: nowrap;
       overflow: hidden;
 
@@ -150,30 +129,32 @@
     }
   }
 
-  .select-box-body {
+  .select-box-kit-body {
     display: none;
-    width: 100%;
     background: $secondary;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
   }
 
-  .select-box-row {
-    margin: 5px;
-    min-height: 1px;
+  .select-box-kit-row {
     cursor: pointer;
     outline: none;
-    padding: 5px;
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
-    align-items: center;
+    -webkit-box-align: center;
+        -ms-flex-align: center;
+            align-items: center;
     -webkit-box-pack: start;
         -ms-flex-pack: start;
             justify-content: flex-start;
 
-    .text {
+    .name {
       margin: 0;
+      overflow: hidden;
+      -o-text-overflow: ellipsis;
+         text-overflow: ellipsis;
+      flex: 10;
     }
 
     .d-icon {
@@ -191,34 +172,25 @@
     &.is-selected.is-highlighted {
       background: $tertiary-low;
     }
+
+    &.none:not(.is-highlighted) {
+      background: $primary-low;
+    }
   }
 
-  .select-box-collection {
-    -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-flex: 0;
-        -ms-flex: 0 1 auto;
-            flex: 0 1 auto;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
+  .select-box-kit-collection {
     background: $secondary;
     overflow-x: hidden;
     overflow-y: auto;
     border-radius: inherit;
-    margin: 0;
-    padding: 0;
     -webkit-overflow-scrolling: touch;
+    margin: 0;
 
-    .collection {
+    .select-box-kit-collection {
       padding: 0;
       margin: 0;
 
-      &:hover .select-box-row.is-highlighted:hover {
+      &:hover .select-box-kit-row.is-highlighted:hover {
         background: $tertiary-low;
       }
     }
@@ -231,7 +203,7 @@
     &::-webkit-scrollbar-thumb {
       cursor: pointer;
       border-radius: 5px;
-      background: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      background: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     &::-webkit-scrollbar-track {
@@ -240,9 +212,7 @@
     }
   }
 
-  .select-box-filter {
-    border-bottom: 1px solid $primary-low;
-    background: $secondary;
+  .select-box-kit-filter {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
@@ -252,24 +222,38 @@
     -webkit-box-pack: justify;
         -ms-flex-pack: justify;
             justify-content: space-between;
-    padding: 0 10px;
 
-    .filter-query, .filter-query:focus, .filter-query:active {
+    .select-box-kit-filter-input, .select-box-kit-filter-input:focus, .select-box-kit-filter-input:active {
       background: none;
       margin: 0;
+      padding: 0;
       -webkit-box-flex: 1;
           -ms-flex: 1;
               flex: 1;
       outline: none;
       border: 0;
+      border-radius: 0;
       -webkit-box-shadow: none;
               box-shadow: none;
       width: 100%;
-      padding: 5px 0;
+    }
+
+    &.is-hidden {
+      clip: rect(0 0 0 0);
+      width: 1px;
+      height: 1px;
+      border: 0;
+      margin: 0;
+      padding: 0;
+      overflow: hidden;
+      position: fixed;
+      outline: 0;
+      left: 0px;
+      top: 0px;
     }
   }
 
-  .select-box-wrapper {
+  .select-box-kit-wrapper {
     position: absolute;
     top: 0;
     left: 0;
@@ -281,7 +265,7 @@
     border: 1px solid transparent;
   }
 
-  .select-box-offscreen, .select-box .select-box-offscreen:focus {
+  .select-box-kit-offscreen, .select-box-kit-offscreen:focus {
     clip: rect(0 0 0 0);
     width: 1px;
     height: 1px;
@@ -289,7 +273,7 @@
     margin: 0;
     padding: 0;
     overflow: hidden;
-    position: absolute;
+    position: fixed;
     outline: 0;
     left: 0px;
     top: 0px;
diff --git a/app/assets/stylesheets/common/components/topic-notifications-button.scss b/app/assets/stylesheets/common/select-box-kit/topic-notifications-button.scss
similarity index 58%
rename from app/assets/stylesheets/common/components/topic-notifications-button.scss
rename to app/assets/stylesheets/common/select-box-kit/topic-notifications-button.scss
index cf9f081990..c9a994089b 100644
--- a/app/assets/stylesheets/common/components/topic-notifications-button.scss
+++ b/app/assets/stylesheets/common/select-box-kit/topic-notifications-button.scss
@@ -19,12 +19,20 @@
 }
 
 .topic-notifications-button {
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
   display: inline-flex;
-  justify-content: flex-start;
-  align-items: center;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   margin: 0;
 
   .topic-notifications-options {
+    display: -webkit-inline-box;
+    display: -ms-inline-flexbox;
     display: inline-flex;
   }
 }
diff --git a/app/assets/stylesheets/common/topic-timeline.scss b/app/assets/stylesheets/common/topic-timeline.scss
index 0aed64cad0..3f5deb9df9 100644
--- a/app/assets/stylesheets/common/topic-timeline.scss
+++ b/app/assets/stylesheets/common/topic-timeline.scss
@@ -48,7 +48,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 90%), scale-color($secondary, $lightness: 90%));
+    border-top: 1px solid dark-light-choose($primary-low, $secondary-low);
     box-shadow: 0px -2px 4px -1px rgba(0,0,0,.25);
     padding-top: 20px;
     z-index: 100000;
@@ -81,7 +81,7 @@
         -webkit-box-orient: vertical;
       }
       .username {
-        color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+        color: dark-light-choose($primary-high, $secondary-low);
         word-wrap: break-word;
         font-weight: bold;
       }
@@ -201,14 +201,14 @@
 
     .start-date {
       @include unselectable;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     .timeline-scrollarea {
       margin-top: 0.5em;
       margin-left: 0.5em;
       border-left: 1px solid;
-      border-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%));
+      border-color: dark-light-choose($tertiary-low, $tertiary-high);
       position: relative;
       -webkit-transform: translate3d(0,0,0);
     }
@@ -224,7 +224,7 @@
     .timeline-handle {
       @include border-radius-all(0.8em);
       width: 0.35em;
-      background-color: dark-light-choose(scale-color($tertiary, $lightness: 80%), scale-color($tertiary, $lightness: 20%));
+      background-color: dark-light-choose($tertiary-low, $tertiary-high);
       height: 100%;
       float: left;
       z-index: 501;
@@ -235,7 +235,7 @@
     }
 
     .timeline-ago {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
 
     .timeline-scroller {
@@ -273,7 +273,7 @@
     .now-date {
       @include unselectable;
       display: inline-block;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin-top: 0.5em;
       i {
         margin-left: 0.15em;
diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss
index fb2de65344..b5d0a93ab0 100644
--- a/app/assets/stylesheets/desktop/category-list.scss
+++ b/app/assets/stylesheets/desktop/category-list.scss
@@ -27,7 +27,7 @@
   .topics .badge-notification,
   .category .badge-notification {
     background-color: transparent;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 
   .topics {
@@ -70,11 +70,11 @@
     a.last-posted-at,
     a.last-posted-at:visited {
       font-size: 0.86em;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .topic-statuses .fa {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .topic-post-badges {
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 88044ba265..ea905523cd 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -100,7 +100,7 @@
   }
 
   .posts-count {
-    background-color: dark-light-choose(scale-color($tertiary, $lightness: -40%), scale-color($tertiary, $lightness: 40%));
+    background-color: dark-light-choose($tertiary, $tertiary-medium);
   }
 
   ul {
@@ -110,7 +110,7 @@
   }
   .search-link {
     .fa, .blurb {
-      color: dark-light-choose(scale-color($primary, $lightness: 45%), scale-color($secondary, $lightness: 55%));
+      color: dark-light-choose($primary-high, $secondary-medium);
     }
   }
   .badge-wrapper {
@@ -155,7 +155,7 @@
     right: 1px;
     position: absolute;
     i { font-size: 1.1em; }
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     padding: 0 10px 5px 10px;
   }
   a.cancel {
@@ -191,7 +191,7 @@
       display: block;
 
       i {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
     }
   }
@@ -239,10 +239,14 @@
       position: relative;
       display: inline-block;
 
-      .category-input .category-select-box {
+      .category-input .category-chooser {
         width: 430px;
         @include medium-width { width: 285px; }
         @include small-width { width: 220px; }
+
+        .select-box-kit-header {
+          padding: 7px 10px;
+        }
       }
     }
     .edit-reason-input {
@@ -353,7 +357,7 @@
   }
 
   i {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
@@ -437,7 +441,7 @@
   .d-editor-button-bar {
     top: 0;
     position: absolute;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     background-color: $secondary;
     z-index: 100;
     overflow: hidden;
@@ -447,7 +451,7 @@
     box-sizing: border-box;
 
     button {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-high, $secondary-high);
     }
   }
 }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 268ee3beae..986ae3e4a5 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -26,7 +26,7 @@ header {
     display: block;
     width: 27px;
     margin: auto;
-    border-top: 3px double dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 50%));
+    border-top: 3px double dark-light-choose($primary-low-mid, $secondary-medium);
   }
 }
 
@@ -293,7 +293,7 @@ input {
     }
 
     .active {
-      background-color: scale-color($danger, $lightness: 30%);
+      background-color: $danger-medium;
       border-color: $danger;
     }
   }
@@ -328,6 +328,8 @@ input {
   input,
   select {
     border-radius: 0;
+    background-color: $primary-low;
+    border-color: $primary-low;
   }
 
   .add-on,
@@ -392,7 +394,7 @@ input {
     .input-append {
       .add-on {
         color: $danger;
-        background-color: scale-color($danger, $lightness: 30%);
+        background-color: $danger-medium;
         border-color: scale-color($danger, $lightness: -20%);
       }
     }
@@ -421,7 +423,7 @@ input {
     .input-append {
       .add-on {
         color: $success;
-        background-color:  scale-color($success, $lightness: 90%);
+        background-color:  $success-low;
         border-color: $success;
       }
     }
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 5bd0b3b9e6..e287be2cb0 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -3,7 +3,7 @@
     float: left;
 
     a, i {
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
 
     .active {
diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss
index c401a76594..9417b84809 100644
--- a/app/assets/stylesheets/desktop/header.scss
+++ b/app/assets/stylesheets/desktop/header.scss
@@ -31,13 +31,13 @@ and (max-width : 570px) {
 }
 
 .search-link .blurb {
-  color: dark-light-choose(scale-color($primary, $lightness: 45%), scale-color($secondary, $lightness: 55%));
+  color: dark-light-choose($primary-high, $secondary-medium);
   display: block;
   word-wrap: break-word;
   font-size: 11px;
   line-height: 1.3em;
   .search-highlight {
-    color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/latest-topic-list.scss b/app/assets/stylesheets/desktop/latest-topic-list.scss
index db703a77b3..6a4337309d 100644
--- a/app/assets/stylesheets/desktop/latest-topic-list.scss
+++ b/app/assets/stylesheets/desktop/latest-topic-list.scss
@@ -3,7 +3,7 @@
 
   .table-heading {
     padding: 12px 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 
   .no-topics, .more-topics {
@@ -32,10 +32,10 @@
   .topic-stats {
     flex: 1;
     text-align: right;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 
   .topic-last-activity a {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 }
diff --git a/app/assets/stylesheets/desktop/login.scss b/app/assets/stylesheets/desktop/login.scss
index 800a954322..23c933180f 100644
--- a/app/assets/stylesheets/desktop/login.scss
+++ b/app/assets/stylesheets/desktop/login.scss
@@ -14,7 +14,7 @@
 
 #login-form {
   a {
-    color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
 }
 
@@ -53,7 +53,7 @@
 
   .instructions {
     label {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss
index 000e2d168b..53e18769a5 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 $primary-low; 
+  border: 1px solid $primary-low;
 
   box-shadow: 0 3px 7px rgba(0,0,0, .8);
   background-clip: padding-box;
@@ -62,7 +62,7 @@
 .close {
   font-size: 1.429em;
   text-decoration: none;
-  color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+  color: dark-light-choose($primary-high, $secondary-low);
   cursor: pointer;
   &:hover {
     color: $primary;
@@ -70,8 +70,8 @@
 }
 
 .modal {
-  .category-select-box {
-    width: 430px;
+  .category-chooser {
+    width: 50%;
   }
 
   .category-combobox {
@@ -92,14 +92,13 @@
 }
 
 .custom-message-length {
-  margin: -10px 0 10px 20px;
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
   font-size: 85%;
 }
 
 .flag-message {
-  margin-left: 20px;
-  width: 95% !important;
+  width: 95%;
+  margin: 0;
 }
 
 .edit-category-modal {
@@ -116,11 +115,11 @@
       li {
         margin: 0 4px 8px 0;
         a {
-          color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+          color: dark-light-choose($primary-medium, $secondary-medium);
           cursor: pointer;
         }
         a:hover {
-          color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
+          color: dark-light-choose($primary-medium, $secondary-medium);
         }
       }
     }
@@ -156,9 +155,11 @@
     flex-wrap: wrap;
 
     .btn {
-      width: 22%;
+      flex: 1 1 0;
       margin-bottom: 1em;
       margin-right: 1em;
+      white-space: nowrap;
+      max-width: 23%;
     }
   }
 
diff --git a/app/assets/stylesheets/desktop/queued-posts.scss b/app/assets/stylesheets/desktop/queued-posts.scss
index 363eca2dc8..38f48442b7 100644
--- a/app/assets/stylesheets/desktop/queued-posts.scss
+++ b/app/assets/stylesheets/desktop/queued-posts.scss
@@ -11,7 +11,7 @@
        float: right;
        font-size: 0.929em;
        margin-top: 1px;
-       span {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+       span {color: dark-light-choose($primary-medium, $secondary-medium); }
      }
 
     .cooked {
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 6d7094999e..b7ebb95653 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -34,10 +34,10 @@
 // --------------------------------------------------
 
 .topic-list-icons {
-  .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%)); }
+  .d-icon-thumb-tack { color: dark-light-choose($primary-medium, $secondary-medium); }
+  .d-icon-thumb-tack.unpinned { color: dark-light-choose($primary-medium, $secondary-medium); }
   a.title {color: $primary;}
-  .d-icon-bookmark { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+  .d-icon-bookmark { color: dark-light-choose($primary-medium, $secondary-medium); }
 }
 
 .topic-list {
@@ -55,7 +55,7 @@
     }
   }
   th {
-    button .d-icon {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+    button .d-icon {color: dark-light-choose($primary-medium, $secondary-medium); }
   }
 
   > tbody > tr {
@@ -106,8 +106,8 @@
   }
 
   .posters a:first-child .avatar.latest:not(.single) {
-     box-shadow: 0 0 3px 1px desaturate(scale-color($tertiary, $lightness: 65%), 35%);
-     border: 2px solid desaturate(scale-color($tertiary, $lightness: 50%), 40%);
+     box-shadow: 0 0 3px 1px desaturate($tertiary-medium, 35%);
+     border: 2px solid desaturate($tertiary-medium, 40%);
      position: relative;
      top: -2px;
      left: -2px;
@@ -134,7 +134,7 @@
   .post-actions {
     clear: both;
     width: auto;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     text-align: left;
     font-size: 12px;
     margin-top: 5px;
@@ -143,7 +143,7 @@
     }
     a {
       font-size: 11px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       margin-right: 3px;
       line-height: 20px;
     }
@@ -220,11 +220,11 @@
     margin: 10px 0 0;
     /* topic status glyphs */
     i {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important;
+      color: dark-light-choose($primary-medium, $secondary-medium) !important;
       font-size: 0.929em;
     }
     a.last-posted-at, a.last-posted-at:visited {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
       font-size: 0.88em;
     }
     .badge {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index cc7bc92f3b..a85d624486 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -31,7 +31,7 @@ h1 .topic-statuses .topic-status i {
     font-size: 0.929em;
     float: right;
     margin: 1px 25px 0 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .actions .fade-out {
@@ -61,11 +61,11 @@ nav.post-controls {
   }
 
   .highlight-action {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
   }
 
   a, button {
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
 
     .d-icon {
       opacity: 1.0;
@@ -98,7 +98,7 @@ nav.post-controls {
   .show-replies {
     margin-left: -10px;
     font-size: inherit;
-    span.badge-posts {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
+    span.badge-posts {color: dark-light-choose($primary-medium, $secondary-high); }
     &:hover {
       background: $primary-low;
       span.badge-posts {color: $primary;}
@@ -111,7 +111,7 @@ nav.post-controls {
 
   button.create {
     margin-right: 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+    color: dark-light-choose($primary-high, $secondary-low);
     margin-left: 10px;
   }
 
@@ -248,7 +248,7 @@ nav.post-controls {
     padding: 0;
   }
 
-  .post-date { color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
+  .post-date { color: dark-light-choose($primary-medium, $secondary-high); }
   .d-icon-arrow-up, .d-icon-arrow-down { margin-left: 5px; }
   .reply:first-of-type .row { border-top: none; }
 
@@ -261,10 +261,10 @@ nav.post-controls {
     font-size: 0.929em;
     a {
       font-weight: bold;
-      color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+      color: dark-light-choose($primary-low-mid, $secondary-high);
     }
   }
-  .arrow {color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); }
+  .arrow {color: dark-light-choose($primary-medium, $secondary-high); }
 }
 
 .post-action {
@@ -291,7 +291,7 @@ a.star {
 
   h3 {
     margin-bottom: 4px;
-    color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+    color: dark-light-choose($primary-high, $secondary-low);
     line-height: 23px;
     font-weight: normal;
     font-size: 1em;
@@ -299,7 +299,7 @@ a.star {
 
   h4 {
     margin: 1px 0 2px 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 0.857em;
     line-height: 15px;
@@ -312,7 +312,7 @@ a.star {
 
   span.domain {
     font-size: 0.714em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .avatars {
@@ -352,7 +352,7 @@ a.star {
       line-height: 20px;
     }
     .number, i {
-      color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+      color: dark-light-choose($primary-high, $secondary-low);
       font-size: 130%;
     }
     .avatar  a {
@@ -369,12 +369,12 @@ a.star {
   .participants { // PMs //
     .user { float: left; margin: 7px 20px 7px 0; }
     .user a {
-      color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+      color: dark-light-choose($primary-high, $secondary-low);
       font-weight: bold;
       font-size: 0.929em;
     }
     .d-icon-times {
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
     }
   }
 
@@ -394,7 +394,7 @@ a.star {
     .btn {
       border: 0;
       padding: 0 23px;
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
       background: blend-primary-secondary(5%);
       border-left: 1px solid $primary-low;
       border-top: 1px solid $primary-low;
@@ -415,7 +415,7 @@ a.star {
   }
 
   .link-summary .btn {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     background: blend-primary-secondary(5%);
     width: 100%;
     &:hover {
@@ -427,7 +427,7 @@ a.star {
 
 @mixin topic-footer-buttons-text {
   line-height: 32px;
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 @mixin topic-footer-button {
@@ -574,7 +574,7 @@ video {
 
 .moderator {
   .topic-body {
-    background-color: $highlight-low;
+    background-color: dark-light-choose($highlight-low, $highlight-medium);
   }
 }
 
@@ -710,7 +710,7 @@ $topic-avatar-width: 45px;
   background-clip: padding-box;
   span {
     font-size: 0.857em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   span.title {
     font-weight: bold;
@@ -809,7 +809,7 @@ $topic-avatar-width: 45px;
     color: $secondary;
     font-weight: normal;
     margin-bottom: 10px;
-    background: scale-color($tertiary, $lightness: 50%);
+    background: $tertiary-medium;
 
     &[href] {
       color: $secondary;
@@ -817,7 +817,7 @@ $topic-avatar-width: 45px;
     &:hover
     {
       color: $secondary;
-      background: scale-color($tertiary, $lightness: 20%);
+      background: $tertiary-high;
     }
     &:active {
       @include linear-gradient(darken($tertiary, 18%), darken($tertiary, 12%));
@@ -837,7 +837,7 @@ $topic-avatar-width: 45px;
     article.boxed {
       .select-posts {
         button.select-post {
-          background-color: scale-color($tertiary, $lightness: 50%);
+          background-color: $tertiary-medium;
           color: $secondary;
         }
       }
@@ -860,8 +860,8 @@ $topic-avatar-width: 45px;
 
       button {
         margin-left: 8px;
-        background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
-        border: 1px solid dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+        background-color: dark-light-choose($primary-low-mid, $secondary-high);
+        border: 1px solid dark-light-choose($primary-medium, $secondary-high);
         color: $primary;
       }
     }
@@ -905,7 +905,7 @@ a.attachment:before {
    float: right;
    font-size: 0.929em;
    margin-top: 1px;
-   a {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
+   a {color: dark-light-choose($primary-medium, $secondary-medium); }
  }
 
 }
@@ -922,11 +922,11 @@ span.highlighted {
 }
 
 .username.new-user a {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
 .read-state {
-  color: scale-color($tertiary, $lightness: 50%);
+  color: $tertiary-medium;
   position: absolute;
   right: 0px;
   top: 13px;
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 98f7ec65fd..8a24d21d2f 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -26,7 +26,7 @@
     margin-top: 6px;
     margin-right: 6px;
   }
-  #edit-title, .category-select-box {
+  #edit-title, .category-chooser {
     width: 500px;
   }
   h1 {
@@ -45,7 +45,7 @@
 }
 
 .private-message-glyph {
-  color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
   float: left;
   margin: 0 5px 0 0;
 }
@@ -188,7 +188,7 @@
 
 
 #topic-filter {
-  background-color: scale-color($highlight, $lightness: 25%);
+  background-color: $highlight-medium;
   padding: 8px;
   bottom: 0;
   position: fixed;
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index 557bdbdbdd..07f68b1598 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -17,7 +17,7 @@
         line-height: 18px;
       }
       .description, .hint {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
         display: block;
       }
       .hint {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 32124e6ca3..2e07197d0c 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -54,7 +54,7 @@
     }
 
     a {
-      color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
 
       &.active {
         color: $primary;
@@ -99,7 +99,7 @@
     text-align: left;
     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%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
   }
 
@@ -140,10 +140,10 @@
       }
     }
 
-    .secondary {
-      background: scale-color($secondary, $lightness: -5%);
-      border-top: 1px solid $primary-low;
-      border-bottom: 1px solid $primary-low;
+  .secondary {
+    background: $secondary;
+    border-top: 1px solid $primary-low;
+    border-bottom: 1px solid $primary-low;
 
       dl {
         padding: 8px 10px;
diff --git a/app/assets/stylesheets/embed.scss b/app/assets/stylesheets/embed.scss
index 65a25aa8f1..0f48544c04 100644
--- a/app/assets/stylesheets/embed.scss
+++ b/app/assets/stylesheets/embed.scss
@@ -87,7 +87,7 @@ article.post {
   }
 
   a.new-user {
-    color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
   }
 
   span.title {
diff --git a/app/assets/stylesheets/mobile/components/user-stream-item.scss b/app/assets/stylesheets/mobile/components/user-stream-item.scss
index 40e43cf7a7..3727bbd76b 100644
--- a/app/assets/stylesheets/mobile/components/user-stream-item.scss
+++ b/app/assets/stylesheets/mobile/components/user-stream-item.scss
@@ -17,7 +17,7 @@
 
   .notification {
     &.unread {
-      background-color: dark-light-choose(scale-color($tertiary, $lightness: 85%), srgb-scale($tertiary, $secondary, 15%));
+      background-color: dark-light-choose($tertiary-low, srgb-scale($tertiary, $secondary, 15%));
     }
   }
 
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 48844826c5..00ff9c9c73 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -66,7 +66,7 @@ input[type=radio], input[type=checkbox] {
     right: 1px;
     position: absolute;
     font-size: 1.071em;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 
   .toggle-toolbar {
@@ -84,7 +84,7 @@ input[type=radio], input[type=checkbox] {
       max-width: 80%;
       white-space: nowrap;
       i {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
     }
   }
@@ -119,7 +119,7 @@ input[type=radio], input[type=checkbox] {
       text-overflow: ellipsis;
 
       i {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
     }
   }
@@ -149,7 +149,7 @@ input[type=radio], input[type=checkbox] {
       .category-input {
         margin-top: 3px;
 
-        .category-select-box {
+        .category-chooser {
           width: 100%;
         }
       }
@@ -176,11 +176,11 @@ input[type=radio], input[type=checkbox] {
     #reply-title {
       margin-right: 10px;
       &:disabled {
-        background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+        background-color: dark-light-choose($primary-low-mid, $secondary-high);
       }
     }
     .d-editor-input:disabled {
-      background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+      background-color: dark-light-choose($primary-low-mid, $secondary-high);
     }
     .d-editor-input {
       color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
@@ -317,7 +317,7 @@ input[type=radio], input[type=checkbox] {
     display: block;
     margin: 1px 4px;
     position: absolute;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     background-color: $secondary;
     z-index: 100;
     overflow: hidden;
@@ -328,7 +328,7 @@ input[type=radio], input[type=checkbox] {
     box-sizing: border-box;
 
     button {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
     button.btn.no-text {
       margin: 0 2px;
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
index 4cd15c8900..4636e391eb 100644
--- a/app/assets/stylesheets/mobile/directory.scss
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -23,7 +23,7 @@
 
 
   &.me {
-    background-color: $highlight-low;
+    background-color: dark-light-choose($highlight-low, $highlight-medium);
 
     .username a, .name, .title, .number, .time-read, .user-stat .label {
       color: scale-color($highlight, $lightness: -50%);
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index fce24121a2..2acd1d8412 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -63,7 +63,7 @@ h2 {
 
   .topic-status {
     i {
-      color: $secondary-medium;
+      color: $secondary-high;
     }
   }
 
@@ -100,7 +100,7 @@ h2 {
 
     .fa {
       margin-right: 8px;
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
diff --git a/app/assets/stylesheets/mobile/login.scss b/app/assets/stylesheets/mobile/login.scss
index c5d7bd61ac..e642c7bcdb 100644
--- a/app/assets/stylesheets/mobile/login.scss
+++ b/app/assets/stylesheets/mobile/login.scss
@@ -16,7 +16,7 @@
 
 #login-form {
   a {
-    color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
+    color: dark-light-choose($primary-high, $secondary-low);
   }
   label { float: left; display: block; }
   textarea, input, select {
@@ -59,7 +59,7 @@ $input-width: 184px;
 
   tr.instructions {
     label {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss
index 5bceb7f11d..2adf1c67cc 100644
--- a/app/assets/stylesheets/mobile/modal.scss
+++ b/app/assets/stylesheets/mobile/modal.scss
@@ -105,7 +105,7 @@
 
 .custom-message-length {
   margin: -4px 0 10px 20px;
-  color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
+  color: dark-light-choose($primary-high, $secondary-low);
   font-size: 85%;
 }
 
@@ -164,7 +164,7 @@
 .alert {
   padding: 5px;
   &.alert-success {
-    background-color:  scale-color($success, $lightness: 90%);
+    background-color: $success-low;
     color: $success;
   }
 }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index cfe5b09e04..806ab8cb1a 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 $primary-low; 
+    border: 1px solid $primary-low;
     position: absolute;
     z-index: 1000;
     background-color: $secondary;
@@ -53,7 +53,7 @@
     }
   }
 
-  .select-box {
+  .select-box-kit {
     &.categories-admin-dropdown, &.category-notifications-button, &.tag-notifications-button {
       margin-top: 5px;
     }
@@ -82,7 +82,7 @@
   th,
   td {
     padding: 7px 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     max-width: 300px;
   }
 
@@ -119,7 +119,7 @@
       max-width: 160px;
     }
     .num .fa, a, a:visited {
-      color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+      color: dark-light-choose($primary-medium, $secondary-medium);
     }
   }
 
@@ -129,7 +129,7 @@
     a {
       // let's make all ages dim on mobile so we're not
       // overwhelming people with info about each topic
-      color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important;
+      color: dark-light-choose($primary-low-mid, $secondary-high) !important;
     }
   }
 }
@@ -142,7 +142,7 @@
 
   td {
     padding: 12px 5px;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     vertical-align: top;
   }
 
@@ -152,9 +152,9 @@
 
   tbody {
     tr {
-      border-bottom: 1px solid $primary-low; 
+      border-bottom: 1px solid $primary-low;
       &:first-of-type {
-        border-top: 3px solid $primary-low; 
+        border-top: 3px solid $primary-low;
       }
     }
     .category {
@@ -212,7 +212,7 @@ tr.category-topic-link {
     .featured-topic {
       margin: 8px 0;
       a.last-posted-at, a.last-posted-at:visited {
-        color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+        color: dark-light-choose($primary-medium, $secondary-medium);
       }
     }
   }
@@ -291,7 +291,7 @@ tr.category-topic-link {
     figure {
       float: left;
       margin: 3px 7px 0 0;
-      color: dark-light-choose(scale-color($primary, $lightness: 10%), scale-color($secondary, $lightness: 90%));
+      color: dark-light-choose($primary, $secondary-low);
       font-weight: bold;
       font-size: 0.857em;
     }
@@ -359,7 +359,7 @@ tr.category-topic-link {
   padding: 4px 0;
   list-style: none;
   background-color: $secondary;
-  border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), scale-color($primary, $lightness: -60%));
+  border: 1px solid dark-light-choose(rgba(0, 0, 0, 0.2), $primary);
   border-radius: 5px;
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   background-clip: padding-box;
@@ -379,7 +379,7 @@ tr.category-topic-link {
 .dropdown-menu .active > a:hover {
   color: $tertiary;
   text-decoration: none;
-  background-color: scale-color($tertiary, $lightness: 75%);
+  background-color: $tertiary-low;
 }
 .open > .dropdown-menu {
   display: block;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 4e35da9a5c..57d2302749 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -63,7 +63,7 @@ nav.post-controls {
     padding: 8px 10px;
     vertical-align: top;
     background: transparent;
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
     float: left;
     &.hidden {
       display: none;
@@ -91,7 +91,7 @@ nav.post-controls {
 /* shift post reply button to the right and make it black */
 .post-controls button.create {
   float: right;
-  color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+  color: dark-light-choose($primary-high, $secondary-low);
 }
 
 
@@ -153,7 +153,7 @@ a.reply-to-tab {
   position: absolute;
   z-index: 400;
   right: 80px;
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
   span { display: none; }
 }
 
@@ -181,7 +181,7 @@ a.star {
   h3 {
     margin-bottom: 4px;
     margin-top: 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     line-height: 23px;
     font-weight: normal;
     font-size: 1em;
@@ -189,7 +189,7 @@ a.star {
 
   h4 {
     margin: 0 0 3px 0;
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
     font-weight: normal;
     font-size: 0.857em;
     line-height: 15px;
@@ -246,7 +246,7 @@ a.star {
       line-height: 20px;
     }
     .number, i {
-      color: dark-light-choose(scale-color($primary, $lightness: 20%), scale-color($secondary, $lightness: 80%));
+      color: dark-light-choose($primary-high, $secondary-low);
       font-size: 110%;
     }
 
@@ -269,7 +269,7 @@ a.star {
   }
 
   .domain {
-    color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
+    color: dark-light-choose($primary-low-mid, $secondary-high);
   }
 
   .topic-links {
@@ -288,7 +288,7 @@ a.star {
     .btn {
       border: 0;
       padding: 0 15px;
-      color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+      color: dark-light-choose($primary-medium, $secondary-high);
       background: blend-primary-secondary(5%);
       border-left: 1px solid $primary-low;
       border-top: 1px solid $primary-low;
@@ -301,7 +301,7 @@ a.star {
   }
 
   .link-summary .btn {
-    color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
+    color: dark-light-choose($primary-medium, $secondary-high);
     background: blend-primary-secondary(5%);
     width: 100%;
   }
@@ -324,7 +324,7 @@ a.star {
 #topic-footer-buttons p {
   clear: both; /* this is to force the drop-down notification state description para below the button */
   margin: 0;
-  color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+  color: dark-light-choose($primary-medium, $secondary-medium);
 }
 
 #topic-footer-button {
@@ -382,7 +382,7 @@ span.post-count {
 }
 
 .moderator .topic-body {
-  background-color: $highlight-low;
+  background-color: dark-light-choose($highlight-low, $highlight-medium);
 }
 
 .quote-button.visible {
@@ -410,7 +410,7 @@ iframe {
     padding-top: 1px;
   }
   span {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
   span.title {
     color: $primary;
@@ -495,7 +495,7 @@ blockquote {
 .posts-wrapper {  position: relative; }
 
 span.highlighted {
-  background-color: dark-light-choose(scale-color($highlight, $lightness: 70%), $highlight);
+  background-color: dark-light-choose($highlight-low, $highlight);
 }
 
 .topic-avatar {
@@ -526,7 +526,7 @@ span.highlighted {
 }
 
 .username.new-user a {
-  color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  color: dark-light-choose($primary-low-mid, $secondary-high);
 }
 
 .user-title {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 3cd5f0ca3a..4886a6f2a3 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -31,7 +31,7 @@
   .private-message-glyph { display: none; }
 }
 
-.private-message-glyph { color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); }
+.private-message-glyph { color: dark-light-choose($primary-low-mid, $secondary-high); }
 .private_message #topic-title .private-message-glyph { display: inline; }
 
 
@@ -172,9 +172,9 @@
 
 .topic-post:last-of-type {padding-bottom: 40px;}
 
-.heatmap-high {color: scale-color($danger, $lightness: -25%) !important;}
-.heatmap-med {color: $danger !important;}
-.heatmap-low {color: scale-color($danger, $lightness: 25%) !important;}
+.heatmap-high {color: $danger !important;}
+.heatmap-med {color: $danger-medium !important;}
+.heatmap-low {color: $danger-low !important;}
 
 sup sup, sub sup, sup sub, sub sub { top: 0; }
 
@@ -194,7 +194,7 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
     margin-top: 8px;
     width: 95% !important;
   }
-  .category-select-box {
+  .category-chooser {
     margin-top: 8px;
     width: 95%;
   }
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index 00797993b0..b9fb058267 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -7,7 +7,7 @@
     line-height: 18px;
   }
   .description {
-    color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
+    color: dark-light-choose($primary-medium, $secondary-medium);
   }
 }
 
diff --git a/app/assets/stylesheets/wizard.scss b/app/assets/stylesheets/wizard.scss
index 922f5afe5d..7d84bb53ae 100644
--- a/app/assets/stylesheets/wizard.scss
+++ b/app/assets/stylesheets/wizard.scss
@@ -2,6 +2,9 @@
 @import "vendor/font_awesome/font-awesome";
 @import "vendor/select2";
 @import "vendor/sweetalert";
+@import "common/foundation/colors";
+@import "common/foundation/variables";
+@import "common/select-box-kit/*";
 
 body.wizard {
   background-color: #fff;
@@ -479,18 +482,18 @@ body.wizard {
 }
 
 /* fix wizard for mobile -- iPhone 5 default width */
-@media only screen and (max-device-width: 568px) {  
+@media only screen and (max-device-width: 568px) {
   h1 { font-size: 1.3em !important; }
   .wizard-column { margin: auto !important; }
   .wizard-step-contents { min-height: auto !important; }
   .wizard-step-banner { width: 100% !important; margin-bottom: 1em !important; }
   .select2-container { width: 100% !important; }
   .wizard-step-footer { display: block !important; }
-  .wizard-progress { margin-bottom: 10px !important; }  
+  .wizard-progress { margin-bottom: 10px !important; }
   .wizard-buttons { text-align: right !important; }
   .wizard-footer { display: none !important; }
   .wizard-field { margin-bottom: 1em !important; }
-  .wizard-step-description { margin-bottom: 1em !important; }  
+  .wizard-step-description { margin-bottom: 1em !important; }
   .wizard-column-contents { padding: 1em !important; }
   .emoji-preview img { width: 16px !important; height: 16px !important; }
   .invite-list .new-user { flex-direction: column !important; align-items: inherit !important; }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cce9eb95fd..75256ea49d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -66,7 +66,7 @@ class ApplicationController < ActionController::Base
   end
 
   def perform_refresh_session
-    refresh_session(current_user)
+    refresh_session(current_user) unless @readonly_mode
   end
 
   def immutable_for(duration)
@@ -108,6 +108,7 @@ class ApplicationController < ActionController::Base
 
   rescue_from PG::ReadOnlySqlTransaction do |e|
     Discourse.received_readonly!
+    Rails.logger.error("#{e.class} #{e.message}: #{e.backtrace.join("\n")}")
     raise Discourse::ReadOnly
   end
 
@@ -170,7 +171,7 @@ class ApplicationController < ActionController::Base
       begin
         current_user
       rescue Discourse::InvalidAccess
-        return render plain: I18n.t(type), status: status_code
+        return render plain: I18n.t(opts[:custom_message] || type), status: status_code
       end
 
       render html: build_not_found_page(status_code, opts[:include_ember] ? 'application' : 'no_ember')
diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb
index 5d1466ebb7..7b11f78920 100644
--- a/app/controllers/badges_controller.rb
+++ b/app/controllers/badges_controller.rb
@@ -47,6 +47,9 @@ class BadgesController < ApplicationController
       if user_badge && user_badge.notification
         user_badge.notification.update_attributes read: true
       end
+      if user_badge
+        @badge.has_badge = true
+      end
     end
 
     serialized = MultiJson.dump(serialize_data(@badge, BadgeSerializer, root: "badge", include_long_description: true))
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 02b3cdd3e5..dd41d020e5 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -187,7 +187,7 @@ class ListController < ApplicationController
     @link = "#{Discourse.base_url}#{@category.url}"
     @atom_link = "#{Discourse.base_url}#{@category.url}.rss"
     @description = "#{I18n.t('topics_in_category', category: @category.name)} #{@category.description}"
-    @topic_list = TopicQuery.new.list_new_in_category(@category)
+    @topic_list = TopicQuery.new(current_user).list_new_in_category(@category)
 
     render 'list', formats: [:rss]
   end
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 17796b2323..4546424606 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -663,8 +663,11 @@ class PostsController < ApplicationController
     finder = finder.with_deleted if current_user.try(:staff?)
     post = finder.first
     raise Discourse::NotFound unless post
+
     # load deleted topic
     post.topic = Topic.with_deleted.find(post.topic_id) if current_user.try(:staff?)
+    raise Discourse::NotFound unless post.topic
+
     guardian.ensure_can_see!(post)
     post
   end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 6972bc2dd3..b0d44da59d 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -29,7 +29,8 @@ class SearchController < ApplicationController
     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)
+    @search_term = params[:q]
+    search = Search.new(@search_term, search_args)
     result = search.execute
 
     result.find_user_data(guardian) if result
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index c67e6baf34..f05d0976af 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -51,6 +51,7 @@ class SessionController < ApplicationController
         sso.external_id = current_user.id.to_s
         sso.admin = current_user.admin?
         sso.moderator = current_user.moderator?
+        sso.groups = current_user.groups.pluck(:name)
 
         if sso.return_sso_url.blank?
           render plain: "return_sso_url is blank, it must be provided", status: 400
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 631a615824..69717e3587 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -439,9 +439,10 @@ class TopicsController < ApplicationController
   def remove_allowed_user
     params.require(:username)
     topic = Topic.find_by(id: params[:topic_id])
-    guardian.ensure_can_remove_allowed_users!(topic)
+    user = User.find_by(username: params[:username])
+    guardian.ensure_can_remove_allowed_users!(topic, user)
 
-    if topic.remove_allowed_user(current_user, params[:username])
+    if topic.remove_allowed_user(current_user, user)
       render json: success_json
     else
       render json: failed_json, status: 422
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 346cf4d8bf..be74190f80 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -641,7 +641,7 @@ class UsersController < ApplicationController
       primary_email = @user.primary_email
 
       primary_email.email = params[:email]
-      primary_email.should_validate_email = true
+      primary_email.skip_validate_email = false
 
       if primary_email.save
         @user.email_tokens.create(email: @user.email)
diff --git a/app/jobs/onceoff/create_tags_search_index.rb b/app/jobs/onceoff/create_tags_search_index.rb
new file mode 100644
index 0000000000..3e673bf2e6
--- /dev/null
+++ b/app/jobs/onceoff/create_tags_search_index.rb
@@ -0,0 +1,9 @@
+module Jobs
+  class CreateTagsSearchIndex < Jobs::Onceoff
+    def execute_onceoff(args)
+      Tag.exec_sql('select id, name from tags').each do |t|
+        SearchIndexer.update_tags_index(t['id'], t['name'])
+      end
+    end
+  end
+end
diff --git a/app/jobs/regular/pull_hotlinked_images.rb b/app/jobs/regular/pull_hotlinked_images.rb
index 64455c859f..39a630635f 100644
--- a/app/jobs/regular/pull_hotlinked_images.rb
+++ b/app/jobs/regular/pull_hotlinked_images.rb
@@ -66,7 +66,7 @@ module Jobs
                   if upload.persisted?
                     downloaded_urls[src] = upload.url
                   else
-                    log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.join("\n")}")
+                    log(:info, "Failed to pull hotlinked image for post: #{post_id}: #{src} - #{upload.errors.full_messages.join("\n")}")
                   end
                 else
                   large_images << original_src
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 be2b537f94..c3db40fbf0 100644
--- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
+++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb
@@ -22,7 +22,11 @@ module Jobs
           user = User.find(user_id)
           if user.badges.where(id: Badge::NewUserOfTheMonth).blank?
             BadgeGranter.grant(badge, user)
-            SystemMessage.new(user).create('new_user_of_the_month',               month_year: Time.now.strftime("%B %Y"))
+
+            SystemMessage.new(user).create('new_user_of_the_month',
+              month_year: Time.now.strftime("%B %Y"),
+              url: "#{Discourse.base_url}/badges"
+            )
           end
         end
       end
diff --git a/app/jobs/scheduled/pending_users_reminder.rb b/app/jobs/scheduled/pending_users_reminder.rb
index 36448e37c2..af0a1b17ca 100644
--- a/app/jobs/scheduled/pending_users_reminder.rb
+++ b/app/jobs/scheduled/pending_users_reminder.rb
@@ -19,12 +19,16 @@ module Jobs
         count = query.count
 
         if count > 0
-          target_usernames = Group[:moderators].users.map do |u|
-            u.id > 0 && u.notifications.joins(:topic)
-              .where("notifications.id > ?", u.seen_notification_id)
+          target_usernames = Group[:moderators].users.map do |user|
+            next if user.id < 0
+
+            count = user.notifications.joins(:topic)
+              .where("notifications.id > ?", user.seen_notification_id)
               .where("notifications.read = false")
-              .where("topics.subtype = '#{TopicSubtype.pending_users_reminder}'")
-              .count == 0 ? u.username : nil
+              .where("topics.subtype = ?", TopicSubtype.pending_users_reminder)
+              .count
+
+            count == 0 ? user.username : nil
           end.compact
 
           unless target_usernames.empty?
diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb
index dc2d7df41d..4f7679d4bf 100644
--- a/app/mailers/admin_confirmation_mailer.rb
+++ b/app/mailers/admin_confirmation_mailer.rb
@@ -8,7 +8,7 @@ class AdminConfirmationMailer < ActionMailer::Base
       to_address,
       template: 'admin_confirmation_mailer',
       target_username: target_username,
-      admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url_no_prefix)
+      admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url)
     )
   end
 end
diff --git a/app/models/application_request.rb b/app/models/application_request.rb
index 1f1f758d95..f13e7275a7 100644
--- a/app/models/application_request.rb
+++ b/app/models/application_request.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ApplicationRequest < ActiveRecord::Base
   enum req_type: %i(http_total
                     http_2xx
@@ -22,6 +23,10 @@ class ApplicationRequest < ActiveRecord::Base
   def self.increment!(type, opts = nil)
     key = redis_key(type)
     val = $redis.incr(key).to_i
+
+    # readonly mode it is going to be 0, skip
+    return if val == 0
+
     # 3.days, see: https://github.com/rails/rails/issues/21296
     $redis.expire(key, 259200)
 
@@ -36,6 +41,12 @@ class ApplicationRequest < ActiveRecord::Base
     end
   end
 
+  GET_AND_RESET = <<~LUA
+    local val = redis.call('get', KEYS[1])
+    redis.call('set', KEYS[1], '0')
+    return val
+  LUA
+
   def self.write_cache!(date = nil)
     if date.nil?
       write_cache!(Time.now.utc)
@@ -51,22 +62,17 @@ class ApplicationRequest < ActiveRecord::Base
     # for concurrent calls without double counting
     req_types.each do |req_type, _|
       key = redis_key(req_type, date)
-      val = $redis.get(key).to_i
 
+      namespaced_key = $redis.namespace_key(key)
+      val = $redis.without_namespace.eval(GET_AND_RESET, keys: [namespaced_key]).to_i
       next if val == 0
 
-      new_val = $redis.incrby(key, -val).to_i
-
-      if new_val < 0
-        # undo and flush next time
-        $redis.incrby(key, val)
-        next
-      end
-
       id = req_id(date, req_type)
-
       where(id: id).update_all(["count = count + ?", val])
     end
+  rescue Redis::CommandError => e
+    raise unless e.message =~ /READONLY/
+    nil
   end
 
   def self.clear_cache!(date = nil)
diff --git a/app/models/badge.rb b/app/models/badge.rb
index 637cb24010..f8c41e7db1 100644
--- a/app/models/badge.rb
+++ b/app/models/badge.rb
@@ -65,6 +65,9 @@ class Badge < ActiveRecord::Base
   # other consts
   AutobiographerMinBioLength = 10
 
+  # used by serializer
+  attr_accessor :has_badge
+
   def self.trigger_hash
     Hash[*(
       Badge::Trigger.constants.map { |k|
diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
index 48d6071803..33535335d7 100644
--- a/app/models/global_setting.rb
+++ b/app/models/global_setting.rb
@@ -92,7 +92,7 @@ class GlobalSetting
 
   def self.database_config
     hash = { "adapter" => "postgresql" }
-    %w{pool timeout socket host port username password replica_host replica_port}.each do |s|
+    %w{pool connect_timeout timeout socket host port username password replica_host replica_port}.each do |s|
       if val = self.send("db_#{s}")
         hash[s] = val
       end
diff --git a/app/models/post.rb b/app/models/post.rb
index a70c69a915..1ae23deac5 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -5,7 +5,6 @@ require_dependency 'enum'
 require_dependency 'post_analyzer'
 require_dependency 'validators/post_validator'
 require_dependency 'plugin/filter'
-require_dependency 'email_cook'
 
 require 'archetype'
 require 'digest/sha1'
@@ -231,37 +230,32 @@ class Post < ActiveRecord::Base
     !add_nofollow?
   end
 
-  def cook(*args)
+  def cook(raw, opts = {})
     # For some posts, for example those imported via RSS, we support raw HTML. In that
     # case we can skip the rendering pipeline.
     return raw if cook_method == Post.cook_methods[:raw_html]
 
-    cooked =
-      if cook_method == Post.cook_methods[:email]
-        EmailCook.new(raw).cook
-      else
-        cloned = args.dup
-        cloned[1] ||= {}
+    options = opts.dup
+    options[:cook_method] = cook_method
 
-        post_user = self.user
-        cloned[1][:user_id] = post_user.id if post_user
+    post_user = self.user
+    options[:user_id] = post_user.id if post_user
 
-        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?
+      cooked = post_analyzer.cook(raw, options)
+    else
+      # At trust level 3, we don't apply nofollow to links
+      options[:omit_nofollow] = true
+      cooked = post_analyzer.cook(raw, options)
+    end
 
     new_cooked = Plugin::Filter.apply(:after_post_cook, self, cooked)
 
     if post_type == Post.types[:regular]
       if new_cooked != cooked && new_cooked.blank?
-        Rails.logger.debug("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}")
+        Rails.logger.debug("Plugin is blanking out post: #{self.url}\nraw: #{raw}")
       elsif new_cooked.blank?
-        Rails.logger.debug("Blank post detected post: #{self.url}\nraw: #{self.raw}")
+        Rails.logger.debug("Blank post detected post: #{self.url}\nraw: #{raw}")
       end
     end
 
@@ -411,11 +405,11 @@ class Post < ActiveRecord::Base
   end
 
   def is_flagged?
-    post_actions.where(post_action_type_id: PostActionType.flag_types.values, deleted_at: nil).count != 0
+    post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values, deleted_at: nil).count != 0
   end
 
   def has_active_flag?
-    post_actions.active.where(post_action_type_id: PostActionType.flag_types.values).count != 0
+    post_actions.active.where(post_action_type_id: PostActionType.flag_types_without_custom.values).count != 0
   end
 
   def unhide!
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index 2ee784f7af..adb1cf0914 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -44,7 +44,7 @@ class PostAction < ActiveRecord::Base
 
   def self.flag_count_by_date(start_date, end_date, category_id = nil)
     result = where('post_actions.created_at >= ? AND post_actions.created_at <= ?', start_date, end_date)
-    result = result.where(post_action_type_id: PostActionType.flag_types.values)
+    result = result.where(post_action_type_id: PostActionType.flag_types_without_custom.values)
     result = result.joins(post: :topic).where("topics.category_id = ?", category_id) if category_id
     result.group('date(post_actions.created_at)')
       .order('date(post_actions.created_at)')
@@ -164,7 +164,7 @@ SQL
       if moderator.id == Discourse::SYSTEM_USER_ID
         PostActionType.auto_action_flag_types.values
       else
-        PostActionType.flag_types.values
+        PostActionType.notify_flag_type_ids
       end
 
     actions = PostAction.where(post_id: post.id)
@@ -179,8 +179,13 @@ SQL
     end
 
     # reset all cached counters
-    f = action_type_ids.map { |t| ["#{PostActionType.types[t]}_count", 0] }
-    Post.with_deleted.where(id: post.id).update_all(Hash[*f.flatten])
+    cached = {}
+    action_type_ids.each do |atid|
+      column = "#{PostActionType.types[atid]}_count"
+      cached[column] = 0 if ActiveRecord::Base.connection.column_exists?(:posts, column)
+    end
+
+    Post.with_deleted.where(id: post.id).update_all(cached)
 
     update_flagged_posts_count
   end
@@ -188,7 +193,7 @@ SQL
   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_action_type_id: PostActionType.notify_flag_type_ids)
 
     actions.each do |action|
       action.deferred_at = Time.zone.now
@@ -355,7 +360,7 @@ SQL
   end
 
   def is_flag?
-    PostActionType.flag_types.values.include?(post_action_type_id)
+    !!PostActionType.flag_types[post_action_type_id]
   end
 
   def is_private_message?
@@ -387,7 +392,7 @@ SQL
   end
 
   before_create do
-    post_action_type_ids = is_flag? ? PostActionType.flag_types.values : post_action_type_id
+    post_action_type_ids = is_flag? ? PostActionType.flag_types_without_custom.values : post_action_type_id
     raise AlreadyActed if PostAction.where(user_id: user_id)
         .where(post_id: post_id)
         .where(post_action_type_id: post_action_type_ids)
@@ -445,7 +450,9 @@ SQL
         .sum("CASE WHEN users.moderator OR users.admin THEN #{SiteSetting.staff_like_weight} ELSE 1 END")
       Post.where(id: post_id).update_all ["like_count = :count, like_score = :score", count: count, score: score]
     else
-      Post.where(id: post_id).update_all ["#{column} = ?", count]
+      if ActiveRecord::Base.connection.column_exists?(:posts, column)
+        Post.where(id: post_id).update_all ["#{column} = ?", count]
+      end
     end
 
     topic_id = Post.with_deleted.where(id: post_id).pluck(:topic_id).first
@@ -583,7 +590,7 @@ SQL
   end
 
   def self.post_action_type_for_post(post_id)
-    post_action = PostAction.find_by(deferred_at: nil, post_id: post_id, post_action_type_id: PostActionType.flag_types.values, deleted_at: nil)
+    post_action = PostAction.find_by(deferred_at: nil, post_id: post_id, post_action_type_id: PostActionType.notify_flag_types.values, deleted_at: nil)
     PostActionType.types[post_action.post_action_type_id]
   end
 
diff --git a/app/models/post_action_type.rb b/app/models/post_action_type.rb
index 6af07c53af..9f757aa013 100644
--- a/app/models/post_action_type.rb
+++ b/app/models/post_action_type.rb
@@ -1,5 +1,6 @@
 require_dependency 'enum'
 require_dependency 'distributed_cache'
+require_dependency 'flag_settings'
 
 class PostActionType < ActiveRecord::Base
   after_save :expire_cache
@@ -14,23 +15,72 @@ class PostActionType < ActiveRecord::Base
 
   class << self
 
+    def flag_settings
+      unless @flag_settings
+        @flag_settings = FlagSettings.new
+        @flag_settings.add(
+          3,
+          :off_topic,
+          notify_type: true,
+          auto_action_type: true
+        )
+        @flag_settings.add(
+          4,
+          :inappropriate,
+          topic_type: true,
+          notify_type: true,
+          auto_action_type: true
+        )
+        @flag_settings.add(
+          8,
+          :spam,
+          topic_type: true,
+          notify_type: true,
+          auto_action_type: true
+        )
+        @flag_settings.add(
+          6,
+          :notify_user,
+          topic_type: false,
+          notify_type: false,
+          custom_type: true
+        )
+        @flag_settings.add(
+          7,
+          :notify_moderators,
+          topic_type: true,
+          notify_type: true,
+          custom_type: true
+        )
+      end
+
+      @flag_settings
+    end
+
+    def replace_flag_settings(settings)
+      @flag_settings = settings
+      @types = nil
+    end
+
     def ordered
       order('position asc')
     end
 
     def types
-      @types ||= Enum.new(bookmark: 1,
-                          like: 2,
-                          off_topic: 3,
-                          inappropriate: 4,
-                          vote: 5,
-                          notify_user: 6,
-                          notify_moderators: 7,
-                          spam: 8)
+      unless @types
+        @types = Enum.new(
+          bookmark: 1,
+          like: 2,
+          vote: 5
+        )
+        @types.merge!(flag_settings.flag_types)
+      end
+
+      @types
     end
 
     def auto_action_flag_types
-      @auto_action_flag_types ||= flag_types.except(:notify_user, :notify_moderators)
+      flag_settings.auto_action_types
     end
 
     def public_types
@@ -41,17 +91,29 @@ class PostActionType < ActiveRecord::Base
       @public_type_ids ||= public_types.values
     end
 
+    def flag_types_without_custom
+      flag_settings.without_custom_types
+    end
+
     def flag_types
-      @flag_types ||= types.only(:off_topic, :spam, :inappropriate, :notify_moderators)
+      flag_settings.flag_types
     end
 
     # flags resulting in mod notifications
     def notify_flag_type_ids
-      @notify_flag_type_ids ||= types.only(:off_topic, :spam, :inappropriate, :notify_moderators).values
+      notify_flag_types.values
+    end
+
+    def notify_flag_types
+      flag_settings.notify_types
     end
 
     def topic_flag_types
-      @topic_flag_types ||= types.only(:spam, :inappropriate, :notify_moderators)
+      flag_settings.topic_flag_types
+    end
+
+    def custom_types
+      flag_settings.custom_types
     end
 
     def is_flag?(sym)
diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb
index 84f018bfa8..2d12b99e77 100644
--- a/app/models/post_analyzer.rb
+++ b/app/models/post_analyzer.rb
@@ -1,4 +1,5 @@
 require_dependency 'oneboxer'
+require_dependency 'email_cook'
 
 class PostAnalyzer
 
@@ -13,12 +14,19 @@ class PostAnalyzer
   end
 
   # What we use to cook posts
-  def cook(*args)
-    cooked = PrettyText.cook(*args)
+  def cook(raw, opts = {})
+    cook_method = opts[:cook_method]
+    return raw if cook_method == Post.cook_methods[:raw_html]
+
+    if cook_method == Post.cook_methods[:email]
+      cooked = EmailCook.new(raw).cook
+    else
+      cooked = PrettyText.cook(raw, opts)
+    end
 
     result = Oneboxer.apply(cooked, topic_id: @topic_id) do |url, _|
       @found_oneboxes = true
-      Oneboxer.invalidate(url) if args.last[:invalidate_oneboxes]
+      Oneboxer.invalidate(url) if opts[:invalidate_oneboxes]
       Oneboxer.cached_onebox(url)
     end
 
diff --git a/app/models/report.rb b/app/models/report.rb
index 8144df648b..83f046cc36 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -175,7 +175,7 @@ class Report
   # Post action counts:
   def self.report_flags(report)
     basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date, report.category_id
-    countable = PostAction.where(post_action_type_id: PostActionType.flag_types.values)
+    countable = PostAction.where(post_action_type_id: PostActionType.flag_types_without_custom.values)
     countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id
     add_counts report, countable, 'post_actions.created_at'
   end
diff --git a/app/models/topic.rb b/app/models/topic.rb
index f4093cb8f5..fe15c98f00 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -37,6 +37,10 @@ class Topic < ActiveRecord::Base
     @max_sort_order ||= (2**31) - 1
   end
 
+  def self.max_fancy_title_length
+    400
+  end
+
   def featured_users
     @featured_users ||= TopicFeaturedUsers.new(self)
   end
@@ -304,18 +308,18 @@ class Topic < ActiveRecord::Base
   def self.fancy_title(title)
     escaped = ERB::Util.html_escape(title)
     return unless escaped
-    Emoji.unicode_unescape(HtmlPrettify.render(escaped))
+    fancy_title = Emoji.unicode_unescape(HtmlPrettify.render(escaped))
+    fancy_title.length > Topic.max_fancy_title_length ? title : fancy_title
   end
 
   def fancy_title
     return ERB::Util.html_escape(title) unless SiteSetting.title_fancy_entities?
 
     unless fancy_title = read_attribute(:fancy_title)
-
       fancy_title = Topic.fancy_title(title)
       write_attribute(:fancy_title, fancy_title)
 
-      unless new_record?
+      if !new_record? && !Discourse.readonly_mode?
         # make sure data is set in table, this also allows us to change algorithm
         # by simply nulling this column
         exec_sql("UPDATE topics SET fancy_title = :fancy_title where id = :id", id: self.id, fancy_title: fancy_title)
@@ -709,14 +713,21 @@ SQL
   end
 
   def remove_allowed_user(removed_by, username)
-    if user = User.find_by(username: username)
+    user = username.is_a?(User) ? username : User.find_by(username: username)
+
+    if user
       topic_user = topic_allowed_users.find_by(user_id: user.id)
+
       if topic_user
         topic_user.destroy
-        # we can not remove ourselves cause then we will end up adding
-        # ourselves in add_small_action
-        removed_by = Discourse.system_user if user.id == removed_by&.id
-        add_small_action(removed_by, "removed_user", user.username)
+
+        if user.id == removed_by&.id
+          removed_by = Discourse.system_user
+          add_small_action(removed_by, "user_left", user.username)
+        else
+          add_small_action(removed_by, "removed_user", user.username)
+        end
+
         return true
       end
     end
diff --git a/app/models/topic_link.rb b/app/models/topic_link.rb
index d66e1616f5..da635aeb99 100644
--- a/app/models/topic_link.rb
+++ b/app/models/topic_link.rb
@@ -161,7 +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?
+            file_extension = File.extname(parsed.path)[1..10].downcase unless parsed.path.nil? || File.extname(parsed.path).empty?
             begin
               TopicLink.create!(post_id: post.id,
                                 user_id: post.user_id,
diff --git a/app/models/user.rb b/app/models/user.rb
index 2429418648..522081371f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -89,7 +89,7 @@ class User < ActiveRecord::Base
 
   after_initialize :add_trust_level
 
-  before_validation :set_should_validate_email
+  before_validation :set_skip_validate_email
 
   after_create :create_email_token
   after_create :create_user_stat
@@ -108,7 +108,6 @@ class User < ActiveRecord::Base
   after_save :expire_old_email_tokens
   after_save :index_search
   after_commit :trigger_user_created_event, on: :create
-  after_commit :trigger_user_updated_event, on: :update
 
   before_destroy do
     # These tables don't have primary keys, so destroying them with activerecord is tricky:
@@ -615,7 +614,7 @@ class User < ActiveRecord::Base
   end
 
   def flags_given_count
-    PostAction.where(user_id: id, post_action_type_id: PostActionType.flag_types.values).count
+    PostAction.where(user_id: id, post_action_type_id: PostActionType.flag_types_without_custom.values).count
   end
 
   def warnings_received_count
@@ -623,7 +622,7 @@ class User < ActiveRecord::Base
   end
 
   def flags_received_count
-    posts.includes(:post_actions).where('post_actions.post_action_type_id' => PostActionType.flag_types.values).count
+    posts.includes(:post_actions).where('post_actions.post_action_type_id' => PostActionType.flag_types_without_custom.values).count
   end
 
   def private_topics_count
@@ -655,7 +654,7 @@ class User < ActiveRecord::Base
   end
 
   def suspended?
-    suspended_till && suspended_till > DateTime.now
+    !!(suspended_till && suspended_till > DateTime.now)
   end
 
   def suspend_record
@@ -1098,14 +1097,9 @@ class User < ActiveRecord::Base
     true
   end
 
-  def trigger_user_updated_event
-    DiscourseEvent.trigger(:user_updated, self)
-    true
-  end
-
-  def set_should_validate_email
+  def set_skip_validate_email
     if self.primary_email
-      self.primary_email.should_validate_email = should_validate_email_address?
+      self.primary_email.skip_validate_email = !should_validate_email_address?
     end
 
     true
diff --git a/app/models/user_email.rb b/app/models/user_email.rb
index c7b35eb3ce..2186e6522e 100644
--- a/app/models/user_email.rb
+++ b/app/models/user_email.rb
@@ -3,7 +3,7 @@ require_dependency 'email_validator'
 class UserEmail < ActiveRecord::Base
   belongs_to :user
 
-  attr_accessor :should_validate_email
+  attr_accessor :skip_validate_email
 
   before_validation :strip_downcase_email
 
@@ -24,7 +24,7 @@ class UserEmail < ActiveRecord::Base
   end
 
   def validate_email?
-    return false unless self.should_validate_email
+    return false if self.skip_validate_email
     email_changed?
   end
 end
diff --git a/app/models/user_option.rb b/app/models/user_option.rb
index 6ce2f12ef5..17eed6baa7 100644
--- a/app/models/user_option.rb
+++ b/app/models/user_option.rb
@@ -59,11 +59,6 @@ class UserOption < ActiveRecord::Base
     super
   end
 
-  def update_tracked_topics
-    return unless saved_change_to_auto_track_topics_after_msecs?
-    TrackedTopicsUpdater.new(id, auto_track_topics_after_msecs).call
-  end
-
   def redirected_to_top_yet?
     last_redirected_to_top_at.present?
   end
@@ -133,6 +128,13 @@ class UserOption < ActiveRecord::Base
     times.max
   end
 
+  private
+
+    def update_tracked_topics
+      return unless saved_change_to_auto_track_topics_after_msecs?
+      TrackedTopicsUpdater.new(id, auto_track_topics_after_msecs).call
+    end
+
 end
 
 # == Schema Information
@@ -162,6 +164,7 @@ end
 #  notification_level_when_replying :integer
 #  theme_key                        :string
 #  theme_key_seq                    :integer          default(0), not null
+#  allow_private_messages           :boolean          default(TRUE), not null
 #
 # Indexes
 #
diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb
index ba3953e5bb..b4f4d60037 100644
--- a/app/serializers/admin_user_list_serializer.rb
+++ b/app/serializers/admin_user_list_serializer.rb
@@ -44,6 +44,14 @@ class AdminUserListSerializer < BasicUserSerializer
     object.suspended?
   end
 
+  def include_suspended_at?
+    object.suspended?
+  end
+
+  def include_suspended_till?
+    object.suspended?
+  end
+
   def can_impersonate
     scope.can_impersonate?(object)
   end
diff --git a/app/serializers/badge_serializer.rb b/app/serializers/badge_serializer.rb
index a726a4dde4..d3bbd87339 100644
--- a/app/serializers/badge_serializer.rb
+++ b/app/serializers/badge_serializer.rb
@@ -1,10 +1,18 @@
 class BadgeSerializer < ApplicationSerializer
   attributes :id, :name, :description, :grant_count, :allow_title,
              :multiple_grant, :icon, :image, :listable, :enabled, :badge_grouping_id,
-             :system, :long_description, :slug
+             :system, :long_description, :slug, :has_badge
 
   has_one :badge_type
 
+  def include_has_badge?
+    object.has_badge
+  end
+
+  def has_badge
+    true
+  end
+
   def system
     object.system?
   end
diff --git a/app/serializers/basic_post_serializer.rb b/app/serializers/basic_post_serializer.rb
index 70153bca9b..bcc75f776e 100644
--- a/app/serializers/basic_post_serializer.rb
+++ b/app/serializers/basic_post_serializer.rb
@@ -31,7 +31,7 @@ class BasicPostSerializer < ApplicationSerializer
   def cooked
     if cooked_hidden
       if scope.current_user && object.user_id == scope.current_user.id
-        I18n.t('flagging.you_must_edit')
+        I18n.t('flagging.you_must_edit', path: "/my/messages")
       else
         I18n.t('flagging.user_must_edit')
       end
diff --git a/app/serializers/flagged_topic_summary_serializer.rb b/app/serializers/flagged_topic_summary_serializer.rb
index de770fef25..f29c365a46 100644
--- a/app/serializers/flagged_topic_summary_serializer.rb
+++ b/app/serializers/flagged_topic_summary_serializer.rb
@@ -15,7 +15,7 @@ class FlaggedTopicSummarySerializer < ActiveModel::Serializer
 
   def flag_counts
     object.flag_counts.map do |k, v|
-      { flag_type_id: k, count: v }
+      { post_action_type_id: k, count: v, name_key: PostActionType.types[k] }
     end
   end
 
diff --git a/app/serializers/post_action_type_serializer.rb b/app/serializers/post_action_type_serializer.rb
index e0bf6f7c97..718c84a5b7 100644
--- a/app/serializers/post_action_type_serializer.rb
+++ b/app/serializers/post_action_type_serializer.rb
@@ -2,13 +2,25 @@ require_dependency 'configurable_urls'
 
 class PostActionTypeSerializer < ApplicationSerializer
 
-  attributes :name_key, :name, :description, :short_description, :long_form, :is_flag, :icon, :id, :is_custom_flag
+  attributes(
+    :id,
+    :name_key,
+    :name,
+    :description,
+    :short_description,
+    :long_form,
+    :is_flag,
+    :is_custom_flag
+  )
 
   include ConfigurableUrls
 
   def is_custom_flag
-    object.id == PostActionType.types[:notify_user] ||
-    object.id == PostActionType.types[:notify_moderators]
+    !!PostActionType.custom_types[object.id]
+  end
+
+  def is_flag
+    !!PostActionType.flag_types[object.id]
   end
 
   def name
@@ -27,10 +39,14 @@ class PostActionTypeSerializer < ApplicationSerializer
     i18n('short_description', tos_url: tos_path)
   end
 
+  def name_key
+    PostActionType.types[object.id]
+  end
+
   protected
 
     def i18n(field, vars = nil)
-      key = "post_action_types.#{object.name_key}.#{field}"
+      key = "post_action_types.#{name_key}.#{field}"
       vars ? I18n.t(key, vars) : I18n.t(key)
     end
 
diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index e06617b0f1..d756ee1dd3 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -246,7 +246,7 @@ class PostSerializer < BasicPostSerializer
       # The following only applies if you're logged in
       if summary[:can_act] && scope.current_user.present?
         summary[:can_defer_flags] = true if scope.is_staff? &&
-                                                   PostActionType.flag_types.values.include?(id) &&
+                                                   PostActionType.flag_types_without_custom.values.include?(id) &&
                                                    active_flags.present? && active_flags.has_key?(id) &&
                                                    active_flags[id].count > 0
       end
diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index ecd93e02ae..850a8dd8dd 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -52,14 +52,15 @@ class SiteSerializer < ApplicationSerializer
 
   def post_action_types
     cache_fragment("post_action_types_#{I18n.locale}") do
-      ActiveModel::ArraySerializer.new(PostActionType.ordered).as_json
+      types = PostActionType.types.values.map { |id| PostActionType.new(id: id) }
+      ActiveModel::ArraySerializer.new(types).as_json
     end
   end
 
   def topic_flag_types
     cache_fragment("post_action_flag_types_#{I18n.locale}") do
-      flags = PostActionType.ordered.where(name_key: ['inappropriate', 'spam', 'notify_moderators'])
-      ActiveModel::ArraySerializer.new(flags, each_serializer: TopicFlagTypeSerializer).as_json
+      types = PostActionType.topic_flag_types.values.map { |id| PostActionType.new(id: id) }
+      ActiveModel::ArraySerializer.new(types, each_serializer: TopicFlagTypeSerializer).as_json
     end
 
   end
diff --git a/app/serializers/topic_flag_type_serializer.rb b/app/serializers/topic_flag_type_serializer.rb
index ee81618448..c0ac6951bd 100644
--- a/app/serializers/topic_flag_type_serializer.rb
+++ b/app/serializers/topic_flag_type_serializer.rb
@@ -3,7 +3,7 @@ class TopicFlagTypeSerializer < PostActionTypeSerializer
   protected
 
     def i18n(field, vars = nil)
-      key = "topic_flag_types.#{object.name_key}.#{field}"
+      key = "topic_flag_types.#{name_key}.#{field}"
       vars ? I18n.t(key, vars) : I18n.t(key)
     end
 
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index df70f3592b..552aeeb25f 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -114,6 +114,7 @@ class TopicViewSerializer < ApplicationSerializer
     result[:can_delete] = true if scope.can_delete?(object.topic)
     result[:can_recover] = true if scope.can_recover_topic?(object.topic)
     result[:can_remove_allowed_users] = true if scope.can_remove_allowed_users?(object.topic)
+    result[:can_remove_self_id] = scope.user.id if scope.can_remove_allowed_users?(object.topic, scope.user)
     result[:can_invite_to] = true if scope.can_invite_to?(object.topic)
     result[:can_invite_via_email] = true if scope.can_invite_via_email?(object.topic)
     result[:can_create_post] = true if scope.can_create?(Post, object.topic)
diff --git a/app/serializers/user_option_serializer.rb b/app/serializers/user_option_serializer.rb
index b8253b40d7..844f6c06b5 100644
--- a/app/serializers/user_option_serializer.rb
+++ b/app/serializers/user_option_serializer.rb
@@ -20,7 +20,8 @@ class UserOptionSerializer < ApplicationSerializer
              :like_notification_frequency,
              :include_tl0_in_digests,
              :theme_key,
-             :theme_key_seq
+             :theme_key_seq,
+             :allow_private_messages,
 
   def auto_track_topics_after_msecs
     object.auto_track_topics_after_msecs || SiteSetting.default_other_auto_track_topics_after_msecs
diff --git a/app/serializers/user_summary_serializer.rb b/app/serializers/user_summary_serializer.rb
index dca6dc544d..76662e1ea6 100644
--- a/app/serializers/user_summary_serializer.rb
+++ b/app/serializers/user_summary_serializer.rb
@@ -1,7 +1,7 @@
 class UserSummarySerializer < ApplicationSerializer
 
-  class TopicSerializer < ApplicationSerializer
-    attributes :id, :created_at, :fancy_title, :slug, :like_count
+  class TopicSerializer < ListableTopicSerializer
+    attributes :category_id
   end
 
   class ReplySerializer < ApplicationSerializer
diff --git a/app/services/spam_rule/auto_block.rb b/app/services/spam_rule/auto_block.rb
index bf855bea87..fd2cb3357f 100644
--- a/app/services/spam_rule/auto_block.rb
+++ b/app/services/spam_rule/auto_block.rb
@@ -66,7 +66,7 @@ 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)
+      .where('spam_count > 0 OR off_topic_count > 0 OR inappropriate_count > 0')
       .pluck(:id)
   end
 
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
index 8b36ce9425..591a50a966 100644
--- a/app/services/user_updater.rb
+++ b/app/services/user_updater.rb
@@ -34,7 +34,8 @@ class UserUpdater
     :email_in_reply_to,
     :like_notification_frequency,
     :include_tl0_in_digests,
-    :theme_key
+    :theme_key,
+    :allow_private_messages,
   ]
 
   def initialize(actor, user)
@@ -109,18 +110,19 @@ class UserUpdater
         update_muted_users(attributes[:muted_usernames])
       end
 
-      saved = (!save_options || user.user_option.save) && user_profile.save && user.save
+      if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
+         (attributes[:name].present? && old_user_name.casecmp(attributes.fetch(:name)) != 0) ||
+         (attributes[:name].blank? && old_user_name.present?)
 
-      if saved
-        # log name changes
-        if attributes[:name].present? && old_user_name.downcase != attributes.fetch(:name).downcase
-          StaffActionLogger.new(@actor).log_name_change(user.id, old_user_name, attributes.fetch(:name))
-        elsif attributes[:name].blank? && old_user_name.present?
-          StaffActionLogger.new(@actor).log_name_change(user.id, old_user_name, "")
-        end
+        StaffActionLogger.new(@actor).log_name_change(
+          user.id,
+          old_user_name,
+          attributes.fetch(:name) { '' }
+        )
       end
     end
 
+    DiscourseEvent.trigger(:user_updated, user) if saved
     saved
   end
 
diff --git a/app/views/pending_flags_mailer/notify.html.erb b/app/views/pending_flags_mailer/notify.html.erb
index 63e6573f3e..940fc6c6e6 100644
--- a/app/views/pending_flags_mailer/notify.html.erb
+++ b/app/views/pending_flags_mailer/notify.html.erb
@@ -1,6 +1,6 @@
 <p>
   <%= t 'flags_reminder.flags_were_submitted', count: @hours %>
-  <a href="<%= Discourse.base_url + '/admin/flags/active' %>"><%= t 'flags_reminder.please_review' %></a>
+  <a href="<%= Discourse.base_url + '/admin/flags' %>"><%= t 'flags_reminder.please_review' %></a>
 </p>
 
 <table style="border-collapse: collapse; border-spacing: 0;">
diff --git a/app/views/pending_flags_mailer/notify.text.erb b/app/views/pending_flags_mailer/notify.text.erb
index c4564fddc0..ca10b097b4 100644
--- a/app/views/pending_flags_mailer/notify.text.erb
+++ b/app/views/pending_flags_mailer/notify.text.erb
@@ -1,6 +1,6 @@
 <%=t 'flags_reminder.flags_were_submitted', count: @hours %> <%=t 'flags_reminder.please_review' %>
 
-<%= Discourse.base_url + '/admin/flags/active' %>
+<%= Discourse.base_url + '/admin/flags' %>
 
 <% @posts.each do |post| %>
  - <%= post[:title] %>: <%=t 'flags_reminder.post_number' %> <%= post[:post_number] %> - <%= post[:reason_counts] %>
diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb
index 95d04d44e6..809e0011e4 100644
--- a/app/views/search/show.html.erb
+++ b/app/views/search/show.html.erb
@@ -1 +1 @@
-<% content_for :title do %><%= t 'js.search.results_page' %> - <%= SiteSetting.title %><% end %>
+<% content_for :title do %><%= I18n.t('search.results_page', term: @search_term) %> - <%= SiteSetting.title %><% end %>
diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb
index ed8badab6f..c08a7661b1 100644
--- a/app/views/static/login.html.erb
+++ b/app/views/static/login.html.erb
@@ -1,3 +1,5 @@
 <% if SiteSetting.login_required %>
-  <%= PrettyText.cook(I18n.t('login_required.welcome_message', title: SiteSetting.title)).html_safe %>
+  <div class='login-required'>
+    <%= PrettyText.cook(I18n.t('login_required.welcome_message', title: SiteSetting.title)).html_safe %>
+  </div>
 <% end %>
diff --git a/app/views/users/confirm_admin.html.erb b/app/views/users/confirm_admin.html.erb
index 4e996da74a..2f9d3cdd4a 100644
--- a/app/views/users/confirm_admin.html.erb
+++ b/app/views/users/confirm_admin.html.erb
@@ -14,7 +14,7 @@
     <%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %>
     <br/>
     <br/>
-    <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), "/", class: 'btn btn-primary' %>
+    <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), Discourse.base_url, class: 'btn btn-primary' %>
   <% end %>
 
 </div>
diff --git a/app/views/users_email/confirm.html.erb b/app/views/users_email/confirm.html.erb
index f02bb9fbe9..0538ddfaac 100644
--- a/app/views/users_email/confirm.html.erb
+++ b/app/views/users_email/confirm.html.erb
@@ -9,7 +9,7 @@
     <a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
   <% else %>
     <div class='alert alert-error'>
-      <%=t 'change_email.error' %>
+      <%=t 'change_email.already_done' %>
     </div>
   <% end %>
 </div>
diff --git a/config/application.rb b/config/application.rb
index e9185f5306..a0a2310625 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -210,6 +210,9 @@ module Discourse
       # Load plugins
       Discourse.plugins.each(&:notify_after_initialize)
 
+      # we got to clear the pool in case plugins connect
+      ActiveRecord::Base.connection_handler.clear_active_connections!
+
       # This nasty hack is required for not precompiling QUnit assets
       # in test mode. see: https://github.com/rails/sprockets-rails/issues/299#issuecomment-167701012
       ActiveSupport.on_load(:action_view) do
diff --git a/config/database.yml b/config/database.yml
index c157512262..f3983ad493 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -5,6 +5,7 @@ development:
   min_messages: warning
   pool: 5
   timeout: 5000
+  checkout_timeout: <%= ENV['CHECKOUT_TIMEOUT'] || 5 %>
   host_names:
     ### Don't include the port number here. Change the "port" site setting instead, at /admin/site_settings.
     ### If you change this setting you will need to
diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf
index 2f47f7ea21..2f1ba286d4 100644
--- a/config/discourse_defaults.conf
+++ b/config/discourse_defaults.conf
@@ -17,9 +17,12 @@
 # connection pool size, sidekiq is set to 5, allowing an extra 3 for bg threads
 db_pool = 8
 
-# database timeout in milliseconds
+# ActiveRecord connection pool timeout in milliseconds
 db_timeout = 5000
 
+# Database connection timeout in seconds
+db_connect_timeout = 5
+
 # socket file used to access db
 db_socket =
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6489a1777e..c6b0d6eb84 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -10,7 +10,7 @@ Discourse::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = GlobalSetting.serve_static_assets
+  config.public_file_server.enabled = GlobalSetting.serve_static_assets || false
 
   config.assets.js_compressor = :uglifier
 
diff --git a/config/environments/profile.rb b/config/environments/profile.rb
index 3f672a9c47..e29421d57e 100644
--- a/config/environments/profile.rb
+++ b/config/environments/profile.rb
@@ -13,7 +13,7 @@ Discourse::Application.configure do
   config.action_controller.perform_caching = true
 
   # in profile mode we serve static assets
-  config.serve_static_files = true
+  config.public_file_server.enabled = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
diff --git a/config/environments/test.rb b/config/environments/test.rb
index c2129f7095..2397915f3a 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,7 +8,7 @@ Discourse::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
+  config.public_file_server.enabled = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
diff --git a/config/initializers/100-lograge.rb b/config/initializers/100-lograge.rb
new file mode 100644
index 0000000000..9e5dcfc916
--- /dev/null
+++ b/config/initializers/100-lograge.rb
@@ -0,0 +1,36 @@
+if (Rails.env.production? && SiteSetting.logging_provider == 'lograge') || ENV["ENABLE_LOGRAGE"]
+  require 'lograge'
+
+  Rails.application.configure do
+    config.lograge.enabled = true
+
+    logstash_uri = ENV["LOGSTASH_URI"]
+
+    config.lograge.custom_options = lambda do |event|
+      exceptions = %w(controller action format id)
+
+      output = {
+        params: event.payload[:params].except(*exceptions),
+        database: RailsMultisite::ConnectionManagement.current_db,
+        time: event.time,
+      }
+
+      output[:type] = :rails if logstash_uri
+      output
+    end
+
+    if logstash_uri
+      require 'logstash-logger'
+
+      config.lograge.formatter = Lograge::Formatters::Logstash.new
+
+      config.lograge.logger = LogStashLogger.new(
+        type: :multi_delegator,
+        outputs: [
+          { uri: logstash_uri },
+          { type: :file, path: "#{Rails.root}/log/#{Rails.env}.log", sync: true }
+        ]
+      )
+    end
+  end
+end
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index a514cab6ab..f86a4b07b0 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -314,7 +314,7 @@ ar:
         unbookmark: "انقر لإزالة كلّ العلامات المرجعية في هذا الموضوع"
     bookmarks:
       not_logged_in: "عذرا، عليك تسجيل الدخول لتضع علامات مرجعية علي المنشورات"
-      created: "لقد وضعت علامة مرعجية علي هذا المنشور"
+      created: "لقد وضعت علامة مرجعية علي هذا المنشور"
       not_bookmarked: "لقد قرأت هذا المنشور، انقر لوضع علامة مرجعية علية"
       last_read: "هذا آخر منشور قرأته، انقر لوضع علامة مرجعية علية"
       remove: "أزل العلامة المرجعية"
@@ -670,13 +670,13 @@ ar:
         individual_no_echo: "أرسل رسالة لكل منشور جديد عدا منشوراتي"
         many_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا {{dailyEmailEstimate}} يوميا)"
         few_per_day: "أرسل لي رسالة لكل منشور جديد (تقريبا إثنتان يوميا)"
-      tag_settings: "الوسوم"
+      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: "ستراقب آليا كل موضوعات هذا القسم. ستصلك إشعارات بالمنشورات و الموضوعات الجديدة، وسيظهر أيضا عدّاد للمنشورات الجديدة بجانب كل موضوع."
       tracked_categories: "متابع"
@@ -684,7 +684,7 @@ ar:
       watched_first_post_categories: "مراقبة أول منشور"
       watched_first_post_categories_instructions: "سيصلك إشعار بأول منشور في كل موضوع بهذا القسم."
       watched_first_post_tags: "مراقبة أول منشور"
-      watched_first_post_tags_instructions: "سيصلك إشعار بأول منشور في كل موضوع يستخدم هذة الوسوم."
+      watched_first_post_tags_instructions: "سيصلك إشعار بأول منشور في كل موضوع يستخدم هذة الأوسمة."
       muted_categories: "مكتوم"
       muted_categories_instructions: "لن يتم إشعارك بأي جديد عن الموضوعات الجديدة في هذا القسم، ولن تظهر موضوعات هذا القسم في قائمة الموضوعات المنشورة مؤخراً."
       no_category_access: "كمشرف لديك صلاحيات وصول محدودة للأقسام, الحفظ معطل"
@@ -729,7 +729,7 @@ ar:
         emails: "البريد الإلكتروني"
         notifications: "التنبيهات"
         categories: "الأقسام"
-        tags: "الوسوم"
+        tags: "الأوسمة"
         interface: "واجهة المستخدم"
         apps: "التطبيقات"
       change_password:
@@ -794,7 +794,7 @@ ar:
         ok: "يبدو اسمك جيدا"
       username:
         title: "اسم المستخدم"
-        instructions: "فريد و دون مسافات و قصير"
+        instructions: "باللغة الإنجليزية و دون مسافات و قصير و غير مكرر"
         short_instructions: "يمكن للغير الإشارة إليك ب‍@{{username}}"
         available: "اسم المستخدم متاح"
         not_available: "غير متاح. جرّب {{suggestion}} ؟"
@@ -1334,7 +1334,7 @@ ar:
       invitee_accepted: "<span>{{username}}</span> قبل دعوتك"
       moved_post: "<span>{{username}}</span> نقل {{description}}"
       linked: "<span>{{username}}</span>{{description}} "
-      granted_badge: "حصلت علي '{{description}}'"
+      granted_badge: "تم منحك شارة '{{description}}'"
       topic_reminder: "<span>{{username}}</span>{{description}} "
       watching_first_post: "<span>موضوع جديد</span> {{description}}"
       group_message_summary:
@@ -1443,7 +1443,7 @@ ar:
           unseen: لم أقرأها
           wiki: من النوع wiki
           images: تحتوي صوراً !!
-          all_tags: تحتوي علي كل الوسوم
+          all_tags: تحتوي علي كل الأوسمة
         statuses:
           label: بشرط أن تكون المواضيع
           open: مفتوحة
@@ -1492,11 +1492,11 @@ 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: "تغيرت وسوم هذه الموضوعات."
+        change_tags: "غيّر الأوسمة"
+        append_tags: "اضف الأوسمة"
+        choose_new_tags: "اختر أوسمة جديدة لهذه الموضوعات:"
+        choose_append_tags: "اختر أوسمة جديدة لإضافتها لهذة الموضوعات"
+        changed_tags: "تغيرت أوسمة هذه الموضوعات."
       none:
         unread: "ليست هناك مواضيع غير مقروءة."
         new: "ليست هناك مواضيع جديدة."
@@ -2212,11 +2212,11 @@ ar:
       general: 'عام'
       settings: 'اعدادات'
       topic_template: "إطار الموضوع"
-      tags: "الوسوم"
-      tags_allowed_tags: "اسمح فقط لهذة الوسمة بالاستخدام في هذا القسم."
-      tags_allowed_tag_groups: "اسمح فقط للأوسمة من هذة المجموعات بالاستخدام في هذا القسم."
-      tags_placeholder: "(اختياري) قائمة الاوسمة المسموح بها"
-      tag_groups_placeholder: "(اختياريّ) قائمة مجموعات الوسوم المسموح بها"
+      tags: "الأوسمة"
+      tags_allowed_tags: "اسمح فقط بإستخدام هذة الأوسمة في هذا القسم."
+      tags_allowed_tag_groups: "اسمح فقط بإستخدام مجموعات الأوسمة هذة في هذا القسم."
+      tags_placeholder: "(اختياري) قائمة الأوسمة المسموح بها"
+      tag_groups_placeholder: "(اختياريّ) قائمة مجموعات الأوسمة المسموح بها"
       topic_featured_link_allowed: "اسمح بالروابط المُميزة بهذا القسم."
       delete: 'احذف القسم'
       create: 'قسم جديد'
@@ -2425,14 +2425,14 @@ ar:
       many: "اﻹعجابات"
       other: "اﻹعجابات"
     likes_long: "هناك {{number}} اعجابات في هذا الموضوع"
-    users: "المستخدمون"
+    users: "الأعضاء"
     users_lowercase:
-      zero: "المستخدمون"
-      one: "المستخدمون"
-      two: "المستخدمون"
-      few: "المستخدمون"
-      many: "المستخدمون"
-      other: "المستخدمون"
+      zero: "عضو"
+      one: "عضو واحد"
+      two: "عضوين"
+      few: "الأعضاء"
+      many: "الأعضاء"
+      other: "الأعضاء"
     category_title: "قسم"
     history: "تاريخ"
     changed_by: "الكاتب {{author}}"
@@ -2655,21 +2655,28 @@ ar:
       </form>
       </p>
     tagging:
-      all_tags: "كل الوسوم"
-      selector_all_tags: "كل الوسوم"
-      selector_no_tags: "لا وسوم"
-      changed: "الوسوم المعدلة:"
-      tags: "الوسوم"
+      all_tags: "كل الأوسمة"
+      selector_all_tags: "كل الأوسمة"
+      selector_no_tags: "لا أوسمة"
+      changed: "الأوسمة المعدلة:"
+      tags: "الأوسمة"
       choose_for_topic: "اختر (إن أردت) وسوما لهذا الموضوع"
       delete_tag: "احذف الوسم"
-      delete_confirm: "أمتأكد من حذف هذا الوسم؟"
+      delete_confirm:
+        zero: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        one: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من موضوع واحد؟"
+        two: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        few: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        many: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+        other: "هل أنت متاكد انك تريد حذف هذا الوسم و إذالتة من {{count}} موضوع؟"
+      delete_confirm_no_topics: "هل أنت متاكد انك تريد حذف هذا الوسم؟"
       rename_tag: "أعد تسمية الوسم"
       rename_instructions: "اختر اسما جديدا للوسم:"
       sort_by: "افرز ب‍:"
       sort_by_count: "العدد"
       sort_by_name: "الاسم"
-      manage_groups: "أدر مجموعات الوسوم"
-      manage_groups_description: "انشئ مجموعات لتنظيم الوسوم"
+      manage_groups: "أدرج مجموعات الأوسمة"
+      manage_groups_description: "أنشئ مجموعات لتنظيم الأوسمة"
       filters:
         without_category: "مواضيع %{tag} %{filter}"
         with_category: "موضوعات %{filter}%{tag}  في %{category}"
@@ -2678,7 +2685,7 @@ ar:
       notifications:
         watching:
           title: "مُراقب"
-          description: "ستتابع بشكل تلقائي جديد هذه التصنيفات. سيتم إشعارك بكل مشاركة او موضوع، بالإضافة لذلك سيتم عرض عدد  المشاركات الغير مقروءة و الجديدة بجانب الموضوع."
+          description: "ستتابع بشكل تلقائي جديد هذه الأقسام. سيتم إشعارك بكل منشور او موضوع، بالإضافة لذلك سيتم عرض عدد  المنشورات الغير مقروءة و الجديدة بجانب الموضوع."
         watching_first_post:
           title: "يُراقب فيه أول مشاركة"
           description: "ستستقبل إشعارًا لأوّل مشاركة في كلّ موضوع في هذا الوسم."
@@ -2692,15 +2699,15 @@ ar:
           title: "مكتوم"
           description: "لن تستقبل أيّ إشعار لأيّ موضوع جديد في هذا الوسم، ولن تظهر هذه المواضيع في لسان المواضيع غير المقروءة."
       groups:
-        title: "مجموعات الوسوم"
-        about: "أضف وسوما للمجموعات ليسهل عليك إدارتها."
+        title: "مجموعات الأوسمة"
+        about: "ضع الأوسمة في مجموعات ليسهل عليك إدارتها."
         new: "مجموعة جديدة"
-        tags_label: "الوسوم في هذه المجموعة:"
+        tags_label: "الأوسمة في هذه المجموعة:"
         parent_tag_label: "التصنيف الأب"
         parent_tag_placeholder: "اختياري"
-        parent_tag_description: "لا يمكن استخدام الوسوم في هذه المجموعة ما لم يوجد الوسم الأب."
-        one_per_topic_label: "اختر علامة وصفية واحدة لكل موضوع من هذه المجموعة"
-        new_name: "مجموعة وسوم جديدة"
+        parent_tag_description: "لا يمكن استخدام الأوسمة في هذه المجموعة ما لم يوجد الوسم الأب."
+        one_per_topic_label: "السماح بوسم واحد فقط من هذة المجموعة لكل موضوع"
+        new_name: "مجموعة أوسمة جديدة"
         save: "حفظ"
         delete: "حذف"
         confirm_delete: "أمتأكد من حذف مجموعة الوسوم هذه؟"
@@ -3310,8 +3317,8 @@ ar:
             grant_moderation: "عين كمشرف"
             revoke_moderation: "سحب صلاحيات المشرف"
             backup_create: "أنشئ نسخة احتياطية"
-            deleted_tag: "علامة وصفية محذوفة"
-            renamed_tag: "اعادة تسمية العلامة الوصفية"
+            deleted_tag: "وسم محذوف"
+            renamed_tag: "إعادة تسمية الوسم"
             revoke_email: "حذف البريد الالكتروني"
             lock_trust_level: "قفل مستوى الثقة"
             unlock_trust_level: "فتح مستوى الثقة "
@@ -3378,11 +3385,11 @@ ar:
         not_found: "تعذر إيجاد المستخدم."
         invalid: "عذراً , لايمكنك تمثل شخصية ذلك العضو."
       users:
-        title: 'المستخدمون'
+        title: 'الأعضاء'
         create: 'اضافة مدير'
         last_emailed: "آخر بريد الكتروني"
-        not_found: "آسفون، اسم هذا المستخدم غير موجود في النظام."
-        id_not_found: "آسفون، معرّف هذا المستخدم غير موجود في النظام."
+        not_found: "عذرا، اسم المستخدم غير موجود في النظام."
+        id_not_found: "عذرا، هذا الرقم التعريفي غير موجود في النظام."
         active: "نشط"
         show_emails: "عرض الرسائل"
         nav:
@@ -3409,8 +3416,8 @@ ar:
           many: "رفض المستخدمين ({{count}})"
           other: "رفض المستخدمين ({{count}})"
         titles:
-          active: 'المستخدمون النشطون'
-          new: 'المستخدمون الجدد'
+          active: 'الأعضاء النشطون'
+          new: 'الأعضاء الجدد'
           pending: 'أعضاء بانتظار المراجعة'
           newuser: 'أعضاء في مستوى الثقة 0 (عضو جديد)'
           basic: 'أعضاء في مستوى الثقة 1 (عضو أساسي)'
@@ -3418,25 +3425,25 @@ ar:
           regular: 'الاعضاء في مستوى الثقة رقم 3 (عاديين)'
           leader: 'الاعضاء في مستوى الثقة رقم 4 (قادة)'
           staff: "الطاقم"
-          admins: 'المستخدمون المدراء'
+          admins: 'الأعضاء المدراء'
           moderators: 'المشرفون'
-          blocked: 'مستخدمين محظورين:'
+          blocked: 'الأعضاء المحظورين'
           suspended: 'أعضاء موقوفين'
-          suspect: 'المستخدمون المريبون'
+          suspect: 'الأعضاء المريبون'
         reject_successful:
-          zero: "رفض بنجاح 1 مستخدم"
-          one: "رفض بنجاح 1 مستخدم"
-          two: "رفض بنجاح %{count} مستخدمين."
-          few: "رفض بنجاح %{count} مستخدمين."
-          many: "رفض بنجاح %{count} مستخدمين."
-          other: "رفض بنجاح %{count} مستخدمين."
+          zero: "رفض بنجاح 1 عضو"
+          one: "رفض بنجاح 1 عضو"
+          two: "رفض بنجاح %{count} عضو."
+          few: "رفض بنجاح %{count} عضو."
+          many: "رفض بنجاح %{count} عضو."
+          other: "رفض بنجاح %{count} عضو."
         reject_failures:
-          zero: "فشل لرفض 1 مستخدم."
-          one: "فشل لرفض 1 مستخدم."
-          two: "فشل لرفض %{count} مستخدمين."
-          few: "فشل لرفض %{count} مستخدمين."
-          many: "فشل لرفض %{count} مستخدمين."
-          other: "فشل لرفض %{count} مستخدمين."
+          zero: "فشل لرفض 1 عضو."
+          one: "فشل لرفض 1 عضو."
+          two: "فشل لرفض %{count} عضو."
+          few: "فشل لرفض %{count} عضو."
+          many: "فشل لرفض %{count} عضو."
+          other: "فشل لرفض %{count} عضو."
         not_verified: "لم يتم التحقق"
         check_email:
           title: "اكشف عنوان البريد الإلكتروني لهذا العضو"
@@ -3573,11 +3580,11 @@ ar:
           posts_read: "المنشورات المقروءة"
           posts_read_all_time: "المشاركات المقروءة (جميع الاوقات)"
           flagged_posts: "المشاركات المبلغ عنها "
-          flagged_by_users: "المستخدمين الذين بلغوا"
+          flagged_by_users: "الأعضاء الذين بلغوا"
           likes_given: "الإعجابات المعطاة"
           likes_received: "الإعجابات المستلمة"
           likes_received_days: "الإعجابات المستلمة : الايام الغير عادية"
-          likes_received_users: "الإعجابات المستلمة : المستخدمين المميزين"
+          likes_received_users: "الإعجابات المستلمة : الأعضاء المميزين"
           qualifies: "مستوى الثقة الممنوحة للمستوى "
           does_not_qualify: "غير مستحق للمستوى"
           will_be_promoted: "سيتم الترقية عنه قريبا"
@@ -3668,7 +3675,7 @@ ar:
           login: "تسجيل الدخول"
           plugins: "الإضافات "
           user_preferences: "تفضيلات العضو"
-          tags: "الوسوم"
+          tags: "الأوسمة"
           search: "البحث"
           groups: "المجموعات"
       badges:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 767050440d..7f66870fa7 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -1006,10 +1006,6 @@ bs_BA:
       olist_title: "Numbered List"
       ulist_title: "Bulleted List"
       list_item: "List item"
-      heading_label: "H"
-      heading_title: "Naslov"
-      heading_text: "Naslov"
-      hr_title: "Horizontalna Crta"
       help: "Markdown Editing Help"
       toggler: "sakrij ili pokaži komposer"
       modal_ok: "OK"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 6ad9bcecdd..87837d6bcc 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -1069,10 +1069,6 @@ da:
       olist_title: "Nummereret liste"
       ulist_title: "Punktopstilling"
       list_item: "Listepunkt"
-      heading_label: "T"
-      heading_title: "Overskrift"
-      heading_text: "Overskrift"
-      hr_title: "Vandret streg"
       help: "Hjælp til Markdown-redigering"
       toggler: "skjul eller vis editor-panelet"
       modal_ok: "OK"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 3486261c0d..1e768b1179 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -116,6 +116,7 @@ de:
       split_topic: "Thema aufgeteilt, %{when}"
       invited_user: "%{who} eingeladen, %{when}"
       invited_group: "%{who} eingeladen, %{when}"
+      user_left: "%{who} hat diese Nachricht %{when} hinterlassen"
       removed_user: "%{who} entfernt, %{when}"
       removed_group: "%{who} entfernt, %{when}"
       autoclosed:
@@ -531,6 +532,7 @@ de:
       disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe"
       dynamic_favicon: "Zeige die Anzahl der neuen und geänderten Themen im Browser-Symbol an"
       theme_default_on_all_devices: "Übernehme dieses Theme für alle meine Geräte."
+      allow_private_messages: "Erlaube anderen Benutzern, mir Nachrichten zu schicken"
       external_links_in_new_tab: "Öffne alle externen Links in einem neuen Tab"
       enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text"
       change: "ändern"
@@ -540,6 +542,7 @@ de:
       admin_tooltip: "Dieser Benutzer ist ein Administrator"
       blocked_tooltip: "Dieser Benutzer wird blockiert."
       suspended_notice: "Dieser Benutzer ist bis zum {{date}} gesperrt."
+      suspended_permanently: "Der Benutzer ist gesperrt."
       suspended_reason: "Grund: "
       github_profile: "Github"
       email_activity_summary: "Aktivitäts-Übersicht"
@@ -805,11 +808,11 @@ de:
           one: "Beitrag erstellt"
           other: "Beiträge erstellt"
         likes_given:
-          one: "<i class='fa fa-heart'></i> gegeben"
-          other: "<i class='fa fa-heart'></i> gegeben"
+          one: "gegeben"
+          other: "gegeben"
         likes_received:
-          one: "<i class='fa fa-heart'></i> erhalten"
-          other: "<i class='fa fa-heart'></i> erhalten"
+          one: "vergeben"
+          other: "vergeben"
         days_visited:
           one: "Tag vorbeigekommen"
           other: "Tage vorbeigekommen"
@@ -927,6 +930,7 @@ de:
     private_message_info:
       title: "Nachricht"
       invite: "Andere einladen…"
+      leave_message: "Möchtest du diese Nachricht wirklich verlassen?"
       remove_allowed_user: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
       remove_allowed_group: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
     email: 'E-Mail-Adresse'
@@ -1129,10 +1133,6 @@ de:
       olist_title: "Nummerierte Liste"
       ulist_title: "Liste mit Aufzählungszeichen"
       list_item: "Listenelement"
-      heading_label: "Ü"
-      heading_title: "Überschrift"
-      heading_text: "Überschrift"
-      hr_title: "Horizontale Linie"
       help: "Hilfe zur Markdown-Formatierung"
       toggler: "Eingabebereich aus- oder einblenden"
       modal_ok: "OK"
@@ -1226,7 +1226,7 @@ de:
       no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
       searching: "Suche …"
       post_format: "#{{post_number}} von {{username}}"
-      results_page: "Suchergebnisse"
+      results_page: "Suchergebnisse für '{{term}}'"
       more_results: "Es gibt mehr Ergebnisse. Bitte grenze deine Suchkriterien weiter ein."
       cant_find: "Nicht gefunden, wonach du suchst?"
       start_new_topic: "Wie wär’s mit einem neuen Thema?"
@@ -1403,19 +1403,27 @@ de:
       jump_reply_down: zur nachfolgenden Antwort springen
       deleted: "Das Thema wurde gelöscht"
       topic_status_update:
-        title: "Setzte die Themen-Stoppuhr"
+        title: "Themen-Zeitschaltuhr"
         save: "Stoppuhr setzen"
         num_of_hours: "Stunden:"
         remove: "Stoppuhr löschen"
         publish_to: "Veröffentlichen in:"
         when: "Wann:"
+        public_timer_types: Themen-Zeitschaltuhren
+        private_timer_types: Benutzer-Themen-Zeitschaltuhren
       auto_update_input:
+        none: "Wähle einen Zeitbereich aus"
         later_today: "Im Laufe des Tages"
         tomorrow: "Morgen"
         later_this_week: "Später in dieser Woche"
         this_weekend: "Dieses Wochenende"
         next_week: "Nächste Woche"
+        two_weeks: "Zwei Wochen"
         next_month: "Nächster Monat"
+        three_months: "Drei Monate"
+        six_months: "Sechs Monate"
+        one_year: "Ein Jahr"
+        forever: "Für immer"
         pick_date_and_time: "Datum und Zeit wählen"
         set_based_on_last_post: "Schließen basierend auf dem letzten Beitrag"
       publish_to_category:
@@ -2164,7 +2172,7 @@ de:
         hamburger_menu: '<b>=</b> „Hamburger“-Menü öffnen'
         user_profile_menu: '<b>p</b> Benutzermenü öffnen'
         show_incoming_updated_topics: '<b>.</b> Aktualisierte Themen anzeigen'
-        search: '<b>/</b> oder <b>Strg</b>+<b>Shift</b>+<b>s</b> Suche'
+        search: '<b>/</b> oder <b>Strg</b>+<b>Alt</b>+<b>f</b> Suche'
         help: '<b>?</b> Tastaturhilfe öffnen'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Neue/ausgewählte Beiträge ausblenden'
         dismiss_topics: '<b>x</b>, <b>t</b> Themen ausblenden'
@@ -2237,7 +2245,10 @@ de:
       tags: "Schlagwörter"
       choose_for_topic: "Optionale Schlagwörter für dieses Thema wählen"
       delete_tag: "Schlagwört löschen"
-      delete_confirm: "Möchtest du wirklich dieses Schlagwort löschen?"
+      delete_confirm:
+        one: "Bist du sicher, dass du dieses Schlagwort löschen und von einem zugeordneten Thema entfernen möchtest?"
+        other: "Bist du sicher, dass du dieses Schlagwort löschen und von {{count}} zugeordneten Themen entfernen möchtest?"
+      delete_confirm_no_topics: "Bist du sicher, dass du dieses Schlagwort löschen möchtest?"
       rename_tag: "Schlagwort umbenennen"
       rename_instructions: "Neuen Namen für das Schlagwort wählen:"
       sort_by: "Sortieren nach:"
@@ -2365,8 +2376,9 @@ de:
         by: "von"
       flags:
         title: "Meldungen"
-        old: "Alt"
-        active: "Aktiv"
+        active_posts: "Gemeldete Beiträge"
+        old_posts: "Alte gemeldete Beiträge"
+        topics: "Gemeldete Themen"
         agree: "Zustimmen"
         agree_title: "Meldung bestätigen, weil diese gültig und richtig ist"
         agree_flag_modal_title: "Zustimmen und…"
@@ -2394,6 +2406,8 @@ de:
         clear_topic_flags: "Erledigt"
         clear_topic_flags_title: "Das Thema wurde untersucht und Probleme wurden beseitigt. Klicke auf „Erledigt“, um die Meldungen zu entfernen."
         more: "(weitere Antworten…)"
+        suspend_user: "Benutzer sperren"
+        suspend_user_title: "Benutzer für diesen Beitrag sperren"
         dispositions:
           agreed: "zugestimmt"
           disagreed: "abgelehnt"
@@ -2404,27 +2418,24 @@ de:
         system: "System"
         error: "Etwas ist schief gelaufen"
         reply_message: "Antworten"
-        no_results: "Es gibt keine Meldungen."
+        no_results: "Es gibt keine gemeldeten Beiträge."
         topic_flagged: "Dieses <strong>Thema</strong> wurde gemeldet."
+        show_full: "zeige vollständigen Beitrag"
         visit_topic: "Besuche das Thema, um zu reagieren"
         was_edited: "Beitrag wurde nach der ersten Meldung bearbeitet"
         previous_flags_count: "Dieses Thema wurde bereits {{count}} mal gemeldet."
-        summary:
-          action_type_3:
-            one: "„am Thema vorbei“"
-            other: "„am Thema vorbei“ x{{count}}"
-          action_type_4:
-            one: "unangemessen"
-            other: "unangemessen x{{count}}"
-          action_type_6:
-            one: "benutzerdefiniert"
-            other: "benutzerdefiniert x{{count}}"
-          action_type_7:
-            one: "benutzerdefiniert"
-            other: "benutzerdefiniert x{{count}}"
-          action_type_8:
-            one: "Spam"
-            other: "Spam x{{count}}"
+        show_details: "Zeige Meldungsdetails"
+        flagged_topics:
+          topic: "Thema"
+          type: "Art"
+          users: "Benutzer"
+          last_flagged: "Zuletzt gemeldet"
+        short_names:
+          off_topic: "off-topic"
+          inappropriate: "unangemessen"
+          spam: "spam"
+          notify_user: "benutzerdefiniert"
+          notify_moderators: "benutzerdefiniert"
       groups:
         primary: "Hauptgruppe"
         no_primary: "(keine Hauptgruppe)"
@@ -2946,6 +2957,7 @@ de:
         form:
           label: 'Neues Wort:'
           placeholder: 'vollständiges Wort oder * als Platzhalter'
+          placeholder_regexp: "regulärer Ausdruck"
           add: 'Hinzufügen'
           success: 'Erfolg'
           upload: "Hochladen"
@@ -3007,10 +3019,15 @@ de:
         suspend_failed: "Beim Sperren dieses Benutzers ist etwas schief gegangen {{error}}"
         unsuspend_failed: "Beim Entsperren dieses Benutzers ist etwas schief gegangen {{error}}"
         suspend_duration: "Wie lange soll dieser Benutzer gesperrt werden?"
-        suspend_duration_units: "(Tage)"
         suspend_reason_label: "Warum sperrst du? Dieser Text ist auf der Profilseite des Benutzers <b>für jeden sichtbar</b> und wird dem Benutzer angezeigt, wenn sich dieser anmelden will. Bitte kurz halten."
+        suspend_reason_hidden_label: "Warum sperrst du? Dieser Text wird dem Benutzer angezeigt, wenn er versucht, sich anzumelden. Fasse dich kurz."
         suspend_reason: "Grund"
+        suspend_reason_placeholder: "Grund der Sperre"
+        suspend_message: "E-Mail-Nachricht"
+        suspend_message_placeholder: "Optional: Gib weitere Informationen über deine Sperrung an und sie wird dem Benutzer per E-Mail geschickt."
         suspended_by: "Gesperrt von"
+        suspended_until: "(bis %{until})"
+        cant_suspend: "Der Benutzer kann nicht gesperrt werden."
         delete_all_posts: "Lösche alle Beiträge"
         delete_all_posts_confirm_MF: "Du wirst {POSTS, plural, one {einen Beitrag} other {# Beiträge}} und {TOPICS, plural, one {ein Thema} other {# Themen}} löschen. Bist du dir sicher?"
         suspend: "Sperren"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 75771e8943..d2d6eb2429 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -116,6 +116,7 @@ el:
       split_topic: "διαχώρισε αυτό το νήμα %{when}"
       invited_user: "προσκάλεσε τον χρήστη %{who} στις %{when}"
       invited_group: "προσκάλεσε την ομάδα %{who} στις %{when}"
+      user_left: "%{who} άφησε αυτό το μήνυμα στις %{when}"
       removed_user: "αφαίρεσε τον χρήστη %{who} στις %{when}"
       removed_group: "αφαίρεσε την ομάδα %{who} στις %{when}"
       autoclosed:
@@ -531,6 +532,7 @@ el:
       disable_jump_reply: "Να μην εστιάζεται η ανάρτηση μου αφού απαντήσω"
       dynamic_favicon: "Δείξε τον αριθμό νέων/ενημερωμένων νημάτων στο εικονίδιο του προγράμματος περιήγησης"
       theme_default_on_all_devices: "Αυτό να γίνει το προεπιλεγμένο θέμα σε όλες μου τις συσκευές"
+      allow_private_messages: "Επίτρεψε στους χρήστες να μου στέλνουν προσωπικά μηνύματα"
       external_links_in_new_tab: "Άνοιγε όλους τους εξωτερικούς συνδέσμους σε νέα καρτέλα"
       enable_quoting: "Το κείμενο που επισημαίνεται να παρατίθεται στην απάντηση "
       change: "αλλαγή"
@@ -806,11 +808,11 @@ el:
           one: "δημιουργημένη ανάρτηση"
           other: "δημιουργημένες αναρτήσεις"
         likes_given:
-          one: "<i class='fa fa-heart'></i> δεδομένο"
-          other: "<i class='fa fa-heart'></i> δόθηκαν"
+          one: "δόθηκε"
+          other: "δόθηκαν"
         likes_received:
-          one: "<i class='fa fa-heart'></i> ελήφθη"
-          other: "<i class='fa fa-heart'></i> ελήφθησαν"
+          one: "ελήφθη"
+          other: "ελήφθησαν"
         days_visited:
           one: "ημέρα επίσκεψης"
           other: "ημέρες επίσκεψης"
@@ -928,6 +930,7 @@ el:
     private_message_info:
       title: "Μήνυμα"
       invite: "Προσκάλεσε άλλους..."
+      leave_message: "Σίγουρα θελετε να αφήσετε αυτό το μήνυμα;"
       remove_allowed_user: "Θέλεις σίγουρα να αφαιρέσεις τον/την {{name}} από αυτή τη συζήτηση;"
       remove_allowed_group: "Θέλεις σίγουρα να αφαιρέσεις τον/την {{name}} από αυτό το μήνυμα;"
     email: 'Email'
@@ -1130,10 +1133,6 @@ el:
       olist_title: "Αριθμημένη λίστα"
       ulist_title: "Κουκίδες"
       list_item: "Στοιχείο Λίστας"
-      heading_label: "H"
-      heading_title: "Επικεφαλίδα"
-      heading_text: "Επικεφαλίδα"
-      hr_title: "Οριζόντια γραμμή"
       help: "Βοήθεια Επεξεργασίας Markdown"
       toggler: "εμφάνιση ή απόκρυψη του παραθύρου σύνθεσης"
       modal_ok: "OK"
@@ -1227,7 +1226,7 @@ el:
       no_more_results: "Δε βρέθηκαν άλλα αποτελέσματα"
       searching: "Ψάχνω ..."
       post_format: "#{{post_number}} από {{username}}"
-      results_page: "Αποτελέσματα Αναζήτησης"
+      results_page: "Αποτελέσματα αναζήτησης για '{{term}}'"
       more_results: "Υπάρχουν περισσότερα αποτελέσματα. Παρακαλούμε περιορίστε την αναζήτησή σας."
       cant_find: "Δεν μπορείτε να βρείτε αυτό που ψάχνετε;"
       start_new_topic: "Ίσως να ξεκινούσατε ένα νέο νήμα;"
@@ -1413,6 +1412,7 @@ el:
         public_timer_types: Χρονοδιακόπτες Νημάτων
         private_timer_types: Χρονοδιακόπτες Νημάτων Χρήστη
       auto_update_input:
+        none: "Επιλέξτε χρονικό περιθώριο"
         later_today: "Αργότερα σήμερα"
         tomorrow: "Αύριο"
         later_this_week: "Αργότερα αυτή την εβδομάδα"
@@ -1420,6 +1420,9 @@ el:
         next_week: "Την άλλη εβδομάδα"
         two_weeks: "Δύο Εβδομάδες"
         next_month: "Τον άλλο μήνα"
+        three_months: "Τρεις Μήνες"
+        six_months: "Έξη Μήνες"
+        one_year: "Ένα Έτος"
         forever: "Για Πάντα"
         pick_date_and_time: "Επίλεξε ημερομηνία και ώρα"
         set_based_on_last_post: "Κλείσε ανάλογα με την τελευταία ανάρτηση"
@@ -1743,8 +1746,8 @@ el:
       actions:
         flag: 'Επισήμανση'
         defer_flags:
-          one: "Αγνόησε την επισήμανση"
-          other: "Αγνόησε τις επισημάνσεις"
+          one: "Αγνόηση επισήμανσης"
+          other: "Αγνόηση επισημάνσεων"
         undo:
           off_topic: "Αναίρεση σήμανσης"
           spam: "Αναίρεση σήμανσης"
@@ -2173,7 +2176,7 @@ el:
         hamburger_menu: '<b>=</b>''Ανοιξε μενού χάμπουρκερ'
         user_profile_menu: '<b>p</b> Άνοιγμα μενού χρήστη'
         show_incoming_updated_topics: '<b>.</b> Εμφάνιση ενημερωμένων νημάτων'
-        search: '<b>/</b> ή <b>ctrl</b>+<b>shift</b>+<b>s</b> Αναζήτηση'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Αναζήτηση'
         help: '<b>?</b> Εμφάνισε βοήθειας πληκτρολογίου'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Απόρριψη Νέων/Αναρτήσεων'
         dismiss_topics: '<b>x</b>, <b>t</b> Απόρριψη Νημάτων'
@@ -2389,11 +2392,11 @@ 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: "Διέγραψε την ανάρτηση και αγνόησε την επισήμανση"
         delete_post_defer_flag_title: "Διέγραψε την ανάρτηση. Αν είναι η πρώτη στο νήμα, διέγραψε και αυτό"
         delete_post_agree_flag: "Διέγραψε την ανάρτηση και συμφώνησε με την επισήμανση"
         delete_post_agree_flag_title: "Διέγραψε την ανάρτηση. Αν είναι η πρώτη στο νήμα, διέγραψε και αυτό"
@@ -2412,7 +2415,7 @@ el:
         dispositions:
           agreed: "συμφώνησε"
           disagreed: "διαφώνησε"
-          deferred: "ανέβαλε"
+          deferred: "Αγνοήθηκε"
         flagged_by: "Επισημάνθηκε από"
         resolved_by: "Επιλύθηκε από"
         took_action: "Ενήργησε"
@@ -2431,22 +2434,12 @@ el:
           type: "Τύπος"
           users: "Χρήστες"
           last_flagged: "Τελευταίες Επισημάνσεις"
-        summary:
-          action_type_3:
-            one: "εκτός θέματος"
-            other: "εκτός θέματος x{{count}}"
-          action_type_4:
-            one: "ανάρμοστο"
-            other: "ανάρμοστο x{{count}}"
-          action_type_6:
-            one: "προσπαρμοσμένο"
-            other: "προσαρμοσμένο x{{count}}"
-          action_type_7:
-            one: "προσαρμοσμένο"
-            other: "προσαρμοσμένο x{{count}}"
-          action_type_8:
-            one: "ανεπιθύμητο"
-            other: "ανεπιθύμητο x{{count}}"
+        short_names:
+          off_topic: "εκτός θέματος"
+          inappropriate: "ακατάλληλο"
+          spam: "spam"
+          notify_user: "προσαρμοσμένο"
+          notify_moderators: "προσαρμοσμένο"
       groups:
         primary: "Κύρια ομάδα"
         no_primary: "(χωρίς κύρια ομάδα)"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index eb1fadc993..fa1a8b1edb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -143,6 +143,7 @@ en:
       split_topic: "split this topic %{when}"
       invited_user: "invited %{who} %{when}"
       invited_group: "invited %{who} %{when}"
+      user_left: "%{who} left this message %{when}"
       removed_user: "removed %{who} %{when}"
       removed_group: "removed %{who} %{when}"
       autoclosed:
@@ -595,6 +596,7 @@ en:
       disable_jump_reply: "Don't jump to my post after I reply"
       dynamic_favicon: "Show new / updated topic count on browser icon"
       theme_default_on_all_devices: "Make this my default theme on all my devices"
+      allow_private_messages: "Allow other users to send me private messages"
       external_links_in_new_tab: "Open all external links in a new tab"
       enable_quoting: "Enable quote reply for highlighted text"
       change: "change"
@@ -895,11 +897,11 @@ en:
           one: "post created"
           other: "posts created"
         likes_given:
-          one: "<i class='fa fa-heart'></i> given"
-          other: "<i class='fa fa-heart'></i> given"
+          one: "given"
+          other: "given"
         likes_received:
-          one: "<i class='fa fa-heart'></i> received"
-          other: "<i class='fa fa-heart'></i> received"
+          one: "received"
+          other: "received"
         days_visited:
           one: "day visited"
           other: "days visited"
@@ -1029,6 +1031,7 @@ en:
     private_message_info:
       title: "Message"
       invite: "Invite Others..."
+      leave_message: "Do you really want to leave this message?"
       remove_allowed_user: "Do you really want to remove {{name}} from this message?"
       remove_allowed_group: "Do you really want to remove {{name}} from this message?"
 
@@ -1250,10 +1253,6 @@ en:
       olist_title: "Numbered List"
       ulist_title: "Bulleted List"
       list_item: "List item"
-      heading_label: "H"
-      heading_title: "Heading"
-      heading_text: "Heading"
-      hr_title: "Horizontal Rule"
       help: "Markdown Editing Help"
       toggler: "hide or show the composer panel"
       modal_ok: "OK"
@@ -1354,7 +1353,7 @@ en:
       no_more_results: "No more results found."
       searching: "Searching ..."
       post_format: "#{{post_number}} by {{username}}"
-      results_page: "Search Results"
+      results_page: "Search results for '{{term}}'"
       more_results: "There are more results. Please narrow your search criteria."
       cant_find: "Can’t find what you’re looking for?"
       start_new_topic: "Perhaps start a new topic?"
@@ -1564,7 +1563,7 @@ en:
         public_timer_types: Topic Timers
         private_timer_types: User Topic Timers
       auto_update_input:
-        none: ""
+        none: "Select a timeframe"
         later_today: "Later today"
         tomorrow: "Tomorrow"
         later_this_week: "Later this week"
@@ -1572,6 +1571,9 @@ en:
         next_week: "Next week"
         two_weeks: "Two Weeks"
         next_month: "Next month"
+        three_months: "Three Months"
+        six_months: "Six Months"
+        one_year: "One Year"
         forever: "Forever"
         pick_date_and_time: "Pick date and time"
         set_based_on_last_post: "Close based on last post"
@@ -1932,8 +1934,8 @@ en:
       actions:
         flag: 'Flag'
         defer_flags:
-          one: "Defer flag"
-          other: "Defer flags"
+          one: "Ignore flag"
+          other: "Ignore flags"
         undo:
           off_topic: "Undo flag"
           spam: "Undo flag"
@@ -2383,7 +2385,7 @@ en:
         hamburger_menu: '<b>=</b> Open hamburger menu'
         user_profile_menu: '<b>p</b> Open user menu'
         show_incoming_updated_topics: '<b>.</b> Show updated topics'
-        search: '<b>/</b> or <b>ctrl</b>+<b>shift</b>+<b>s</b> Search'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Search'
         help: '<b>?</b> Open keyboard help'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
         dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
@@ -2617,11 +2619,11 @@ en:
         agree_flag_restore_post_title: "Restore this post"
         agree_flag: "Agree with flag"
         agree_flag_title: "Agree with flag and keep the post unchanged"
-        defer_flag: "Defer"
+        defer_flag: "Ignore"
         defer_flag_title: "Remove this flag; it requires no action at this time."
         delete: "Delete"
         delete_title: "Delete the post this flag refers to."
-        delete_post_defer_flag: "Delete post and Defer flag"
+        delete_post_defer_flag: "Delete post and Ignore flag"
         delete_post_defer_flag_title: "Delete post; if the first post, delete the topic"
         delete_post_agree_flag: "Delete post and Agree with flag"
         delete_post_agree_flag_title: "Delete post; if the first post, delete the topic"
@@ -2641,7 +2643,7 @@ en:
         dispositions:
           agreed: "agreed"
           disagreed: "disagreed"
-          deferred: "deferred"
+          deferred: "ignored"
 
         flagged_by: "Flagged by"
         resolved_by: "Resolved by"
@@ -2663,22 +2665,12 @@ en:
           users: "Users"
           last_flagged: "Last Flagged"
 
-        summary:
-          action_type_3:
-            one: "off-topic"
-            other: "off-topic x{{count}}"
-          action_type_4:
-            one: "inappropriate"
-            other: "inappropriate x{{count}}"
-          action_type_6:
-            one: "custom"
-            other: "custom x{{count}}"
-          action_type_7:
-            one: "custom"
-            other: "custom x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        short_names:
+          off_topic: "off-topic"
+          inappropriate: "inappropriate"
+          spam: "spam"
+          notify_user: "custom"
+          notify_moderators: "custom"
 
       groups:
         primary: "Primary Group"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 10f224b892..8def12123a 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -1119,10 +1119,6 @@ es:
       olist_title: "Lista numerada"
       ulist_title: "Lista con viñetas"
       list_item: "Lista de ítems"
-      heading_label: "H"
-      heading_title: "Encabezado"
-      heading_text: "Encabezado"
-      hr_title: "Linea Horizontal"
       help: "Ayuda de Edición con Markdown"
       toggler: "ocultar o mostrar el panel de edición"
       modal_ok: "OK"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index d6749dbdb5..5f1b56a94c 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -1044,10 +1044,6 @@ et:
       olist_title: "Numberloend"
       ulist_title: "Täpploend"
       list_item: "Loendi element"
-      heading_label: "H"
-      heading_title: "Päis"
-      heading_text: "Päis"
-      hr_title: "Rõhtjoon "
       help: "Markdown-i redaktori spikker"
       toggler: "peida või ava ladumispaneel"
       modal_ok: "OK"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index eb7b5486de..e54fe0fe4a 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -1068,10 +1068,6 @@ fa_IR:
       olist_title: "فهرست شماره گذاری شده"
       ulist_title: "فهرست نقطه‌ای"
       list_item: "فهرست موارد"
-      heading_label: "H"
-      heading_title: "عنوان"
-      heading_text: "عنوان"
-      hr_title: "خط‌کش افقی"
       help: "راهنمای ویرایش با Markdown"
       toggler: "مخفی‌سازی یا نمایش پنل نوشتن"
       modal_ok: "تایید"
@@ -1273,7 +1269,7 @@ fa_IR:
         login_required: "برای مشاهده‌ی موضوع باید وارد سیستم شوید."
       server_error:
         title: "بارگذاری موضوع ناموفق بود"
-        description: "متأسفیم، نتوانستیم موضوع را بار‌گیری کنیم، احتمالا دلیل آن مشکل اتصال اینترنت است. لطفاً دوباره تلاش کنید. اگر مشکل پابرجا بود، ما به ما اطلاع دهید."
+        description: "متأسفیم، نتوانستیم موضوع را بار‌گیری کنیم، احتمالا دلیل آن مشکل اتصال اینترنت است. لطفاً دوباره تلاش کنید. اگر مشکل پابرجا بود، به ما اطلاع دهید."
       not_found:
         title: "موضوع پیدا نشد"
         description: "متأسفیم، نتوانستیم آن موضوع را پیدا کنیم. شاید یکی از همکاران آن را پاک کرده؟"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 46d3202abe..b9548257a5 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -531,6 +531,7 @@ fi:
       disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen"
       dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa"
       theme_default_on_all_devices: "Tee tästä oletusteema kaikille laitteilleni"
+      allow_private_messages: "Salli muiden lähettää minulle yksityisviestejä"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
       change: "vaihda"
@@ -807,11 +808,11 @@ fi:
           one: "kirjoitettu viesti"
           other: "kirjoitettua viestiä"
         likes_given:
-          one: "<i class='fa fa-heart'></i> annettu"
-          other: "<i class='fa fa-heart'></i> annettu"
+          one: "annettu"
+          other: "annettu"
         likes_received:
-          one: "<i class='fa fa-heart'></i> saatu"
-          other: "<i class='fa fa-heart'></i> saatu"
+          one: "saatu"
+          other: "saatu"
         days_visited:
           one: "päivänä vieraillut"
           other: "päivänä vieraillut"
@@ -929,6 +930,7 @@ fi:
     private_message_info:
       title: "Viesti"
       invite: "Kutsu muita..."
+      leave_message: "Haluatko varmasti poistua yksityiskeskustelusta?"
       remove_allowed_user: "Haluatko varmasti poistaa käyttäjän {{name}} tästä keskustelusta?"
       remove_allowed_group: "Haluatko varmasti poistaa käyttäjän {{name}} tästä viestiketjusta?"
     email: 'Sähköposti'
@@ -1131,10 +1133,6 @@ fi:
       olist_title: "Numeroitu lista"
       ulist_title: "Luettelomerkillinen luettelo"
       list_item: "Listan alkio"
-      heading_label: "H"
-      heading_title: "Otsikko"
-      heading_text: "Otsikko"
-      hr_title: "Vaakaviiva"
       help: "Markdown apu"
       toggler: "näytä tai piilota kirjoitusalue"
       modal_ok: "OK"
@@ -1228,7 +1226,7 @@ fi:
       no_more_results: "Enempää tuloksia ei löytynyt."
       searching: "Etsitään ..."
       post_format: "#{{post_number}} käyttäjältä {{username}}"
-      results_page: "Hakutulokset"
+      results_page: "Tulokset hakusanalle '{{term}}'"
       more_results: "Tuloksia olisi enemmänkin. Rajaa hakuasi."
       cant_find: "Etkö löydä etsimääsi?"
       start_new_topic: "Haluaisitko aloittaa uuden ketjun?"
@@ -1405,13 +1403,16 @@ fi:
       jump_reply_down: hyppää myöhempään vastaukseen
       deleted: "Tämä ketju on poistettu"
       topic_status_update:
-        title: "Aseta ajastin ketjulle"
+        title: "Ketjun ajastin"
         save: "Aseta ajastin"
         num_of_hours: "Kuinka monta tuntia:"
         remove: "Poista ajastin"
         publish_to: "Mihin julkaistaan:"
         when: "Milloin:"
+        public_timer_types: Ketjuajastimet
+        private_timer_types: Käyttäjän ketjuajastimet
       auto_update_input:
+        none: "Valitse ajanjakso"
         later_today: "Myöhemmin tänään"
         tomorrow: "Huomenna"
         later_this_week: "Myöhemmin tällä viikolla"
@@ -1419,6 +1420,9 @@ fi:
         next_week: "Ensi viikolla"
         two_weeks: "Kahden viikon kuluttua"
         next_month: "Ensi kuussa"
+        three_months: "Kolme kuukautta"
+        six_months: "Kuusi kuukautta"
+        one_year: "Yksi vuosi"
         forever: "Ikuisesti"
         pick_date_and_time: "Valitse päivämäärä ja kellonaika"
         set_based_on_last_post: "Sulje viimeisimmän viestin mukaan"
@@ -1742,8 +1746,8 @@ fi:
       actions:
         flag: 'Liputa'
         defer_flags:
-          one: "Lykkää lippua"
-          other: "Lykkää lippuja"
+          one: "Sivuuta lippu"
+          other: "Sivuuta liput"
         undo:
           off_topic: "Peru lippu"
           spam: "Peru lippu"
@@ -2172,7 +2176,7 @@ fi:
         hamburger_menu: '<b>=</b> Avaa hampurilaisvalikko'
         user_profile_menu: '<b>p</b> Avaa käyttäjävalikko'
         show_incoming_updated_topics: '<b>.</b> Näytä päivttyneet ketjut'
-        search: '<b>/</b> tai <b>ctrl</b>+<b>shift</b>+<b>s</b> Haku'
+        search: '<b>/</b> or <b>ctrl</b>+<b>alt</b>+<b>f</b> Haku'
         help: '<b>?</b> Näytä näppäimistöoikotiet'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Unohda Uudet/Viestit'
         dismiss_topics: '<b>x</b>, <b>t</b> Unohda ketjut'
@@ -2245,7 +2249,10 @@ fi:
       tags: "Tunnisteet"
       choose_for_topic: "valitse valinnaiset tunnisteet tälle ketjulle"
       delete_tag: "Poista tunniste"
-      delete_confirm: "Oletko varma, että haluat poistaa tunnisteen?"
+      delete_confirm:
+        one: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös yhdeltä ketjulta, jolla tunniste on?"
+        other: "Haluatko varmasti poistaa tunnisteen, mikä poistaa sen myös {{count}} ketjulta, joilla tunniste on?"
+      delete_confirm_no_topics: "Haluatko varmasti poistaa tunnisteen?"
       rename_tag: "Uudelleennimeä tunniste"
       rename_instructions: "Valitse uusi nimi tälle tunnisteelle:"
       sort_by: "Järjestä:"
@@ -2385,11 +2392,11 @@ fi:
         agree_flag_restore_post_title: "Palauta tämä viesti"
         agree_flag: "Ole samaa mieltä lipun kanssa"
         agree_flag_title: "Ole samaa mieltä lipun kanssa ja älä muokkaa viestiä"
-        defer_flag: "Lykkää"
+        defer_flag: "Sivuuta"
         defer_flag_title: "Poista lippu; se ei vaadi toimenpiteitä tällä hetkellä."
         delete: "Poista"
         delete_title: "Poista viesti, johon lippu viittaa."
-        delete_post_defer_flag: "Poista viesti ja lykkää lipun käsittelyä"
+        delete_post_defer_flag: "Poista viesti ja sivuuta lippu"
         delete_post_defer_flag_title: "Poista viesti; jos se on aloitusviesti, niin poista koko ketju"
         delete_post_agree_flag: "Poista viesti ja ole sama mieltä lipun kanssa"
         delete_post_agree_flag_title: "Poista viesti; jos se on aloitusviesti, niin poista koko ketju"
@@ -2408,7 +2415,7 @@ fi:
         dispositions:
           agreed: "samaa mieltä"
           disagreed: "eri mieltä"
-          deferred: "lykätty"
+          deferred: "sivuutettu"
         flagged_by: "Liputtajat"
         resolved_by: "Selvittäjä"
         took_action: "Ryhtyi toimenpiteisiin"
@@ -2427,22 +2434,12 @@ fi:
           type: "Tyyppi"
           users: "Käyttäjät"
           last_flagged: "Viimeksi liputettu"
-        summary:
-          action_type_3:
-            one: "eksyy aiheesta"
-            other: "eksyy aiheesta x{{count}}"
-          action_type_4:
-            one: "sopimaton"
-            other: "sopimaton x{{count}}"
-          action_type_6:
-            one: "mukautettu"
-            other: "mukautettu x{{count}}"
-          action_type_7:
-            one: "mukautettu"
-            other: "mukautettu x{{count}}"
-          action_type_8:
-            one: "roskaposti"
-            other: "roskapostia x {{count}}"
+        short_names:
+          off_topic: "eksyy aiheesta"
+          inappropriate: "sopimaton"
+          spam: "roskaposti"
+          notify_user: "mukautettu"
+          notify_moderators: "mukautettu"
       groups:
         primary: "Ensisijainen ryhmä"
         no_primary: "(ei ensisijaista ryhmää)"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 0fc8215647..40f3559beb 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -116,6 +116,7 @@ fr:
       split_topic: "a scindé ce sujet %{when}"
       invited_user: "a invité %{who} %{when}"
       invited_group: "a invité %{who} %{when}"
+      user_left: "%{who}a quitté cette conversation %{when}"
       removed_user: "a retiré %{who} %{when}"
       removed_group: "a retiré %{who} %{when}"
       autoclosed:
@@ -531,6 +532,7 @@ fr:
       disable_jump_reply: "Ne pas aller à mon nouveau message après avoir répondu"
       dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur"
       theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques"
+      allow_private_messages: "Autoriser les autres utilisateurs à m'envoyer des messages privés"
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer de citer le texte sélectionné"
       change: "modifier"
@@ -540,6 +542,7 @@ fr:
       admin_tooltip: "Cet utilisateur est un administrateur"
       blocked_tooltip: "Cet utilisateur est bloqué"
       suspended_notice: "L'utilisateur est suspendu jusqu'au {{date}}."
+      suspended_permanently: "Cet utilisateur est suspendu."
       suspended_reason: "Raison :"
       github_profile: "GitHub"
       email_activity_summary: "Résumé d'activité"
@@ -805,11 +808,11 @@ fr:
           one: "message créé"
           other: "messages créés"
         likes_given:
-          one: "<i class='fa fa-heart'></i> donné"
-          other: "<i class='fa fa-heart'></i> donnés"
+          one: "donné"
+          other: "donnés"
         likes_received:
-          one: "<i class='fa fa-heart'></i> reçu"
-          other: "<i class='fa fa-heart'></i> reçus"
+          one: "reçu"
+          other: "reçus"
         days_visited:
           one: "jour visité"
           other: "jours visités"
@@ -927,6 +930,7 @@ fr:
     private_message_info:
       title: "Message privé"
       invite: "Inviter d'autres utilisateurs…"
+      leave_message: "Êtes-vous sûr de vouloir quitter cette conversation ?"
       remove_allowed_user: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message privé ?"
       remove_allowed_group: "Êtes-vous sûr de vouloir supprimer {{name}} de ce message privé ?"
     email: 'Courriel'
@@ -1129,10 +1133,6 @@ fr:
       olist_title: "Liste numérotée"
       ulist_title: "Liste à puces"
       list_item: "Élément"
-      heading_label: "T"
-      heading_title: "Titre"
-      heading_text: "Titre"
-      hr_title: "Barre horizontale"
       help: "Aide Markdown"
       toggler: "cacher ou afficher le panneau d'édition"
       modal_ok: "OK"
@@ -1403,19 +1403,24 @@ fr:
       jump_reply_down: allez à des réponses ultérieures
       deleted: "Ce sujet a été supprimé"
       topic_status_update:
-        title: "Planifier une action"
+        title: "Action planifiée du sujet"
         save: "Planifier"
         num_of_hours: "Nombre d'heures :"
         remove: "Supprimer la planification"
         publish_to: "Publier dans :"
         when: "Quand :"
+        public_timer_types: Actions planifiées du sujet
+        private_timer_types: Actions utilisateur planifiées du sujet
       auto_update_input:
+        none: "Sélectionner un intervalle de temps"
         later_today: "Plus tard aujourd'hui"
         tomorrow: "Demain"
         later_this_week: "Plus tard cette semaine"
         this_weekend: "Ce weekend"
         next_week: "Semaine prochaine"
+        two_weeks: "Deux semaines"
         next_month: "Mois prochai"
+        forever: "Toujours"
         pick_date_and_time: "Sélectionner une date et heure"
         set_based_on_last_post: "Fermer par rapport au dernier message"
       publish_to_category:
@@ -2168,7 +2173,7 @@ fr:
         hamburger_menu: '<b>=</b> Ouvrir le menu hamburger'
         user_profile_menu: '<b>p</b>Ouvrir le menu utilisateur'
         show_incoming_updated_topics: '<b>.</b> Montrer les sujets mis à jour récemment'
-        search: '<b>/</b> ou <b>ctrl</b>+<b>MAJ.</b>+<b>s</b> Rechercher'
+        search: '<b>/</b> ou <b>Ctrl</b>+<b>Alt</b>+<b>f</b> Rechercher'
         help: '<b>?</b> Ouvrir l''aide du clavier'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Ignorer les nouveaux messages'
         dismiss_topics: '<b>x</b>, <b>t</b> Ignorer les sujets'
@@ -2241,7 +2246,10 @@ fr:
       tags: "Tags"
       choose_for_topic: "choisir des tags optionnels pour ce sujet"
       delete_tag: "Supprimer le tag"
-      delete_confirm: "Êtes-vous sûr de vouloir supprimer ce tag ?"
+      delete_confirm:
+        one: "Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de 1 sujet auquel il est assigné ?"
+        other: "Êtes-vous sûr de vouloir supprimer ce tag et l'enlever de {{count}} sujets auxquels il est assigné ?"
+      delete_confirm_no_topics: "Êtes-vous sûr de vouloir supprimer ce tag ?"
       rename_tag: "Renommer le tag"
       rename_instructions: "Choisir un nouveau nom pour ce tag :"
       sort_by: "Trier par :"
@@ -2423,22 +2431,10 @@ fr:
           type: "Type"
           users: "Utilisateurs"
           last_flagged: "Dernier signalés"
-        summary:
-          action_type_3:
-            one: "hors sujet"
-            other: "hors sujet x{{count}}"
-          action_type_4:
-            one: "inaproprié"
-            other: "inaproprié x{{count}}"
-          action_type_6:
-            one: "personnalisé"
-            other: "personnalisé x{{count}}"
-          action_type_7:
-            one: "personnalisé"
-            other: "personnalisé x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        short_names:
+          off_topic: "hors-sujet"
+          inappropriate: "inapproprié"
+          spam: "spam"
       groups:
         primary: "Groupe principal"
         no_primary: "(pas de groupe principal)"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 9776ec5d7a..5c61cdf2f3 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -846,9 +846,6 @@ gl:
       olist_title: "Lista numerada"
       ulist_title: "Lista con símbolos"
       list_item: "Elemento da lista"
-      heading_title: "Cabeceira"
-      heading_text: "Cabeceira"
-      hr_title: "Regra horizontal"
       help: "Axuda para edición con Markdown"
       toggler: "agochar ou amosar o panel de composición"
       modal_ok: "De acordo"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 83bfebd0d8..a4e08a8814 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -1105,10 +1105,6 @@ he:
       olist_title: "רשימה ממוספרת"
       ulist_title: "רשימת נקודות"
       list_item: "פריט ברשימה"
-      heading_label: "H"
-      heading_title: "כותרת"
-      heading_text: "כותרת"
-      hr_title: "קו אופקי"
       help: "עזרה על כתיבה ב-Markdown"
       toggler: "הסתר או הצג את פאנל העריכה"
       modal_ok: "אישור"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index da922eda26..e02452b0a0 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -116,6 +116,7 @@ it:
       split_topic: "ha separato questo argomento %{when}"
       invited_user: "Invitato %{who} %{when}"
       invited_group: "invitato %{who} %{when}"
+      user_left: "%{who} ha abbandonato questo messaggio %{when}"
       removed_user: "rimosso %{who} %{when}"
       removed_group: "cancellato %{who} %{when}"
       autoclosed:
@@ -531,6 +532,7 @@ it:
       disable_jump_reply: "Non saltare al mio messaggio dopo la mia risposta"
       dynamic_favicon: "Visualizza il conteggio degli argomenti nuovi / aggiornati sull'icona del browser"
       theme_default_on_all_devices: "Rendi questo il mio tema di default su tutti i miei dispositivi"
+      allow_private_messages: "Consenti agli altri utenti di inviarmi messaggi privati"
       external_links_in_new_tab: "Apri tutti i link esterni in nuove schede"
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       change: "cambia"
@@ -806,11 +808,11 @@ it:
           one: "messaggio creato"
           other: "messaggi creati"
         likes_given:
-          one: "<i class='fa fa-heart'></i> assegnato"
-          other: "<i class='fa fa-heart'></i> assegnati"
+          one: "assegnati"
+          other: "assegnati"
         likes_received:
-          one: "<i class='fa fa-heart'></i> ricevuto"
-          other: "<i class='fa fa-heart'></i> ricevuti"
+          one: "ricevuti"
+          other: "ricevuti"
         days_visited:
           one: "giorno di frequenza"
           other: "giorni di frequenza"
@@ -928,6 +930,7 @@ it:
     private_message_info:
       title: "Messaggio"
       invite: "Invita altri utenti..."
+      leave_message: "Vuoi veramente abbandonare questo messaggio?"
       remove_allowed_user: "Davvero vuoi rimuovere {{name}} da questo messaggio?"
       remove_allowed_group: "Vuoi veramente rimuovere {{name}} da questo messaggio?"
     email: 'Email'
@@ -1008,7 +1011,7 @@ it:
     invites:
       accept_title: "Invito"
       welcome_to: "Benvenuto su %{site_name}!"
-      invited_by: "Sei stao invitato da:"
+      invited_by: "Sei stato invitato da:"
       social_login_available: "Sarai anche in grado di accedere con qualsiasi login social usando questa email."
       your_email: "L'indirizzo email del tuo account è <b>%{email}</b>."
       accept_invite: "Accetta Invito"
@@ -1130,10 +1133,6 @@ it:
       olist_title: "Elenco Numerato"
       ulist_title: "Elenco Puntato"
       list_item: "Elemento lista"
-      heading_label: "T"
-      heading_title: "Titolo"
-      heading_text: "Titolo"
-      hr_title: "Linea Orizzontale"
       help: "Aiuto Inserimento Markdown"
       toggler: "nascondi o mostra il pannello di editing"
       modal_ok: "OK"
@@ -1413,6 +1412,7 @@ it:
         public_timer_types: Timer Argomento
         private_timer_types: Timer Argomento per Utente
       auto_update_input:
+        none: "Seleziona un lasso di tempo"
         later_today: "Più tardi oggi"
         tomorrow: "Domani"
         later_this_week: "Più tardi questa settimana"
@@ -2169,7 +2169,7 @@ it:
         hamburger_menu: '<b>=</b> Apri il menu hamburger'
         user_profile_menu: '<b>p</b> Apri menu utente'
         show_incoming_updated_topics: '<b>.</b> Mostra argomenti aggiornati'
-        search: '<b>/</b> o <b>ctrl</b>+<b>shift</b>+<b>s</b> Cerca'
+        search: '<b>/</b> o <b>ctrl</b>+<b>alt</b>+<b>f</b> Cerca'
         help: '<b>?</b> Apri la legenda tasti'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Chiudi Nuovi Messaggi'
         dismiss_topics: '<b>x</b>, <b>t</b> Chiudi Argomenti'
@@ -2427,22 +2427,10 @@ it:
           type: "Tipo"
           users: "Utenti"
           last_flagged: "Ultima Segnalazione"
-        summary:
-          action_type_3:
-            one: "off-topic "
-            other: "fuori tema x{{count}}"
-          action_type_4:
-            one: "inappropriato"
-            other: "inappropriati x{{count}}"
-          action_type_6:
-            one: "personalizzato"
-            other: "personalizzati x{{count}}"
-          action_type_7:
-            one: "personalizzato"
-            other: "personalizzati x{{count}}"
-          action_type_8:
-            one: "spam"
-            other: "spam x{{count}}"
+        short_names:
+          off_topic: "fuori tema"
+          inappropriate: "inappropriato"
+          spam: "spam"
       groups:
         primary: "Gruppo Primario"
         no_primary: "(nessun gruppo primario)"
@@ -2693,7 +2681,7 @@ it:
           child_themes_check: "Il tema include altri temi figli"
           css_html: "CSS/HTML personalizzato"
           edit_css_html: "Modifica CSS/HTML"
-          edit_css_html_help: "Non hai mofificato nessun CSS o HTML"
+          edit_css_html_help: "Non hai modificato nessun CSS o HTML"
           delete_upload_confirm: "Elimina questo caricamento? (Il CSS del tema potrebbe non funzionare!)"
           import_web_tip: "Repository contenente il tema"
           import_file_tip: "Il file .dcstyle.json contenente il tema"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index c2906f34b6..0b8bba78ce 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -122,7 +122,7 @@ ja:
         enabled: 'この広告%{when}を作成して下さい。ユーザーが拒否するまで各ページの上部に表示されます。'
         disabled: 'このバナー%{when}を削除すると、各ページの最上部に表示しません。'
     topic_admin_menu: "トピックの管理"
-    wizard_required: "ディスコースへようこそ!さあ<a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
+    wizard_required: "Discourseへようこそ！ さあ<a href='%{url}' data-auto-route='true'>セットアップウィザード</a>から始めましょう"
     emails_are_disabled: "メールアドレスの送信は管理者によって無効化されています。全てのメール通知は行われません"
     bootstrap_mode_enabled: "かんたんにサイトを立ち上げられるようにするため、ブートストラップモードが有効になっています。新しいユーザーは全員、トラストレベル1を付与し、毎日更新がメールで届けられます。これらの機能は総ユーザー数が%{min_users}を超えた時にオフになります。"
     bootstrap_mode_disabled: "ブートストラップモードは24時間後に無効化されます。"
@@ -454,7 +454,7 @@ ja:
       location_not_found: （不明）
       organisation: 組織
       phone: 電話
-      other_accounts: "同じIPアドレスを持つアカウント"
+      other_accounts: "同じIPアドレスを持つアカウント:"
       delete_other_accounts: "%{count}件削除"
       username: "ユーザー名"
       trust_level: "トラストレベル"
@@ -626,7 +626,7 @@ ja:
         instructions: "背景画像は、幅590pxで中央揃えになります"
       email:
         title: "メールアドレス"
-        instructions: "外部には公開しない"
+        instructions: "外部には公開されません"
         ok: "確認用メールを送信します"
         invalid: "正しいメールアドレスを入力してください"
         authenticated: "あなたのメールアドレスは {{provider}} によって認証されています"
@@ -641,7 +641,7 @@ ja:
         ok: "問題ありません"
       username:
         title: "ユーザー名"
-        instructions: "スペースを含まない、短く、ユニークなもの"
+        instructions: "被らず、空白を含まず、短い名前を入力してください。"
         short_instructions: "@{{username}} であなたにメンションを送ることができます"
         available: "ユーザ名は利用可能です"
         not_available: "利用できない名前です。 {{suggestion}} などはどうでしょうか？"
@@ -942,10 +942,10 @@ ja:
       forgot: "アカウントの詳細を忘れてしまった"
       not_approved: "あなたのアカウントはまだ承認されていません。ログイン可能になった際にメールで通知いたします。"
       google:
-        title: "Googleで"
+        title: "Google"
         message: "Google による認証 (ポップアップがブロックされていないことを確認してください)"
       google_oauth2:
-        title: "Googleで"
+        title: "Google"
         message: "Googleによる認証 (ポップアップがブロックされていないことを確認してください)"
       twitter:
         title: "Twitter"
@@ -954,13 +954,13 @@ ja:
         title: "Instagram"
         message: "Instagram による認証 (ポップアップがブロックされていないことを確認してください)"
       facebook:
-        title: "Facebookで"
+        title: "Facebook"
         message: "Facebook による認証 (ポップアップがブロックされていないことを確認してください)"
       yahoo:
-        title: "with Yahoo"
+        title: "Yahoo"
         message: "Yahoo による認証 (ポップアップがブロックされていないことを確認してください)"
       github:
-        title: "with GitHub"
+        title: "GitHub"
         message: "Github による認証 (ポップアップがブロックされていないことを確認してください)"
     invites:
       accept_title: "招待"
@@ -1086,10 +1086,6 @@ ja:
       olist_title: "番号付きリスト"
       ulist_title: "箇条書き"
       list_item: "リストアイテム"
-      heading_label: "H"
-      heading_title: "見出し"
-      heading_text: "見出し"
-      hr_title: "水平線"
       help: "Markdown 編集のヘルプ"
       toggler: "編集パネルの表示/非表示"
       modal_ok: "OK"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 55f9b73024..6100c40805 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -98,6 +98,7 @@ ko:
       split_topic: "이 토픽을 %{when}에 분리"
       invited_user: "%{who}이(가) %{when}에 초대됨"
       invited_group: "%{who} 이(가) %{when} 에 초대됨"
+      user_left: "%{who} 님이 %{when} 에 이 메시지를 남겼습니다."
       removed_user: "%{who}이(가) %{when}에 삭제됨"
       removed_group: "%{who}이(가) %{when}에 삭제됨"
       autoclosed:
@@ -502,6 +503,7 @@ ko:
       disable_jump_reply: "댓글을 작성했을 때, 새로 작성한 댓글로 화면을 이동하지 않습니다."
       dynamic_favicon: "새 글이나 업데이트된 글 수를 브라우저 아이콘에 보이기"
       theme_default_on_all_devices: "이 테마를 모든 기기의 기본 테마로 설정합니다."
+      allow_private_messages: "다른 사용자가 개인 메시지를 보내도록 허용합니다."
       external_links_in_new_tab: "모든 외부 링크를 새 탭에 열기"
       enable_quoting: "강조 표시된 텍스트에 대한 알림을 사용합니다"
       change: "변경"
@@ -773,7 +775,7 @@ ko:
         post_count:
           other: "작성 시간"
         likes_given:
-          other: "좋아요"
+          other: "누름"
         likes_received:
           other: "받음"
         days_visited:
@@ -888,6 +890,7 @@ ko:
     private_message_info:
       title: "메시지"
       invite: "다른 사람 초대"
+      leave_message: "정말로 이 메시지를 남길까요?"
       remove_allowed_user: "{{name}}에게서 온 메시지를 삭제할까요?"
       remove_allowed_group: "{{name}}에게서 온 메시지를 삭제할까요?"
     email: '이메일'
@@ -1089,10 +1092,6 @@ ko:
       olist_title: "번호 매기기 목록"
       ulist_title: "글 머리 기호 목록"
       list_item: "주제"
-      heading_label: "H"
-      heading_title: "표제"
-      heading_text: "표제"
-      hr_title: "수평선"
       help: "마크다운 편집 도움말"
       toggler: "작성 패널을 숨기거나 표시"
       modal_ok: "OK"
@@ -1108,6 +1107,27 @@ ko:
       empty: "알림이 없습니다."
       more: "이전 알림을 볼 수 있습니다."
       total_flagged: "관심 표시된 총 글"
+      mentioned: "<span>{{username}}</span> {{description}}"
+      group_mentioned: "<span>{{username}}</span> {{description}}"
+      quoted: "<span>{{username}}</span> {{description}}"
+      replied: "<span>{{username}}</span> {{description}}"
+      posted: "<span>{{username}}</span> {{description}}"
+      edited: "<span>{{username}}</span> {{description}} "
+      liked: "<span>{{username}}</span> {{description}}"
+      liked_2: "<span>{{username}}, {{username2}}</span> {{description}}"
+      liked_many:
+        other: "<span>{{username}}, {{username2}} 외 {{count}} 명의 사용자가</span> {{description}}"
+      private_message: "<span>{{username}}</span> {{description}}"
+      invited_to_private_message: "<p><span>{{username}}</span> {{description}}"
+      invited_to_topic: "<span>{{username}}</span> {{description}}"
+      invitee_accepted: "<span>{{username}}</span> 님이 초대를 수락했습니다"
+      moved_post: "<span>{{username}}</span> 님이 {{description}} (을)를 이동했습니다"
+      linked: "<span>{{username}}</span> {{description}}"
+      granted_badge: "'{{description}}' 를 받았습니다"
+      topic_reminder: "<span>{{username}}</span> {{description}}"
+      watching_first_post: "<span>새 토픽</span> {{description}}"
+      group_message_summary:
+        other: " {{group_name}} 사서함에 {{count}} 개의 메시지가 있습니다"
       alt:
         mentioned: "멘션 by"
         quoted: "인용  by"
@@ -1155,12 +1175,18 @@ ko:
       select_all: "모두 선택"
       clear_all: "다 지우기"
       too_short: "검색 단어가 너무 짧습니다."
+      result_count:
+        other: "<span class='term'>{{term}}</span>에 대하여 {{count}}개의 결과가 검색되었습니다."
       title: "주제, 글, 사용자, 카테고리 검색"
       no_results: "검색 결과가 없습니다"
       no_more_results: "더 이상 결과가 없습니다."
       searching: "검색중..."
       post_format: "#{{post_number}} by {{username}}"
-      results_page: "검색 결과"
+      more_results: "검색 결과가 많습니다. 검색 조건을 좁혀보세요."
+      cant_find: "원하는 걸 찾을 수 없으신가요?"
+      start_new_topic: "새 토픽을 만들어볼까요?"
+      or_search_google: "혹은 구글에서 검색해볼 수도 있습니다."
+      search_google: "대신 구글에서 검색해보세요."
       search_google_button: "Google"
       search_google_title: "이 사이트 검색"
       context:
@@ -1324,19 +1350,24 @@ ko:
       jump_reply_down: 이후 답글로 이동
       deleted: "주제가 삭제되었습니다"
       topic_status_update:
-        title: "토픽 타이머 설정"
+        title: "토픽 타이머"
         save: "타이머 설정"
         num_of_hours: "시간:"
         remove: "타이머 제거하기"
         publish_to: "게시되는 곳:"
         when: "게시일:"
+        public_timer_types: 토픽 타이머
+        private_timer_types: 사용자 토픽 타이머
       auto_update_input:
+        none: "시간대 선택"
         later_today: "오늘 늦게"
         tomorrow: "내일"
         later_this_week: "이번 주 후반"
         this_weekend: "이번 주말"
         next_week: "다음 주"
+        two_weeks: "2주"
         next_month: "다음 달"
+        forever: "영구적"
         pick_date_and_time: "날짜와 시간을 "
         set_based_on_last_post: "마지막 게시글 기준으로 닫기"
       publish_to_category:
@@ -1909,6 +1940,12 @@ ko:
         help: "이 주제는 목록에서 제외됩니다. 주제 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다."
     posts: "글"
     posts_long: "이 주제의 글 수는 {{number}}개 입니다."
+    posts_likes_MF: |
+      이 토픽에는 {ratio, select,
+      low {포스트 대비 높은 좋아요를 받은}
+      med {포스트 대비 매우 높은 좋아요를 받은}
+      high {포스트 대비 엄청나게 높은 좋아요를 받은}
+      other {}} {count, plural, one {1 개} other {# 개의 답글이 있습니다.}}
     original_post: "원본 글"
     views: "조회수"
     views_lowercase:
@@ -2034,6 +2071,7 @@ ko:
         hamburger_menu: '<b>=</b> 햄버거 메뉴 열기'
         user_profile_menu: '<b>p</b> 사용자 메뉴 열기'
         show_incoming_updated_topics: '<b>.</b> 갱신된 토픽 보기'
+        search: '<b>/</b> 또는 <b>ctrl</b>+<b>alt</b>+<b>f</b> 를 사용하여 검색'
         help: '<b>?</b> 키보드 도움말 열기'
         dismiss_new_posts: '<b>x</b>, <b>r</b> 새글을 읽은 상태로 표시하기'
         dismiss_topics: '<b>x</b>, <b>t</b> 토픽 무시하기'
@@ -2102,7 +2140,9 @@ ko:
       tags: "태그"
       choose_for_topic: "이 토픽에 붙일 태그 선택"
       delete_tag: "태그 삭제"
-      delete_confirm: "정말로 그 태그를 삭제할까요?"
+      delete_confirm:
+        other: "정말로 이 태그를 삭제하고 이 태그가 붙은 {{count}} 개의 토픽에서 태그를 제거할까요?"
+      delete_confirm_no_topics: "정말로 이 태그를 삭제할까요?"
       rename_tag: "태그 이름변경"
       rename_instructions: "새로운 태그의 이름을 입력하세요:"
       sort_by: "정렬 기준:"
@@ -2231,6 +2271,8 @@ ko:
       flags:
         title: "신고"
         active_posts: "신고된 포스트"
+        old_posts: "오래된 신고 포스트"
+        topics: "신고된 토픽"
         agree: "동의"
         agree_title: "이 신고가 올바르고 타당함을 확인합니다"
         agree_flag_modal_title: "동의 및 ..."
@@ -2259,35 +2301,34 @@ ko:
         clear_topic_flags_title: "주제 조사를 끝냈고 이슈를 해결했습니다. 신고를 지우기 위해 완료를 클릭하세요"
         more: "(더 많은 답글...)"
         suspend_user: "정지된 사용자"
+        suspend_user_title: "이 포스트에 한하여 사용자 일시정지"
         dispositions:
           agreed: "동의"
           disagreed: "반대"
-          deferred: "유예 중인"
         flagged_by: "신고 한 사람"
         resolved_by: "해결 by"
         took_action: "처리하기"
         system: "System"
         error: "뭔가 잘못 됐어요"
         reply_message: "답글"
+        no_results: "신고된 포스트가 없습니다."
         topic_flagged: "이 <strong> 주제 </strong>는 신고 되었습니다."
+        show_full: "전체 포스트 보기"
         visit_topic: "처리하기 위해 주제로 이동"
         was_edited: "첫 신고 이후에 글이 수정되었음"
         previous_flags_count: "이 글은 이미 {{count}}번 이상 신고 되었습니다."
+        show_details: "신고내용 자세히 보기"
         flagged_topics:
           topic: "토픽"
           type: "타입"
           users: "사용자"
-        summary:
-          action_type_3:
-            other: "off-topic x{{count}}"
-          action_type_4:
-            other: "부적절한 x{{count}}"
-          action_type_6:
-            other: "custom x{{count}}"
-          action_type_7:
-            other: "custom x{{count}}"
-          action_type_8:
-            other: "스팸 x{{count}}"
+          last_flagged: "마지막으로 신고받은 때"
+        short_names:
+          off_topic: "주제 벗어남"
+          inappropriate: "부적절"
+          spam: "스팸"
+          notify_user: "커스텀"
+          notify_moderators: "커스텀"
       groups:
         primary: "주 그룹"
         no_primary: "(주 그룹이 없습니다.)"
@@ -2786,13 +2827,30 @@ ko:
         logster:
           title: "에러 로그"
       watched_words:
+        title: "\b감시 단어"
         search: "검색"
         clear_filter: "지우기"
+        show_words: "단어 보이기"
+        word_count:
+          other: "%{count}개 단어"
+        actions:
+          block: '차단'
+          censor: '가리기'
+          require_approval: '승인 필요'
+          flag: '신고'
+        action_descriptions:
+          block: '이 단어를 포함한 포스트는 게시되지 못하게 합니다. 사용자가 포스트를 올리려할 때 에러 메시지를 표시합니다.'
+          censor: '이 단어를 포함해도 포스트는 올라가지만, 가리기 설정된 단어는 다른 글자로 교체됩니다.'
+          require_approval: '이 단어를 포함한 포스트가 올라가려면 스탭의 허가가 필요합니다.'
+          flag: '이 단어를 포함해도 포스트의 게시는 허용되지만, 부적절한 포스트로 자동신고되어 운영자가 리뷰할 수 있습니다.'
         form:
+          label: '새 단어:'
+          placeholder: '전체 단어 또는 * 을 와일드카드로 사용'
           placeholder_regexp: "정규표현식"
           add: '추가'
           success: '성공'
           upload: "업로드"
+          upload_successful: "성공적으로 업로드되었습니다. 단어가 추가되었습니다."
       impersonate:
         title: "이 사용자 행세하기"
         help: "디버깅 목적으로 사용자 계정으로 로그인 할 수 있습니다. 사용이 끝나면 로그아웃하여야 합니다."
@@ -2847,9 +2905,14 @@ ko:
         unsuspend_failed: "이 사용자를 접근 허용 하는데 오류 발생 {{error}}"
         suspend_duration: "사용자를 몇일 접근 금지 하시겠습니까?"
         suspend_reason_label: "Why are you suspending? This text <b>will be visible to everyone</b> on this user's profile page, and will be shown to the user when they try to log in. Keep it short."
+        suspend_reason_hidden_label: "이 사용자를 일시정지하는 사유는 무엇인가요? 이 텍스트는 해당 사용자가 로그인할 때 보이게 됩니다. 짧게 적어주세요."
         suspend_reason: "Reason"
+        suspend_reason_placeholder: "일시정지 사유"
         suspend_message: "이메일 메시지"
+        suspend_message_placeholder: "필요한 경우, 사용자에게 이메일을 통하여 일시정지에 대한 더 많은 정보를 제공할 수 있습니다."
         suspended_by: "접근 금지자"
+        suspended_until: "(%{until} 까지)"
+        cant_suspend: "이 사용자는 일시정지할 수 없습니다."
         delete_all_posts: "모든 글을 삭제합니다"
         delete_all_posts_confirm_MF: " {POSTS, plural, one {1개의 포스트} other {#개의 포스트}} 와 {TOPICS, plural, one {1개의 토픽} other {#개의 토픽}}을 삭제하려고 합니다. 정말로 삭제할까요?"
         suspend: "접근 금지"
@@ -3181,6 +3244,8 @@ ko:
       upload: "업로드"
       uploading: "업로드 중..."
       quit: "아마도 다음에"
+      staff_count:
+        other: "커뮤니티에는 당신을 포함한 %{count}명의 스탭이 있습니다."
       invites:
         add_user: "추가"
         none_added: "관리자에게 초대되지 않았습니다. 계속하시겠습니까?"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index ed93cdfdc8..66c0b482d6 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -1153,10 +1153,6 @@ lv:
       olist_title: "Numurēts saraksts"
       ulist_title: "Nenumurēts saraksts"
       list_item: "Saraksta punkts"
-      heading_label: "V"
-      heading_title: "Virsraksts"
-      heading_text: "Virsraksts"
-      hr_title: "Horizontāla Līnija"
       help: "Palīdzība ar formatēšanu, izmantojot Markdown"
       toggler: "slēpt vai rādīt rediģēšanas paneli"
       modal_ok: "Labi"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index f03d3aa506..ca30afe0b7 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -116,6 +116,7 @@ nb_NO:
       split_topic: "splittet dette emnet %{when}"
       invited_user: "inviterte %{who} %{when}"
       invited_group: "inviterte %{who} %{when}"
+      user_left: "%{who} la igjen denne meldingen %{when}"
       removed_user: "fjernet %{who} %{when}"
       removed_group: "fjernet %{who} %{when}"
       autoclosed:
@@ -531,6 +532,7 @@ nb_NO:
       disable_jump_reply: "Ikke hopp til ditt nye innlegg etter svar"
       dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleser ikonet"
       theme_default_on_all_devices: "Gjør dette til forvalgt drakt på alle mine enheter"
+      allow_private_messages: "Tillat andre brukere å sende meg private meldinger"
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
       change: "Endre"
@@ -806,11 +808,11 @@ nb_NO:
           one: "innlegg skrevet"
           other: "innlegg skrevet"
         likes_given:
-          one: "<i class='fa fa-heart'></i> gitt"
-          other: "<i class='fa fa-heart'></i> gitt"
+          one: "gitt"
+          other: "gitt"
         likes_received:
-          one: "<i class='fa fa-heart'></i> mottatt"
-          other: "<i class='fa fa-heart'></i> mottatt"
+          one: "mottatt"
+          other: "mottatt"
         days_visited:
           one: "dag besøkt"
           other: "dager besøkt"
@@ -928,6 +930,7 @@ nb_NO:
     private_message_info:
       title: "Send"
       invite: "Inviter andre…"
+      leave_message: "Ønsker du virkelig å legge igjen denne meldingen?"
       remove_allowed_user: "Er du sikker på at du vil fjerne {{name}} fra denne meldingen?"
       remove_allowed_group: "Vil du virkelig fjerne {{name}} fra denne meldingen?"
     email: 'E-post'
@@ -1130,10 +1133,6 @@ nb_NO:
       olist_title: "Nummerert liste"
       ulist_title: "Kulepunktliste"
       list_item: "Listeelement"
-      heading_label: "O"
-      heading_title: "Overskrift"
-      heading_text: "Overskrift"
-      hr_title: "Horisontalt skille"
       help: "Hjelp for redigering i Markdown"
       toggler: "gjem eller vis redigeringspanelet"
       modal_ok: "OK"
@@ -1413,6 +1412,7 @@ nb_NO:
         public_timer_types: Emneutløp
         private_timer_types: Brukerstyrte emneutløp
       auto_update_input:
+        none: "Velg et tidsrom"
         later_today: "Senere i dag"
         tomorrow: "I morgen"
         later_this_week: "Senere denne uken"
@@ -2173,7 +2173,7 @@ nb_NO:
         hamburger_menu: '<b>=</b> Åpne hamburgermeny'
         user_profile_menu: '<b>p</b> Åpne brukermenyen'
         show_incoming_updated_topics: '<b>.</b> Vis oppdaterte emner'
-        search: '<b>/</b> eller <b>ctrl</b>+<b>shift</b>+<b>s</b> Søk'
+        search: '<b>/</b> eller <b>Ctrl</b>+<b>Alt</b>+<b>f</b> Søk'
         help: '<b>?</b> Åpne tastaturhjelp'
         dismiss_new_posts: '<b>x</b>, <b>r</b> Avvis Nye/Innlegg'
         dismiss_topics: '<b>x</b>, <b>t</b> Avvis emner'
@@ -2431,22 +2431,12 @@ nb_NO:
           type: "Type"
           users: "Brukere"
           last_flagged: "Sist rapporter"
-        summary:
-          action_type_3:
-            one: "irrelevant"
-            other: "irrelevant x{{count}}"
-          action_type_4:
-            one: "upassende"
-            other: "upassende x{{count}}"
-          action_type_6:
-            one: "tilpasset"
-            other: "tilpasset x{{count}}"
-          action_type_7:
-            one: "tilpasset"
-            other: "tilpasset x{{count}}"
-          action_type_8:
-            one: "nettsøppel"
-            other: "nettsøppel x{{count}}"
+        short_names:
+          off_topic: "urelatert"
+          inappropriate: "upassende"
+          spam: "spam"
+          notify_user: "egendefinert"
+          notify_moderators: "egendefinert"
       groups:
         primary: "Primærgruppe"
         no_primary: "(ingen primærgruppe)"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 866174ca1d..b891cbadb8 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -806,11 +806,11 @@ nl:
           one: "bericht gemaakt"
           other: "berichten gemaakt"
         likes_given:
-          one: "<i class='fa fa-heart'></i> gegeven"
-          other: "<i class='fa fa-heart'></i> gegeven"
+          one: "gegeven"
+          other: "gegeven"
         likes_received:
-          one: "<i class='fa fa-heart'></i> ontvangen"
-          other: "<i class='fa fa-heart'></i> ontvangen"
+          one: "ontvangen"
+          other: "ontvangen"
         days_visited:
           one: "dag bezocht"
           other: "dagen bezocht"
@@ -1130,10 +1130,6 @@ nl:
       olist_title: "Genummerde lijst"
       ulist_title: "Opsommingslijst"
       list_item: "Lijstitem"
-      heading_label: "H"
-      heading_title: "Kop"
-      heading_text: "Kop"
-      hr_title: "Horizontale lijn"
       help: "Hulp voor Markdown"
       toggler: "editorpaneel verbergen of tonen"
       modal_ok: "OK"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 0262442353..ae4ec076a2 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -1210,10 +1210,6 @@ pl_PL:
       olist_title: "Lista numerowana"
       ulist_title: "Lista wypunktowana"
       list_item: "Element listy"
-      heading_label: "Nagłówek"
-      heading_title: "Nagłówek"
-      heading_text: "Nagłówek"
-      hr_title: "Pozioma linia"
       help: "Pomoc formatowania Markdown"
       toggler: "ukryj lub pokaż panel kompozytora tekstu"
       modal_ok: "OK"
@@ -2369,7 +2365,7 @@ pl_PL:
         hamburger_menu: '<b>=</b> Otwórz menu'
         user_profile_menu: '<b>p</b> Otwórz menu użytkownika'
         show_incoming_updated_topics: '<b>.</b> Pokaż zaktualizowane tematy'
-        search: '<b>/</b> lub <b>ctrl</b>+<b>shift</b>+<b>s</b> Wyszukaj'
+        search: '<b>/</b> lub <b>ctrl</b>+<b>alt</b>+<b>f</b> Wyszukaj'
         help: '<b>?</b> Pokaż skróty klawiszowe'
         dismiss_new_posts: '<b>x</b>, <b>r</b> wyczyść listę wpisów'
         dismiss_topics: '<b>x</b>, <b>t</b> wyczyść listę tematów'
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index ea7630fd82..90551d82a1 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -1097,10 +1097,6 @@ pt:
       olist_title: "Lista numerada"
       ulist_title: "Lista de items"
       list_item: "Item da Lista"
-      heading_label: "H"
-      heading_title: "Título"
-      heading_text: "Título"
-      hr_title: "Barra horizontal"
       help: "Ajuda de Edição Markdown"
       toggler: "esconder ou exibir o painel de composição"
       modal_ok: "OK"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 0b6d814810..62f52ccb59 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -352,6 +352,8 @@ pt_BR:
         add_members: "Adicionar Membros"
         delete_member_confirm: "Remover '%{username}' do grupo '%{group}'?"
       name_placeholder: "Nome do grupo, sem espaços, regras iguais ao nome de usuário"
+      public_admission: "Permitir que os usuários se juntem ao grupo livremente (Requer grupo visível ao público)"
+      public_exit: "Permitir que os usuários deixem o grupo livremente"
       empty:
         posts: "Não há publicações de membros deste grupo."
         members: "Não há membros neste grupo."
@@ -363,10 +365,14 @@ pt_BR:
       join: "Entrar no Grupo"
       leave: "Sair do Grupo"
       request: "Pedir para Entrar no Grupo"
+      message: "Mensagem"
       automatic_group: Grupo Automático
       closed_group: Grupo Fechado
       is_group_user: "Você é membro deste grupo"
       allow_membership_requests: "Permitir usuários enviar pedidos de adesão a proprietários de grupos"
+      membership_request:
+        submit: "Enviar Pedido"
+        title: "Pedir para entrar no grupo @%{group_name}"
       membership: "Adesão"
       name: "Nom"
       user_count: "Número de Membros"
@@ -1068,10 +1074,6 @@ pt_BR:
       olist_title: "Lista numerada"
       ulist_title: "Lista de itens"
       list_item: "Item da lista"
-      heading_label: "H"
-      heading_title: "Título"
-      heading_text: "Título"
-      hr_title: "Barra horizontal"
       help: "Ajuda da edição Markdown"
       toggler: "esconder ou exibir o painel de composição"
       modal_ok: "OK"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 80025815a0..8a1d7b4e74 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -1072,10 +1072,6 @@ ro:
       olist_title: "Listă numerotată"
       ulist_title: "Listă cu marcatori"
       list_item: "Element listă"
-      heading_label: "H"
-      heading_title: "Titlu"
-      heading_text: "Titlu"
-      hr_title: "Riglă orizontală"
       help: "Ajutor pentru formatarea cu Markdown"
       toggler: "ascunde sau arată editorul"
       modal_ok: "Ok"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 40bd015707..1f5f183c18 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -192,6 +192,7 @@ ru:
         eu_west_2: "EU (London)"
         sa_east_1: "South America (Sao Paulo)"
         us_east_1: "US East (N. Virginia)"
+        us_east_2: "US East (Ohio)"
         us_gov_west_1: "AWS GovCloud (US)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
@@ -578,6 +579,7 @@ ru:
       admin_tooltip: "{{user}} - админ"
       blocked_tooltip: "Этот пользователь заблокирован"
       suspended_notice: "Пользователь заморожен до {{date}}."
+      suspended_permanently: "Этот пользователь заморожен."
       suspended_reason: "Причина:"
       github_profile: "Github"
       email_activity_summary: "Сводка Активности"
@@ -1179,10 +1181,6 @@ ru:
       olist_title: "Нумерованный список"
       ulist_title: "Ненумерованный список"
       list_item: "Пункт первый"
-      heading_label: "А"
-      heading_title: "Заголовок"
-      heading_text: "Заголовок"
-      hr_title: "Горизонтальный разделитель"
       help: "Справка по форматированию (Markdown)"
       toggler: "Закрыть / открыть панель редактирования"
       modal_ok: "OK"
@@ -1533,6 +1531,7 @@ ru:
         open: "Открыть тему"
         close: "Закрыть тему"
         multi_select: "Выбрать сообщения..."
+        timed_update: "Действие по таймеру..."
         pin: "Закрепить тему..."
         unpin: "Открепить тему..."
         unarchive: "Разархивировать тему"
@@ -2444,7 +2443,7 @@ ru:
         moderators: 'Модераторы:'
         admins: 'Администраторы:'
         blocked: 'Заблокированы:'
-        suspended: 'Заморожены:'
+        suspended: 'Заморожен:'
         private_messages_short: "Сообщ."
         private_messages_title: "Сообщений"
         mobile_title: "Мобильный"
@@ -3107,11 +3106,11 @@ ru:
       user:
         suspend_failed: "Ошибка заморозки пользователя {{error}}"
         unsuspend_failed: "Ошибка разморозки пользователя {{error}}"
-        suspend_duration: "На сколько времени вы хотите заморозить пользователя?"
-        suspend_duration_units: "(дней)"
+        suspend_duration: "На сколько времени заморозить пользователя?"
         suspend_reason_label: "Причина заморозки? Данный текст <b>будет виден всем</b> на странице профиля пользователя и будет отображаться, когда пользователь пытается войти. Введите краткое описание."
         suspend_reason: "Причина"
-        suspended_by: "Заморожен"
+        suspended_by: "Заморожен (кем)"
+        cant_suspend: "Этого пользователя нельзя заморозить."
         delete_all_posts: "Удалить все сообщения"
         delete_all_posts_confirm_MF: "Вы собираетесь удалить {POSTS, plural, one {1 сообщение} other {# сообщений}} и {TOPICS, plural, one {1 тему} other {# тем}}. Вы уверены?"
         suspend: "Заморозить"
@@ -3198,7 +3197,7 @@ ru:
           label: "Сбросить"
           title: "сбросить карму к 0"
         deactivate_explanation: "Дезактивированные пользователи должны заново подтвердить свой e-mail."
-        suspended_explanation: "Замороженный пользователь не может войти."
+        suspended_explanation: "Замороженный пользователь не может войти (авторизоваться)."
         block_explanation: "Заблокированный не может отвечать и создавать новые темы."
         staged_explanation: "Имитированный пользователь может отправлять сообщения только по эл.почте в определённые темы."
         bounce_score_explanation:
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 734c0c1d19..2d8d67a54b 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -1016,10 +1016,6 @@ sk:
       olist_title: "Číslované odrážky"
       ulist_title: "Odrážky"
       list_item: "Položka zoznamu"
-      heading_label: "H"
-      heading_title: "Nadpis"
-      heading_text: "Nadpis"
-      hr_title: "Horizonálny oddeľovač"
       help: "Nápoveda úprav pre Markdown"
       toggler: "skryť alebo zobraziť panel úprav"
       modal_ok: "OK"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 3abfc99072..36a04370c4 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -1030,10 +1030,6 @@ sq:
       olist_title: "Listë e numëruar"
       ulist_title: "Listë me pika"
       list_item: "Element liste"
-      heading_label: "T"
-      heading_title: "Titull"
-      heading_text: "Titull"
-      hr_title: "Vizë ndarëse horizontale"
       help: "Ndihmë mbi Markdown"
       toggler: "trego ose fshih panelin e shkrimit"
       modal_ok: "OK"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index b75a3e1373..2e8ccc07a3 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -1053,10 +1053,6 @@ sv:
       olist_title: "Numrerad lista"
       ulist_title: "Punktlista"
       list_item: "Listobjekt"
-      heading_label: "H"
-      heading_title: "Rubrik"
-      heading_text: "Rubrik"
-      hr_title: "Horisontell linje"
       help: "Markdown redigeringshjälp"
       toggler: "Dölj eller visa composer-panelen"
       modal_ok: "OK"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index dfeb91dbde..46aa61838b 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -573,9 +573,6 @@ te:
       olist_title: "సంఖ్యా జాబితా"
       ulist_title: "చుక్కల జాబితా"
       list_item: "జాబితా అంశం"
-      heading_title: "తలకట్టు"
-      heading_text: "తలకట్టు"
-      hr_title: "అడ్డు గీత"
       help: "మార్క్ డైన్ సవరణ సహాయం"
       toggler: "దాచు లేదా చూపు కంపోజరు ఫలకం"
       admin_options_title: "ఈ విషయానికి ఐచ్చిక సిబ్బంది అమరికలు"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 673ddd4e6f..814b6648aa 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -898,9 +898,6 @@ th:
       olist_title: "รายการลำดับ"
       ulist_title: "รายการดอกจันทร์"
       list_item: "รายการ"
-      heading_title: "หัวเรื่อง"
-      heading_text: "หัวเรื่อง"
-      hr_title: "เส้นนอน"
       help: "ช่วยเหลือการจัดรูปแบบ"
       toggler: "ซ่อนหรือแสดงแผงตกแต่ง"
       modal_ok: "ตกลง"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index dc346b5e50..4202b1b896 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -1016,10 +1016,6 @@ tr_TR:
       olist_title: "Numaralandırılmış Liste"
       ulist_title: "Madde İşaretli Liste"
       list_item: "Liste öğesi"
-      heading_label: "H"
-      heading_title: "Başlık"
-      heading_text: "Başlık"
-      hr_title: "Yatay Çizgi"
       help: "Markdown Düzenleme Yardımı"
       toggler: "yazım alanını gizle veya göster"
       modal_ok: "Tamam"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index b78acf2c10..5a164f2499 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -671,9 +671,6 @@ uk:
       olist_title: "Нумерований список"
       ulist_title: "Маркований список"
       list_item: "Елемент списку"
-      heading_title: "Заголовок"
-      heading_text: "Заголовок"
-      hr_title: "Горизонтальна лінія"
       help: "Markdown Editing Help"
       toggler: "показати або сховати панель редагування"
       modal_ok: "OK"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index bab62badff..76610872fd 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -1033,10 +1033,6 @@ ur:
       olist_title: "نمبروار فہرست"
       ulist_title: "بلٹ والی لسٹ"
       list_item: "فہرست آئٹم"
-      heading_label: "H"
-      heading_title: "سرخی"
-      heading_text: "سرخی"
-      hr_title: "افقی لکیر"
       help: "مارکڈائون ترمیم میں مدد"
       toggler: "کمپوزر پینل چھپائیں یا دکھائیں"
       modal_ok: "ٹھیک"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 86cca050b6..b9f13c557b 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -1026,10 +1026,6 @@ vi:
       olist_title: "Danh sách kiểu số"
       ulist_title: "Danh sách kiểu ký hiệu"
       list_item: "Danh sách các mục"
-      heading_label: "H"
-      heading_title: "Tiêu đề"
-      heading_text: "Tiêu đề"
-      hr_title: "Căn ngang"
       help: "Trợ giúp soạn thảo bằng Markdown"
       toggler: "ẩn hoặc hiển thị bảng điều khiển soạn thảo"
       modal_ok: "OK"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 136d7b36fd..2e913e6389 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -1088,10 +1088,6 @@ zh_CN:
       olist_title: "数字列表"
       ulist_title: "符号列表"
       list_item: "列表条目"
-      heading_label: "H"
-      heading_title: "标题"
-      heading_text: "标题头"
-      hr_title: "分割线"
       help: "Markdown 编辑帮助"
       toggler: "隐藏或显示编辑面板"
       modal_ok: "确认"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 9f0f6def36..6de9387ed2 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -119,7 +119,7 @@ zh_TW:
         disabled: '於 %{when} 除名'
     topic_admin_menu: "版區管理員操作"
     emails_are_disabled: "管理員已經停用了所有外寄郵件功能。通知信件都不會寄出。"
-    bootstrap_mode_enabled: "為方便站點準備發佈，現正處於初始化模式中。所有新用戶將被授予信任等級1，並為他們設置接受每日郵件摘要。初始化模式會在用戶數超過 %{min_users} 個時關閉。"
+    bootstrap_mode_enabled: "為了讓你的新網站更容易上軌道，現正處於初始化模式中。所有新用戶將被授予信任等級1，並為他們設定接受每日郵件摘要。初始化模式將於用戶數超過 %{min_users} 位後關閉。"
     bootstrap_mode_disabled: "初始化模式將會在24小時後關閉。"
     s3:
       regions:
@@ -1013,10 +1013,6 @@ zh_TW:
       olist_title: "編號清單"
       ulist_title: "符號清單"
       list_item: "清單項目"
-      heading_label: "H"
-      heading_title: "標頭"
-      heading_text: "標頭"
-      hr_title: "分隔線"
       help: "Markdown 編輯說明"
       toggler: "隱藏或顯示編輯面板"
       modal_ok: "確定"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 0dcc76db84..57e78d175e 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -1455,19 +1455,19 @@ ar:
   flags_reminder:
     subject_template:
       zero: "لا يوجد تبليغات تنتظر التعامل معها"
-      one: "تبليغ 1 ينتظر التعامل معها"
-      two: "تبليغان ينتظران التعامل معها"
-      few: "%{count} تبليغات تنتظر التعامل معها"
-      many: "%{count} تبليغات تنتظر التعامل معها"
-      other: "%{count} تبليغات تنتظر التعامل معها"
+      one: "بلاغ واحد ينتظر التعامل معه"
+      two: "بلاغان ينتظران التعامل معهما"
+      few: "%{count} بلاغات تنتظر التعامل معها"
+      many: "%{count} بلاغات تنتظر التعامل معها"
+      other: "%{count} بلاغات تنتظر التعامل معها"
   unsubscribe_mailer:
     subject_template: "أكّد عدم رغبتك بعد الآن باستقبال تحديثات %{site_title} على البريد"
   invite_mailer:
-    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على {site_domain_name}"
+    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على %{site_domain_name}"
   custom_invite_mailer:
-    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على {site_domain_name}"
+    subject_template: "دعاك %{invitee_name} إلى ’%{topic_title}‘ على %{site_domain_name}"
   invite_forum_mailer:
-    subject_template: "دعاك %{invitee_name} للانضمام إلى {site_domain_name}"
+    subject_template: "%{invitee_name} قام بدعوتك للإنضمام إلى %{site_domain_name}"
   custom_invite_forum_mailer:
     subject_template: "دعاك %{invitee_name} للانضمام إلى %{site_domain_name}"
   invite_password_instructions:
@@ -1632,6 +1632,10 @@ ar:
     see_more: "المزيد"
     search_title: "البحث في الموقع"
     search_google: "غوغل"
+  login_required:
+    welcome_message: |
+      ## اهلا بك في %{title}
+      من فضلك قم بتسجيل الدخول او انشاء حساب جديد للمتابعة.
   terms_of_service:
     title: "شروط الخدمة"
     signup_form_message: 'لقد قرأت و أوافق على <a href="/tos" target="_blank">بنود الخدمة</a>.'
@@ -1679,7 +1683,7 @@ ar:
   static_topic_first_reply: |
     تعديل محتويات المنشور الاول في هذا الموضوع  %{page_name} page.
   guidelines_topic:
-    title: "الأسئلة الشّائعة/توجيهات"
+    title: "الأسئلة الشائعة/القواعد العامة"
   tos_topic:
     title: "شروط الخدمة"
   privacy_topic:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index aba151f27a..96774ae04c 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -46,6 +46,7 @@ de:
         no_message_id_error: "Passiert wenn in der E-Mail die Kopfzeile 'Message-Id' fehlt."
         auto_generated_email_error: "Passiert wenn die Kopfzeile 'precedence' folgendes enthält: list, junk, bulk oder auto_reply, oder eine der anderen Kopfzeilen enthält: auto-submitted, auto-replied oder auto-generated."
         no_body_detected_error: "Passiert, wenn wir keinen Textkörper extrahieren konnten und keine Anhänge gefunden wurden."
+        no_sender_detected_error: "Kommt vor, wenn wir keine gültige E-Mail-Adresse im From-Header finden konnten."
         inactive_user_error: "Passiert wenn der Sender nicht aktiv ist."
         blocked_user_error: "Passiert wenn der Sender geblockt wurde."
         bad_destination_address: "Passiert wenn keine der E-Mail Adressen in den Feldern To/Cc/Bcc zu einer konfigurierten Eingangs-E-Mail-Adresse passt."
@@ -56,9 +57,12 @@ de:
         topic_closed_error: "Passiert wenn eine Antwort eintraf aber das verbundene Thema geschlossen wurde."
         bounced_email_error: "E-Mail ist ein zurückgekommener Zustellungsbericht."
         screened_email_error: "Passiert, wenn die Absenderadresse schon einmal gefiltert wurde."
+        unsubscribe_not_allowed: "Kommt vor, wenn die Abbestellung per E-Mail für diesen Benutzer nicht erlaubt ist."
+        email_not_allowed: "Kommt vor, wenn die E-Mail-Adresse nicht auf der Positivliste oder auf der Negativliste ist."
       unrecognized_error: "Unbekannter Fehler"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b>: %{message}'
     messages:
       too_long_validation: "darf höchstens %{max} Zeichen lang sein; du hast %{length} eingegeben."
       invalid_boolean: "Ungültiger boolescher Wert."
@@ -128,6 +132,7 @@ de:
   not_logged_in: "Dazu musst du angemeldet sein."
   not_found: "Die angeforderte URL oder Ressource konnte nicht gefunden werden."
   invalid_access: "Du hast nicht die Erlaubnis, die angeforderte Ressource zu betrachten."
+  invalid_api_credentials: "Du bist nicht berechtigt, die angeforderte Ressource anzuzeigen. Der API-Benutzername oder -Schlüssel ist ungültig."
   read_only_mode_enabled: "Die Seite befindet sich im Nur-Lesen Modus. Änderungen sind deaktiviert."
   reading_time: "Lesezeit"
   likes: "Likes"
@@ -632,6 +637,9 @@ de:
       short_description: 'Für diesen Beitrag abstimmen'
       long_form: 'für diesen Beitrag gestimmt'
   user_activity:
+    no_default:
+      self: "Du hast noch keine Aktivität."
+      others: "Keine Aktivität."
     no_bookmarks:
       self: "Du hast keine Beiträge mit Lesezeichen, Lesezeichen ermöglichen es dir, diese später einfach zu finden."
       others: "Keine Lesezeichen."
@@ -964,6 +972,7 @@ de:
     gtm_container_id: "Google Tag Manager Container-ID, z.B.: GTM-ABCDEF"
     enable_escaped_fragments: "Als Fallback die Ajax-Crawling-API von Google verwenden, wenn keine Suchmaschine deaktiviert wurde. Siehe https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     allow_moderators_to_create_categories: "Erlaube Moderatoren neue Kategorien zu erstellen"
+    crawler_user_agents: "Liste der Browserkennungen, die als Crawler betrachtet werden und an die statische HTML-Seiten statt JavaScript-Inhalt ausgeliefert wird"
     cors_origins: "Erlaubte Adressen für Cross-Origin-Requests (CORS). Jede Adresse muss http:// oder https:// enthalten. Die Umgebungsvariable DISCOURSE_ENABLE_CORS muss gesetzt sein, um CORS zu aktivieren."
     use_admin_ip_whitelist: "Administratoren können sich nur anmelden, wenn sie von einer IP-Adresse aus zugreifen, welcher unter den vertrauenswürden IP-Adressen gelistet ist (Admin > Logs > Screened Ips)."
     blacklist_ip_blocks: "Eine Liste von privaten IP-Blöcken, die nie von Discourse indiziert werden sollen"
@@ -992,7 +1001,7 @@ de:
     allow_index_in_robots_txt: "Suchmaschinen mittels der robots.txt Datei erlauben, die Site zu indizieren."
     email_domains_blacklist: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten nicht verwendet werden dürfen. Beispiel: mailinator.com|trashmail.net"
     email_domains_whitelist: "Eine durch senkrechte Striche getrennte Liste von E-Mail-Domains, die für die Registrierung neuer Konten verwendet werden können. ACHTUNG: Benutzer mit E-Mail-Adressen anderer Domains werden nicht zugelassen!"
-    hide_email_address_taken: "Benutzer nicht informieren, ob ein Konto existiert, wenn sie den Passwort vergessen-Dialog verwenden."
+    hide_email_address_taken: "Teile Benutzer während der Registrierung und beim „Passwort vergessen“-Formular nicht mit, wenn ein Konto mit der angegebenen E-Mail-Adresse existiert."
     log_out_strict: "Beim Abmelden ALLE Sitzungen des Benutzers auf allen Geräten beenden"
     version_checks: "Kontaktiere den Discourse Hub zur Überprüfung auf neue Versionen und zeige Benachrichtigungen über neue Versionen auf der Administratorkonsole an."
     new_version_emails: "Sende eine E-Mail an die contact_email Adresse wenn eine neue Version von Discourse verfügbar ist."
@@ -1191,6 +1200,7 @@ de:
     auto_block_fast_typers_on_first_post: "Blockiere Benutzer automatisch, welche unterhalb der min_first_post_typing_time liegen."
     auto_block_fast_typers_max_trust_level: "Maximale Vertrauensstufe um \"Schnelltipper\" automatisch zu blockieren."
     auto_block_first_post_regex: "Regulärer Ausdruck der dafür sorgt dass passende erste Beiträge von Benutzern genehmigt werden müssen. Groß- und Kleinschreibung wird nicht beachtet.\nBeispiel: raging|a[bc]a blockiert alle ersten Beiträge, die raging, aba oder aca beinhalten. Wird nur auf den ersten Beitrag angewendet."
+    flags_default_topics: "Zeige gemeldete Themen standardmäßig im Administrationsbereich"
     reply_by_email_enabled: "Aktviere das Antworten auf Themen via E-Mail."
     reply_by_email_address: "Vorlage für die Antwort einer per E-Mail eingehender E-Mail-Adresse, zum Beispiel: %{reply_key}@reply.example.com oder replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Liste alternativer Vorlagen für eingehende E-Mail-Adressen für das Antworten per E-Mail. Beispiel: %{reply_key}@antwort.example.com|antworten+%{reply_key}@example.com"
@@ -1253,7 +1263,7 @@ de:
     suppress_digest_email_after_days: "Unterdrücke E-Mail-Zusammenfassungen für Benutzer, die länger als (n) Tage nicht auf der Seite gesehen wurden."
     digest_suppress_categories: "Unterdrücke diese Kategorien in E-Mail-Zusammenfassungen."
     disable_digest_emails: "Deaktiviere E-Mail-Zusammenfassungen für alle Benutzer."
-    email_accent_bg_color: "Die Hervorhebungsfarbe, die als Hintergrund mancher Elemente in HTML-E-Mails verwendet wird. Gib’ einen Namen ('red') oder einen Hex-Wert ('#FF000') der Farbe an."
+    email_accent_bg_color: "Die Hervorhebungsfarbe, die als Hintergrundfarbe bestimmter Elemente in HTML-Mails verwendet wird. Gib einen Farbnamen an (z.B. 'red' für rot) oder einen Hex-Wert ('#FF0000')."
     email_accent_fg_color: "Gib’ einen Namen ('white') oder einen Hex-Wert ('#FFFFFF') der Farbe an."
     email_link_color: "Die Farbe von Links in HTML-Mails. Gib’ einen Namen ('blue') oder einen Hex-Wert ('#0000FF') der Farbe an."
     detect_custom_avatars: "Aktiviere diese Option, um zu überprüfen, ob Benutzer eigene Profilbilder hochgeladen haben."
@@ -1266,6 +1276,7 @@ de:
     anonymous_posting_min_trust_level: "Vertrauensstufe, ab der das Schreiben anonymer Beiträge erlaubt ist"
     anonymous_account_duration_minutes: "Erzeuge alle (n) Minuten ein neues anonymes Konto je Benutzer, um die Anonymität der virtuellen anonymen Benutzer zu gewährleisten. Beispiel: Ein Wert von 600 sorgt dafür, dass ein neues anonymes Konto erzeugt wird, wenn ein Benutzer in den anonymen Modus wechselt UND mindestens 600 Minuten seit der letzten anonymen Nachricht dieses Benutzers vergangen sind."
     hide_user_profiles_from_public: "Deaktiviert Benutzerkarten, Benutzerprofile und das Benutzerverzeichnis für anonyme Benutzer."
+    hide_suspension_reasons: "Zeige Sperrgründe nicht öffentlich auf Benutzerprofilen an."
     user_website_domains_whitelist: "Benutzer-Webseiten werden mit diesen Domains abgeglichen. Mehrere Domains können mit einem Pipe-Symbol „|“ getrennt angegeben werden."
     allow_profile_backgrounds: "Erlaubt es Benutzern, Profilhintergründe hochzuladen."
     sequential_replies_threshold: "Anzahl an Beiträgen die ein Benutzer machen muss, um benachrichtigt zu werden, dass er zu viele aufeinanderfolgende Antworten schreibt."
@@ -1282,7 +1293,7 @@ de:
     topic_page_title_includes_category: "Name des Themas enthält den Namen der Kategorie."
     native_app_install_banner: "Wiederkehrende Benutzer dazu einladen, die native Discourse-App herunterzuladen."
     share_anonymized_statistics: "Anonymisierte Nutzungsdaten teilen."
-    auto_handle_queued_age: "Automatische Behandlung von Einträgen, die auf Überprüfung warten, nach dieser Anzahl an Tagen. Meldungen werden aufgeschoben. Anstehende Beiträge und Benutzer werden abgelehnt. Setze sie auf 0, um diese Funktion zu deaktivieren."
+    auto_handle_queued_age: "Bearbeite Einträge automatisch, die so viele Tage auf Überprüfung warten. Meldungen werden ignorieren. Beiträge und Benutzer in der Warteschlange werden zurückgewiesen. Setze den Wert auf 0, um diese Funktion zu deaktivieren."
     max_prints_per_hour_per_user: "Maximale Anzahl von Aufrufen der Druckansicht pro Nutzer pro Stunde (0 zum deaktivieren)"
     full_name_required: "Der voller Name wird für das Benutzerprofil benötigt."
     enable_names: "Zeigt den vollen Namen eines Benutzers auf dem Profil, der Benutzerkarte und in E-Mails an. Wenn deaktiviert wird der volle Name überall ausgeblendet."
@@ -1314,6 +1325,7 @@ de:
     auto_close_topics_post_count: "Maximale Anzahl von Beiträgen, die in einem Thema erlaubt sind, bevor es automatisch geschlossen wird (0 = ausgeschaltet)"
     code_formatting_style: "Code-Schaltfläche im Editor wird standardmäßig diesen Formatierungsstil anwenden"
     max_allowed_message_recipients: "Maximale Anzahl von Empfängern in einer Nachricht."
+    watched_words_regular_expressions: "Beobachtete Wörter sind reguläre Ausdrücke."
     default_email_digest_frequency: "Wie häufig sollen Benutzer standardmäßig E-Mail-Zusammenfassungen erhalten?"
     default_include_tl0_in_digests: "Beiträge von neuen Benutzern in E-Mail-Zusammenfassungen standardmäßig anzeigen. Benutzer können dies in ihren Einstelllungen ändern."
     default_email_private_messages: "Sende einem Benutzer standardmäßig eine E-Mail, wenn dieser eine Nachricht von einem anderen Benutzer erhält."
@@ -1394,6 +1406,7 @@ de:
       category: 'Kategorien'
       topic: 'Ergebnisse'
       user: 'Benutzer'
+    results_page: "Suchergebnisse für '%{term}'"
   sso:
     login_error: "Fehler bei der Anmeldung"
     not_found: "Dein Konto wurde nicht erkannt. Bitte kontaktiere den Administrator dieser Site."
@@ -1516,7 +1529,7 @@ de:
     username:
       short: "muss mindestens %{min} Zeichen lang sein"
       long: "darf nicht länger als %{max} Zeichen sein"
-      characters: "darf nur aus Zahlen und Buchstaben bestehen"
+      characters: "darf nur Zahlen, Buchstaben, Bindestriche und Unterstriche enthalten"
       unique: "muss eindeutig sein"
       blank: "muss angegeben werden"
       must_begin_with_alphanumeric_or_underscore: "muss mit einem Buchstaben, einer Zahl oder einem Unterstrich beginnen"
@@ -1887,6 +1900,13 @@ de:
         Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (Betreff: %{former_title}) hat nicht funktioniert.
 
         Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
+    email_reject_not_allowed_email:
+      title: "E-Mail abgelehnt weil E-Mail-Adresse nicht erlaubt"
+      subject_template: "[%{email_prefix}] E-Mail-Problem -- E-Mail blockiert"
+      text_body_template: |
+        Tut uns leid, aber deine E-Mail-Nachricht an %{destination} (mit dem Betreff %{former_title}) hat nicht funktioniert.
+
+        Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Versuche, von einer anderen E-Mail-Adresse zu schicken, oder [kontaktiere ein Team-Mitglied](%{base_url}/about).
     email_reject_inactive_user:
       title: "E-Mail abgelehnt weil Benutzer inaktiv"
       subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer inaktiv"
@@ -2319,6 +2339,26 @@ de:
       text_body_template: |2
 
         %{message}
+    account_suspended:
+      title: "Konto gesperrt"
+      subject_template: "[%{email_prefix}] Dein Konto wurde gesperrt"
+      text_body_template: |
+        Du wurdest vom Forum gesperrt bis %{suspended_till}.
+
+        %{reason}
+
+        %{message}
+    account_exists:
+      title: "Konto existiert bereits"
+      subject_template: "[%{email_prefix}] Konto existiert bereits"
+      text_body_template: |
+        Du hast gerade versuchst, ein Konto auf %{site_name} zu erstellen oder die E-Mail-Adresse eines Kontos zu %{email} zu ändern. Allerdings gibt es schon ein Konto für %{email}.
+
+        Wenn du dein Passwort vergessen hast, [setze es jetzt zurück](%{base_url}/password-reset).
+
+        Wenn du nicht versucht hast, ein Konto für %{email} zu erstellen oder deine E-Mail-Adresse zu ändern, mach’ dir keine Sorgen – du kannst diese Nachricht getrost ignorieren.
+
+        Wenn du Fragen hast, [kontaktiere unser freundliches Team](%{base_url}/about).
     digest:
       why: "Eine kurze Zusammenfassung von %{site_link} seit deinem letzten Besuch am %{last_seen_at}"
       since_last_visit: "Seit deinem letzten Besuch"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 66c0f71749..9167f54ca4 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -132,6 +132,7 @@ el:
   not_logged_in: "Χρειάζεται να είσαι συνδεδεμένος για να το κάνεις αυτό."
   not_found: "Η ζητούμενη διεύθυνση URL δεν βρέθηκε."
   invalid_access: "Δεν έχεις δικαίωμα να δεις τους πόρους που ζήτησες."
+  invalid_api_credentials: "Δεν επιτρέπεται η προβολή της ζητούμενης πληροφορίας. Το API username ή το κλειδί δεν είναι έγκυρα."
   read_only_mode_enabled: "Η ιστοσελίδα είναι σε λειτουργία μόνο για ανάγνωση. Οι αλλαγές είναι απενεργοποιημένες."
   reading_time: "Χρόνος ανάγνωσης"
   likes: "Μου Αρέσει"
@@ -1209,6 +1210,7 @@ el:
     auto_block_fast_typers_on_first_post: "Αυτόματος αποκλεισμός στους χρήστες που δεν πληρούν min_first_post_typing_time"
     auto_block_fast_typers_max_trust_level: "Μέγιστο επίπεδο εμπιστοσύνης για τον αυτόματο αποκλεισμό γρήγορων δακτυλογράφων"
     auto_block_first_post_regex: "Το regex χωρίς διάκριση πεζών-κεφαλαίων το οποίο αν περάσει θα προκαλέσει την πρώτη ανάρτηση από το χρήστη να μπλοκάρει και να σταλθεί στην ουρά για έγκριση. Παράδειγμα: raging|a[bc]a, θα προκαλέσει όλα τα μηνύματα που περιέχουν raging ή ΑΒΑ ή ACA να μπλοκάρουν. Ισχύει μόνο για την πρώτη ανάρτηση."
+    flags_default_topics: "Προβολή επισημασμένων νημάτων από προεπιλογή στην σελίδα διαχείρισης"
     reply_by_email_enabled: "Ενεργοποίηση απάντησης στα νήματα μέσω email."
     reply_by_email_address: "Πρότυπο για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, για παράδειγμα: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Λίστα εναλλακτικών προτύπων για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, πχ: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1271,7 +1273,7 @@ el:
     suppress_digest_email_after_days: "Καταστολή του συνοπτικού email για χρήστες που δεν έχουν επισκεφθεί την ιστοσελίδα για πάνω απο (χ) μέρες. "
     digest_suppress_categories: "Καταστείλει αυτές τις κατηγορίες από το συνοπτικό email."
     disable_digest_emails: "Απενεργοποίηση των συνοπτικών emails για όλους τους χρήστες."
-    email_accent_bg_color: "Το χρώμα τονισμού που θα χρησιμοποιηθεί ως φόντο σε κάποια στοιχεία σε HTML email. Εισήγαγε το όνομα του χρώματος ('red') ή την δεκαεξαδική τιμή του ('#FF000')."
+    email_accent_bg_color: "Η απόχρωση η οποία θα χρησιμοποιηθεί ως φόντο κάποιων στοιχείων στα HTML emails. Δώστε όνομα χρώματος ('red') ή τιμή hex ('#FF0000')."
     email_accent_fg_color: "Το χρώμα του κειμένου που θα αποδωθεί στο φόντο του email σε HTML ηλεκτρονικά μηνύματα. Εισήγαγε το όνομα του χρώματος ('white') ή την δεκαεξαδική τιμή του ('#FFFFFF')."
     email_link_color: "Το χρώμα των συνδέσμων σε HTML email.  Εισήγαγε το όνομα του χρώματος ('blue') ή την δεκαεξαδική τιμή του ('#0000FF'). "
     detect_custom_avatars: "Αν πρέπει ή όχι να ελεγχθεί ότι οι χρήστες έχουν μεταφορτώσει εξατομικευμένες φωτογραφίες προφίλ. "
@@ -1301,7 +1303,7 @@ el:
     topic_page_title_includes_category: "Ο τίτλος του νήματος της σελίδας περιλαμβάνει και το όνομα της κατηγορίας."
     native_app_install_banner: "Ζήτα από τους συχνούς επισκέπτες να εγκαταστήσουν την υπάρχουσα εφαρμογή Discourse. "
     share_anonymized_statistics: "Μοιράσου ανωνυμοποιημένα στατιστικά χρήσης"
-    auto_handle_queued_age: "Αυτόματη διαχείριση εγγραφών σε αναμονή για έλεγχο μετά από τόσες ημέρες. Οι σημάνσεις θα αναβληθούν. Αναρτήσεις στην ουρά και χρήστες θα απορριφθούν. Θέσε 0 για απενεργοποίηση αυτής της λειτουργίας."
+    auto_handle_queued_age: "Αυτόματη διαχείριση εγγραφών σε αναμονή για έλεγχο μετά από τόσες ημέρες. Οι σημάνσεις θα αγνοηθούν. Αναρτήσεις σε ουρά και χρήστες θα αγνοηθούν. Θέσε 0 για απενεργοποίηση αυτής της λειτουργίας."
     max_prints_per_hour_per_user: "Μέγιστος αριθμός προβολών σελίδας /print (0 για απενεργοποίηση)"
     full_name_required: "Το ονοματεπώνυμο είναι απαραίτητο πεδίο για το προφίλ του χρήστη."
     enable_names: "Εμφάνιζε το πλήρες όνομα του χρήστη στο προφίλ τους, στην κάρτα χρήστη και στα email. Απενεργοποίησε για να κρύβεται το πλήρες όνομα παντού. "
@@ -1414,6 +1416,7 @@ el:
       category: 'Κατηγορίες'
       topic: 'Αποτελέσματα'
       user: 'Χρήστες'
+    results_page: "Αποτελέσματα αναζήτησης για '%{term}'"
   sso:
     login_error: "Σφάλμα Σύνδεσης"
     not_found: "Ο λογαριασμός σου δεν ήταν δυνατόν να βρεθεί. Παρακαλώ επικοινώνησε με το διαχειριστή της ιστοσελίδας."
@@ -1536,7 +1539,7 @@ el:
     username:
       short: "πρέπει να είναι τουλάχιστον %{min} χαρακτήρες"
       long: "δεν πρέπει να είναι περισσότερο από %{max} χαρακτήρες"
-      characters: "πρέπει να συμπεριλαμβάνει μόνο αριθμούς, γράμματα και κάτω παύλες"
+      characters: "πρέπει να περιέχει μόνο αριθμούς, γράμματα, παύλες και κάτω παύλες"
       unique: "πρέπει να είναι μοναδικό"
       blank: "πρέπει να υπάρχει"
       must_begin_with_alphanumeric_or_underscore: "πρέπει να αρχίζει με ένα γράμμα, έναν αριθμό ή μια κάτω παύλα"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index faf758f5c9..cd740988d9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -164,6 +164,7 @@ en:
   not_logged_in: "You need to be logged in to do that."
   not_found: "The requested URL or resource could not be found."
   invalid_access: "You are not permitted to view the requested resource."
+  invalid_api_credentials: "You are not permitted to view the requested resource. The API username or key is invalid."
   read_only_mode_enabled: "The site is in read only mode. Interactions are disabled."
 
   reading_time: "Reading time"
@@ -741,7 +742,7 @@ en:
       email_body: "%{link}\n\n%{message}"
 
   flagging:
-    you_must_edit: '<p>Your post was flagged by the community. Please <a href="/my/messages">see your messages</a>.</p>'
+    you_must_edit: '<p>Your post was flagged by the community. Please <a href="%{path}">see your messages</a>.</p>'
     user_must_edit: '<p>This post was flagged by the community and is temporarily hidden.</p>'
 
   archetypes:
@@ -1357,6 +1358,7 @@ en:
     auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time"
     auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers"
     auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post."
+    flags_default_topics: "Show flagged topics by default in the admin section"
 
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
@@ -1432,7 +1434,7 @@ en:
     suppress_digest_email_after_days: "Suppress summary emails for users not seen on the site for more than (n) days."
     digest_suppress_categories: "Suppress these categories from summary emails."
     disable_digest_emails: "Disable summary emails for all users."
-    email_accent_bg_color: "The accent color to be used as the background of some elements in HTML emails. Enter a color name ('red') or hex value ('#FF000')."
+    email_accent_bg_color: "The accent color to be used as the background of some elements in HTML emails. Enter a color name ('red') or hex value ('#FF0000')."
     email_accent_fg_color: "The color of text rendered on the email bg color in HTML emails. Enter a color name ('white') or hex value ('#FFFFFF')."
     email_link_color: "The color of links in HTML emails. Enter a color name ('blue') or hex value ('#0000FF')."
 
@@ -1481,7 +1483,7 @@ en:
 
     share_anonymized_statistics: "Share anonymized usage statistics."
 
-    auto_handle_queued_age: "Automatically handle records that are waiting to be reviewed after this many days. Flags will be deferred. Queued posts and users will be rejected. Set to 0 to disable this feature."
+    auto_handle_queued_age: "Automatically handle records that are waiting to be reviewed after this many days. Flags will be ignored. Queued posts and users will be rejected. Set to 0 to disable this feature."
 
     max_prints_per_hour_per_user: "Maximum number of /print page impressions (set to 0 to disable)"
 
@@ -1616,6 +1618,7 @@ en:
       category: 'Categories'
       topic: 'Results'
       user: 'Users'
+    results_page: "Search results for '%{term}'"
 
   sso:
     login_error: "Login Error"
@@ -1749,7 +1752,7 @@ en:
     username:
       short: "must be at least %{min} characters"
       long: "must be no more than %{max} characters"
-      characters: "must only include numbers, letters and underscores"
+      characters: "must only include numbers, letters, dashes, and underscores"
       unique: "must be unique"
       blank: "must be present"
       must_begin_with_alphanumeric_or_underscore: "must begin with a letter, a number or an underscore"
@@ -2409,7 +2412,7 @@ en:
       text_body_template: |
         Congratulations, you've earned the **New User of the Month award for %{month_year}**. :trophy:
 
-        This award is only granted to two new users per month, and it will be permanently visible on [your user page](%{base_url}/my/badges).
+        This award is only granted to two new users per month, and it will be permanently visible on [the badges page](%{url}).
 
         You've quickly become a valuable member of our community. Thanks for joining, and keep up the great work!
 
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 12e2e431b2..2b73d7fde9 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -621,6 +621,8 @@ es:
       short_description: 'Vota por este post'
       long_form: 'Votado para este post'
   user_activity:
+    no_default:
+      others: "Sin actividad."
     no_bookmarks:
       self: "No tienes temas en marcadores, añadir temas a marcadores te permite acceder a ellos más tarde fácilmente."
       others: "Sin marcadores."
@@ -628,6 +630,7 @@ es:
       self: "No le has dado a \"Me gusta\" en ningún tema."
       others: "No te gusta ningún tema."
     no_replies:
+      self: "No has respondido a ningún post."
       others: "Sin respuestas."
   topic_flag_types:
     spam:
@@ -703,7 +706,7 @@ es:
       xaxis: "Día"
       yaxis: "Número de topics nuevos"
     posts:
-      title: "Nuevos posts"
+      title: "Posts"
       xaxis: "día"
       yaxis: "Número de posts nuevos"
     likes:
@@ -2184,7 +2187,7 @@ es:
       unread_messages: "Mensajes no leídos"
       unread_notifications: "Notificaciones no leídas"
       liked_received: "Me gusta recibidos"
-      new_posts: "Nuevos temas"
+      new_posts: "Nuevos posts"
       new_users: "Nuevos usuarios"
       popular_topics: "Temas populares"
       follow_topic: "Seguir este tema"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 9b7a62f7a7..533f20f2d5 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -1395,6 +1395,7 @@ fi:
       category: 'Alueet'
       topic: 'Tulokset'
       user: 'Käyttäjät'
+    results_page: "Tulokset hakusanalle '%{term}'"
   sso:
     login_error: "Virhe kirjauduttaessa"
     not_found: "Tiliäsi ei löydetty. Ota yhteyttä sivuston ylläpitäjään."
@@ -1517,7 +1518,7 @@ fi:
     username:
       short: "täytyy olla vähintään %{min} merkkiä"
       long: "ei saa olla yli %{max} merkkiä"
-      characters: "täytyy koostua vain numeroista, kirjaimista ja alaviivoista"
+      characters: "vain numerot, kirjaimet (A-Z, a-z), tavuviivat ja alaviivat sallittu"
       unique: "täytyy olla uniikki"
       blank: "pakollinen kenttä"
       must_begin_with_alphanumeric_or_underscore: "täytyy alkaa kirjaimella, numerolla tai alaviivalla"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 842705b220..f49326be4a 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -60,6 +60,7 @@ fr:
       unrecognized_error: "Erreur non reconnue"
   errors: &errors
     format: '%{attribute} %{message}'
+    format_with_full_message: '<b>%{attribute}</b> : %{message}'
     messages:
       too_long_validation: "est limité à %{max} caractères maximum ; il y en a %{length}."
       invalid_boolean: "Vrai/Faux invalide."
@@ -612,8 +613,8 @@ fr:
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: "Autre chose"
-      description: 'Ce message demande l''attention des responsables pour une autre raison..'
-      short_description: 'Requière l''attention du staff pour une autre raison'
+      description: 'Ce message demande l''attention des responsables pour une autre raison.'
+      short_description: 'Nécessite l''attention du staff pour une autre raison'
       long_form: 'signalé aux responsables'
       email_title: 'Un message dans « %{title} » nécessite l''attention des responsables'
       email_body: "%{link}\n\n%{message}"
@@ -633,6 +634,9 @@ fr:
       short_description: 'Voter pour ce message'
       long_form: 'a voté pour ce message'
   user_activity:
+    no_default:
+      self: "Vous n'avez aucune activité pour le moment."
+      others: "Aucune activité."
     no_bookmarks:
       self: "Vous n'avez mis de signets à aucun message ; mettre des signets vous permet de facilement les retrouver par la suite."
       others: "Aucun signet."
@@ -1083,6 +1087,7 @@ fr:
     twitter_summary_large_image_url: "URL de l'image par défaut de la carte de résumé Twitter (devrait au moins mesurer 280px en largeur et 150px en hauteur). "
     allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes."
     png_to_jpg_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 99 est la meilleure, 100 pour désactiver)."
+    allow_staff_to_upload_any_file_in_pm: "Autoriser les responsables à envoyer n'importe quel fichier dans les messages privés."
     strip_image_metadata: "Enlever les métadonnées de l'image."
     enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité."
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
@@ -1252,6 +1257,7 @@ fr:
     anonymous_posting_min_trust_level: "Le niveau de confiance minimum pour passer en mode anonyme."
     anonymous_account_duration_minutes: "Pour protéger l'anonymat, créer un nouveau compte anonyme tous les N minutes pour chaque utilisateur. Exemple: si 600 est choisi, dès 600 minutes après le dernier message ET que l'utilisateur passe en mode anonyme, un nouveau compte anonyme lui sera crée."
     hide_user_profiles_from_public: "Cacher les cartes, les profils et le répertoire d'utilisateurs aux visiteurs."
+    hide_suspension_reasons: "Ne pas afficher les raisons d'une suspension sur les profils utilisateurs."
     user_website_domains_whitelist: "Les sites Web des utilisateurs vont être vérifiés contre ces domaines. Liste délimitée par des pipes (|)."
     allow_profile_backgrounds: "Autoriser les utilisateurs à envoyer des arrières-plans de profil."
     sequential_replies_threshold: "Nombre de messages successifs qu'un utilisateur peut poster dans un sujet avant d'être averti d'avoir posté un nombre excessif de réponses qui se suivent."
@@ -2600,6 +2606,18 @@ fr:
       description: Contributions remarquables durant leur premier mois
       long_description: |
         Ce badge est accordé pour féliciter deux nouveaux utilisateurs chaque mois pour leur excellente contribution mesurée par la fréquence à laquelle leurs messages reçoivent des J'aime et par qui.
+    enthusiast:
+      name: Passionné
+      description: A visité 10 jours
+      long_description: Ce badge est décerné pour avoir visiter 10 jours consécutifs. Merci d'être resté avec nous pendant plus d'une semaine !
+    aficionado:
+      name: Aficionado
+      description: A visité 100 jours
+      long_description: Ce badge est décerné pour avoir visiter 100 jours consécutifs. C'est plus de trois mois !
+    devotee:
+      name: Adepte
+      description: A visité 365 jours
+      long_description: Ce badge est décerné pour avoir visiter 365 jours consécutifs. Waouh, une année entière !
     badge_title_metadata: "%{display_name} badge sur %{site_title}"
   admin_login:
     success: "Courriel envoyé"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 0fc8aacbdc..e0f4e97c05 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -132,6 +132,7 @@ it:
   not_logged_in: "Devi essere connesso per farlo."
   not_found: "L'URL o la risorsa richiesta non sono stati trovati."
   invalid_access: "Non hai il permesso di vedere la risorsa richiesta."
+  invalid_api_credentials: "Non è consentito visualizzare la risorsa richiesta. Il nome utente o la chiave API non sono validi."
   read_only_mode_enabled: "Il sito è in modalità di sola lettura. Le interazioni sono disabilitate."
   reading_time: "Tempo di lettura"
   likes: "Mi piace"
@@ -1202,6 +1203,7 @@ it:
     auto_block_fast_typers_on_first_post: "Blocca automaticamente gli utenti che non soddisfano min_first_post_typing_time"
     auto_block_fast_typers_max_trust_level: "Livello di esperienza massimo per bloccare automaticamente i digitatori veloci"
     auto_block_first_post_regex: "Regex senza distinzione tra maiuscole e minuscole che, se passato, causerà il blocco del primo messaggio dell'utente e che sarà inviato nella coda dei messaggi da approvare. Esempio: rabbia|a[bc]a, fa in modo che tutti i messaggi contenenti le parole rabbia o aba o aca siano bloccati in un primo momento. Si applica solo al primo messaggio."
+    flags_default_topics: "Di default, mostra gli argomenti segnalati nella sezione di amministrazione"
     reply_by_email_enabled: "Abilita la possibilità di rispondere ai messaggi tramite email."
     reply_by_email_address: "Modello per rispondere via email, per esempio: %{reply_key}@risposta.esempio.com o risposte+%{reply_key}@esempio.com"
     alternative_reply_by_email_addresses: "Elenco dei template alternativi per la risposta via email in arrivo da indirizzi email. Esempio: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
@@ -1264,7 +1266,7 @@ it:
     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_accent_bg_color: "Colore da usare come background per alcuni elementi delle email HTML. Inserire il nome di un colore ('red') o un valore esadecimale ('#FF0000')."
     email_accent_fg_color: "Colore del testo reso sul colore di background delle email bg nelle email HTML. Inserire il nome di un colore ('white') o un valore esadecimale ('#FFFFFF'). "
     email_link_color: "Colore dei collegamenti nelle email HTML. Inserire il nome di un colore ('blue') o un valore esadecimale ('#0000FF')."
     detect_custom_avatars: "Controllare o meno che gli utenti abbiano caricato immagini personalizzate sul profilo."
@@ -1529,7 +1531,7 @@ it:
     username:
       short: "deve essere almeno di %{min} caratteri"
       long: "non deve essere più lungo di %{max} caratteri"
-      characters: "deve includere solo numeri, lettere e trattini bassi"
+      characters: "deve includere solo numeri, lettere, trattini e trattini bassi"
       unique: "deve essere univoco"
       blank: "deve essere presente"
       must_begin_with_alphanumeric_or_underscore: "deve iniziare con una lettera, un numero o un underscore"
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 120cfa0a2b..fd24476343 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -53,6 +53,7 @@ nb_NO:
         reply_user_not_matching_error: "Skjer når et innkommende svar kommer fra en annen e-postadresse enn varselet var sendt til."
         topic_not_found_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er slettet."
         topic_closed_error: "Skjer når et svar blir mottatt, men det tilhørene emnet er stengt."
+      unrecognized_error: "Ukjent feil"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -73,6 +74,7 @@ nb_NO:
       inclusion: er ikke inkludert i listen
       invalid: er ugyldig
       is_invalid: "virker uklart, er det en komplett setning?"
+      contains_censored_words: "inneholder følgende sensurerte ord: %{censored_words}"
       less_than: må være mindre enn %{count}
       less_than_or_equal_to: må være lik eller mindre enn %{count}
       not_a_number: er ikke et nummer
@@ -195,6 +197,7 @@ nb_NO:
     delete_reason: "Slettet via køen for innleggmoderering"
   groups:
     errors:
+      can_not_modify_automatic: "Du kan ikke modifisere en automatisk gruppe"
       member_already_exist: "'%{username}' er allerede medlem av denne gruppen."
       invalid_domain: "'%{domain}' er ikke et gyldig domene."
       invalid_incoming_email: "'%{email}' er ikke en gyldig e-postadresse."
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 42b43a4fe3..ad4cc23a68 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -614,6 +614,7 @@ ru:
     like:
       title: 'Нравится'
       description: 'Мне нравится это сообщение'
+      short_description: 'Мне нравится'
       long_form: 'понравилось это'
     vote:
       title: 'Проголосовать'
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index c0784b48d3..223772bffa 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -57,9 +57,12 @@ zh_CN:
         topic_closed_error: "回复到已经锁定的主题。"
         bounced_email_error: "邮件是投递失败的错误报告。"
         screened_email_error: "发件人邮箱已经被封禁。"
+        unsubscribe_not_allowed: "当用户不能通过邮件退订时发生。"
+        email_not_allowed: "当用户邮件不在白名单或在黑名单时发生。"
       unrecognized_error: "无法识别的错误"
   errors: &errors
     format: '%{attribute}%{message}'
+    format_with_full_message: '<b>%{attribute}</b>：%{message}'
     messages:
       too_long_validation: "最多只能有 %{max} 个字；你已经输入了 %{length} 个字。"
       invalid_boolean: "无效布尔值。"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 3e42c07db8..1878e2ce41 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -468,12 +468,14 @@ posting:
   min_topic_title_length:
     client: true
     default: 15
+    min: 1
     locale_default:
       zh_CN: 6
       zh_TW: 6
   max_topic_title_length:
     client: true
     default: 255
+    min: 5
     max: 255
   title_min_entropy:
     default: 10
@@ -927,7 +929,7 @@ security:
   allow_index_in_robots_txt: true
   allow_moderators_to_create_categories: false
   crawler_user_agents:
-    default: 'Googlebot|Mediapartners|AdsBot|curl|HTTrack|Twitterbot|facebookexternalhit|bingbot|Baiduspider|ia_archiver|Wayback Save Page|360Spider|Swiftbot|YandexBot'
+    default: 'Googlebot|Mediapartners|AdsBot|curl|HTTrack|Twitterbot|facebookexternalhit|bingbot|Baiduspider|ia_archiver|archive.org_bot|Wayback Save Page|360Spider|Swiftbot|YandexBot'
     type: list
   cors_origins:
     default: ''
@@ -997,6 +999,9 @@ spam:
   auto_block_fast_typers_on_first_post: true
   auto_block_fast_typers_max_trust_level: 0
   auto_block_first_post_regex: ""
+  flags_default_topics:
+    default: false
+    client: true
 
 rate_limits:
   unique_posts_mins: 5
@@ -1095,6 +1100,13 @@ developer:
   bypass_wizard_check:
     default: false
     hidden: true
+  logging_provider:
+    hidden: true
+    default: 'default'
+    type: 'list'
+    choices:
+      - 'default'
+      - 'lograge'
 
 embedding:
   feed_polling_enabled:
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index bc47ed7e85..f90911a1bb 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -113,10 +113,14 @@ before_fork do |server, worker|
       puts "Starting up #{sidekiqs} supervised sidekiqs"
 
       require 'demon/sidekiq'
-
       if @stats_socket_dir
         Demon::Sidekiq.after_fork do
           start_stats_socket(server)
+          DiscourseEvent.trigger(:sidekiq_fork_started)
+        end
+      else
+        Demon::Sidekiq.after_fork do
+          DiscourseEvent.trigger(:sidekiq_fork_started)
         end
       end
       Demon::Sidekiq.start(sidekiqs)
@@ -218,6 +222,8 @@ end
 after_fork do |server, worker|
   start_stats_socket(server)
 
+  DiscourseEvent.trigger(:web_fork_started)
+
   # warm up v8 after fork, that way we do not fork a v8 context
   # it may cause issues if bg threads in a v8 isolate randomly stop
   # working due to fork
diff --git a/db/migrate/20171006030028_add_allow_private_messages_to_user_options.rb b/db/migrate/20171006030028_add_allow_private_messages_to_user_options.rb
new file mode 100644
index 0000000000..c74f68fff8
--- /dev/null
+++ b/db/migrate/20171006030028_add_allow_private_messages_to_user_options.rb
@@ -0,0 +1,5 @@
+class AddAllowPrivateMessagesToUserOptions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :user_options, :allow_private_messages, :boolean, default: true, null: false
+  end
+end
diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md
index abb88cb2aa..a7c90019f7 100644
--- a/docs/DEVELOPMENT-OSX-NATIVE.md
+++ b/docs/DEVELOPMENT-OSX-NATIVE.md
@@ -114,7 +114,7 @@ unix_socket_directories = '/var/pgsql_socket'   # comma-separated list of direct
 #and
 unix_socket_permissions = 0777  # begin with 0 to use octal notation
 ```
-Then create the '/var/pgsql/' folder and set up the appropriate permission in your bash (this requires admin access)
+Then create the '/var/pgsql_socket/' folder and set up the appropriate permission in your bash (this requires admin access)
 ```
 sudo mkdir /var/pgsql_socket
 sudo chmod 770 /var/pgsql_socket
diff --git a/docs/INSTALL-email.md b/docs/INSTALL-email.md
index e1c534897e..d62a669d8c 100644
--- a/docs/INSTALL-email.md
+++ b/docs/INSTALL-email.md
@@ -7,7 +7,13 @@ The following are template configurations for email service providers who offer
 **Please note that in any email provider, you _must_ verify and use the subdomain, e.g. `discourse.example.com`. If you verify the domain only, e.g. `example.com`, mail will not be configured correctly.**
 
 Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration):
-  
+
+#### [Mailgun][gun] &mdash; 10k emails/month (with credit card)
+
+    SMTP server address? smtp.mailgun.org
+    SMTP user name?      [SMTP credentials for your domain under domains tab]
+    SMTP password?       [SMTP credentials for your domain under domains tab]
+
 #### [Elastic Email][ee] &mdash; 150k emails/month
 
     SMTP server address? smtp.elasticemail.com
@@ -23,12 +29,6 @@ Enter these values when prompted by `./discourse-setup` per the [install guide](
 
 We recommend creating an [API Key][sg2] instead of using your SendGrid username and password.
 
-#### [Mailgun][gun] &mdash; 10k emails/month (with credit card)
-
-    SMTP server address? smtp.mailgun.org
-    SMTP user name?      [SMTP credentials for your domain under domains tab]
-    SMTP password?       [SMTP credentials for your domain under domains tab]
-
 #### [Mailjet][jet] &mdash; 6k emails/month
 
 Go to [My Account page](https://www.mailjet.com/account) and click on the ["SMTP and SEND API Settings"](https://www.mailjet.com/account/setup) link.
diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index 1e2e84f8c6..fca51bd2a6 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -1,13 +1,26 @@
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/postgresql_adapter'
 require 'discourse'
+require 'sidekiq/pausable'
 
 class PostgreSQLFallbackHandler
   include Singleton
 
+  attr_reader :masters_down
+  attr_accessor :initialized
+
+  DATABASE_DOWN_CHANNEL = '/global/database_down'.freeze
+
   def initialize
-    @masters_down = {}
+    @masters_down = DistributedCache.new('masters_down', namespace: false)
     @mutex = Mutex.new
+    @initialized = false
+
+    MessageBus.subscribe(DATABASE_DOWN_CHANNEL) do |payload|
+      RailsMultisite::ConnectionManagement.with_connection(payload.data['db']) do
+        clear_connections
+      end
+    end
   end
 
   def verify_master
@@ -18,41 +31,51 @@ class PostgreSQLFallbackHandler
         begin
           thread = Thread.new { initiate_fallback_to_master }
           thread.join
-          break if synchronize { @masters_down.empty? }
+          break if synchronize { @masters_down.hash.empty? }
           sleep 10
         ensure
           thread.kill
         end
       end
     end
+
+    @thread.abort_on_exception = true
   end
 
   def master_down?
     synchronize { @masters_down[namespace] }
   end
 
-  def master_down=(args)
-    synchronize { @masters_down[namespace] = args }
+  def master_down
+    synchronize do
+      @masters_down[namespace] = true
+      Sidekiq.pause! if !Sidekiq.paused?
+      MessageBus.publish(DATABASE_DOWN_CHANNEL, db: namespace)
+    end
   end
 
   def master_up(namespace)
-    synchronize { @masters_down.delete(namespace) }
+    synchronize { @masters_down.delete(namespace, publish: false) }
   end
 
   def initiate_fallback_to_master
-    @masters_down.keys.each do |key|
+    @masters_down.hash.keys.each do |key|
       RailsMultisite::ConnectionManagement.with_connection(key) do
         begin
           logger.warn "#{log_prefix}: Checking master server..."
-          connection = ActiveRecord::Base.postgresql_connection(config)
+          begin
+            connection = ActiveRecord::Base.postgresql_connection(config)
+            is_connection_active = connection.active?
+          ensure
+            connection.disconnect! if connection
+          end
 
-          if connection.active?
-            connection.disconnect!
-            ActiveRecord::Base.clear_all_connections!
+          if is_connection_active
             logger.warn "#{log_prefix}: Master server is active. Reconnecting..."
-
+            clear_connections
             self.master_up(key)
-            Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+            disable_readonly_mode
+            Sidekiq.unpause!
           end
         rescue => e
           logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'"
@@ -63,11 +86,21 @@ class PostgreSQLFallbackHandler
 
   # Use for testing
   def setup!
-    @masters_down = {}
+    @masters_down.clear
+    disable_readonly_mode
+  end
+
+  def clear_connections
+    ActiveRecord::Base.clear_active_connections!
+    ActiveRecord::Base.clear_all_connections!
   end
 
   private
 
+  def disable_readonly_mode
+    Discourse.disable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
+  end
+
   def config
     ActiveRecord::Base.connection_config
   end
@@ -96,19 +129,29 @@ module ActiveRecord
       config = config.symbolize_keys
 
       if fallback_handler.master_down?
+        Discourse.enable_readonly_mode(Discourse::PG_READONLY_MODE_KEY)
         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)
       else
         begin
           connection = postgresql_connection(config)
+          fallback_handler.initialized ||= true
         rescue PG::ConnectionBad => e
-          fallback_handler.master_down = true
+          fallback_handler.master_down
           fallback_handler.verify_master
-          raise e
+
+          if !fallback_handler.initialized
+            return postgresql_fallback_connection(config)
+          else
+            fallback_handler.clear_connections
+            raise e
+          end
         end
       end
 
diff --git a/lib/auth/default_current_user_provider.rb b/lib/auth/default_current_user_provider.rb
index eb1e014f02..f454c67e8a 100644
--- a/lib/auth/default_current_user_provider.rb
+++ b/lib/auth/default_current_user_provider.rb
@@ -76,7 +76,7 @@ class Auth::DefaultCurrentUserProvider
     # possible we have an api call, impersonate
     if api_key
       current_user = lookup_api_user(api_key, request)
-      raise Discourse::InvalidAccess unless current_user
+      raise Discourse::InvalidAccess.new(I18n.t('invalid_api_credentials'), nil, custom_message: "invalid_api_credentials") unless current_user
       raise Discourse::InvalidAccess if current_user.suspended? || !current_user.active
       @env[API_KEY_ENV] = true
     end
diff --git a/lib/autospec/rspec_runner.rb b/lib/autospec/rspec_runner.rb
index f086ef77c9..03b49f63d8 100644
--- a/lib/autospec/rspec_runner.rb
+++ b/lib/autospec/rspec_runner.rb
@@ -23,6 +23,7 @@ module Autospec
     watch(%r{^plugins/.*/discourse-markdown/.*\.js\.es6$}) { "spec/components/pretty_text_spec.rb" }
 
     watch(%r{^plugins/.*/spec/.*\.rb})
+    watch(%r{^(plugins/.*)/lib/(.*)\.rb}) { |m| "#{m[1]}/spec/lib/#{m[2]}_spec.rb" }
 
     RELOADERS = Set.new
     def self.reload(pattern); RELOADERS << pattern; end
diff --git a/lib/badge_queries.rb b/lib/badge_queries.rb
index dd70192c08..9bba4dca8c 100644
--- a/lib/badge_queries.rb
+++ b/lib/badge_queries.rb
@@ -70,7 +70,7 @@ SQL
     SELECT pa.user_id, min(pa.id) id
     FROM post_actions pa
     JOIN badge_posts p on p.id = pa.post_id
-    WHERE post_action_type_id IN (#{PostActionType.flag_types.values.join(",")}) AND
+    WHERE post_action_type_id IN (#{PostActionType.flag_types_without_custom.values.join(",")}) AND
       (:backfill OR pa.post_id IN (:post_ids) )
     GROUP BY pa.user_id
   ) x
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index c1c51717b6..30f91d44e4 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -20,6 +20,7 @@ class CookedPostProcessor
     @cooking_options[:topic_id] = post.topic_id
     @cooking_options = @cooking_options.symbolize_keys
     @cooking_options[:omit_nofollow] = true if post.omit_nofollow?
+    @cooking_options[:cook_method] = post.cook_method
 
     analyzer = post.post_analyzer
     @doc = Nokogiri::HTML::fragment(analyzer.cook(post.raw, @cooking_options))
@@ -29,10 +30,13 @@ class CookedPostProcessor
 
   def post_process(bypass_bump = false)
     DistributedMutex.synchronize("post_process_#{@post.id}") do
+      DiscourseEvent.trigger(:before_post_process_cooked, @doc, @post)
       keep_reverse_index_up_to_date
       post_process_images
       post_process_oneboxes
       optimize_urls
+      update_post_image
+      enforce_nofollow
       pull_hotlinked_images(bypass_bump)
       grant_badges
       DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
@@ -109,8 +113,16 @@ class CookedPostProcessor
   end
 
   def oneboxed_image_uploads
-    urls = oneboxed_images.map { |img| img["src"] }
-    Upload.where(origin: urls)
+    urls = Set.new
+
+    oneboxed_images.each do |img|
+      url = img["src"].sub(/^https?:/i, "")
+      urls << url
+      urls << "http:#{url}"
+      urls << "https:#{url}"
+    end
+
+    Upload.where(origin: urls.to_a)
   end
 
   def limit_size!(img)
@@ -174,7 +186,7 @@ class CookedPostProcessor
     # we can *always* crawl our own images
     return unless SiteSetting.crawl_images? || Discourse.store.has_been_uploaded?(url)
 
-    @size_cache[url] ||= FastImage.size(absolute_url)
+    @size_cache[url] = FastImage.size(absolute_url)
   rescue Zlib::BufError # FastImage.size raises BufError for some gifs
   end
 
@@ -190,24 +202,20 @@ class CookedPostProcessor
 
   def convert_to_link!(img)
     src = img["src"]
-    return unless src.present?
+    return if src.blank? || is_a_hyperlink?(img)
 
     width, height = img["width"].to_i, img["height"].to_i
-    original_width, original_height = get_size(src)
+    # TODO: store original dimentions in db
+    original_width, original_height = (get_size(src) || [0, 0]).map(&:to_i)
 
     # can't reach the image...
-    if original_width.nil? ||
-       original_height.nil? ||
-       original_width == 0 ||
-       original_height == 0
+    if original_width == 0 || original_height == 0
       Rails.logger.info "Can't reach '#{src}' to get its dimension."
       return
     end
 
-    return if original_width.to_i <= width && original_height.to_i <= height
-    return if original_width.to_i <= SiteSetting.max_image_width && original_height.to_i <= SiteSetting.max_image_height
-
-    return if is_a_hyperlink?(img)
+    return if original_width <= width && original_height <= height
+    return if original_width <= SiteSetting.max_image_width && original_height <= SiteSetting.max_image_height
 
     crop = false
     if original_width.to_f / original_height.to_f < MIN_RATIO_TO_CROP
@@ -228,8 +236,7 @@ class CookedPostProcessor
     parent = img.parent
     while parent
       return true if parent.name == "a"
-      break unless parent.respond_to? :parent
-      parent = parent.parent
+      parent = parent.parent if parent.respond_to?(:parent)
     end
     false
   end
@@ -308,24 +315,15 @@ class CookedPostProcessor
       Oneboxer.onebox(url, args)
     end
 
-    update_post_image
+    uploads = oneboxed_image_uploads.select(:url, :origin)
+    oneboxed_images.each do |img|
+      url = img["src"].sub(/^https?:/i, "")
+      upload = uploads.find { |u| u.origin.sub(/^https?:/i, "") == url }
+      img["src"] = upload.url if upload.present?
+    end
 
     # make sure we grab dimensions for oneboxed images
     oneboxed_images.each { |img| limit_size!(img) }
-
-    uploads = oneboxed_image_uploads.select(:url, :origin)
-    oneboxed_images.each do |img|
-      upload = uploads.detect { |u| u.origin == img["src"] }
-      next unless upload.present?
-      img["src"] = upload.url
-      # make sure we grab dimensions for oneboxed images
-      limit_size!(img)
-    end
-
-    # respect nofollow admin settings
-    if !@cooking_options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
-      PrettyText.add_rel_nofollow_to_user_content(@doc)
-    end
   end
 
   def optimize_urls
@@ -354,6 +352,12 @@ class CookedPostProcessor
     end
   end
 
+  def enforce_nofollow
+    if !@cooking_options[:omit_nofollow] && SiteSetting.add_rel_nofollow_to_user_content
+      PrettyText.add_rel_nofollow_to_user_content(@doc)
+    end
+  end
+
   def pull_hotlinked_images(bypass_bump = false)
     # is the job enabled?
     return unless SiteSetting.download_remote_images_to_local?
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 698294f476..49f0a3ec1d 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -159,6 +159,7 @@ class DiscourseRedis
 
       fallback_handler.verify_master if !fallback_handler.master
       Discourse.received_readonly!
+      nil
     else
       raise ex
     end
@@ -231,6 +232,14 @@ class DiscourseRedis
     @redis.client.reconnect
   end
 
+  def namespace_key(key)
+    if @namespace
+      "#{namespace}:#{key}"
+    else
+      key
+    end
+  end
+
   def namespace
     RailsMultisite::ConnectionManagement.current_db
   end
diff --git a/lib/distributed_cache.rb b/lib/distributed_cache.rb
index b88e4679c7..2c454526db 100644
--- a/lib/distributed_cache.rb
+++ b/lib/distributed_cache.rb
@@ -10,6 +10,7 @@ require 'base64'
 class DistributedCache
 
   class Manager
+    CHANNEL_NAME ||= '/distributed_hash'.freeze
 
     def initialize(message_bus = nil)
       @subscribers = []
@@ -31,7 +32,7 @@ class DistributedCache
         begin
           current = @subscribers[i]
 
-          next if payload["origin"] == current.identity
+          next if payload["origin"] == current.identity && !Rails.env.test?
           next if current.key != payload["hash_key"]
           next if payload["discourse_version"] != Discourse.git_version
 
@@ -51,15 +52,11 @@ class DistributedCache
       end
     end
 
-    def channel_name
-      "/distributed_hash".freeze
-    end
-
     def ensure_subscribe!
       return if @subscribed
       @lock.synchronize do
         return if @subscribed
-        @message_bus.subscribe(channel_name) do |message|
+        @message_bus.subscribe(CHANNEL_NAME) do |message|
           @lock.synchronize do
             process_message(message)
           end
@@ -72,7 +69,7 @@ class DistributedCache
       message[:origin] = hash.identity
       message[:hash_key] = hash.key
       message[:discourse_version] = Discourse.git_version
-      @message_bus.publish(channel_name, message, user_ids: [-1])
+      @message_bus.publish(CHANNEL_NAME, message, user_ids: [-1])
     end
 
     def set(hash, key, value)
@@ -105,10 +102,11 @@ class DistributedCache
 
   attr_reader :key
 
-  def initialize(key, manager = nil)
+  def initialize(key, manager: nil, namespace: true)
     @key = key
     @data = {}
     @manager = manager || DistributedCache.default_manager
+    @namespace = namespace
 
     @manager.ensure_subscribe!
     @manager.register(self)
@@ -130,9 +128,9 @@ class DistributedCache
     hash[k]
   end
 
-  def delete(k)
+  def delete(k, publish: true)
     k = k.to_s if Symbol === k
-    @manager.delete(self, k)
+    @manager.delete(self, k) if publish
     hash.delete(k)
   end
 
@@ -142,7 +140,13 @@ class DistributedCache
   end
 
   def hash(db = nil)
-    db ||= RailsMultisite::ConnectionManagement.current_db
+    db =
+      if @namespace
+        db || RailsMultisite::ConnectionManagement.current_db
+      else
+        RailsMultisite::ConnectionManagement::DEFAULT
+      end
+
     @data[db] ||= ThreadSafe::Hash.new
   end
 
diff --git a/lib/email_cook.rb b/lib/email_cook.rb
index f440be6389..162643da66 100644
--- a/lib/email_cook.rb
+++ b/lib/email_cook.rb
@@ -21,12 +21,11 @@ class EmailCook
     str.scan(EmailCook.url_regexp).each do |m|
       url = m[0]
 
-      val = "<a href='#{url}'>#{url}</a>"
-
-      # Onebox consideration
       if str.strip == url
-        oneboxed = Oneboxer.onebox(url)
-        val = oneboxed if oneboxed.present?
+        # this could be oneboxed
+        val = %|<a href="#{url}" class="onebox" target="_blank">#{url}</a>|
+      else
+        val = %|<a href="#{url}">#{url}</a>|
       end
 
       str.gsub!(url, val)
diff --git a/lib/final_destination.rb b/lib/final_destination.rb
index 80734df4b0..f578867053 100644
--- a/lib/final_destination.rb
+++ b/lib/final_destination.rb
@@ -1,11 +1,30 @@
-require "socket"
-require "ipaddr"
+require 'socket'
+require 'ipaddr'
 require 'excon'
 require 'rate_limiter'
 
 # Determine the final endpoint for a Web URI, following redirects
 class FinalDestination
 
+  def self.clear_https_cache!(domain)
+    key = redis_https_key(domain)
+    $redis.without_namespace.del(key)
+  end
+
+  def self.cache_https_domain(domain)
+    key = redis_https_key(domain)
+    $redis.without_namespace.setex(key, "1", 1.day.to_i).present?
+  end
+
+  def self.is_https_domain?(domain)
+    key = redis_https_key(domain)
+    $redis.without_namespace.get(key).present?
+  end
+
+  def self.redis_https_key(domain)
+    "HTTPS_DOMAIN_#{domain}"
+  end
+
   attr_reader :status, :cookie, :status_code
 
   def initialize(url, opts = nil)
@@ -31,6 +50,7 @@ class FinalDestination
     @status = :ready
     @http_verb = @force_get_hosts.any? { |host| hostname_matches?(host) } ? :get : :head
     @cookie = nil
+    @limited_ips = []
   end
 
   def self.connection_timeout
@@ -66,6 +86,11 @@ class FinalDestination
   end
 
   def resolve
+    if @uri && @uri.port == 80 && FinalDestination.is_https_domain?(@uri.hostname)
+      @uri.scheme = "https"
+      @uri = URI(@uri.to_s)
+    end
+
     if @limit < 0
       @status = :too_many_redirects
       return nil
@@ -132,9 +157,17 @@ class FinalDestination
     end
 
     if location
+      old_port = @uri.port
+
       location = "#{@uri.scheme}://#{@uri.host}#{location}" if location[0] == "/"
       @uri = URI(location) rescue nil
       @limit -= 1
+
+      # https redirect, so just cache that whole new domain is https
+      if old_port == 80 && @uri.port == 443 && (URI::HTTPS === @uri)
+        FinalDestination.cache_https_domain(@uri.hostname)
+      end
+
       return resolve
     end
 
@@ -196,8 +229,9 @@ class FinalDestination
     end
 
     # Rate limit how often this IP can be crawled
-    unless @opts[:skip_rate_limit]
-      RateLimiter.new(nil, "crawl-destination-ip:#{address_s}", 100, 1.hour).performed!
+    if !@opts[:skip_rate_limit] && !@limited_ips.include?(address)
+      @limited_ips << address
+      RateLimiter.new(nil, "crawl-destination-ip:#{address_s}", 1000, 1.hour).performed!
     end
 
     true
diff --git a/lib/flag_settings.rb b/lib/flag_settings.rb
new file mode 100644
index 0000000000..3fb700d7cc
--- /dev/null
+++ b/lib/flag_settings.rb
@@ -0,0 +1,42 @@
+class FlagSettings
+
+  attr_reader(
+    :without_custom_types,
+    :notify_types,
+    :topic_flag_types,
+    :auto_action_types,
+    :custom_types
+  )
+
+  def initialize
+    @all_flag_types = Enum.new
+    @topic_flag_types = Enum.new
+    @notify_types = Enum.new
+    @auto_action_types = Enum.new
+    @custom_types = Enum.new
+    @without_custom_types = Enum.new
+  end
+
+  def add(id, name, details = nil)
+    details ||= {}
+
+    @all_flag_types[name] = id
+    @topic_flag_types[name] = id if !!details[:topic_type]
+    @notify_types[name] = id if !!details[:notify_type]
+    @auto_action_types[name] = id if !!details[:auto_action_type]
+    if !!details[:custom_type]
+      @custom_types[name] = id
+    else
+      @without_custom_types[name] = id
+    end
+  end
+
+  def is_flag?(key)
+    @all_flag_types.valid?(key)
+  end
+
+  def flag_types
+    @all_flag_types
+  end
+
+end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 773dfcb0da..ccf6a8b557 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -286,15 +286,20 @@ class Guardian
   end
 
   def can_send_private_message?(target)
-    (target.is_a?(Group) || target.is_a?(User)) &&
+    is_user = target.is_a?(User)
+    is_group = target.is_a?(Group)
+
+    (is_group || is_user) &&
     # User is authenticated
     authenticated? &&
     # Have to be a basic level at least
     @user.has_trust_level?(SiteSetting.min_trust_to_send_messages) &&
+    # User disabled private message
+    (is_staff? || is_group || target.user_option.allow_private_messages) &&
     # PMs are enabled
     (is_staff? || SiteSetting.enable_private_messages) &&
     # Can't send PMs to suspended users
-    (is_staff? || target.is_a?(Group) || !target.suspended?) &&
+    (is_staff? || is_group || !target.suspended?) &&
     # Blocked users can only send PM to staff
     (!is_blocked? || target.staff?)
   end
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index cd274e0d05..b5d4c43f67 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -10,13 +10,14 @@ module PostGuardian
     return false if (action_key == :notify_user && !is_staff? && opts[:is_warning].present? && opts[:is_warning] == 'true')
 
     taken = opts[:taken_actions].try(:keys).to_a
-    is_flag = PostActionType.is_flag?(action_key)
+    is_flag = PostActionType.flag_types_without_custom[action_key]
     already_taken_this_action = taken.any? && taken.include?(PostActionType.types[action_key])
-    already_did_flagging      = taken.any? && (taken & PostActionType.flag_types.values).any?
+    already_did_flagging      = taken.any? && (taken & PostActionType.flag_types_without_custom.values).any?
 
     result = if authenticated? && post && !@user.anonymous?
 
-      return false if action_key == :notify_moderators && !SiteSetting.enable_private_messages
+      return false if [:notify_user, :notify_moderators].include?(action_key) &&
+        !SiteSetting.enable_private_messages?
 
       # we allow flagging for trust level 1 and higher
       # always allowed for private messages
@@ -34,11 +35,9 @@ module PostGuardian
       # don't like your own stuff
       not(action_key == :like && is_my_own?(post)) &&
 
-      # new users can't notify_user because they are not allowed to send private messages
-      not(action_key == :notify_user && !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages)) &&
-
-      # can't send private messages if they're disabled globally
-      not(action_key == :notify_user && !SiteSetting.enable_private_messages) &&
+      # new users can't notify_user or notify_moderators because they are not allowed to send private messages
+      not((action_key == :notify_user || action_key == :notify_moderators) &&
+        !@user.has_trust_level?(SiteSetting.min_trust_to_send_messages)) &&
 
       # no voting more than once on single vote topics
       not(action_key == :vote && opts[:voted_in_topic] && post.topic.has_meta_data_boolean?(:single_vote))
diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index b8db72d315..1bf07ef82c 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -1,8 +1,13 @@
 #mixin for all guardian methods dealing with topic permisions
 module TopicGuardian
 
-  def can_remove_allowed_users?(topic)
-    is_staff?
+  def can_remove_allowed_users?(topic, target_user = nil)
+    is_staff? ||
+    (
+      topic.allowed_users.count > 1 &&
+      topic.user != target_user &&
+      !!(target_user && user == target_user)
+    )
   end
 
   # Creating Methods
diff --git a/lib/import_export/category_importer.rb b/lib/import_export/category_importer.rb
index 8493b006a0..b432bd078b 100644
--- a/lib/import_export/category_importer.rb
+++ b/lib/import_export/category_importer.rb
@@ -39,14 +39,15 @@ module ImportExport
 
     def import_categories
       id = @export_data[:category].delete(:id)
+      import_id = "#{id}#{import_source}"
 
-      parent = CategoryCustomField.where(name: 'import_id', value: id.to_s).first.try(:category)
+      parent = CategoryCustomField.where(name: 'import_id', value: import_id).first.try(:category)
 
       unless parent
         permissions = @export_data[:category].delete(:permissions_params)
         parent = Category.new(@export_data[:category])
         parent.user_id = @topic_importer.new_user_id(@export_data[:category][:user_id]) # imported user's new id
-        parent.custom_fields["import_id"] = id
+        parent.custom_fields["import_id"] = import_id
         parent.permissions = permissions.present? ? permissions : { "everyone" => CategoryGroup.permission_types[:full] }
         parent.save!
         set_category_description(parent, @export_data[:category][:description])
@@ -54,14 +55,15 @@ module ImportExport
 
       @export_data[:subcategories].each do |cat_attrs|
         id = cat_attrs.delete(:id)
-        existing = CategoryCustomField.where(name: 'import_id', value: id.to_s).first.try(:category)
+        import_id = "#{id}#{import_source}"
+        existing = CategoryCustomField.where(name: 'import_id', value: import_id).first.try(:category)
 
         unless existing
           permissions = cat_attrs.delete(:permissions_params)
           subcategory = Category.new(cat_attrs)
           subcategory.parent_category_id = parent.id
           subcategory.user_id = @topic_importer.new_user_id(cat_attrs[:user_id])
-          subcategory.custom_fields["import_id"] = id
+          subcategory.custom_fields["import_id"] = import_id
           subcategory.permissions = permissions.present? ? permissions : { "everyone" => CategoryGroup.permission_types[:full] }
           subcategory.save!
           set_category_description(subcategory, cat_attrs[:description])
@@ -79,5 +81,9 @@ module ImportExport
     def import_topics
       @topic_importer.import_topics
     end
+
+    def import_source
+      @_import_source ||= "#{ENV['IMPORT_SOURCE'] || ''}"
+    end
   end
 end
diff --git a/lib/import_export/topic_importer.rb b/lib/import_export/topic_importer.rb
index 6b1d9f5d26..721536d722 100644
--- a/lib/import_export/topic_importer.rb
+++ b/lib/import_export/topic_importer.rb
@@ -18,14 +18,15 @@ module ImportExport
 
     def import_users
       @export_data[:users].each do |u|
+        import_id = "#{u[:id]}#{import_source}"
         existing = User.with_email(u[:email]).first
         if existing
-          if existing.custom_fields["import_id"] != u[:id]
-            existing.custom_fields["import_id"] = u[:id]
+          if existing.custom_fields["import_id"] != import_id
+            existing.custom_fields["import_id"] = import_id
             existing.save!
           end
         else
-          u = create_user(u, u[:id]) # see ImportScripts::Base
+          u = create_user(u, import_id) # see ImportScripts::Base
         end
       end
       self
@@ -37,13 +38,15 @@ module ImportExport
         print t[:title]
 
         first_post_attrs = t[:posts].first.merge(t.slice(*(TopicExporter::TOPIC_ATTRS - [:id, :category_id])))
+
         first_post_attrs[:user_id] = new_user_id(first_post_attrs[:user_id])
         first_post_attrs[:category] = new_category_id(t[:category_id])
 
-        first_post = PostCustomField.where(name: "import_id", value: first_post_attrs[:id]).first.try(:post)
+        import_id = "#{first_post_attrs[:id]}#{import_source}"
+        first_post = PostCustomField.where(name: "import_id", value: import_id).first&.post
 
         unless first_post
-          first_post = create_post(first_post_attrs, first_post_attrs[:id])
+          first_post = create_post(first_post_attrs, import_id)
         end
 
         topic_id = first_post.topic_id
@@ -51,10 +54,17 @@ module ImportExport
         t[:posts].each_with_index do |post_data, i|
           next if i == 0
           print "."
-          existing = PostCustomField.where(name: "import_id", value: post_data[:id]).first.try(:post)
+          post_import_id = "#{post_data[:id]}#{import_source}"
+          existing = PostCustomField.where(name: "import_id", value: post_import_id).first&.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
+            # see ImportScripts::Base
+            create_post(
+              post_data.merge(
+                topic_id: topic_id,
+                user_id: new_user_id(post_data[:user_id])
+              ),
+              post_import_id
+            )
           end
         end
       end
@@ -65,12 +75,16 @@ module ImportExport
     end
 
     def new_user_id(external_user_id)
-      ucf = UserCustomField.where(name: "import_id", value: external_user_id.to_s).first
+      ucf = UserCustomField.where(name: "import_id", value: "#{external_user_id}#{import_source}").first
       ucf ? ucf.user_id : Discourse::SYSTEM_USER_ID
     end
 
     def new_category_id(external_category_id)
-      CategoryCustomField.where(name: "import_id", value: external_category_id).first.category_id rescue nil
+      CategoryCustomField.where(name: "import_id", value: "#{external_category_id}#{import_source}").first.category_id rescue nil
+    end
+
+    def import_source
+      @_import_source ||= "#{ENV['IMPORT_SOURCE'] || ''}"
     end
   end
 end
diff --git a/lib/method_profiler.rb b/lib/method_profiler.rb
new file mode 100644
index 0000000000..6d99b9f88e
--- /dev/null
+++ b/lib/method_profiler.rb
@@ -0,0 +1,43 @@
+# see https://samsaffron.com/archive/2017/10/18/fastest-way-to-profile-a-method-in-ruby
+class MethodProfiler
+  def self.patch(klass, methods, name)
+    patches = methods.map do |method_name|
+      <<~RUBY
+      unless defined?(#{method_name}__mp_unpatched)
+        alias_method :#{method_name}__mp_unpatched, :#{method_name}
+        def #{method_name}(*args, &blk)
+          unless prof = Thread.current[:_method_profiler]
+            return #{method_name}__mp_unpatched(*args, &blk)
+          end
+          begin
+            start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            #{method_name}__mp_unpatched(*args, &blk)
+          ensure
+            data = (prof[:#{name}] ||= {duration: 0.0, calls: 0})
+            data[:duration] += Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+            data[:calls] += 1
+          end
+        end
+      end
+      RUBY
+    end.join("\n")
+
+    klass.class_eval patches
+  end
+
+  def self.start
+    Thread.current[:_method_profiler] = {
+      __start: Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    }
+  end
+
+  def self.stop
+    finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    if data = Thread.current[:_method_profiler]
+      Thread.current[:_method_profiler] = nil
+      start = data.delete(:__start)
+      data[:total_duration] = finish - start
+    end
+    data
+  end
+end
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index a2dae84e97..7a57ba94de 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -1,7 +1,43 @@
+# frozen_string_literal: true
+
 require_dependency 'middleware/anonymous_cache'
 
 class Middleware::RequestTracker
 
+  @@detailed_request_loggers = nil
+
+  # register callbacks for detailed request loggers called on every request
+  # example:
+  #
+  # Middleware::RequestTracker.detailed_request_logger(->|env, data| do
+  #   # do stuff with env and data
+  # end
+  def self.register_detailed_request_logger(callback)
+
+    unless @patched_instrumentation
+      require_dependency "method_profiler"
+      MethodProfiler.patch(PG::Connection, [
+        :exec, :async_exec, :exec_prepared, :send_query_prepared, :query
+      ], :sql)
+
+      MethodProfiler.patch(Redis::Client, [
+        :call, :call_pipeline
+      ], :redis)
+      @patched_instrumentation = true
+    end
+
+    (@@detailed_request_loggers ||= []) << callback
+  end
+
+  def self.unregister_detailed_request_logger(callback)
+    @@detailed_request_loggers.delete callback
+
+    if @@detailed_request_loggers.length == 0
+      @detailed_request_loggers = nil
+    end
+
+  end
+
   def initialize(app, settings = {})
     @app = app
   end
@@ -44,19 +80,17 @@ class Middleware::RequestTracker
 
   end
 
-  TRACK_VIEW = "HTTP_DISCOURSE_TRACK_VIEW".freeze
-  CONTENT_TYPE = "Content-Type".freeze
-  def self.get_data(env, result)
+  def self.get_data(env, result, timing)
     status, headers = result
     status = status.to_i
 
     helper = Middleware::AnonymousCache::Helper.new(env)
     request = Rack::Request.new(env)
 
-    env_track_view = env[TRACK_VIEW]
+    env_track_view = env["HTTP_DISCOURSE_TRACK_VIEW"]
     track_view = status == 200
-    track_view &&= env_track_view != "0".freeze && env_track_view != "false".freeze
-    track_view &&= env_track_view || (request.get? && !request.xhr? && headers[CONTENT_TYPE] =~ /text\/html/)
+    track_view &&= env_track_view != "0" && env_track_view != "false"
+    track_view &&= env_track_view || (request.get? && !request.xhr? && headers["Content-Type"] =~ /text\/html/)
     track_view = !!track_view
 
     {
@@ -65,22 +99,32 @@ class Middleware::RequestTracker
       has_auth_cookie: helper.has_auth_cookie?,
       is_background: request.path =~ /^\/message-bus\// || request.path == /\/topics\/timings/,
       is_mobile: helper.is_mobile?,
-      track_view: track_view
+      track_view: track_view,
+      timing: timing
     }
+
   end
 
   def call(env)
+    MethodProfiler.start if @@detailed_request_loggers
     result = @app.call(env)
+    info = MethodProfiler.stop if @@detailed_request_loggers
+    result
   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, info) rescue nil
     host = RailsMultisite::ConnectionManagement.host(env)
 
     if data
       if result && (headers = result[1])
         headers["X-Discourse-TrackView"] = "1" if data[:track_view]
       end
+
+      if @@detailed_request_loggers
+        @@detailed_request_loggers.each { |logger| logger.call(env, data) }
+      end
+
       log_later(data, host)
     end
 
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index db1c866baf..721441229f 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -90,6 +90,15 @@ class Plugin::Instance
     end
   end
 
+  def replace_flags
+    settings = ::FlagSettings.new
+    yield settings
+
+    reloadable_patch do |plugin|
+      ::PostActionType.replace_flag_settings(settings) if plugin.enabled?
+    end
+  end
+
   def whitelist_staff_user_custom_field(field)
     reloadable_patch do |plugin|
       ::User.register_plugin_staff_custom_field(field, plugin) if plugin.enabled?
diff --git a/lib/plugin/metadata.rb b/lib/plugin/metadata.rb
index 134f82d170..d516d4ccb6 100644
--- a/lib/plugin/metadata.rb
+++ b/lib/plugin/metadata.rb
@@ -14,7 +14,7 @@ class Plugin::Metadata
     "discourse-details",
     "discourse-nginx-performance-report",
     "discourse-push-notifications",
-    "discourse-slack-official",
+    "discourse-chat-integration",
     "discourse-solved",
     "Spoiler Alert!",
     "staff-notes",
@@ -31,7 +31,8 @@ class Plugin::Metadata
     "discourse-bbcode",
     "discourse-affiliate",
     "discourse-translator",
-    "discourse-patreon"
+    "discourse-patreon",
+    "discourse-prometheus"
   ])
 
   FIELDS ||= [:name, :about, :version, :authors, :url, :required_version]
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index dc28b66bce..be0e6a8026 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -109,10 +109,20 @@ class PostCreator
       # Make sure none of the users have muted the creator
       users = User.where(username: names).pluck(:id, :username).to_h
 
-      MutedUser.where(user_id: users.keys, muted_user_id: @user.id).pluck(:user_id).each do |m|
+      User
+        .joins("LEFT JOIN user_options ON user_options.user_id = users.id")
+        .joins("LEFT JOIN muted_users ON muted_users.muted_user_id = #{@user.id.to_i}")
+        .where("user_options.user_id IS NOT NULL")
+        .where("
+          (user_options.user_id IN (:user_ids) AND NOT user_options.allow_private_messages) OR
+          muted_users.user_id IN (:user_ids)
+        ", user_ids: users.keys)
+        .pluck(:id).each do |m|
+
         errors[:base] << I18n.t(:not_accepting_pms, username: users[m])
-        return false
       end
+
+      return false if errors[:base].present?
     end
 
     if new_topic?
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index f443a64d93..01f14a1f80 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -316,7 +316,7 @@ class PostRevisor
 
   def remove_flags_and_unhide_post
     return unless editing_a_flagged_and_hidden_post?
-    @post.post_actions.where(post_action_type_id: PostActionType.flag_types.values).each do |action|
+    @post.post_actions.where(post_action_type_id: PostActionType.flag_types_without_custom.values).each do |action|
       action.remove_act!(Discourse.system_user)
     end
     @post.unhide!
diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rb
index 68965f4ae9..6346b16dae 100644
--- a/lib/scheduler/defer.rb
+++ b/lib/scheduler/defer.rb
@@ -74,6 +74,8 @@ module Scheduler
       end
     rescue => ex
       Discourse.handle_job_exception(ex, message: "Processing deferred code queue")
+    ensure
+      ActiveRecord::Base.connection_handler.clear_active_connections!
     end
   end
 
diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
index fabb38a398..e9d98b9abd 100644
--- a/lib/scheduler/manager.rb
+++ b/lib/scheduler/manager.rb
@@ -109,6 +109,7 @@ module Scheduler
               success: !failed,
               error: error
             )
+            DiscourseEvent.trigger(:scheduled_job_ran, stat)
           end
         end
         attempts(3) do
diff --git a/lib/sidekiq/pausable.rb b/lib/sidekiq/pausable.rb
index c7cd9b5928..1d96f19e16 100644
--- a/lib/sidekiq/pausable.rb
+++ b/lib/sidekiq/pausable.rb
@@ -76,7 +76,11 @@ class Sidekiq::Pausable
     if Sidekiq.paused?
       worker.class.perform_in(@delay, *msg['args'])
     else
-      yield
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      result = yield
+      duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+      DiscourseEvent.trigger(:sidekiq_job_ran, worker, msg, queue, duration)
+      result
     end
   end
 
diff --git a/lib/single_sign_on.rb b/lib/single_sign_on.rb
index 7578a8aabe..ef5a47d7b1 100644
--- a/lib/single_sign_on.rb
+++ b/lib/single_sign_on.rb
@@ -1,9 +1,10 @@
 class SingleSignOn
   ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
                :bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
-               :add_groups, :remove_groups]
+               :add_groups, :remove_groups, :groups]
   FIXNUMS = []
   BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
+  ARRAYS = [:groups]
   NONCE_EXPIRY_TIME = 10.minutes
 
   attr_accessor(*ACCESSORS)
@@ -40,6 +41,7 @@ class SingleSignOn
       if BOOLS.include? k
         val = ["true", "false"].include?(val) ? val == "true" : nil
       end
+      val = Array(val) if ARRAYS.include?(k) && !val.nil?
       sso.send("#{k}=", val)
     end
 
@@ -78,7 +80,7 @@ class SingleSignOn
   end
 
   def payload
-    payload = Base64.encode64(unsigned_payload)
+    payload = Base64.strict_encode64(unsigned_payload)
     "sso=#{CGI::escape(payload)}&sig=#{sign(payload)}"
   end
 
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 703e7e9fd3..7701e89cfc 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -65,6 +65,9 @@ module SiteSettingExtension
 
   def setting(name_arg, default = nil, opts = {})
     name = name_arg.to_sym
+
+    shadowed_val = nil
+
     mutex.synchronize do
       defaults.load_setting(
         name,
@@ -82,6 +85,7 @@ module SiteSettingExtension
         val = GlobalSetting.send(name)
 
         unless val.nil? || (val == ''.freeze)
+          shadowed_val = val
           hidden_settings << name
           shadowed_settings << name
         end
@@ -104,7 +108,11 @@ module SiteSettingExtension
         opts.extract!(*SiteSettings::TypeSupervisor::CONSUMED_OPTS)
       )
 
-      setup_methods(name)
+      if !shadowed_val.nil?
+        setup_shadowed_methods(name, shadowed_val)
+      else
+        setup_methods(name)
+      end
     end
   end
 
@@ -291,6 +299,24 @@ module SiteSettingExtension
     [changes, deletions]
   end
 
+  def setup_shadowed_methods(name, value)
+    clean_name = name.to_s.sub("?", "").to_sym
+
+    define_singleton_method clean_name do
+      value
+    end
+
+    define_singleton_method "#{clean_name}?" do
+      value
+    end
+
+    define_singleton_method "#{clean_name}=" do |val|
+      Rails.logger.warn("An attempt was to change #{clean_name} SiteSetting to #{val} however it is shadowed so this will be ignored!")
+      nil
+    end
+
+  end
+
   def setup_methods(name)
     clean_name = name.to_s.sub("?", "").to_sym
 
diff --git a/lib/slug.rb b/lib/slug.rb
index 5ee570198e..dc95095b7b 100644
--- a/lib/slug.rb
+++ b/lib/slug.rb
@@ -3,8 +3,9 @@
 module Slug
 
   CHAR_FILTER_REGEXP = /[:\/\?#\[\]@!\$&'\(\)\*\+,;=_\.~%\\`^\s|\{\}"<>]+/ # :/?#[]@!$&'()*+,;=_.~%\`^|{}"<>
+  MAX_LENGTH = 255
 
-  def self.for(string, default = 'topic')
+  def self.for(string, default = 'topic', max_length = MAX_LENGTH)
     slug =
       case (SiteSetting.slug_generation_method || :ascii).to_sym
       when :ascii then self.ascii_generator(string)
@@ -13,30 +14,38 @@ module Slug
       end
     # Reject slugs that only contain numbers, because they would be indistinguishable from id's.
     slug = (slug =~ /[^\d]/ ? slug : '')
+    slug = self.prettify_slug(slug, max_length: max_length)
     slug.blank? ? default : slug
   end
 
-  def self.sanitize(string)
-    self.encoded_generator(string)
+  def self.sanitize(string, downcase: false, max_length: MAX_LENGTH)
+    slug = self.encoded_generator(string, downcase: downcase)
+    self.prettify_slug(slug, max_length: max_length)
   end
 
   private
 
-  def self.ascii_generator(string)
-    string.tr("'", "")
-      .parameterize
+  def self.prettify_slug(slug, max_length:)
+    slug
       .tr("_", "-")
+      .truncate(max_length, omission: '')
+      .squeeze('-') # squeeze continuous dashes to prettify slug
+      .gsub(/\A-+|-+\z/, '') # remove possible trailing and preceding dashes
   end
 
-  def self.encoded_generator(string)
+  def self.ascii_generator(string)
+    string.tr("'", "").parameterize
+  end
+
+  def self.encoded_generator(string, downcase: true)
     # This generator will sanitize almost all special characters,
     # including reserved characters from RFC3986.
     # See also URI::REGEXP::PATTERN.
-    string.strip
+    string = string.strip
       .gsub(/\s+/, '-')
       .gsub(CHAR_FILTER_REGEXP, '')
-      .gsub(/\A-+|-+\z/, '') # remove possible trailing and preceding dashes
-      .squeeze('-') # squeeze continuous dashes to prettify slug
+
+    downcase ? string.downcase : string
   end
 
   def self.none_generator(string)
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 6c13d53ae4..144a92e865 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -58,10 +58,12 @@ task 'posts:rebake_match', [:pattern, :type, :delay] => [:environment] do |_, ar
     exit 1
   end
 
+  search = Post.raw_match(pattern, type)
+
   rebaked = 0
   total = search.count
 
-  Post.raw_match(pattern, type).find_each do |post|
+  search.find_each do |post|
     rebake_post(post)
     print_status(rebaked += 1, total)
     sleep(delay) if delay
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index ef84747cce..7d1ce3ab30 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -42,6 +42,15 @@ def reindex_search(db = RailsMultisite::ConnectionManagement.current_db)
     id = c["id"]
     name = c["name"]
     SearchIndexer.update_categories_index(id, name)
+
+    putc '.'
+  end
+
+  puts '', 'Tags'
+
+  Tag.exec_sql('select id, name from tags').each do |t|
+    SearchIndexer.update_tags_index(t['id'], t['name'])
+    putc '.'
   end
 
   puts
diff --git a/lib/topic_creator.rb b/lib/topic_creator.rb
index 36c20247c0..69ca76d73c 100644
--- a/lib/topic_creator.rb
+++ b/lib/topic_creator.rb
@@ -190,7 +190,7 @@ class TopicCreator
     names = usernames.split(',').flatten
     len = 0
 
-    User.where(username: names).each do |user|
+    User.includes(:user_option).where(username: names).find_each do |user|
       check_can_send_permission!(topic, user)
       @added_users << user
       topic.topic_allowed_users.build(user_id: user.id)
diff --git a/lib/version.rb b/lib/version.rb
index f659a5e014..6faaf7a21f 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 9
       TINY  = 0
-      PRE   = 'beta13'
+      PRE   = 'beta14'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ar.yml b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
index 6e7957ffda..c604ee2726 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ar.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ar.yml
@@ -28,12 +28,10 @@ ar:
     bio: "مرحباً, انا لستُ شخص حقيقي, انا الروبوت الذي سيقوم بتوجيهك لكي تتعلم استخدام ادوات هذا الموقع, لكي تتفاعل معي ارسل لي رسالة او اشر الي بـ**`@%{discobot_username}`** في اي مكان."
     timeout:
       message: |-
-        مرحباً @%{username}, انا احاول ان اتفقدك لاني لم اسمع منك منذ وقت طويل.
+        مرحباً @%{username}, انا فقط اتفقدك لانك غائب منذ وقت طويل.
 
         - للاستمرار, رد علي في اي وقت.
-
         - ان كنت ترغب بتجاوز هذه الخطوة فقط قُل `%{skip_trigger}`.
-
         - للبدء من جديد, قُل  `%{reset_trigger}`.
 
         ان كنت لا ترغب بالقيام بذلك فلا بأس ايضاً, انا روبوت. و لن تجرح مشاعري. :sob:
@@ -147,11 +145,11 @@ ar:
         message: |-
           شكرا لإنضمامك إلي %{title}, و مرحباً بك!
 
-          انا فقط روبوت, لكن [طاقم العمل](/about) ايضاً هنا لخدمتك إذا احتجت التواصل مع شخص حقيقي.
+          انا روبوت, لكن [طاقم العمل](/about) هنا لخدمتك إذا احتجت التواصل مع شخص حقيقي.
 
           لأسباب وقائية, نحن نقوم بالحد من صلاحيات الأعضاء الجدد. سوف تحصل علي صلاحيات جديده و ([شارات](/badges)) مع الوقت.
 
-          نحن نؤمن [بالسلوك المجتمعي المتحضر](/guidelines) في جميع الاوقات.
+          نحن نؤمن [بالسلوك المجتمعي المتحضر](/guidelines) لذا نتوقع منك المثل.
       onebox:
         instructions: |-
           التالي, هل يمكنك ان تشارك احد هذه الروابط معي؟ رد مع **وضع الرابط في سطر منفصل**, و سيظهر ملخص للصفحة المشير اليها.
diff --git a/plugins/discourse-narrative-bot/config/locales/server.de.yml b/plugins/discourse-narrative-bot/config/locales/server.de.yml
index 0314a9889a..218f778756 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.de.yml
@@ -162,7 +162,7 @@ de:
           - https://de.wikipedia.org/wiki/Tetraphobie
           - https://de.wikipedia.org/wiki/Beghilos
         reply: |-
-          Super! Dies funktioniert mit den meisten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> Links. Aber denk dran: er muss _ganz alleine_ in der Zeile stehen, mit nichts davor und nichts dahinter.
+          Schick! Das wird für die meisten <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">-Links funktionieren. Denke daran, dass er auf einer _ganz eigenen_ Zeile stehen muss, ohne etwas davor oder dahinter.
         not_found: |-
           Entschuldige bitte, ich konnte den Link in deiner Antwort nicht finden! :cry:
 
@@ -175,9 +175,9 @@ de:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
 
-          Wenn es dir gefällt (und wie kann jemand das nicht mögen!), drücke den "Gefällt-mir" Knopf :heart: unter diesem Beitrag, um mich das wissen zu lassen.
+          Wenn du es magst (und wer würde das nicht), gehe voran und drücke die „Gefällt mir“-Schaltfläche :hear: unter diesem Beitrag, um mich dies wissen zu lassen.
 
-          Kannst du mir **mit einem Bild antworten?** Nimm irgendein Bild, es ist ganz egal welches. Du kannst mit der Maus ziehen und loslassen, oder den Hochlade-Knopf drücken, und sogar  kopieren und einfügen funktioniert.
+          Kannst du **mit einem Bild antworten?** Welches Bild spielt keine Rolle! Ziehe das Bild einfach ins Fenster, drücke die Hochladen-Schaltfläche, oder kopiere und füge es ein.
         reply: |-
           Hübsches Bild – ich habe die Like-Schaltfläche :heart: gedrückt, um dich wissen zu lassen, wie sehr es mir gefällt :heart_eyes:
         like_not_found: |-
@@ -222,28 +222,28 @@ de:
           Das Auswählen von beliebigem Text in meinem Beitrag lässt die <kbd>**Zitat**</kbd>-Schaltfläche erscheinen. Und das Drücken von **Antworten** mit einem beliebigen ausgewählten Text wird auch funktionieren! Kannst du es nochmal versuchen?
       bookmark:
         instructions: |-
-          Wenn Du gerne mehr erfahren möchtest, wähle <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> unten und <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **setze ein Lesezeichen für diese private Nachricht**. Wenn Du das tust, habe ich ein kleines :gift: für dich!
+          Wenn du gerne mehr lernen würdest, wähle <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> unten und <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **Lesezeichen auf diese Nachricht setzen**.  Wenn du das macht, gibt es vielleicht ein :gift: in deiner Zukunft!
         reply: |-
           Hervorragend! Jetzt kannst du jederzeit über [den Lesezeichen-Reiter in deinem Profil](%{profile_page_url}/activity/bookmarks) zu unserer Unterhaltung zurückkehren. Gehe dazu einfach auf dein Profilbild oben rechts &#8599;.
         not_found: |-
-          Oh je! Ich sehe gar keine Lesezeichen in diesem Thema. Hast du das Lesezeichen-Symbol unter jedem Beitrag gefunden? Falls du es nicht siehst, benutze das "Zeige mehr"-Symbol <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> um weitere Aktionsmöglichkeiten sichtbar zu machen.
+          Oh weh, ich sehe keine Lesezeichen in diesem Thema. Hast du das Lesezeichen unter jedme Beitrag gefunden? Verwende das „Mehr anzeigen“-Symbol <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16">, um bei Bedarf weitere Aktionen anzuzeigen.
       emoji:
         instructions: |-
-          Du hast vielleicht bemerkt, dass ich kleine Bilder in meinen Antworten verwendet habe :blue_car::dash:. Die heißen [Emoji](https://de.wikipedia.org/wiki/Emoji) heißen. Kannst du in deiner Antwort **ein Emoji hinzufügen**? Du kannst das auf verschiedene Weise tun:
+          Du hast vielleicht gesehen, dass ich kleine Bilder in meinen Antworten verwendet habe :blue_car::dash:. Die heißen [Emoji](https://de.wikipedia.org/wiki/Emoji). Kannst du in deiner Antwort **ein Emoji hinzufügen**? Du kannst das auf verschiedene Weise tun:
 
           - Gib `:) ;) :D :P :O` ein
 
           - Gib einen Doppelpunkt <kbd>:</kbd> gefolgt vom Emoji-Namen ein `:tada:`
 
-          - Drücke die Emoji-Schaltfläche <img src="/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> im Editor oder auf der Tastatur deines mobilen Geräts.
+          - Drücke die Emoji-Schaltfläche <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> im Editor oder auf der Tastatur deines mobilen Geräts.
         reply: |-
           Das ist :sparkles: _emojitastisch!_ :sparkles:
         not_found: |-
-          Hoppla, ich sehe kein Emoji in deinem Beitrag. Warum bloß? :sob:
+          Hoppla, ich sehe keinen Emoji in deinem Beitrag. Warum bloß? :sob:
 
           Versuche einen Doppelpunkt <kbd>:</kbd> einzugeben, um damit die Emoji-Auswahl zu öffnen. Dann gib die ersten Buchstaben vom gesuchten Emoji ein; also zum Beispiel `:bird:`
 
-          Oder drücke die Emoji-Schaltfläche <img src="/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> im Editor.
+          Oder drücke die Emoji-Schaltfläche <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16"> im Editor.
 
           (Auf einem mobilen Gerät kannst du Emojis auch direkt über deine Tastatur eingeben.)
       mention:
@@ -263,22 +263,22 @@ de:
 
           > :imp: Ich habe dir hier etwas anstößiges geschrieben
 
-          Ich denke, du weißt was zu tun ist. Los, **melde diesen Beitrag** <img src="/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> als unangemessen!
+          Ich denke, du weißt was zu tun ist. Leg los und **melde diesen Beitrag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16"> als unangemessen!
         reply: |-
           [Unser Team](/groups/staff) wird diskret über deine Meldung informiert. Wenn genügend Community-Mitglieder einen Beitrag melden, wird er als Vorsichtsmaßnahme automatisch versteckt. (Weil ich nicht wirklich einen bösen Beitrag geschrieben habe :angel:, habe ich mir erlaubt, die Meldung fürs Erste wieder zu löschen.)
         not_found: |-
-          Oh nein, mein widerlicher Beitrag wurde nicht gemeldet. :worried: Kannst du ihn als unangemessen **melden** <img src="/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Vergiss nicht, die „Mehr anzeigen“-Schaltfläche <img src="/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> zu verwenden, damit für jeden Beitrag weitere Aktionsmöglichkeiten sichtbar werden.
+          Oh nein, mein anstößiger Beitrag wurde noch nicht gemeldet. :worried: Kannst du ihn als unangemessen **melden** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Vergiss nicht, die „Mehr anzeigen“-Schaltfläche <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> zu verwenden, um weitere Aktionen für den jeweiligen Beitrag einzublenden.
       search:
         instructions: |-
-          _Psst_… ich habe in diesem Thema eine Überraschung versteckt. Wenn du für eine Herausforderung zu haben bist, dann **wähle das Such-Symbol** <img src="/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> oben rechts &#8599; aus und suche danach.
+          _Psst_… ich habe in diesem Thema eine Überraschung versteckt. Wenn du für eine Herausforderung zu haben bist, dann **wähle das Such-Symbol** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> oben rechts &#8599; aus und suche danach.
 
-          Probier mal, in diesem Thema nach dem Begriff „Capy&#8203;bara“ zu suchen.
+          Versuche, in diesem Thema nach dem Begriff „Capy&#8203;bara“ zu suchen.
         hidden_message: |-
           Wie konntest du das Capybara übersehen? :wink:
 
-          <img src="/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
-          Hast du bemerkt, dass du jetzt zurück am Anfang bist? Füttere dieses arme, hungrige Capybara, indem du **mit dem `:herb:`-Emoji antwortest** und du wirst automatisch wieder zum Ende gebracht.
+          Hast du bemerkt, dass du jetzt zurück am Anfang bist? Füttere dieses arme, hungrige Capybara, indem du **mit dem `:herb:`-Emoji antwortest** und du wirst automatisch zum Ende gebracht.
         reply: |-
           Juhu! Du hast es gefunden :tada:
 
@@ -288,7 +288,7 @@ de:
 
           - Wenn du eine physische Tastatur verwendest, gib <kbd>?</kbd> ein, um eine nützliche Übersicht über Tastenkombinationen anzuzeigen.
         not_found: |-
-          Hm… es sieht so aus, als hättest du Schwierigkeiten. Das tut mir leid. Hast du nach dem Begriff **capy&#8203;bara** gesucht <img src="/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">?
+          Hm… es sieht so aus, als hättest du Schwierigkeiten. Das tut mir leid. Hast du nach dem Begriff **Capy&#8203;bara** gesucht <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">?
       end:
         message: |-
           Danke, dass du mir treu geblieben bist, @%{username}! Ich habe dies für dich gemacht. Ich denke, du hast es verdient:
@@ -317,14 +317,14 @@ de:
         not_found: |-
           Es sieht so aus, als hättest Du den [Beitrag](%{url}), den ich für dich erstellt habe, noch gar nicht bearbeitet. Kannst du es nochmal versuchen?
 
-          Verwende das <img src="/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">-Symbol, um den Editor zu öffnen.
+          Verwende das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16">-Symbol, um den Editor zu öffnen.
         reply: |-
           Gut gemacht!
 
           Beachte, dass Änderungen, die nach 5 Minuten gemacht werden, als Überarbeitungen für jeden sichtbar sind. Die Anzahl der Überarbeitungen wird, neben einem kleinen Bleistift-Symbol, am Beitrag rechts oben angezeigt.
       delete:
         instructions: |-
-          Wenn du einen Beitrag zurückziehen möchtest, kannst du ihn löschen.
+          Wenn du einen Beitrag von dir zurückziehen möchtest, kannst du ihn löschen.
 
           Leg’ los und **lösche** einen deiner Beiträge über die <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **Löschen**-Aktion. Lösche aber bitte nicht den ersten Beitrag!
         not_found: |-
@@ -336,11 +336,11 @@ de:
       recover:
         deleted_post_raw: 'Warum hat @%{discobot_username} meinen Beitrag gelöscht? :anguished:'
         instructions: |-
-          Oh nein! Es sieht so aus als hätte ich gerade einen neuen Beitrag gelöscht, den ich gerade für dich erstellt hatte.
+          Oh nein! Es sieht so aus als hätte ich versehentlich einen neuen Beitrag gelöscht, den ich gerade für dich erstellt hatte.
 
           Kannst du mir einen Gefallen tun und ihn <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **wiederherstellen**?
         not_found: |-
-          Klappt es nicht? Denk daran, dass <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> „Mehr anzeigen“ auch <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> „Wiederherstellen“ anzeigt.
+          Hast du Schwierigkeiten? Denk daran, dass <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> „Mehr anzeigen“ auch die Aktion <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16">  „Wiederherstellen“ anzeigt.
         reply: |-
           Puh, das war knapp! Danke, dass du das korrigiert hast :wink:
 
@@ -373,11 +373,11 @@ de:
           Beachte, dass die Benachrichtigungsstufe automatisch auf „Verfolgen“ geändert wird, wenn du auf ein Thema antwortest oder ein Thema länger als ein paar Minuten liest. Du kannst dies in [deinen Benutzer-Einstellungen](/my/preferences) ändern.
       poll:
         instructions: |-
-          Wusstest du, dass du eine Umfrage zu jedem Beitrag hinzufügen kannst? Verwende das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16">-Symbol, um im Editor die **Umfrage [zu] erstellen**.
+          Wusstest du, dass du eine Umfrage zu jedem Beitrag hinzufügen kannst? Versuche, das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor zu verwenden, um **eine Umfrage zu erstellen**.
         not_found: |-
-          Upps! Deine Antwort hat keine Umfrage enthalten.
+          Oops! Es war keine Umfrage in deiner Antwort.
 
-          Verwende das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad-Symbol im Editor, oder kopiere diese Umfrage und füge sie in deine nächste Antwort ein:
+          Verwende das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad-Icon im Editor oder kopiere und füge die folgende Umfrage in deine nächste Antwort ein:
 
           ```text
           [poll]
@@ -394,19 +394,19 @@ de:
           [/poll]
       details:
         instructions: |-
-          Manchmal möchtest du vielleicht in deinen Antworten bestimmte **Details ausblenden** :
+          Manchmal möchtest du vielleicht in deinen Antworten bestimmte **Details ausblenden**:
 
-          - Wenn du Handlungsfäden eines Films oder einer Fernsehserie diskutierst, die ein Spoiler darstellen würden.
+          - Wenn du Handlungen eines Films oder einer TV-Serie diskutierst und dies als Spoiler betrachtet werden könnte.
 
-          - Wenn dein Beitrag viele optionale Details benötigt, die überwältigend wäre, wenn man sie auf einmal liest.
+          - Wenn dein Beitrag viele optionalen Details benötigt, die überwältigend sein könnten, wenn man sie alle auf einmal liest.
 
-          [details=Wähle dies aus, um zu sehen wie es funktioniert!]
-          1. Wähle das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Werkzeug-Symbol im Editor.
-          2. Wähle "Details ausblenden".
-          3. Bearbeite die Zusammenfassung der Details und ergänze deinen Inhalt.
+          [details=Wähle dies aus, um zu sehen, wie es funktioniert!]
+          1. Wähle das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor aus.
+          2. Wähle „Details ausblenden“ aus.
+          3. Bearbeite die Zusammenfassung der Details und füge deinen Inhalt hinzu.
           [/details]
 
-          Kannst du das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Werkzeug-Symbol im Editor sehen und einen Details-Abschnitt in deine nächste Antwort einfügen?
+          Kannst du das <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-gear.png" width="16" height="16"> Zahnrad im Editor verwenden und einen Details-Abschnitt in deine nächste Antwort einfügen?
         not_found: |-
           Hast du Schwierigkeiten, den Details-Abschnitt zu erstellen? Versuche Folgendes in deine nächste Antwort aufzunehmen:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.fi.yml b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
index 6ddf3baf1d..594b14b756 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.fi.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.fi.yml
@@ -243,7 +243,7 @@ fi:
 
           Saat emojivalitsimen esiin näppäilemällä kaksoispisteen <kbd>:</kbd>. Ala kirjoittaa sen perään englanniksi millaisen emojin haluat - esimerkiksi lintu on `:bird:`
 
-          Voit myös painaa editorin emojikuvaketta <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">.
+          Voit myös painaa editorin emojikuvaketta  <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-smile.png" width="16" height="16">.
 
           (Mobiililaitteella voit lisätä emojin suoraan näppäimistöltäsikin.)
       mention:
@@ -267,12 +267,12 @@ fi:
         reply: |-
           [Henkilökuntamme](/groups/staff) saa ei-julkisen ilmoituksen lipusta. Jos riittävän moni yhteisön jäsen liputtaa viestin, sekin riittää viestin automaattiseen piilottamiseen varotoimena. (Koska en oikeasti kirjoittanut mitään tuhmaa :angel:, menin ja poistin liputuksesi.)
         not_found: |-
-          Oi voi, tuhmaa viestiäni ei ole vielä liputettu. :worried: Voitko liputtaa sen sopimattomaksi **lippupainikkeen** avulla <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
+          Oh no, my nasty post hasn’t been flagged yet. :worried: Can you flag it as inappropriate using the **flag** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? Don’t forget to use the show more button <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> to reveal more actions for each post.
       search:
         instructions: |-
-          _psst_ … Tein pienen jekun tähän ketjuun. Jos olet valmis ottamaan haasteen vastaan, oikealla ylhäällä &#8599; on **hakukuvake** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">, jolla voit yrittää löytää sen.
+          _psst_ … I’ve hidden a surprise in this topic. If you’re up for the challenge, **select the search icon** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> at the top right &#8599; to search for it.
 
-          Etsi hakusanaa "kapy&#8203;bara" tästä ketjusta
+          Try searching for the term "capy&#8203;bara" in this topic
         hidden_message: |-
           Miten sinulta jäi tämä kapybara huomaamatta? :wink:
 
@@ -328,7 +328,7 @@ fi:
 
           Anna mennä ja **poista** yltä mikä tahansa viestisi <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> poista-toiminnon avulla. Älä kuitenkaan erehdy poistamaan ketjun ensimmäistä viestiä!
         not_found: |-
-          Minusta viestejä ei vielä poistettu? Muista, että <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> näytä lisää -kuvake paljastaa <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> poista-kuvakkeen.
+          Minusta viestejä ei vielä poistettu? Muista, että <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> näytä lisää -kuvake paljastaa <img src="%{base_uri}/images/font-awesome-trash.png" width="16" height="16"> poista-kuvakkeen.
         reply: |-
           Vau! :boom:
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.it.yml b/plugins/discourse-narrative-bot/config/locales/server.it.yml
index 4d1c4ca353..9c8c3f44df 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.it.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.it.yml
@@ -396,7 +396,7 @@ it:
         instructions: |-
           Qualche volta potresti voler **nascondere dei dettagli** nelle tue risposte:
 
-          - Quando si stanno discutento dei punti della trama di un film o di uno show televisivo che potrebbero essere considerati degli spoiler.
+          - Quando si stanno discutento punti della trama di un film o di uno show televisivo che potrebbero essere considerati degli spoiler.
 
           - Quando il tuo messaggio necessita di molti dettagli opzionali che potrebbero intralciare la lettura se letti tutti in una volta.
 
diff --git a/plugins/discourse-narrative-bot/config/locales/server.ko.yml b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
index be3d5b9512..e3a1e417d6 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.ko.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.ko.yml
@@ -162,12 +162,18 @@ ko:
           - https://en.wikipedia.org/wiki/Death_by_coconut
           - https://en.wikipedia.org/wiki/Calculator_spelling
         reply: |-
-          대단해! 이 기능은 가장 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16">한 링크에 작동해. 잊지마. 줄 하나 당  링크 하나씩이야. 주소 앞이나 뒤에 무언가가 있으면 작동하지 않아.
+          좋았어! 이건 대부분의 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> 링크에 대해서 작동해.  딱 링크로만 된 한줄이어야만 한다는 걸 명심해. 앞이나 뒤에 다른게 있어서는 안돼.
+        not_found: |-
+          미안해. 답글에서 링크를 찾지 못했어! :cry:
+
+          아래 링크 한줄을 복사해서 다음 답글에 넣어볼래?
+
+          <https://en.wikipedia.org/wiki/Exotic_Shorthair>
       images:
         instructions: |-
           유니콘 사진이야.
 
-          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">
+          <img src="/plugins/discourse-narrative-bot/images/unicorn.png" width="520" height="520">%{base_uri}/images/unicorn.png" width="520" height="520">
 
           (당연히 그렇겠지만) 맘에 들면 이 포스트 아래에 있는 '좋아요'버튼을 눌러봐.
 
@@ -216,14 +222,14 @@ ko:
           내 포스트에서 아무 글이나 선택해도 <kbd>**인용하기**</kbd> 버튼이 뜰거야. 글을 선택하고 **답글쓰기** 를 눌러도 돼! 다시 한 번 해 볼래?
       bookmark:
         instructions: |-
-          더 알고 싶다면 아래에 있는 이걸<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  너의 미래에 보내는 좋은 선물:gift:이 되겠지!
+          더 알고 싶다면 아래에 있는 이걸 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 선택한 다음 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-bookmark.png" width="16" height="16"> **이 개인메시지 북마크**를 하렴.  미래의 너에게 보내는 좋은 선물:gift:이 되겠지!
         reply: |-
           대단해! 이제는 [프로필의 북마크 탭](%{profile_page_url}/activity/bookmarks)만 눌러도 우리의 개인적인 대화를 손쉽게 뒤돌아 볼 수 있어. 우측 상단에 있는 프로필 사진만 선택하면 돼. &#8599;
         not_found: |-
-          어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
+          어라, 이 토픽에는 북마크가 없는데? 포스트 별로 있는 북마크 버튼을 찾았니? 더 보기 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 를 눌러서 필요한 추가 기능이 있는지 살펴 봐.
       emoji:
         instructions: |-
-          내가 답글에서 조그마한 그림을 쓰는 걸 봤겠지?:blue_car::dash: 이런 걸 [이모지 (emoji)](https://en.wikipedia.org/wiki/Emoji)라고 해. 너도 답글에 **이모지를 추가**해 볼래? 아래 중에서 아무거나 해도 돼.
+          내가 답글에서 조그마한 그림을 쓰는 걸 봤겠지?:blue_car::dash: 이런 걸 [이모지](https://en.wikipedia.org/wiki/Emoji)라고 해. 너도 답글에 **이모지를 추가**해 볼래? 아래 중에서 아무거나 해도 돼.
 
           - `:) ;) :D :P :O` 라고 입력하기
 
@@ -261,14 +267,14 @@ ko:
         reply: |-
           [우리의 운영진](/groups/staff)은 니가 한 신고내용을 개인 메시지로 알림받게 될 거야. 충분한 커뮤니티 회원들이 신고를 하면, 포스트의 내용이 숨겨지고 사전경고가 걸리게 돼.(난 실제로 나쁜 글을 쓴 건 아니니까:angel:, 이제 신고를 지울게.)
         not_found: |-
-          아이고, 나의 나쁜 포스트가 아직 신고가 안됐네. :worried: 부적절한 게시물로 **신고** 해주겠니 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? 더 보기 버튼을 누르면 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 포스트에 수행할 기능을 더 볼 수 있다는 걸 잊지마.
+          이런 내가 쓴 나쁜 포스트가 아직 신고가 안됐네. :worried:  부적절한 게시물로 **신고** 해주겠니 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-flag.png" width="16" height="16">? 더 보기 버튼을 누르면 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 포스트에 수행할 기능을 더 볼 수 있다는 걸 잊지마.
       search:
         instructions: |-
-          이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">  선택해서 &#8599; 찾아봐.
+          이봐, 내가 이 토픽에 놀라운 걸 숨겼다구. 찾아보고 싶다면, 우측 상단에 있는 **검색 아이콘을** <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16"> 선택해서 &#8599; 찾아봐.
 
-          이 토픽에서  "capy&#8203;bara"를 찾으면 돼.
+          이 토픽에서 "capy&#8203;bara"를 찾으면 돼.
         hidden_message: |-
-          어떻게 이 capybara를 놓칠 수 있어? :wink:
+          어떻게 이 capybara를 잊을 수 있어? :wink:
 
           <img src="%{base_uri}/plugins/discourse-narrative-bot/images/capybara-eating.gif"/>
 
@@ -283,19 +289,66 @@ ko:
           - 진짜 실물 :keyboard:가 있다면, <kbd>?</kbd>를 눌러서 간편한 단축키가 뭐가 있는지 알아봐.
         not_found: |-
           흠.... 아무래도 문제가 있어 보이네. 미안해. 검색<img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-search.png" width="16" height="16">을 눌러서 **capy&#8203;bara**를 찾아봤어?
+      end:
+        message: |-
+          @%{username}! 나와 함께 해줘서 고마워! 널 위해 이 뱃지를 준비했어.
+
+          %{certificate}
+
+          이제 다 됐어! [**최근 논의되는 토픽**](/latest)이나 [**카테고리**](/categories) 를 확인해봐. :sunglasses:
+
+          (또 다른 걸 알고싶으면, `@%{discobot_username}`으로 메시지를 보내거나 멘션을 걸어줘!)
       certificate:
         alt: '목표달성 인증'
     advanced_user_narrative:
       reset_trigger: '고급 사용자'
       cert_title: "고급 사용자 튜토리얼을 훌륭하게 완료한 것에 대한 보상으로"
       title: ':arrow_up: 고급 사용자 기능'
+      start_message: |-
+        @%{username}! _고급_ 사용자로서, [설정 페이지](/my/preferences) 를 가본적 있니? 다크 테마, 라이트 테마 선택같은 사용자 경험을 개인화할 수 있는 많은 옵션이 있어.
+
+        사설이 길었네, 시작하자!
       edit:
         bot_created_post_raw: "@%{discobot_username}는 내가 아는 한, 현존하는 가장 쿨한 봇이지:wink:"
         instructions: |-
           누구나 실수해. 걱정마, 편집을 하면 그 실수를 언제든지 바로잡을 수 있거든!
 
           내가 너 대신 만든 이 포스트를 **편집**하는 걸로 시작해 볼래 ?
+        not_found: |-
+          내가 만들어준 [post](%{url}) 편집이 다 안끝난 것 같네. 다시 해볼래?
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-pencil.png" width="16" height="16"> 아이콘을 눌러서 에디터를 띄워보렴.
+        reply: |-
+          아주 잘했어!
+
+          편집된 글은 5분뒤에 수정본으로 공개되고, 우측 상단에 작은 연필 아이콘과 함께 수정 횟수가 뜬다는 걸 기억하렴.
+      delete:
+        instructions: |-
+          작성한 포스트를 없애고 싶으면, 삭제를 하면 돼.
+
+          위에 있는 포스트 중에서 어떤 것이든 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> **삭제하기** 기능으로  **삭제**해보렴. 그래도 첫번째 포스트는 삭제하지마!
+        not_found: |-
+          삭제된 포스트가 없는 것 같은데? <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 더보기를 통해서 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-trash.png" width="16" height="16"> 삭제하기를 볼 수 있어.
+        reply: |-
+          우와! :boom:
+
+          토론이 잘 진행될 수 있도록, 곧장 삭제되지는 않아. 어느 정도 시간이 지나면 포스트가 없어질거야.
       recover:
         deleted_post_raw: '왜 @%{discobot_username}가 내 포스트를 지웠지? :anguished:'
+        instructions: |-
+          오 이런! 너한테 만들어 준 새 포스트를 실수로 삭제해버린 것 같아.
+
+          <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> **삭제 취소하기**를 부탁해도 될까?
+        not_found: |-
+          잘 안되니? <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-ellipsis.png" width="16" height="16"> 더 보기를 누르면 <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-rotate-left.png" width="16" height="16"> 삭제 취소하기가 보일거야.
+        reply: |-
+          휴, 큰일날 뻔 했네! 바로 잡아줘서 고마워 :wink:
+
+          삭제 취소하기는 24시간 내에만 가능하다는 거 기억해 둬.
+      category_hashtag:
+        instructions: |-
+          포스트에 카테고리나 태그를 언급할 수 있다는 거 알고 있어? 예를 들어, %{category} 카테고리가 보이니?
+
+          문장 중간에 `#`을 넣고 어떤 카테고리나 태그든 선택해봐.
       certificate:
         alt: '고급 사용자 추적 인증'
diff --git a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
index 1c507b020d..1c847c138b 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.nb_NO.yml
@@ -58,6 +58,8 @@ nb_NO:
       '5':
         quote: "Tro at du kan, og du finner deg selv på halvveien."
         author: "Theodore Roosevelt"
+      '6':
+        author: "Forrest Gumps Mor"
       '7':
         author: "Neil Armstrong"
       '8':
diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb
index efca56e7e8..f7524b8b6d 100644
--- a/plugins/discourse-narrative-bot/plugin.rb
+++ b/plugins/discourse-narrative-bot/plugin.rb
@@ -32,7 +32,7 @@ after_initialize do
   ].each { |path| load File.expand_path(path, __FILE__) }
 
   # Disable welcome message because that is what the bot is supposed to replace.
-  SiteSetting.send_welcome_message = false
+  SiteSetting.send_welcome_message = false if SiteSetting.send_welcome_message
 
   require_dependency 'plugin_store'
 
@@ -184,7 +184,7 @@ after_initialize do
     if self.user.enqueue_narrative_bot_job?
       input =
         case self.post_action_type_id
-        when *PostActionType.flag_types.values
+        when *PostActionType.flag_types_without_custom.values
           :flag
         when PostActionType.types[:like]
           :like
diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb
index b156a0f70c..f06d8cbe87 100644
--- a/script/import_scripts/base.rb
+++ b/script/import_scripts/base.rb
@@ -72,6 +72,8 @@ class ImportScripts::Base
       min_private_message_title_length: 1,
       allow_duplicate_topic_titles: true,
       disable_emails: true,
+      max_attachment_size_kb: 102400,
+      max_image_size_kb: 102400,
       authorized_extensions: '*'
     }
   end
@@ -144,7 +146,7 @@ class ImportScripts::Base
     created = 0
     skipped = 0
     failed = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
 
     results.each do |result|
       g = yield(result)
@@ -176,7 +178,7 @@ class ImportScripts::Base
     opts[:name] = UserNameSuggester.suggest(import_name)
 
     existing = Group.where(name: opts[:name]).first
-    return existing if existing && existing.custom_fields["import_id"].to_i == (import_id.to_i)
+    return existing if existing && existing.custom_fields["import_id"].to_s == (import_id.to_s)
     g = existing || Group.new(opts)
     g.custom_fields["import_id"] = import_id
     g.custom_fields["import_name"] = import_name
@@ -220,7 +222,7 @@ class ImportScripts::Base
     created = 0
     skipped = 0
     failed = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
 
     results.each do |result|
       u = yield(result)
@@ -268,7 +270,7 @@ class ImportScripts::Base
     post_create_action = opts.delete(:post_create_action)
 
     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)
+    return existing if existing && (merge || existing.custom_fields["import_id"].to_s == import_id.to_s)
 
     bio_raw = opts.delete(:bio_raw)
     website = opts.delete(:website)
@@ -277,6 +279,7 @@ class ImportScripts::Base
 
     original_username = opts[:username]
     original_name = opts[:name]
+    original_email = opts[:email] = opts[:email].downcase
 
     # Allow the || operations to work with empty strings ''
     opts[:username] = nil if opts[:username].blank?
@@ -292,9 +295,13 @@ class ImportScripts::Base
       opts[:username] = UserNameSuggester.suggest(opts[:username] || opts[:name].presence || opts[:email])
     end
 
+    unless opts[:email].match(EmailValidator.email_regex)
+      opts[:email] = "invalid#{SecureRandom.hex}@no-email.invalid"
+      puts "Invalid email #{original_email} for #{opts[:username]}. Using: #{opts[:email]}"
+    end
+
     opts[:name] = original_username if original_name.blank? && opts[:username] != original_username
 
-    opts[:email] = opts[:email].downcase
     opts[:trust_level] = TrustLevel[1] unless opts[:trust_level]
     opts[:active] = opts.fetch(:active, true)
     opts[:import_mode] = true
@@ -306,6 +313,7 @@ class ImportScripts::Base
     u.custom_fields["import_username"] = opts[:username] if original_username.present?
     u.custom_fields["import_avatar_url"] = avatar_url if avatar_url.present?
     u.custom_fields["import_pass"] = opts[:password] if opts[:password].present?
+    u.custom_fields["import_email"] = original_email if original_email != opts[:email]
 
     begin
       User.transaction do
@@ -335,6 +343,27 @@ class ImportScripts::Base
       end
     end
 
+    if u.custom_fields['import_email']
+      u.suspended_at = Time.zone.at(Time.now)
+      u.suspended_till = 200.years.from_now
+      ban_reason = 'Invalid email address on import'
+      u.active = false
+      u.save!
+
+      user_option = u.user_option
+      user_option.email_digests = false
+      user_option.email_private_messages = false
+      user_option.email_direct = false
+      user_option.email_always = false
+      user_option.save!
+      if u.save
+        StaffActionLogger.new(Discourse.system_user).log_user_suspend(u, ban_reason)
+      else
+        Rails.logger.error("Failed to suspend user #{u.username}. #{u.errors.try(:full_messages).try(:inspect)}")
+      end
+
+    end
+
     post_create_action.try(:call, u) if u.persisted?
 
     u # If there was an error creating the user, u.errors has the messages
@@ -353,7 +382,7 @@ class ImportScripts::Base
   def create_categories(results)
     created = 0
     skipped = 0
-    total = results.size
+    total = results.count
 
     results.each do |c|
       params = yield(c)
@@ -425,7 +454,7 @@ class ImportScripts::Base
   def create_posts(results, opts = {})
     skipped = 0
     created = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
     start_time = get_start_time("posts-#{total}") # the post count should be unique enough to differentiate between posts and PMs
 
     results.each do |r|
@@ -505,7 +534,7 @@ class ImportScripts::Base
   def create_bookmarks(results, opts = {})
     created = 0
     skipped = 0
-    total = opts[:total] || results.size
+    total = opts[:total] || results.count
 
     user = User.new
     post = Post.new
diff --git a/script/import_scripts/mbox/importer.rb b/script/import_scripts/mbox/importer.rb
index 762c162e82..1c55804a98 100644
--- a/script/import_scripts/mbox/importer.rb
+++ b/script/import_scripts/mbox/importer.rb
@@ -97,7 +97,7 @@ module ImportScripts::Mbox
 
     def map_post(row)
       user_id = user_id_from_imported_user_id(row['from_email']) || Discourse::SYSTEM_USER_ID
-      body = row['body'] || ''
+      body = CGI.escapeHTML(row['body'] || '')
       body << map_attachments(row['raw_message'], user_id) if row['attachment_count'].positive?
       body << Email::Receiver.elided_html(row['elided']) if row['elided'].present?
 
@@ -108,7 +108,10 @@ module ImportScripts::Mbox
         raw: body,
         raw_email: row['raw_message'],
         via_email: true,
-        # cook_method: Post.cook_methods[:email] # this is slowing down the import by factor 4
+        cook_method: Post.cook_methods[:email],
+        post_create_action: proc do |post|
+          create_incoming_email(post, row)
+        end
       }
     end
 
@@ -154,6 +157,18 @@ module ImportScripts::Mbox
       attachment_markdown
     end
 
+    def create_incoming_email(post, row)
+      IncomingEmail.create(
+        message_id: row['msg_id'],
+        raw: row['raw_message'],
+        subject: row['subject'],
+        from_address: row['from_email'],
+        user_id: post.user_id,
+        topic_id: post.topic_id,
+        post_id: post.id
+      )
+    end
+
     def to_time(datetime)
       Time.zone.at(DateTime.iso8601(datetime)) if datetime
     end
diff --git a/script/import_scripts/mbox/support/database.rb b/script/import_scripts/mbox/support/database.rb
index 396d23e5b2..a3cb723046 100644
--- a/script/import_scripts/mbox/support/database.rb
+++ b/script/import_scripts/mbox/support/database.rb
@@ -163,7 +163,7 @@ module ImportScripts::Mbox
     private
 
     def configure_database
-      @db.execute 'PRAGMA journal_mode = TRUNCATE'
+      @db.execute 'PRAGMA journal_mode = OFF'
     end
 
     def upgrade_schema_version
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 924e44390e..5d48ea2186 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,13 +6,34 @@ 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(:multisite_db) { "database_2" }
+
+  let(:multisite_config) do
+    {
+      host: 'localhost1',
+      port: 5432,
+      replica_host: replica_host,
+      replica_port: replica_port
+    }
   end
 
   let(:postgresql_fallback_handler) { PostgreSQLFallbackHandler.instance }
 
+  before do
+    postgresql_fallback_handler.initialized = true
+
+    ['default', multisite_db].each do |db|
+      postgresql_fallback_handler.master_up(db)
+    end
+  end
+
   after do
     postgresql_fallback_handler.setup!
   end
@@ -24,17 +45,6 @@ describe ActiveRecord::ConnectionHandling do
     end
 
     context 'when master server is down' do
-      let(:multisite_db) { "database_2" }
-
-      let(:multisite_config) do
-        {
-          host: 'localhost1',
-          port: 5432,
-          replica_host: replica_host,
-          replica_port: replica_port
-        }
-      end
-
       before do
         @replica_connection = mock('replica_connection')
       end
@@ -51,50 +61,65 @@ describe ActiveRecord::ConnectionHandling do
       end
 
       it 'should failover to a replica server' do
-        current_threads = Thread.list
-
         RailsMultisite::ConnectionManagement.stubs(:all_dbs).returns(['default', multisite_db])
+        postgresql_fallback_handler.expects(:verify_master).at_least(3)
 
         [config, multisite_config].each do |configuration|
           ActiveRecord::Base.expects(:postgresql_connection).with(configuration).raises(PG::ConnectionBad)
           ActiveRecord::Base.expects(:verify_replica).with(@replica_connection)
 
-          ActiveRecord::Base.expects(:postgresql_connection).with(configuration.merge(host: replica_host, port: replica_port)).returns(@replica_connection)
+          ActiveRecord::Base.expects(:postgresql_connection).with(configuration.merge(
+            host: replica_host, port: replica_port)
+          ).returns(@replica_connection)
         end
 
         expect(postgresql_fallback_handler.master_down?).to eq(nil)
 
-        expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
-          .to raise_error(PG::ConnectionBad)
+        message = MessageBus.track_publish(PostgreSQLFallbackHandler::DATABASE_DOWN_CHANNEL) do
+          expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
+            .to raise_error(PG::ConnectionBad)
+        end.first
+
+        expect(message.data[:db]).to eq('default')
 
         expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
           .to change { Discourse.readonly_mode? }.from(false).to(true)
 
         expect(postgresql_fallback_handler.master_down?).to eq(true)
+        expect(Sidekiq.paused?).to eq(true)
 
         with_multisite_db(multisite_db) do
-          expect(postgresql_fallback_handler.master_down?).to eq(nil)
+          begin
+            expect(postgresql_fallback_handler.master_down?).to eq(nil)
 
-          expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
-            .to raise_error(PG::ConnectionBad)
+            message = MessageBus.track_publish(PostgreSQLFallbackHandler::DATABASE_DOWN_CHANNEL) do
+              expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
+                .to raise_error(PG::ConnectionBad)
+            end.first
 
-          expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
-            .to change { Discourse.readonly_mode? }.from(false).to(true)
+            expect(message.data[:db]).to eq(multisite_db)
 
-          expect(postgresql_fallback_handler.master_down?).to eq(true)
+            expect { ActiveRecord::Base.postgresql_fallback_connection(multisite_config) }
+              .to change { Discourse.readonly_mode? }.from(false).to(true)
+
+            expect(postgresql_fallback_handler.master_down?).to eq(true)
+          ensure
+            postgresql_fallback_handler.master_up(multisite_db)
+            expect(postgresql_fallback_handler.master_down?).to eq(nil)
+          end
         end
 
-        postgresql_fallback_handler.master_up(multisite_db)
-
         ActiveRecord::Base.unstub(:postgresql_connection)
 
         postgresql_fallback_handler.initiate_fallback_to_master
 
         expect(Discourse.readonly_mode?).to eq(false)
-        expect(postgresql_fallback_handler.master_down?).to eq(nil)
+        expect(Sidekiq.paused?).to eq(false)
         expect(ActiveRecord::Base.connection_pool.connections.count).to eq(0)
+        expect(postgresql_fallback_handler.master_down?).to eq(nil)
+
+        skip("Only fails on Travis")
 
-        skip("Figuring out why the following keeps failing to obtain a connection on Travis")
         expect(ActiveRecord::Base.connection)
           .to be_an_instance_of(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
       end
@@ -102,9 +127,14 @@ describe ActiveRecord::ConnectionHandling do
 
     context 'when both master and replica server is down' do
       it 'should raise the right error' do
-        ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad).once
+        ActiveRecord::Base.expects(:postgresql_connection).with(config).raises(PG::ConnectionBad)
 
-        ActiveRecord::Base.expects(:postgresql_connection).with(config.dup.merge(host: replica_host, port: replica_port)).raises(PG::ConnectionBad).once
+        ActiveRecord::Base.expects(:postgresql_connection).with(config.dup.merge(
+          host: replica_host,
+          port: replica_port
+        )).raises(PG::ConnectionBad).once
+
+        postgresql_fallback_handler.expects(:verify_master).twice
 
         2.times do
           expect { ActiveRecord::Base.postgresql_fallback_connection(config) }
diff --git a/spec/components/auth/default_current_user_provider_spec.rb b/spec/components/auth/default_current_user_provider_spec.rb
index 4c93ed6481..d742a6deb7 100644
--- a/spec/components/auth/default_current_user_provider_spec.rb
+++ b/spec/components/auth/default_current_user_provider_spec.rb
@@ -19,7 +19,7 @@ describe Auth::DefaultCurrentUserProvider do
   it "raises errors for incorrect api_key" do
     expect {
       provider("/?api_key=INCORRECT").current_user
-    }.to raise_error(Discourse::InvalidAccess)
+    }.to raise_error(Discourse::InvalidAccess, /API username or key is invalid/)
   end
 
   it "finds a user for a correct per-user api key" do
diff --git a/spec/components/concern/category_hashtag_spec.rb b/spec/components/concern/category_hashtag_spec.rb
index c57ac89163..d058ef1af9 100644
--- a/spec/components/concern/category_hashtag_spec.rb
+++ b/spec/components/concern/category_hashtag_spec.rb
@@ -28,7 +28,7 @@ describe CategoryHashtag do
       child_category.update_attributes!(slug: "OraNGE")
 
       expect(Category.query_from_hashtag_slug("apple")).to eq(nil)
-      expect(Category.query_from_hashtag_slug("apple:orange")).to eq(nil)
+      expect(Category.query_from_hashtag_slug("apple#{CategoryHashtag::SEPARATOR}orange")).to eq(nil)
     end
   end
 end
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index e56f364cc6..7247649417 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -90,9 +90,7 @@ describe CookedPostProcessor do
 
     shared_examples "leave dimensions alone" do
       it "doesn't use them" do
-        # adds the width from the image sizes provided when no dimension is provided
         expect(cpp.html).to match(/src="http:\/\/foo.bar\/image.png" width="" height=""/)
-        # adds the width from the image sizes provided
         expect(cpp.html).to match(/src="http:\/\/domain.com\/picture.jpg" width="50" height="42"/)
         expect(cpp).to be_dirty
       end
@@ -108,10 +106,7 @@ describe CookedPostProcessor do
         let(:image_sizes) { { "http://foo.bar/image.png" => { "width" => 111, "height" => 222 } } }
 
         it "uses them" do
-
-          # adds the width from the image sizes provided when no dimension is provided
           expect(cpp.html).to match(/src="http:\/\/foo.bar\/image.png" width="111" height="222"/)
-          # adds the width from the image sizes provided
           expect(cpp.html).to match(/src="http:\/\/domain.com\/picture.jpg" width="50" height="42"/)
           expect(cpp).to be_dirty
         end
@@ -159,9 +154,7 @@ describe CookedPostProcessor do
         SiteSetting.create_thumbnails = true
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.stubs(:size).returns([1750, 2000])
-
-        # hmmm this should be done in a cleaner way
+        FastImage.expects(:size).returns([1750, 2000])
         OptimizedImage.expects(:resize).returns(true)
 
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
@@ -192,9 +185,7 @@ describe CookedPostProcessor do
         Discourse.stubs(:base_uri).returns(base_uri)
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.stubs(:size).returns([1750, 2000])
-
-        # hmmm this should be done in a cleaner way
+        FastImage.expects(:size).returns([1750, 2000])
         OptimizedImage.expects(:resize).returns(true)
 
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
@@ -229,10 +220,9 @@ describe CookedPostProcessor do
         SiteSetting.create_thumbnails = true
 
         Upload.expects(:get_from_url).returns(upload)
-        FastImage.stubs(:size).returns([1750, 2000])
-
-        # hmmm this should be done in a cleaner way
+        FastImage.expects(:size).returns([1750, 2000])
         OptimizedImage.expects(:resize).returns(true)
+
         FileStore::BaseStore.any_instance.expects(:get_depth_for).returns(0)
       end
 
diff --git a/spec/components/discourse_redis_spec.rb b/spec/components/discourse_redis_spec.rb
index 9067ceedbe..c1b94859f9 100644
--- a/spec/components/discourse_redis_spec.rb
+++ b/spec/components/discourse_redis_spec.rb
@@ -10,6 +10,11 @@ describe DiscourseRedis do
 
   let(:fallback_handler) { DiscourseRedis::FallbackHandler.instance }
 
+  it "ignore_readonly returns nil from a pure exception" do
+    result = DiscourseRedis.ignore_readonly { raise Redis::CommandError.new("READONLY") }
+    expect(result).to eq(nil)
+  end
+
   describe 'redis commands' do
     let(:raw_redis) { Redis.new(DiscourseRedis.config) }
 
diff --git a/spec/components/distributed_cache_spec.rb b/spec/components/distributed_cache_spec.rb
index 162e553cd3..e1256346ac 100644
--- a/spec/components/distributed_cache_spec.rb
+++ b/spec/components/distributed_cache_spec.rb
@@ -14,7 +14,7 @@ describe DistributedCache do
   end
 
   def cache(name)
-    DistributedCache.new(name, @manager)
+    DistributedCache.new(name, manager: @manager)
   end
 
   let! :cache1 do
diff --git a/spec/components/email_cook_spec.rb b/spec/components/email_cook_spec.rb
index 48e38169e9..22181c29d9 100644
--- a/spec/components/email_cook_spec.rb
+++ b/spec/components/email_cook_spec.rb
@@ -27,17 +27,19 @@ LONG_COOKED
     expect(EmailCook.new(long).cook).to eq(long_cooked.strip)
   end
 
-  it 'autolinks' do
-    stub_request(:get, "https://www.eviltrout.com").to_return(body: "")
-    stub_request(:head, "https://www.eviltrout.com").to_return(body: "")
-    expect(EmailCook.new("https://www.eviltrout.com").cook).to eq("<a href='https://www.eviltrout.com'>https://www.eviltrout.com</a><br>")
+  it 'creates oneboxed link when the line contains only a link' do
+    expect(EmailCook.new("https://www.eviltrout.com").cook).to eq('<a href="https://www.eviltrout.com" class="onebox" target="_blank">https://www.eviltrout.com</a><br>')
   end
 
   it 'autolinks without the beginning of a line' do
-    expect(EmailCook.new("my site: https://www.eviltrout.com").cook).to eq("my site: <a href='https://www.eviltrout.com'>https://www.eviltrout.com</a><br>")
+    expect(EmailCook.new("my site: https://www.eviltrout.com").cook).to eq('my site: <a href="https://www.eviltrout.com">https://www.eviltrout.com</a><br>')
+  end
+
+  it 'autolinks without the end of a line' do
+    expect(EmailCook.new("https://www.eviltrout.com is my site").cook).to eq('<a href="https://www.eviltrout.com">https://www.eviltrout.com</a> is my site<br>')
   end
 
   it 'links even within a quote' do
-    expect(EmailCook.new("> https://www.eviltrout.com").cook).to eq("<blockquote><a href='https://www.eviltrout.com'>https://www.eviltrout.com</a><br></blockquote>")
+    expect(EmailCook.new("> https://www.eviltrout.com").cook).to eq('<blockquote><a href="https://www.eviltrout.com">https://www.eviltrout.com</a><br></blockquote>')
   end
 end
diff --git a/spec/components/final_destination_spec.rb b/spec/components/final_destination_spec.rb
index 5248299e72..93b6f061d2 100644
--- a/spec/components/final_destination_spec.rb
+++ b/spec/components/final_destination_spec.rb
@@ -20,6 +20,7 @@ describe FinalDestination do
         when 'internal-ipv6.com' then '2001:abc:de:01:3:3d0:6a65:c2bf'
         when 'ignore-me.com' then '53.84.143.152'
         when 'force.get.com' then '22.102.29.40'
+        when 'wikipedia.com' then '1.2.3.4'
         else
           as_ip = IPAddr.new(host) rescue nil
           raise "couldn't lookup #{host}" if as_ip.nil?
@@ -308,6 +309,25 @@ describe FinalDestination do
     end
   end
 
+  describe "https cache" do
+    it 'will cache https lookups' do
+
+      FinalDestination.clear_https_cache!("wikipedia.com")
+
+      stub_request(:head, "http://wikipedia.com/image.png")
+        .to_return(status: 302, body: "", headers: { location: 'https://wikipedia.com/image.png' })
+      stub_request(:head, "https://wikipedia.com/image.png")
+        .to_return(status: 200, body: "", headers: [])
+
+      fd('http://wikipedia.com/image.png').resolve
+
+      stub_request(:head, "https://wikipedia.com/image2.png")
+        .to_return(status: 200, body: "", headers: [])
+
+      fd('http://wikipedia.com/image2.png').resolve
+    end
+  end
+
   describe "#escape_url" do
     it "correctly escapes url" do
       fragment_url = "https://eviltrout.com/2016/02/25/fixing-android-performance.html#discourse-comments"
diff --git a/spec/components/flag_settings_spec.rb b/spec/components/flag_settings_spec.rb
new file mode 100644
index 0000000000..e82d572814
--- /dev/null
+++ b/spec/components/flag_settings_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+require 'flag_settings'
+
+RSpec.describe FlagSettings do
+
+  let(:settings) { FlagSettings.new }
+
+  describe 'add' do
+    it 'will add a type' do
+      settings.add(3, :off_topic)
+      expect(settings.flag_types).to include(:off_topic)
+      expect(settings.is_flag?(:off_topic)).to eq(true)
+      expect(settings.is_flag?(:vote)).to eq(false)
+
+      expect(settings.topic_flag_types).to be_empty
+      expect(settings.notify_types).to be_empty
+      expect(settings.auto_action_types).to be_empty
+    end
+
+    it 'will add a topic type' do
+      settings.add(4, :inappropriate, topic_type: true)
+      expect(settings.flag_types).to include(:inappropriate)
+      expect(settings.topic_flag_types).to include(:inappropriate)
+      expect(settings.without_custom_types).to include(:inappropriate)
+    end
+
+    it 'will add a notify type' do
+      settings.add(3, :off_topic, notify_type: true)
+      expect(settings.flag_types).to include(:off_topic)
+      expect(settings.notify_types).to include(:off_topic)
+    end
+
+    it 'will add an auto action type' do
+      settings.add(7, :notify_moderators, auto_action_type: true)
+      expect(settings.flag_types).to include(:notify_moderators)
+      expect(settings.auto_action_types).to include(:notify_moderators)
+    end
+
+    it 'will add a custom type' do
+      settings.add(7, :notify_user, custom_type: true)
+      expect(settings.flag_types).to include(:notify_user)
+      expect(settings.custom_types).to include(:notify_user)
+      expect(settings.without_custom_types).to be_empty
+    end
+  end
+end
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index 82ee29609a..692fa1ad89 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -75,12 +75,12 @@ describe Guardian do
       expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_falsey
     end
 
-    it "returns false for notify_user if private messages are enabled but threshold not met" do
+    it "returns false for notify_user and notify_moderators if private messages are enabled but threshold not met" do
       SiteSetting.enable_private_messages = true
       SiteSetting.min_trust_to_send_messages = 2
       user.trust_level = TrustLevel[1]
       expect(Guardian.new(user).post_can_act?(post, :notify_user)).to be_falsey
-      expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_truthy
+      expect(Guardian.new(user).post_can_act?(post, :notify_moderators)).to be_falsey
     end
 
     describe "trust levels" do
@@ -216,6 +216,27 @@ describe Guardian do
         end
       end
     end
+
+    context 'target user has private message disabled' do
+      before do
+        another_user.user_option.update!(allow_private_messages: false)
+      end
+
+      context 'for a normal user' do
+        it 'should return false' do
+          expect(Guardian.new(user).can_send_private_message?(another_user)).to eq(false)
+        end
+      end
+
+      context 'for a staff user' do
+        it 'should return true' do
+          [admin, moderator].each do |staff_user|
+            expect(Guardian.new(staff_user).can_send_private_message?(another_user))
+              .to eq(true)
+          end
+        end
+      end
+    end
   end
 
   describe 'can_reply_as_new_topic' do
@@ -2575,4 +2596,60 @@ describe Guardian do
       end
     end
   end
+
+  describe '#can_remove_allowed_users?' do
+    context 'staff users' do
+      it 'should be true' do
+        expect(Guardian.new(moderator).can_remove_allowed_users?(topic))
+          .to eq(true)
+      end
+    end
+
+    context 'normal user' do
+      let(:topic) { Fabricate(:topic, user: Fabricate(:user)) }
+      let(:another_user) { Fabricate(:user) }
+
+      before do
+        topic.allowed_users << user
+        topic.allowed_users << another_user
+      end
+
+      it 'should be false' do
+        expect(Guardian.new(user).can_remove_allowed_users?(topic))
+          .to eq(false)
+      end
+
+      describe 'target_user is the user' do
+        describe 'when user is in a pm with another user' do
+          it 'should return true' do
+            expect(Guardian.new(user).can_remove_allowed_users?(topic, user))
+              .to eq(true)
+          end
+        end
+
+        describe 'when user is the creator of the topic' do
+          it 'should return false' do
+            expect(Guardian.new(topic.user).can_remove_allowed_users?(topic, topic.user))
+              .to eq(false)
+          end
+        end
+
+        describe 'when user is the only user in the topic' do
+          it 'should return false' do
+            topic.remove_allowed_user(Discourse.system_user, another_user.username)
+
+            expect(Guardian.new(user).can_remove_allowed_users?(topic, user))
+              .to eq(false)
+          end
+        end
+      end
+
+      describe 'target_user is not the user' do
+        it 'should return false' do
+          expect(Guardian.new(user).can_remove_allowed_users?(topic, moderator))
+            .to eq(false)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/components/middleware/request_tracker_spec.rb b/spec/components/middleware/request_tracker_spec.rb
index c8c217eb44..b61a995d22 100644
--- a/spec/components/middleware/request_tracker_spec.rb
+++ b/spec/components/middleware/request_tracker_spec.rb
@@ -21,7 +21,7 @@ describe Middleware::RequestTracker do
     def log_tracked_view(val)
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_DISCOURSE_TRACK_VIEW" => val
-      ), ["200", { "Content-Type" => 'text/html' }])
+      ), ["200", { "Content-Type" => 'text/html' }], 0.2)
 
       Middleware::RequestTracker.log_request(data)
     end
@@ -40,19 +40,19 @@ describe Middleware::RequestTracker do
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "AdsBot-Google (+http://www.google.com/adsbot.html)"
-      ), ["200", { "Content-Type" => 'text/html' }])
+      ), ["200", { "Content-Type" => 'text/html' }], 0.1)
 
       Middleware::RequestTracker.log_request(data)
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_DISCOURSE_TRACK_VIEW" => "1"
-      ), ["200", {}])
+      ), ["200", {}], 0.1)
 
       Middleware::RequestTracker.log_request(data)
 
       data = Middleware::RequestTracker.get_data(env(
         "HTTP_USER_AGENT" => "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4"
-      ), ["200", { "Content-Type" => 'text/html' }])
+      ), ["200", { "Content-Type" => 'text/html' }], 0.1)
 
       Middleware::RequestTracker.log_request(data)
 
@@ -65,5 +65,49 @@ describe Middleware::RequestTracker do
       expect(ApplicationRequest.page_view_crawler.first.count).to eq(1)
       expect(ApplicationRequest.page_view_anon_mobile.first.count).to eq(1)
     end
+
+  end
+
+  context "callbacks" do
+    def app(result, sql_calls: 0, redis_calls: 0)
+      lambda do |env|
+        sql_calls.times do
+          User.where(id: -100).first
+        end
+        redis_calls.times do
+          $redis.get("x")
+        end
+        result
+      end
+    end
+
+    let :logger do
+      ->(env, data) do
+        @env = env
+        @data = data
+      end
+    end
+
+    before do
+      Middleware::RequestTracker.register_detailed_request_logger(logger)
+    end
+
+    after do
+      Middleware::RequestTracker.register_detailed_request_logger(logger)
+    end
+
+    it "can correctly log detailed data" do
+      tracker = Middleware::RequestTracker.new(app([200, {}, []], sql_calls: 2, redis_calls: 2))
+      tracker.call(env)
+
+      timing = @data[:timing]
+      expect(timing[:total_duration]).to be > 0
+
+      expect(timing[:sql][:duration]).to be > 0
+      expect(timing[:sql][:calls]).to eq 2
+
+      expect(timing[:redis][:duration]).to be > 0
+      expect(timing[:redis][:calls]).to eq 2
+    end
   end
 end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index a2e4908dbd..f3d2e8350a 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -954,6 +954,30 @@ describe PostCreator do
     end
   end
 
+  context 'private message to a user that has disabled private messages' do
+    let(:another_user) { Fabricate(:user) }
+
+    before do
+      another_user.user_option.update!(allow_private_messages: false)
+    end
+
+    it 'should not be valid' do
+      post_creator = PostCreator.new(
+        user,
+        title: 'this message is to someone who muted me!',
+        raw: "you will have to see this even if you muted me!",
+        archetype: Archetype.private_message,
+        target_usernames: "#{another_user.username}"
+      )
+
+      expect(post_creator).to_not be_valid
+
+      expect(post_creator.errors.full_messages).to include(I18n.t(
+        "not_accepting_pms", username: another_user.username
+      ))
+    end
+  end
+
   context "private message to a muted user" do
     let(:muted_me) { Fabricate(:evil_trout) }
 
diff --git a/spec/components/site_setting_extension_spec.rb b/spec/components/site_setting_extension_spec.rb
index 1c2d8cb7f9..8adf3c1556 100644
--- a/spec/components/site_setting_extension_spec.rb
+++ b/spec/components/site_setting_extension_spec.rb
@@ -472,6 +472,7 @@ describe SiteSettingExtension do
       it "should return default cause nothing is set" do
         expect(settings.nada).to eq('nothing')
       end
+
     end
 
     context "with a false override" do
@@ -484,6 +485,14 @@ describe SiteSettingExtension do
       it "should return default cause nothing is set" do
         expect(settings.bool).to eq(false)
       end
+
+      it "should not trigger any message bus work if you try to set it" do
+        m = MessageBus.track_publish('/site_settings') do
+          settings.bool = true
+          expect(settings.bool).to eq(false)
+        end
+        expect(m.length).to eq(0)
+      end
     end
 
     context "with global setting" do
diff --git a/spec/components/slug_spec.rb b/spec/components/slug_spec.rb
index 24c7117c6b..ad436f6b52 100644
--- a/spec/components/slug_spec.rb
+++ b/spec/components/slug_spec.rb
@@ -6,6 +6,24 @@ require 'slug'
 describe Slug do
 
   describe '#for' do
+    let(:default_slug) { 'topic' }
+
+    let(:very_long_string) do
+      '内容似乎不清晰，这是个完整的句子吗？内容似乎不清晰，这是个完整的句子吗？' * 10
+    end
+
+    it 'returns topic by default' do
+      expect(Slug.for('')).to eq default_slug
+    end
+
+    it 'accepts fallback' do
+      expect(Slug.for('', 'king')).to eq 'king'
+    end
+
+    it 'replaces the underscore' do
+      expect(Slug.for("o_o_o")).to eq("o-o-o")
+    end
+
     context 'ascii generator' do
       before { SiteSetting.slug_generation_method = 'ascii' }
 
@@ -14,11 +32,15 @@ describe Slug do
       end
 
       it 'generates default slug when nothing' do
-        expect(Slug.for('')).to eq('topic')
+        expect(Slug.for('')).to eq(default_slug)
       end
 
       it "doesn't generate slugs that are just numbers" do
-        expect(Slug.for('123')).to eq('topic')
+        expect(Slug.for('123')).to eq(default_slug)
+      end
+
+      it "fallbacks to empty string if it's too long" do
+        expect(Slug.for(very_long_string)).to eq(default_slug)
       end
     end
 
@@ -28,14 +50,25 @@ describe Slug do
 
       it 'generates the slug' do
         expect(Slug.for("熱帶風暴畫眉")).to eq('熱帶風暴畫眉')
+        expect(Slug.for("Jeff hate's !~-_|,=#this")).to eq("jeff-hates-this")
       end
 
       it 'generates default slug when nothing' do
-        expect(Slug.for('')).to eq('topic')
+        expect(Slug.for('')).to eq(default_slug)
       end
 
       it "doesn't generate slugs that are just numbers" do
-        expect(Slug.for('123')).to eq('topic')
+        expect(Slug.for('123')).to eq(default_slug)
+      end
+
+      it "handles the special characters" do
+        expect(Slug.for(
+          " - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- "
+        )).to eq("english-and-chinese-title-with-special-characters-中文标题")
+      end
+
+      it "kills the trailing dash" do
+        expect(Slug.for("2- -this!~-_|,we-#-=^-")).to eq('2-this-we')
       end
     end
 
@@ -45,9 +78,9 @@ describe Slug do
 
       it 'generates the slug' do
         expect(Slug.for("hello world", 'category')).to eq('category')
-        expect(Slug.for("hello world")).to eq('topic')
-        expect(Slug.for('')).to eq('topic')
-        expect(Slug.for('123')).to eq('topic')
+        expect(Slug.for("hello world")).to eq(default_slug)
+        expect(Slug.for('')).to eq(default_slug)
+        expect(Slug.for('123')).to eq(default_slug)
       end
     end
   end
@@ -89,10 +122,6 @@ describe Slug do
       expect(Slug.ascii_generator(from)).to eq(to)
     end
 
-    it 'replaces underscores' do
-      expect(Slug.ascii_generator("o_o_o")).to eq("o-o-o")
-    end
-
     it "doesn't keep single quotes within word" do
       expect(Slug.ascii_generator("Jeff hate's this")).to eq("jeff-hates-this")
     end
@@ -111,15 +140,13 @@ describe Slug do
     after { SiteSetting.slug_generation_method = 'ascii' }
 
     it 'generates precentage encoded string' do
-      expect(Slug.encoded_generator("Jeff hate's !~-_|,=#this")).to eq("Jeff-hates-this")
       expect(Slug.encoded_generator("뉴스피드")).to eq("뉴스피드")
       expect(Slug.encoded_generator("آموزش اضافه کردن لینک اختیاری به هدر")).to eq("آموزش-اضافه-کردن-لینک-اختیاری-به-هدر")
       expect(Slug.encoded_generator("熱帶風暴畫眉")).to eq("熱帶風暴畫眉")
     end
 
     it 'reject RFC 3986 reserved character and blank' do
-      expect(Slug.encoded_generator(":/?#[]@!$ &'()*+,;=% -_`~.")).to eq("")
-      expect(Slug.encoded_generator(" - English and Chinese title with special characters / 中文标题 !@:?\\:'`#^& $%&*()` -- ")).to eq("English-and-Chinese-title-with-special-characters-中文标题")
+      expect(Slug.encoded_generator(":/?#[]@!$ &'()*+,;=% -_`~.")).to eq("---") # will be clear by #for
     end
 
     it 'generates null when nothing' do
@@ -129,6 +156,10 @@ describe Slug do
     it "keeps number unchanged" do
       expect(Slug.encoded_generator('123')).to eq('123')
     end
+
+    it 'downcase the string' do
+      expect(Slug.encoded_generator("LoWer")).to eq('lower')
+    end
   end
 
   describe '#none_generator' do
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index f1ac0aa408..64dbb1060b 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -125,6 +125,7 @@ describe Admin::UsersController do
 
       it "works properly" do
         Fabricate(:api_key, user: user)
+        expect(user).not_to be_suspended
         put(
           :suspend,
           params: {
@@ -137,6 +138,7 @@ describe Admin::UsersController do
         expect(response).to be_success
 
         user.reload
+        expect(user).to be_suspended
         expect(user.suspended_at).to be_present
         expect(user.suspended_till).to be_present
         expect(ApiKey.where(user_id: user.id).count).to eq(0)
diff --git a/spec/controllers/categories_controller_spec.rb b/spec/controllers/categories_controller_spec.rb
index 30eeaef636..f0cca3fa94 100644
--- a/spec/controllers/categories_controller_spec.rb
+++ b/spec/controllers/categories_controller_spec.rb
@@ -338,7 +338,7 @@ describe CategoriesController do
         expect(@category.reload.slug).to eq('valid-slug')
       end
 
-      it 'accepts and sanitize custom slug when the slug generation method is not english' do
+      it 'accepts and sanitize custom slug when the slug generation method is not ascii' do
         SiteSetting.slug_generation_method = 'none'
         put :update_slug,
           params: { category_id: @category.id, slug: ' another !_ slug @' },
diff --git a/spec/controllers/session_controller_spec.rb b/spec/controllers/session_controller_spec.rb
index e04681b2f3..f80e5b7643 100644
--- a/spec/controllers/session_controller_spec.rb
+++ b/spec/controllers/session_controller_spec.rb
@@ -303,6 +303,9 @@ describe SessionController do
         @sso.return_sso_url = "http://somewhere.over.rainbow/sso"
 
         @user = Fabricate(:user, password: "frogs", active: true, admin: true)
+        group = Fabricate(:group)
+        group.add(@user)
+        @user.reload
         EmailToken.update_all(confirmed: true)
       end
 
@@ -328,6 +331,7 @@ describe SessionController do
         expect(sso2.external_id).to eq(@user.id.to_s)
         expect(sso2.admin).to eq(true)
         expect(sso2.moderator).to eq(false)
+        expect(sso2.groups).to eq(@user.groups.pluck(:name))
       end
 
       it "successfully redirects user to return_sso_url when the user is logged in" do
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 74b02ba222..f24e0811ed 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -1065,7 +1065,7 @@ describe TopicsController do
             }, format: format
 
             expect(response.code.to_i).to be(403)
-            expect(response.body).to eq(I18n.t("invalid_access"))
+            expect(response.body).to include(I18n.t("invalid_access"))
           end
         end
       end
diff --git a/spec/models/application_request_spec.rb b/spec/models/application_request_spec.rb
index 78488de3de..59d9490a95 100644
--- a/spec/models/application_request_spec.rb
+++ b/spec/models/application_request_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe ApplicationRequest do
   before do
+    ApplicationRequest.last_flush = Time.now.utc
     ApplicationRequest.clear_cache!
   end
 
@@ -13,19 +14,52 @@ describe ApplicationRequest do
     ApplicationRequest.increment!(key, opts)
   end
 
+  def disable_date_flush!
+    freeze_time(Time.now)
+    ApplicationRequest.last_flush = Time.now.utc
+  end
+
+  context "readonly test" do
+    it 'works even if redis is in readonly' do
+      disable_date_flush!
+
+      inc(:http_total)
+      inc(:http_total)
+
+      $redis.without_namespace.stubs(:incr).raises(Redis::CommandError.new("READONLY"))
+      $redis.without_namespace.stubs(:eval).raises(Redis::CommandError.new("READONLY"))
+
+      # flush will be deferred no error raised
+      inc(:http_total, autoflush: 3)
+      ApplicationRequest.write_cache!
+
+      $redis.without_namespace.unstub(:incr)
+      $redis.without_namespace.unstub(:eval)
+
+      inc(:http_total, autoflush: 3)
+      expect(ApplicationRequest.http_total.first.count).to eq(3)
+    end
+  end
+
   it 'logs nothing for an unflushed increment' do
     ApplicationRequest.increment!(:anon)
     expect(ApplicationRequest.count).to eq(0)
   end
 
   it 'can automatically flush' do
-    t1 = Time.now.utc.at_midnight
-    freeze_time(t1)
+    disable_date_flush!
+
     inc(:http_total)
     inc(:http_total)
     inc(:http_total, autoflush: 3)
 
     expect(ApplicationRequest.http_total.first.count).to eq(3)
+
+    inc(:http_total)
+    inc(:http_total)
+    inc(:http_total, autoflush: 3)
+
+    expect(ApplicationRequest.http_total.first.count).to eq(6)
   end
 
   it 'can flush based on time' do
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 34514489b3..aaa1af0b0b 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -506,7 +506,7 @@ describe PostAction do
 
   it "prevents user to act twice at the same time" do
     # flags are already being tested
-    all_types_except_flags = PostActionType.types.except(PostActionType.flag_types)
+    all_types_except_flags = PostActionType.types.except(PostActionType.flag_types_without_custom)
     all_types_except_flags.values.each do |action|
       expect do
         PostAction.act(eviltrout, post, action)
diff --git a/spec/models/post_analyzer_spec.rb b/spec/models/post_analyzer_spec.rb
index fda9180071..2ae66cef1c 100644
--- a/spec/models/post_analyzer_spec.rb
+++ b/spec/models/post_analyzer_spec.rb
@@ -10,19 +10,18 @@ describe PostAnalyzer do
 
     let(:raw) { "Here's a tweet:\n#{url}" }
     let(:options) { {} }
-    let(:args) { [raw, options] }
 
     before { Oneboxer.stubs(:onebox) }
 
     it 'fetches the cached onebox for any urls in the post' do
       Oneboxer.expects(:cached_onebox).with url
-      post_analyzer.cook(*args)
+      post_analyzer.cook(raw, options)
       expect(post_analyzer.found_oneboxes?).to be(true)
     end
 
     it 'does not invalidate the onebox cache' do
       Oneboxer.expects(:invalidate).with(url).never
-      post_analyzer.cook(*args)
+      post_analyzer.cook(raw, options)
     end
 
     context 'when invalidating oneboxes' do
@@ -30,9 +29,29 @@ describe PostAnalyzer do
 
       it 'invalidates the oneboxes for urls in the post' do
         Oneboxer.expects(:invalidate).with url
-        post_analyzer.cook(*args)
+        post_analyzer.cook(raw, options)
       end
     end
+
+    it "does nothing when the cook_method is 'raw_html'" do
+      cooked = post_analyzer.cook('Hello <div/> world', cook_method: Post.cook_methods[:raw_html])
+      expect(cooked).to eq('Hello <div/> world')
+    end
+
+    it "does not interpret Markdown when cook_method is 'email'" do
+      cooked = post_analyzer.cook('*this is not italic* and here is a link: https://www.example.com', cook_method: Post.cook_methods[:email])
+      expect(cooked).to eq('*this is not italic* and here is a link: <a href="https://www.example.com">https://www.example.com</a>')
+    end
+
+    it "does interpret Markdown when cook_method is 'regular'" do
+      cooked = post_analyzer.cook('*this is italic*', cook_method: Post.cook_methods[:regular])
+      expect(cooked).to eq('<p><em>this is italic</em></p>')
+    end
+
+    it "does interpret Markdown when not cook_method is set" do
+      cooked = post_analyzer.cook('*this is italic*')
+      expect(cooked).to eq('<p><em>this is italic</em></p>')
+    end
   end
 
   context "links" do
@@ -113,21 +132,25 @@ describe PostAnalyzer do
 
     it "doesn't count avatars as images" do
       post_analyzer = PostAnalyzer.new(raw_post_with_avatars, default_topic_id)
+      PrettyText.stubs(:cook).returns(raw_post_with_avatars)
       expect(post_analyzer.image_count).to eq(0)
     end
 
     it "doesn't count favicons as images" do
       post_analyzer = PostAnalyzer.new(raw_post_with_favicon, default_topic_id)
+      PrettyText.stubs(:cook).returns(raw_post_with_favicon)
       expect(post_analyzer.image_count).to eq(0)
     end
 
     it "doesn't count thumbnails as images" do
       post_analyzer = PostAnalyzer.new(raw_post_with_thumbnail, default_topic_id)
+      PrettyText.stubs(:cook).returns(raw_post_with_thumbnail)
       expect(post_analyzer.image_count).to eq(0)
     end
 
     it "doesn't count whitelisted images" do
       Post.stubs(:white_listed_image_classes).returns(["classy"])
+      PrettyText.stubs(:cook).returns(raw_post_with_two_classy_images)
       post_analyzer = PostAnalyzer.new(raw_post_with_two_classy_images, default_topic_id)
       expect(post_analyzer.image_count).to eq(0)
     end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b387c7e179..99b5e898bc 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -189,15 +189,19 @@ describe Post do
     end
 
     it "doesn't count favicons as images" do
+      PrettyText.stubs(:cook).returns(post_with_favicon.raw)
       expect(post_with_favicon.image_count).to eq(0)
     end
 
     it "doesn't count thumbnails as images" do
+      PrettyText.stubs(:cook).returns(post_with_thumbnail.raw)
       expect(post_with_thumbnail.image_count).to eq(0)
     end
 
     it "doesn't count whitelisted images" do
       Post.stubs(:white_listed_image_classes).returns(["classy"])
+      # I dislike this, but passing in a custom whitelist is hard
+      PrettyText.stubs(:cook).returns(post_with_two_classy_images.raw)
       expect(post_with_two_classy_images.image_count).to eq(0)
     end
 
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index 40fafa5a03..bb9408f808 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -230,7 +230,6 @@ http://b.com/#{'a' * 500}
       end
 
     end
-
   end
 
   describe 'internal link from pm' do
@@ -382,6 +381,11 @@ http://b.com/#{'a' * 500}
         expect(result).to eq({})
       end
     end
+
+    it "works with invalid link target" do
+      post = Fabricate(:post, raw: '<a href="http:geturl">http:geturl</a>', user: user, topic: topic, cook_method: Post.cook_methods[:raw_html])
+      expect { TopicLink.extract_from(post) }.to_not raise_error
+    end
   end
 
 end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 706b2ee497..23021afbb6 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -6,6 +6,7 @@ require_dependency 'post_destroyer'
 describe Topic do
   let(:now) { Time.zone.local(2013, 11, 20, 8, 0) }
   let(:user) { Fabricate(:user) }
+  let(:topic) { Fabricate(:topic) }
 
   context 'validations' do
     let(:topic) { Fabricate.build(:topic) }
@@ -122,21 +123,25 @@ describe Topic do
   context 'slug' do
     let(:title) { "hello world topic" }
     let(:slug) { "hello-world-topic" }
+    let!(:expected_title) { title.dup }
+    let!(:expected_slug) { slug.dup }
+    let(:topic) { Fabricate.build(:topic, title: title) }
+
     context 'encoded generator' do
       before { SiteSetting.slug_generation_method = 'encoded' }
-      after { SiteSetting.slug_generation_method = 'ascii' }
 
       it "returns a Slug for a title" do
-        Slug.expects(:for).with(title).returns(slug)
-        expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
+        expect(topic.title).to eq(expected_title)
+        expect(topic.slug).to eq(expected_slug)
       end
 
       context 'for cjk characters' do
         let(:title) { "熱帶風暴畫眉" }
-        let(:slug) { "熱帶風暴畫眉" }
+        let!(:expected_title) { title.dup }
+
         it "returns encoded Slug for a title" do
-          Slug.expects(:for).with(title).returns(slug)
-          expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
+          expect(topic.title).to eq(expected_title)
+          expect(topic.slug).to eq(expected_title)
         end
       end
 
@@ -152,7 +157,7 @@ describe Topic do
 
     context 'none generator' do
       before { SiteSetting.slug_generation_method = 'none' }
-      after { SiteSetting.slug_generation_method = 'ascii' }
+
       let(:title) { "熱帶風暴畫眉" }
       let(:slug) { "topic" }
 
@@ -164,6 +169,7 @@ describe Topic do
 
     context '#ascii_generator' do
       before { SiteSetting.slug_generation_method = 'ascii' }
+
       it "returns a Slug for a title" do
         Slug.expects(:for).with(title).returns(slug)
         expect(Fabricate.build(:topic, title: title).slug).to eq(slug)
@@ -172,6 +178,7 @@ describe Topic do
       context 'for cjk characters' do
         let(:title) { "熱帶風暴畫眉" }
         let(:slug) { 'topic' }
+
         it "returns 'topic' when the slug is empty (say, non-latin characters)" do
           Slug.expects(:for).with(title).returns("topic")
           expect(Fabricate.build(:topic, title: title).slug).to eq("topic")
@@ -327,6 +334,35 @@ describe Topic do
         topic.title = "this is another edge case"
         expect(topic.fancy_title).to eq("this is another edge case")
       end
+
+      it "works with long title that results in lots of entities" do
+        long_title = "NEW STOCK PICK: PRCT - LAST PICK UP 233%, NNCO.................................................................................................................................................................. ofoum"
+        topic.title = long_title
+
+        expect { topic.save! }.to_not raise_error
+        expect(topic.fancy_title).to eq(long_title)
+      end
+
+      context 'readonly mode' do
+        before do
+          Discourse.enable_readonly_mode
+        end
+
+        after do
+          Discourse.disable_readonly_mode
+        end
+
+        it 'should not attempt to update `fancy_title`' do
+          topic.save!
+          expect(topic.fancy_title).to eq('&ldquo;this topic&rdquo; &ndash; has &ldquo;fancy stuff&rdquo;')
+
+          topic.title = "This is a test testing testing"
+          expect(topic.fancy_title).to eq("This is a test testing testing")
+
+          expect(topic.reload.read_attribute(:fancy_title))
+            .to eq('&ldquo;this topic&rdquo; &ndash; has &ldquo;fancy stuff&rdquo;')
+        end
+      end
     end
   end
 
@@ -2040,4 +2076,23 @@ describe Topic do
       end
     end
   end
+
+  describe '#remove_allowed_user' do
+    let(:another_user) { Fabricate(:user) }
+
+    describe 'removing oneself' do
+      it 'should remove onself' do
+        topic.allowed_users << another_user
+
+        expect(topic.remove_allowed_user(another_user, another_user)).to eq(true)
+        expect(topic.allowed_users.include?(another_user)).to eq(false)
+
+        post = Post.last
+
+        expect(post.user).to eq(Discourse.system_user)
+        expect(post.post_type).to eq(Post.types[:small_action])
+        expect(post.action_code).to eq('user_left')
+      end
+    end
+  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cd07511834..4f4071bffa 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -67,7 +67,7 @@ describe User do
     end
 
     it "doesn't enqueue the system message when the site settings disable it" do
-      SiteSetting.expects(:send_welcome_message?).returns(false)
+      SiteSetting.send_welcome_message = false
       Jobs.expects(:enqueue).with(:send_system_message, user_id: user.id, message_type: 'welcome_user').never
       user.enqueue_welcome_message('welcome_user')
     end
@@ -91,15 +91,12 @@ describe User do
       user.approve(admin)
     end
 
-    it 'triggers extensibility events' do
+    it 'triggers a extensibility event' do
       user && admin # bypass the user_created event
-      user_updated_event, user_approved_event = DiscourseEvent.track_events { user.approve(admin) }
+      event = DiscourseEvent.track_events { user.approve(admin) }.first
 
-      expect(user_updated_event[:event_name]).to eq(:user_updated)
-      expect(user_updated_event[:params].first).to eq(user)
-
-      expect(user_approved_event[:event_name]).to eq(:user_approved)
-      expect(user_approved_event[:params].first).to eq(user)
+      expect(event[:event_name]).to eq(:user_approved)
+      expect(event[:params].first).to eq(user)
     end
 
     context 'after approval' do
diff --git a/spec/multisite/distributed_cache_spec.rb b/spec/multisite/distributed_cache_spec.rb
new file mode 100644
index 0000000000..6267e18194
--- /dev/null
+++ b/spec/multisite/distributed_cache_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe 'Multisite SiteSettings' do
+  let(:conn) { RailsMultisite::ConnectionManagement }
+
+  before do
+    conn.config_filename = "spec/fixtures/multisite/two_dbs.yml"
+    conn.load_settings!
+    conn.remove_class_variable(:@@current_db)
+  end
+
+  after do
+    conn.clear_settings!
+
+    [:@@db_spec_cache, :@@host_spec_cache, :@@default_spec].each do |class_variable|
+      conn.remove_class_variable(class_variable)
+    end
+
+    conn.set_current_db
+  end
+
+  def cache(name, namespace: true)
+    DistributedCache.new(name, namespace: namespace)
+  end
+
+  context 'without namespace' do
+    let(:cache1) { cache('test', namespace: false) }
+
+    it 'does not leak state across multisite' do
+      cache1['default'] = true
+
+      expect(cache1.hash).to eq('default' => true)
+
+      conn.with_connection('second') do
+        message = MessageBus.track_publish(DistributedCache::Manager::CHANNEL_NAME) do
+          cache1['second'] = true
+        end.first
+
+        expect(message.data[:hash_key]).to eq('test')
+        expect(message.data[:op]).to eq(:set)
+        expect(message.data[:key]).to eq('second')
+        expect(message.data[:value]).to eq(true)
+      end
+
+      expect(cache1.hash).to eq('default' => true, 'second' => true)
+    end
+  end
+end
diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js
index 04d0984399..50926f3338 100644
--- a/spec/phantom_js/smoke_test.js
+++ b/spec/phantom_js/smoke_test.js
@@ -178,121 +178,127 @@ var runTests = function() {
     return $("#user-card .names").length;
   });
 
-  exec("open login modal", function() {
-    $(".login-button").click();
-  });
+  if (system.env["READONLY_TESTS"]) {
+    test("readonly alert is present", function() {
+      return $(".alert-read-only").length;
+    });
+  } else {
+    exec("open login modal", function() {
+      $(".login-button").click();
+    });
 
-  test("login modal is open", function() {
-    return $(".login-modal").length;
-  });
+    test("login modal is open", function() {
+      return $(".login-modal").length;
+    });
 
-  exec("type in credentials & log in", function(system) {
-    $("#login-account-name").val(system.env['DISCOURSE_USERNAME'] || 'smoke_user').trigger("change");
-    $("#login-account-password").val(system.env["DISCOURSE_PASSWORD"] || 'P4ssw0rd').trigger("change");
-    $(".login-modal .btn-primary").click();
-  });
+    exec("type in credentials & log in", function(system) {
+      $("#login-account-name").val(system.env['DISCOURSE_USERNAME'] || 'smoke_user').trigger("change");
+      $("#login-account-password").val(system.env["DISCOURSE_PASSWORD"] || 'P4ssw0rd').trigger("change");
+      $(".login-modal .btn-primary").click();
+    });
 
-  test("is logged in", function() {
-    return $(".current-user").length;
-  });
+    test("is logged in", function() {
+      return $(".current-user").length;
+    });
 
-  exec("go home", function() {
-    if ($('#site-logo').length) $('#site-logo').click();
-    if ($('#site-text-logo').length) $('#site-text-logo').click();
-  });
+    exec("go home", function() {
+      if ($('#site-logo').length) $('#site-logo').click();
+      if ($('#site-text-logo').length) $('#site-text-logo').click();
+    });
 
-  test("it shows a topic list", function() {
-    return $(".topic-list").length;
-  });
+    test("it shows a topic list", function() {
+      return $(".topic-list").length;
+    });
 
-  test('we have a create topic button', function() {
-    return $("#create-topic").length;
-  });
+    test('we have a create topic button', function() {
+      return $("#create-topic").length;
+    });
 
-  exec("open composer", function() {
-    $("#create-topic").click();
-  });
+    exec("open composer", function() {
+      $("#create-topic").click();
+    });
 
-  test('the editor is visible', function() {
-    return $(".d-editor").length;
-  });
+    test('the editor is visible', function() {
+      return $(".d-editor").length;
+    });
 
-  exec("compose new topic", function() {
-    var date = " (" + (+new Date()) + ")",
-        title = "This is a new topic" + date,
-        post = "I can write a new topic inside the smoke test!" + date + "\n\n";
+    exec("compose new topic", function() {
+      var date = " (" + (+new Date()) + ")",
+          title = "This is a new topic" + date,
+          post = "I can write a new topic inside the smoke test!" + date + "\n\n";
 
-    $("#reply-title").val(title).trigger("change");
-    $("#reply-control .d-editor-input").val(post).trigger("change");
-    $("#reply-control .d-editor-input").focus()[0].setSelectionRange(post.length, post.length);
-  });
+      $("#reply-title").val(title).trigger("change");
+      $("#reply-control .d-editor-input").val(post).trigger("change");
+      $("#reply-control .d-editor-input").focus()[0].setSelectionRange(post.length, post.length);
+    });
 
-  test("updates preview", function() {
-    return $(".d-editor-preview p").length;
-  });
+    test("updates preview", function() {
+      return $(".d-editor-preview p").length;
+    });
 
-  exec("open upload modal", function() {
-    $(".d-editor-button-bar .upload").click();
-  });
+    exec("open upload modal", function() {
+      $(".d-editor-button-bar .upload").click();
+    });
 
-  test("upload modal is open", function() {
-    return $("#filename-input").length;
-  });
+    test("upload modal is open", function() {
+      return $("#filename-input").length;
+    });
 
-  // TODO: Looks like PhantomJS 2.0.0 has a bug with `uploadFile`
-  // which breaks this code.
+    // TODO: Looks like PhantomJS 2.0.0 has a bug with `uploadFile`
+    // which breaks this code.
 
-  // upload("#filename-input", "spec/fixtures/images/large & unoptimized.png");
-  // test("the file is inserted into the input", function() {
-  //   return document.getElementById('filename-input').files.length
-  // });
-  // screenshot('/tmp/upload-modal.png');
-  //
-  // test("upload modal is open", function() {
-  //   return document.querySelector("#filename-input");
-  // });
-  //
-  // exec("click upload button", function() {
-  //   $(".modal .btn-primary").click();
-  // });
-  //
-  // test("image is uploaded", function() {
-  //   return document.querySelector(".cooked img");
-  // });
+    // upload("#filename-input", "spec/fixtures/images/large & unoptimized.png");
+    // test("the file is inserted into the input", function() {
+    //   return document.getElementById('filename-input').files.length
+    // });
+    // screenshot('/tmp/upload-modal.png');
+    //
+    // test("upload modal is open", function() {
+    //   return document.querySelector("#filename-input");
+    // });
+    //
+    // exec("click upload button", function() {
+    //   $(".modal .btn-primary").click();
+    // });
+    //
+    // test("image is uploaded", function() {
+    //   return document.querySelector(".cooked img");
+    // });
 
-  exec("submit the topic", function() {
-    $("#reply-control .create").click();
-  });
+    exec("submit the topic", function() {
+      $("#reply-control .create").click();
+    });
 
-  test("topic is created", function() {
-    return $(".fancy-title").length;
-  });
+    test("topic is created", function() {
+      return $(".fancy-title").length;
+    });
 
-  exec("click reply button", function() {
-    $(".post-controls:first .create").click();
-  });
+    exec("click reply button", function() {
+      $(".post-controls:first .create").click();
+    });
 
-  test("composer is open", function() {
-    return $("#reply-control .d-editor-input").length;
-  });
+    test("composer is open", function() {
+      return $("#reply-control .d-editor-input").length;
+    });
 
-  exec("compose reply", function() {
-    var post = "I can even write a reply inside the smoke test ;) (" + (+new Date()) + ")";
-    $("#reply-control .d-editor-input").val(post).trigger("change");
-  });
+    exec("compose reply", function() {
+      var post = "I can even write a reply inside the smoke test ;) (" + (+new Date()) + ")";
+      $("#reply-control .d-editor-input").val(post).trigger("change");
+    });
 
-  test("waiting for the preview", function() {
-    return $(".d-editor-preview").text().trim().indexOf("I can even write") === 0;
-  });
+    test("waiting for the preview", function() {
+      return $(".d-editor-preview").text().trim().indexOf("I can even write") === 0;
+    });
 
-  execAsync("submit the reply", 6000, function() {
-    $("#reply-control .create").click();
-  });
+    execAsync("submit the reply", 6000, function() {
+      $("#reply-control .create").click();
+    });
 
-  test("reply is created", function() {
-    return !document.querySelector(".saving-text")
-        && $(".topic-post").length === 2;
-  });
+    test("reply is created", function() {
+      return !document.querySelector(".saving-text")
+          && $(".topic-post").length === 2;
+    });
+  }
 
   run();
 };
diff --git a/spec/requests/users_email_controller_spec.rb b/spec/requests/users_email_controller_spec.rb
index 78c83cbe3e..a0572cb726 100644
--- a/spec/requests/users_email_controller_spec.rb
+++ b/spec/requests/users_email_controller_spec.rb
@@ -7,7 +7,7 @@ describe UsersEmailController do
       get "/u/authorize-email/asdfasdf"
 
       expect(response).to be_success
-      expect(response.body).to include(I18n.t('change_email.error'))
+      expect(response.body).to include(I18n.t('change_email.already_done'))
     end
 
     context 'valid old address token' do
diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb
index 50f9f08c65..5e75727cfc 100644
--- a/spec/serializers/post_serializer_spec.rb
+++ b/spec/serializers/post_serializer_spec.rb
@@ -9,8 +9,7 @@ describe PostSerializer do
     let(:admin) { Fabricate(:admin) }
     let(:acted_ids) {
       PostActionType.public_types.values
-        .concat([:notify_user, :spam]
-        .map { |k| PostActionType.types[k] })
+        .concat([:notify_user, :spam].map { |k| PostActionType.types[k] })
     }
 
     def visible_actions_for(user)
diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
index 91fde1605a..b3c9a11ca9 100644
--- a/spec/services/user_updater_spec.rb
+++ b/spec/services/user_updater_spec.rb
@@ -76,8 +76,9 @@ describe UserUpdater do
                            notification_level_when_replying: 3,
                            email_in_reply_to: false,
                            date_of_birth: date_of_birth,
-                           theme_key: theme.key
-                    )
+                           theme_key: theme.key,
+                           allow_private_messages: false)
+
       expect(val).to be_truthy
 
       user.reload
@@ -92,6 +93,7 @@ describe UserUpdater do
       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.allow_private_messages).to eq(false)
       expect(user.date_of_birth).to eq(date_of_birth.to_date)
     end
 
@@ -198,10 +200,25 @@ describe UserUpdater do
     it "logs the action" do
       user_without_name = Fabricate(:user, name: nil)
       user = Fabricate(:user, name: 'Billy Bob')
-      expect { UserUpdater.new(acting_user, user).update(name: 'Jim Tom') }.to change { UserHistory.count }.by(1)
-      expect { UserUpdater.new(acting_user, user).update(name: 'Jim Tom') }.to change { UserHistory.count }.by(0) # make sure it does not log a dupe
-      expect { UserUpdater.new(acting_user, user_without_name).update(bio_raw: 'foo bar') }.to change { UserHistory.count }.by(0) # make sure user without name (name = nil) does not raise an error
-      expect { UserUpdater.new(acting_user, user_without_name).update(name: 'Jim Tom') }.to change { UserHistory.count }.by(1)
+      expect do
+        UserUpdater.new(acting_user, user).update(name: 'Jim Tom')
+      end.to change { UserHistory.count }.by(1)
+
+      expect do
+        UserUpdater.new(acting_user, user).update(name: 'JiM TOm')
+      end.to_not change { UserHistory.count }
+
+      expect do
+        UserUpdater.new(acting_user, user_without_name).update(bio_raw: 'foo bar')
+      end.to_not change { UserHistory.count }
+
+      expect do
+        UserUpdater.new(acting_user, user_without_name).update(name: 'Jim Tom')
+      end.to change { UserHistory.count }.by(1)
+
+      expect do
+        UserUpdater.new(acting_user, user).update(name: '')
+      end.to change { UserHistory.count }.by(1)
     end
   end
 end
diff --git a/spec/tasks/posts_spec.rb b/spec/tasks/posts_spec.rb
index 7f3e307f9e..acaf19c5dc 100644
--- a/spec/tasks/posts_spec.rb
+++ b/spec/tasks/posts_spec.rb
@@ -3,6 +3,9 @@ require 'highline/import'
 require 'highline/simulate'
 
 RSpec.describe "Post rake tasks" do
+  let!(:post) { Fabricate(:post, raw: 'The quick brown fox jumps over the lazy dog') }
+  let!(:tricky_post) { Fabricate(:post, raw: 'Today ^Today') }
+
   before do
     Rake::Task.clear
     Discourse::Application.load_tasks
@@ -10,11 +13,7 @@ RSpec.describe "Post rake tasks" do
   end
 
   describe 'remap' do
-    let!(:tricky_post) { Fabricate(:post, raw: 'Today ^Today') }
-
     it 'should remap posts' do
-      post = Fabricate(:post, raw: "The quick brown fox jumps over the lazy dog")
-
       HighLine::Simulate.with('y') do
         Rake::Task['posts:remap'].invoke("brown", "red")
       end
@@ -43,4 +42,16 @@ RSpec.describe "Post rake tasks" do
       end
     end
   end
+
+  describe 'rebake_match' do
+    it 'rebakes matched posts' do
+      post.update_attributes(cooked: '')
+
+      HighLine::Simulate.with('y') do
+        Rake::Task['posts:rebake_match'].invoke('brown')
+      end
+
+      expect(post.reload.cooked).to eq('<p>The quick brown fox jumps over the lazy dog</p>')
+    end
+  end
 end
diff --git a/test/javascripts/acceptance/admin-suspend-user-test.js.es6 b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
index b122e5a826..4c3d43feeb 100644
--- a/test/javascripts/acceptance/admin-suspend-user-test.js.es6
+++ b/test/javascripts/acceptance/admin-suspend-user-test.js.es6
@@ -43,8 +43,9 @@ QUnit.test("suspend, then unsuspend a user", assert => {
 
   andThen(() => {
     assert.equal(find('.perform-suspend[disabled]').length, 1, 'disabled by default');
-    find('.suspend-until .combobox').select2('val', 'tomorrow');
-    find('.suspend-until .combobox').trigger('change', 'tomorrow');
+
+    expandSelectBox('.suspend-until .combobox');
+    selectBoxSelectRow('tomorrow', { selector: '.suspend-until .combobox'});
   });
 
   fillIn('.suspend-reason', "for breaking the rules");
@@ -63,4 +64,3 @@ QUnit.test("suspend, then unsuspend a user", assert => {
     assert.ok(!exists('.suspension-info'));
   });
 });
-
diff --git a/test/javascripts/acceptance/category-select-box-test.js.es6 b/test/javascripts/acceptance/category-chooser-test.js.es6
similarity index 60%
rename from test/javascripts/acceptance/category-select-box-test.js.es6
rename to test/javascripts/acceptance/category-chooser-test.js.es6
index 7d8b915777..de39c87094 100644
--- a/test/javascripts/acceptance/category-select-box-test.js.es6
+++ b/test/javascripts/acceptance/category-chooser-test.js.es6
@@ -1,6 +1,6 @@
 import { acceptance } from "helpers/qunit-helpers";
 
-acceptance("CategorySelectBox", {
+acceptance("CategoryChooser", {
   loggedIn: true,
   settings: {
     allow_uncategorized_topics: false
@@ -11,9 +11,10 @@ QUnit.test("does not display uncategorized if not allowed", assert => {
   visit("/");
   click('#create-topic');
 
-  click(".category-select-box .select-box-header");
+  expandSelectBox('.category-chooser');
+
   andThen(() => {
-    assert.ok(!exists('.category-select-box .select-box-row[title="uncategorized"]'));
+    assert.ok(selectBox('.category-chooser').rowByIndex(0).name() !== 'uncategorized');
   });
 });
 
@@ -21,6 +22,6 @@ QUnit.test("prefill category when category_id is set", assert => {
   visit("/new-topic?category_id=1");
 
   andThen(() => {
-    assert.equal(find('.category-select-box .current-selection').html().trim(), "bug");
+    assert.equal(selectBox('.category-chooser').header.name(), 'bug');
   });
 });
diff --git a/test/javascripts/acceptance/category-edit-test.js.es6 b/test/javascripts/acceptance/category-edit-test.js.es6
index 24c2ada061..d3a99c3a35 100644
--- a/test/javascripts/acceptance/category-edit-test.js.es6
+++ b/test/javascripts/acceptance/category-edit-test.js.es6
@@ -75,9 +75,9 @@ QUnit.test("Subcategory list settings", assert => {
 
   click('.edit-category-general');
 
-  expandSelectBox('.edit-category-tab-general .category-select-box');
+  expandSelectBox('.edit-category-tab-general .category-chooser');
 
-  selectBoxSelectRow(3, {selector: '.edit-category-tab-general .category-select-box'});
+  selectBoxSelectRow(3, {selector: '.edit-category-tab-general .category-chooser'});
 
   click('.edit-category-settings');
   andThen(() => {
diff --git a/test/javascripts/acceptance/category-hashtag-test.js.es6 b/test/javascripts/acceptance/category-hashtag-test.js.es6
index 813578712c..bd410abc18 100644
--- a/test/javascripts/acceptance/category-hashtag-test.js.es6
+++ b/test/javascripts/acceptance/category-hashtag-test.js.es6
@@ -16,4 +16,4 @@ QUnit.test("category hashtag is cooked properly", assert => {
   andThen(() => {
     assert.equal(find('.topic-post:last .cooked p').html().trim(), "this is a category hashtag <a href=\"/c/bugs\" class=\"hashtag\">#<span>bug</span></a>");
   });
-});
\ No newline at end of file
+});
diff --git a/test/javascripts/acceptance/queued-posts-test.js.es6 b/test/javascripts/acceptance/queued-posts-test.js.es6
index d3a561c71e..8c41899fc0 100644
--- a/test/javascripts/acceptance/queued-posts-test.js.es6
+++ b/test/javascripts/acceptance/queued-posts-test.js.es6
@@ -20,7 +20,7 @@ QUnit.test("For topics: body of post, title, category and tags are all editbale"
   andThen(() => {
     assert.ok(exists(".d-editor-container"), "the body should be editable");
     assert.ok(exists(".edit-title .ember-text-field"), "the title should be editable");
-    assert.ok(exists(".category-select-box"), "category should be editbale");
+    assert.ok(exists(".category-chooser"), "category should be editbale");
     assert.ok(exists(".tag-chooser"), "tags should be editable");
   });
 });
@@ -41,7 +41,7 @@ QUnit.test("For replies: only the body of post is editbale", assert => {
   andThen(() => {
     assert.ok(exists(".d-editor-container"), "the body should be editable");
     assert.notOk(exists(".edit-title .ember-text-field"), "title should not be editbale");
-    assert.notOk(exists(".category-select-box"), "category should not be editable");
+    assert.notOk(exists(".category-chooser"), "category should not be editable");
     assert.notOk(exists("div.tag-chooser"), "tags should not be editable");
   });
 });
diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6
index a7f480df9c..b64ca86dec 100644
--- a/test/javascripts/acceptance/search-full-test.js.es6
+++ b/test/javascripts/acceptance/search-full-test.js.es6
@@ -256,11 +256,13 @@ QUnit.test("update in filter through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  selectDropdown('.search-advanced-options #s2id_in', 'bookmarks');
-  fillIn('.search-advanced-options #in', 'bookmarks');
+
+  expandSelectBox('.search-advanced-options .select-box-kit#in');
+  selectBoxSelectRow('bookmarks', { selector: '.search-advanced-options .select-box-kit#in' });
+  fillIn('.search-advanced-options .select-box-kit#in', 'bookmarks');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_in .select2-choice .select2-chosen:contains("I\'ve bookmarked")'), 'has "I\'ve bookmarked" populated');
+    assert.ok(exists(selectBox('.search-advanced-options .select-box-kit#in').rowByName("I\'ve bookmarked").el), 'has "I\'ve bookmarked" populated');
     assert.equal(find('.search input.full-page-search').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
   });
 });
@@ -269,11 +271,12 @@ QUnit.test("update status through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  selectDropdown('.search-advanced-options #s2id_status', 'closed');
-  fillIn('.search-advanced-options #status', 'closed');
+  expandSelectBox('.search-advanced-options .select-box-kit#status');
+  selectBoxSelectRow('closed', { selector: '.search-advanced-options .select-box-kit#status' });
+  fillIn('.search-advanced-options .select-box-kit#status', 'closed');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_status .select2-choice .select2-chosen:contains("are closed")'), 'has "are closed" populated');
+    assert.ok(exists(selectBox('.search-advanced-options .select-box-kit#status').rowByName("are closed").el), 'has "are closed" populated');
     assert.equal(find('.search input.full-page-search').val(), "none status:closed", 'has updated search term to "none status:closed"');
   });
 });
@@ -283,11 +286,12 @@ QUnit.test("update post time through advanced search ui", assert => {
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
   fillIn('#search-post-date', '2016-10-05');
-  selectDropdown('.search-advanced-options #s2id_postTime', 'after');
-  fillIn('.search-advanced-options #postTime', 'after');
+  expandSelectBox('.search-advanced-options .select-box-kit#postTime');
+  selectBoxSelectRow('after', { selector: '.search-advanced-options .select-box-kit#postTime' });
+  fillIn('.search-advanced-options .select-box-kit#postTime', 'after');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_postTime .select2-choice .select2-chosen:contains("after")'), 'has "after" populated');
+    assert.ok(exists(selectBox('.search-advanced-options .select-box-kit#postTime').rowByName("after").el), 'has "after" populated');
     assert.equal(find('.search-advanced-options #search-post-date').val(), "2016-10-05", 'has "2016-10-05" populated');
     assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
   });
diff --git a/test/javascripts/acceptance/search-test.js.es6 b/test/javascripts/acceptance/search-test.js.es6
index 346c53b723..c449d17ccc 100644
--- a/test/javascripts/acceptance/search-test.js.es6
+++ b/test/javascripts/acceptance/search-test.js.es6
@@ -89,18 +89,20 @@ QUnit.test("Search with context", assert => {
 QUnit.test("Right filters are shown to anonymous users", assert => {
   visit("/search?expanded=true");
 
-  andThen(() => {
-    assert.ok(exists('select#in option[value=first]'));
-    assert.ok(exists('select#in option[value=pinned]'));
-    assert.ok(exists('select#in option[value=unpinned]'));
-    assert.ok(exists('select#in option[value=wiki]'));
-    assert.ok(exists('select#in option[value=images]'));
+  expandSelectBox(".select-box-kit#in");
 
-    assert.notOk(exists('select#in option[value=unseen]'));
-    assert.notOk(exists('select#in option[value=posted]'));
-    assert.notOk(exists('select#in option[value=watching]'));
-    assert.notOk(exists('select#in option[value=tracking]'));
-    assert.notOk(exists('select#in option[value=bookmarks]'));
+  andThen(() => {
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=first]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=pinned]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=unpinned]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=wiki]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=images]'));
+
+    assert.notOk(exists('.select-box-kit#in .select-box-kit-row[data-value=unseen]'));
+    assert.notOk(exists('.select-box-kit#in .select-box-kit-row[data-value=posted]'));
+    assert.notOk(exists('.select-box-kit#in .select-box-kit-row[data-value=watching]'));
+    assert.notOk(exists('.select-box-kit#in .select-box-kit-row[data-value=tracking]'));
+    assert.notOk(exists('.select-box-kit#in .select-box-kit-row[data-value=bookmarks]'));
 
     assert.notOk(exists('.search-advanced-options .in-likes'));
     assert.notOk(exists('.search-advanced-options .in-private'));
@@ -113,18 +115,20 @@ QUnit.test("Right filters are shown to logged-in users", assert => {
   Discourse.reset();
   visit("/search?expanded=true");
 
-  andThen(() => {
-    assert.ok(exists('select#in option[value=first]'));
-    assert.ok(exists('select#in option[value=pinned]'));
-    assert.ok(exists('select#in option[value=unpinned]'));
-    assert.ok(exists('select#in option[value=wiki]'));
-    assert.ok(exists('select#in option[value=images]'));
+  expandSelectBox(".select-box-kit#in");
 
-    assert.ok(exists('select#in option[value=unseen]'));
-    assert.ok(exists('select#in option[value=posted]'));
-    assert.ok(exists('select#in option[value=watching]'));
-    assert.ok(exists('select#in option[value=tracking]'));
-    assert.ok(exists('select#in option[value=bookmarks]'));
+  andThen(() => {
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=first]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=pinned]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=unpinned]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=wiki]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=images]'));
+
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=unseen]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=posted]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=watching]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=tracking]'));
+    assert.ok(exists('.select-box-kit#in .select-box-kit-row[data-value=bookmarks]'));
 
     assert.ok(exists('.search-advanced-options .in-likes'));
     assert.ok(exists('.search-advanced-options .in-private'));
diff --git a/test/javascripts/acceptance/topic-notifications-button-test.js.es6 b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
index 6585b4b206..353ac65150 100644
--- a/test/javascripts/acceptance/topic-notifications-button-test.js.es6
+++ b/test/javascripts/acceptance/topic-notifications-button-test.js.es6
@@ -23,17 +23,18 @@ QUnit.test("Updating topic notification level", assert => {
 
   andThen(() => {
     assert.ok(
-      exists(`${notificationOptions} .tracking`),
+      exists(`${notificationOptions}`),
       "it should display the notification options button in the topic's footer"
     );
   });
 
-  click(`${notificationOptions} .tracking`);
-  click(`${notificationOptions} .select-box-collection .select-box-row[title=Tracking]`);
+  expandSelectBox(notificationOptions);
+  selectBoxSelectRow("3", { selector: notificationOptions});
 
   andThen(() => {
-    assert.ok(
-      exists(`${notificationOptions} .watching`),
+    assert.equal(
+      selectBox(notificationOptions).selectedRow.name(),
+      "watching",
       "it should display the right notification level"
     );
 
diff --git a/test/javascripts/acceptance/topic-test.js.es6 b/test/javascripts/acceptance/topic-test.js.es6
index 530ea1cad3..b1f7d80d6d 100644
--- a/test/javascripts/acceptance/topic-test.js.es6
+++ b/test/javascripts/acceptance/topic-test.js.es6
@@ -53,9 +53,9 @@ QUnit.test("Updating the topic title and category", assert => {
 
   fillIn('#edit-title', 'this is the new title');
 
-  expandSelectBox('.title-wrapper .category-select-box');
+  expandSelectBox('.title-wrapper .category-chooser');
 
-  selectBoxSelectRow(4, {selector: '.title-wrapper .category-select-box'});
+  selectBoxSelectRow(4, {selector: '.title-wrapper .category-chooser'});
 
   click('#topic-title .submit-edit');
 
@@ -103,7 +103,7 @@ QUnit.test("Reply as new topic", assert => {
       "it fills composer with the ring string"
     );
     assert.equal(
-      selectBox('.category-select-box').header.text(), "feature",
+      selectBox('.category-chooser').header.name(), "feature",
       "it fills category selector with the right category"
     );
   });
diff --git a/test/javascripts/acceptance/user-test.js.es6 b/test/javascripts/acceptance/user-test.js.es6
index 22759a7ee7..261a9b6632 100644
--- a/test/javascripts/acceptance/user-test.js.es6
+++ b/test/javascripts/acceptance/user-test.js.es6
@@ -30,4 +30,17 @@ QUnit.test("Root URL - Viewing Self", assert => {
     assert.equal(currentPath(), 'user.userActivity.index', "it defaults to activity");
     assert.ok(exists('.container.viewing-self'), "has the viewing-self class");
   });
-});
\ No newline at end of file
+});
+
+QUnit.test("Viewing Summary", assert => {
+  visit("/u/eviltrout/summary");
+  andThen(() => {
+    assert.ok(exists('.replies-section li a'), 'replies');
+    assert.ok(exists('.topics-section li a'), 'topics');
+    assert.ok(exists('.links-section li a'), 'links');
+    assert.ok(exists('.replied-section .user-info'), 'liked by');
+    assert.ok(exists('.liked-by-section .user-info'), 'liked by');
+    assert.ok(exists('.liked-section .user-info'), 'liked');
+    assert.ok(exists('.badges-section .badge-card'), 'badges');
+  });
+});
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js.es6
index 4a05e6f83e..e831da6eb5 100644
--- a/test/javascripts/components/ace-editor-test.js.es6
+++ b/test/javascripts/components/ace-editor-test.js.es6
@@ -17,3 +17,22 @@ componentTest('html editor', {
     assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
   }
 });
+
+componentTest('sql editor', {
+  template: '{{ace-editor mode="sql" content="SELECT * FROM users"}}',
+  test(assert) {
+    assert.expect(1);
+    assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
+  }
+});
+
+componentTest('disabled editor', {
+  template: '{{ace-editor mode="sql" content="SELECT * FROM users" disabled=true}}',
+  test(assert) {
+    const $ace = this.$('.ace_editor');
+    assert.expect(3);
+    assert.ok($ace.length, 'it renders the ace editor');
+    assert.equal($ace.parent().data().editor.getReadOnly(), true, 'it sets ACE to read-only mode');
+    assert.equal($ace.parent().attr('data-disabled'), "true", 'ACE wrapper has `data-disabled` attribute set to true');
+  }
+});
diff --git a/test/javascripts/components/categories-admin-dropdown-test.js.es6 b/test/javascripts/components/categories-admin-dropdown-test.js.es6
new file mode 100644
index 0000000000..9816850677
--- /dev/null
+++ b/test/javascripts/components/categories-admin-dropdown-test.js.es6
@@ -0,0 +1,19 @@
+import componentTest from 'helpers/component-test';
+moduleForComponent('categories-admin-dropdown', {integration: true});
+
+componentTest('default', {
+  template: '{{categories-admin-dropdown}}',
+
+  test(assert) {
+    const $selectBox = selectBox('.categories-admin-dropdown');
+
+    assert.equal($selectBox.el.find(".d-icon-bars").length, 1);
+    assert.equal($selectBox.el.find(".d-icon-caret-down").length, 1);
+
+    expandSelectBox('.categories-admin-dropdown');
+
+    andThen(() => {
+      assert.equal($selectBox.rowByValue("create").name(), "New Category");
+    });
+  }
+});
diff --git a/test/javascripts/components/category-chooser-test.js.es6 b/test/javascripts/components/category-chooser-test.js.es6
new file mode 100644
index 0000000000..f5ebfe2685
--- /dev/null
+++ b/test/javascripts/components/category-chooser-test.js.es6
@@ -0,0 +1,139 @@
+import componentTest from 'helpers/component-test';
+
+moduleForComponent('category-chooser', {integration: true});
+
+componentTest('with value', {
+  template: '{{category-chooser value=2}}',
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "feature");
+    });
+  }
+});
+
+componentTest('with excludeCategoryId', {
+  template: '{{category-chooser excludeCategoryId=2}}',
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').rowByValue(2).el.length, 0);
+    });
+  }
+});
+
+componentTest('with scopedCategoryId', {
+  template: '{{category-chooser scopedCategoryId=2}}',
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').rowByIndex(0).name(), "feature");
+      assert.equal(selectBox('.category-chooser').rowByIndex(1).name(), "spec");
+      assert.equal(selectBox('.category-chooser').el.find(".select-box-kit-row").length, 2);
+    });
+  }
+});
+
+componentTest('with allowUncategorized=null', {
+  template: '{{category-chooser allowUncategorized=null}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = false;
+  },
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "Select a category&hellip;");
+    });
+  }
+});
+
+componentTest('with allowUncategorized=null rootNone=true', {
+  template: '{{category-chooser allowUncategorized=null rootNone=true}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = false;
+  },
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "Select a category&hellip;");
+    });
+  }
+});
+
+componentTest('with disallowed uncategorized, rootNone and rootNoneLabel', {
+  template: '{{category-chooser allowUncategorized=null rootNone=true rootNoneLabel="test.root"}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {root: 'root none label'};
+    this.siteSettings.allow_uncategorized_topics = false;
+  },
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "Select a category&hellip;");
+    });
+  }
+});
+
+componentTest('with allowed uncategorized', {
+  template: '{{category-chooser allowUncategorized=true}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = true;
+  },
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "uncategorized");
+    });
+  }
+});
+
+componentTest('with allowed uncategorized and rootNone', {
+  template: '{{category-chooser allowUncategorized=true rootNone=true}}',
+
+  beforeEach() {
+    this.siteSettings.allow_uncategorized_topics = true;
+  },
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "(no category)");
+    });
+  }
+});
+
+componentTest('with allowed uncategorized rootNone and rootNoneLabel', {
+  template: '{{category-chooser allowUncategorized=true rootNone=true rootNoneLabel="test.root"}}',
+
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {root: 'root none label'};
+    this.siteSettings.allow_uncategorized_topics = true;
+  },
+
+  test(assert) {
+    expandSelectBox('.category-chooser');
+
+    andThen(() => {
+      assert.equal(selectBox('.category-chooser').header.name(), "root none label");
+    });
+  }
+});
diff --git a/test/javascripts/components/combo-box-test.js.es6 b/test/javascripts/components/combo-box-test.js.es6
index 285d817e3a..dcaccdfc1b 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -1,74 +1,241 @@
 import componentTest from 'helpers/component-test';
 moduleForComponent('combo-box', {integration: true});
 
-componentTest('with objects', {
-  template: '{{combo-box content=items value=value}}',
+componentTest('default', {
+  template: '{{combo-box content=items}}',
   beforeEach() {
     this.set('items', [{id: 1, name: 'hello'}, {id: 2, name: 'world'}]);
   },
 
   test(assert) {
-    assert.equal(this.get('value'), 1);
-    assert.ok(this.$('.combobox').length);
-    assert.equal(this.$("select option[value='1']").text(), 'hello');
-    assert.equal(this.$("select option[value='2']").text(), 'world');
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').header.name(), "hello");
+      assert.equal(selectBox('.combobox').rowByValue(1).name(), "hello");
+      assert.equal(selectBox('.combobox').rowByValue(2).name(), "world");
+    });
   }
 });
 
-componentTest('with objects and valueAttribute', {
+componentTest('with valueAttribute', {
   template: '{{combo-box content=items valueAttribute="value"}}',
   beforeEach() {
     this.set('items', [{value: 0, name: 'hello'}, {value: 1, name: 'world'}]);
   },
 
   test(assert) {
-    assert.ok(this.$('.combobox').length);
-    assert.equal(this.$("select option[value='0']").text(), 'hello');
-    assert.equal(this.$("select option[value='1']").text(), 'world');
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').rowByValue(0).name(), "hello");
+      assert.equal(selectBox('.combobox').rowByValue(1).name(), "world");
+    });
   }
 });
 
-componentTest('with an array', {
+componentTest('with nameProperty', {
+  template: '{{combo-box content=items nameProperty="text"}}',
+  beforeEach() {
+    this.set('items', [{id: 0, text: 'hello'}, {id: 1, text: 'world'}]);
+  },
+
+  test(assert) {
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').rowByValue(0).name(), "hello");
+      assert.equal(selectBox('.combobox').rowByValue(1).name(), "world");
+    });
+  }
+});
+
+componentTest('with an array as content', {
   template: '{{combo-box content=items value=value}}',
   beforeEach() {
     this.set('items', ['evil', 'trout', 'hat']);
   },
 
   test(assert) {
-    assert.equal(this.get('value'), 'evil');
-    assert.ok(this.$('.combobox').length);
-    assert.equal(this.$("select option[value='evil']").text(), 'evil');
-    assert.equal(this.$("select option[value='trout']").text(), 'trout');
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').rowByValue('evil').name(), "evil");
+      assert.equal(selectBox('.combobox').rowByValue('trout').name(), "trout");
+    });
   }
 });
 
-componentTest('with none', {
+componentTest('with value and none as a string', {
   template: '{{combo-box content=items none="test.none" value=value}}',
   beforeEach() {
     I18n.translations[I18n.locale].js.test = {none: 'none'};
     this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', 'trout');
   },
 
   test(assert) {
-    assert.equal(this.$("select option:eq(0)").text(), 'none');
-    assert.equal(this.$("select option:eq(0)").val(), '');
-    assert.equal(this.$("select option:eq(1)").text(), 'evil');
-    assert.equal(this.$("select option:eq(2)").text(), 'trout');
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').noneRow.name(), 'none');
+      assert.equal(selectBox('.combobox').rowByValue("evil").name(), "evil");
+      assert.equal(selectBox('.combobox').rowByValue("trout").name(), "trout");
+      assert.equal(selectBox('.combobox').header.name(), 'trout');
+      assert.equal(this.get('value'), 'trout');
+    });
+
+    selectBoxSelectRow('', {selector: '.combobox' });
+
+    andThen(() => {
+      assert.equal(this.get('value'), null);
+    });
   }
 });
 
-componentTest('with Object none', {
-  template: '{{combo-box content=items none=none value=value selected="something"}}',
+componentTest('with value and none as an object', {
+  template: '{{combo-box content=items none=none value=value}}',
   beforeEach() {
     this.set('none', { id: 'something', name: 'none' });
     this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', 'evil');
   },
 
   test(assert) {
-    assert.equal(this.get('value'), 'something');
-    assert.equal(this.$("select option:eq(0)").text(), 'none');
-    assert.equal(this.$("select option:eq(0)").val(), 'something');
-    assert.equal(this.$("select option:eq(1)").text(), 'evil');
-    assert.equal(this.$("select option:eq(2)").text(), 'trout');
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').noneRow.name(), 'none');
+      assert.equal(selectBox('.combobox').rowByValue("evil").name(), "evil");
+      assert.equal(selectBox('.combobox').rowByValue("trout").name(), "trout");
+      assert.equal(selectBox('.combobox').header.name(), 'evil');
+      assert.equal(this.get('value'), 'evil');
+    });
+
+    selectBoxSelectNoneRow({ selector: '.combobox' });
+
+    andThen(() => {
+      assert.equal(this.get('value'), null);
+    });
+  }
+});
+
+componentTest('with no value and none as an object', {
+  template: '{{combo-box content=items none=none value=value}}',
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('none', { id: 'something', name: 'none' });
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', null);
+  },
+
+  test(assert) {
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').header.name(), 'none');
+    });
+  }
+});
+
+componentTest('with no value and none string', {
+  template: '{{combo-box content=items none=none value=value}}',
+  beforeEach() {
+    I18n.translations[I18n.locale].js.test = {none: 'none'};
+    this.set('none', 'test.none');
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', null);
+  },
+
+  test(assert) {
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').header.name(), 'none');
+    });
+  }
+});
+
+componentTest('with no value and no none', {
+  template: '{{combo-box content=items value=value}}',
+  beforeEach() {
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', null);
+  },
+
+  test(assert) {
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').header.name(), 'evil', 'it sets the first row as value');
+    });
+  }
+});
+
+// componentTest('can be filtered', {
+//   template: '{{combo-box filterable=true value=1 content=content}}',
+//
+//   beforeEach() {
+//     this.set("content", [{ id: 1, name: "robin"}, { id: 2, name: "regis" }]);
+//   },
+//
+//   test(assert) {
+//     expandSelectBox();
+//
+//     andThen(() => assert.equal(find(".select-box-kit-filter-input").length, 1, "it has a search input"));
+//
+//     selectBoxFillInFilter("regis");
+//
+//     andThen(() => assert.equal(selectBox().rows.length, 1, "it filters results"));
+//
+//     selectBoxFillInFilter("");
+//
+//     andThen(() => {
+//       assert.equal(
+//         selectBox().rows.length, 2,
+//         "it returns to original content when filter is empty"
+//       );
+//     });
+//   }
+// });
+
+// componentTest('persists filter state when expanding/collapsing', {
+//   template: '{{combo-box value=1 content=content filterable=true}}',
+//
+//   beforeEach() {
+//     this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "régis" }]);
+//   },
+//
+//   test(assert) {
+//     expandSelectBox();
+//
+//     selectBoxFillInFilter("rob");
+//
+//     andThen(() => assert.equal(selectBox().rows.length, 1) );
+//
+//     collapseSelectBox();
+//
+//     andThen(() => assert.notOk(selectBox().isExpanded) );
+//
+//     expandSelectBox();
+//
+//     andThen(() => assert.equal(selectBox().rows.length, 1) );
+//   }
+// });
+
+
+componentTest('with empty string as value', {
+  template: '{{combo-box content=items value=value}}',
+  beforeEach() {
+    this.set('items', ['evil', 'trout', 'hat']);
+    this.set('value', '');
+  },
+
+  test(assert) {
+    expandSelectBox('.combobox');
+
+    andThen(() => {
+      assert.equal(selectBox('.combobox').header.name(), 'evil', 'it sets the first row as value');
+    });
   }
 });
diff --git a/test/javascripts/components/d-editor-test.js.es6 b/test/javascripts/components/d-editor-test.js.es6
index 8bc3b0d09d..07242c4e33 100644
--- a/test/javascripts/components/d-editor-test.js.es6
+++ b/test/javascripts/components/d-editor-test.js.es6
@@ -692,66 +692,6 @@ testCase(`list button with line sequence`, function(assert, textarea) {
   });
 });
 
-testCase(`heading button with no selection`, function(assert, textarea) {
-  const example = I18n.t('composer.heading_text');
-
-  click(`button.heading`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n## ${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 17 + example.length);
-  });
-
-  textarea.selectionStart = 30;
-  textarea.selectionEnd = 30;
-  click(`button.heading`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n${example}`);
-    assert.equal(textarea.selectionStart, 14);
-    assert.equal(textarea.selectionEnd, 14 + example.length);
-  });
-});
-
-testCase(`rule between things`, function(assert, textarea) {
-  textarea.selectionStart = 5;
-  textarea.selectionEnd = 5;
-
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello\n\n----------\n world.`);
-    assert.equal(textarea.selectionStart, 18);
-    assert.equal(textarea.selectionEnd, 18);
-  });
-});
-
-testCase(`rule with no selection`, function(assert, textarea) {
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n----------\n`);
-    assert.equal(textarea.selectionStart, 25);
-    assert.equal(textarea.selectionEnd, 25);
-  });
-
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello world.\n\n----------\n\n\n----------\n`);
-    assert.equal(textarea.selectionStart, 38);
-    assert.equal(textarea.selectionEnd, 38);
-  });
-});
-
-testCase(`rule with a selection`, function(assert, textarea) {
-  textarea.selectionStart = 6;
-  textarea.selectionEnd = 11;
-
-  click(`button.rule`);
-  andThen(() => {
-    assert.equal(this.get('value'), `hello \n\n----------\n.`);
-    assert.equal(textarea.selectionStart, 19);
-    assert.equal(textarea.selectionEnd, 19);
-  });
-});
-
 testCase(`doesn't jump to bottom with long text`, function(assert, textarea) {
 
   let longText = 'hello world.';
diff --git a/test/javascripts/components/dropdown-select-box-test.js.es6 b/test/javascripts/components/dropdown-select-box-test.js.es6
deleted file mode 100644
index 97d4f8fc28..0000000000
--- a/test/javascripts/components/dropdown-select-box-test.js.es6
+++ /dev/null
@@ -1,23 +0,0 @@
-import componentTest from 'helpers/component-test';
-
-moduleForComponent('dropdown-select-box', { integration: true });
-
-componentTest('the header has a title', {
-  template: '{{dropdown-select-box content=content value=value}}',
-
-  beforeEach() {
-    this.set("value", 1);
-    this.set("content", [{ id: 1, text: "apple" }, { id: 2, text: "peach" }]);
-  },
-
-  test(assert) {
-    andThen(() => {
-      assert.equal(find(".select-box-header .btn").attr("title"), "apple", "it has the correct title");
-    });
-
-    andThen(() => {
-      this.set("value", 2);
-      assert.equal(find(".select-box-header .btn").attr("title"), "peach", "it correctly changes the title");
-    });
-  }
-});
diff --git a/test/javascripts/components/multi-combo-box-test.js.es6 b/test/javascripts/components/multi-combo-box-test.js.es6
new file mode 100644
index 0000000000..9dbe3b5ffe
--- /dev/null
+++ b/test/javascripts/components/multi-combo-box-test.js.es6
@@ -0,0 +1,17 @@
+import componentTest from 'helpers/component-test';
+moduleForComponent('multi-combo-box', {integration: true});
+
+componentTest('with objects and values', {
+  template: '{{multi-combo-box content=items value=value}}',
+
+  beforeEach() {
+    this.set('items', [{id: 1, name: 'hello'}, {id: 2, name: 'world'}]);
+    this.set('value', [1, 2]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.propEqual(selectBox(".multi-combobox").header.name(), 'hello,world');
+    });
+  }
+});
diff --git a/test/javascripts/components/pinned-button-test.js.es6 b/test/javascripts/components/pinned-button-test.js.es6
index 0e41d4056d..eba26d40eb 100644
--- a/test/javascripts/components/pinned-button-test.js.es6
+++ b/test/javascripts/components/pinned-button-test.js.es6
@@ -25,11 +25,11 @@ componentTest('updating the content refreshes the list', {
 
     expandSelectBox();
 
-    andThen(() => assert.equal(selectBox().selectedRow.el().find(".title").text(), "Pinned") );
+    andThen(() => assert.equal(selectBox().selectedRow.name(), "Pinned") );
 
     andThen(() => {
       this.set("topic.pinned", false);
-      assert.equal(selectBox().selectedRow.el().find(".title").text(), "Unpinned");
+      assert.equal(selectBox().selectedRow.name(), "Unpinned");
     });
 
     andThen(() => {
diff --git a/test/javascripts/components/select-box-test.js.es6 b/test/javascripts/components/select-box-test.js.es6
index 4365e6a937..d5ce466053 100644
--- a/test/javascripts/components/select-box-test.js.es6
+++ b/test/javascripts/components/select-box-test.js.es6
@@ -1,31 +1,31 @@
 import componentTest from 'helpers/component-test';
 
-moduleForComponent('select-box', { integration: true });
+moduleForComponent('select-box-kit', { integration: true });
 
 componentTest('updating the content refreshes the list', {
-  template: '{{select-box value=1 content=content}}',
+  template: '{{select-box-kit value=1 content=content}}',
 
   beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }]);
+    this.set("content", [{ id: 1, name: "robin" }]);
   },
 
   test(assert) {
     expandSelectBox();
 
     andThen(() => {
-      assert.equal(selectBox().row(1).text(), "robin");
-      this.set("content", [{ id: 1, text: "regis" }]);
-      assert.equal(selectBox().row(1).text(), "regis");
+      assert.equal(selectBox().rowByValue(1).name(), "robin");
+      this.set("content", [{ id: 1, name: "regis" }]);
+      assert.equal(selectBox().rowByValue(1).name(), "regis");
     });
   }
 });
 
 componentTest('accepts a value by reference', {
-  template: '{{select-box value=value content=content}}',
+  template: '{{select-box-kit value=value content=content}}',
 
   beforeEach() {
     this.set("value", 1);
-    this.set("content", [{ id: 1, text: "robin" }, { id: 2, text: "regis" }]);
+    this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
   },
 
   test(assert) {
@@ -33,7 +33,7 @@ componentTest('accepts a value by reference', {
 
     andThen(() => {
       assert.equal(
-        selectBox().selectedRow.text(), "robin",
+        selectBox().selectedRow.name(), "robin",
         "it highlights the row corresponding to the value"
       );
     });
@@ -46,63 +46,28 @@ componentTest('accepts a value by reference', {
   }
 });
 
-componentTest('select-box can be filtered', {
-  template: '{{select-box filterable=true value=1 content=content}}',
-
-  beforeEach() {
-    this.set("content", [{ id: 1, text: "robin"}, { id: 2, text: "regis" }]);
-  },
-
-  test(assert) {
-    expandSelectBox();
-
-    andThen(() => assert.equal(find(".filter-query").length, 1, "it has a search input"));
-
-    selectBoxFillInFilter("regis");
-
-    andThen(() => assert.equal(selectBox().rows.length, 1, "it filters results"));
-
-    selectBoxFillInFilter("");
-
-    andThen(() => {
-      assert.equal(
-        selectBox().rows.length, 2,
-        "it returns to original content when filter is empty"
-      );
-    });
-  }
-});
-
 componentTest('no default icon', {
-  template: '{{select-box}}',
+  template: '{{select-box-kit}}',
 
   test(assert) {
     assert.equal(selectBox().header.icon().length, 0, "it doesn’t have an icon if not specified");
   }
 });
 
-componentTest('customisable icon', {
-  template: '{{select-box icon="shower"}}',
-
-  test(assert) {
-    assert.ok(selectBox().header.icon().hasClass("d-icon-shower"), "it has a the correct icon");
-  }
-});
-
 componentTest('default search icon', {
-  template: '{{select-box filterable=true}}',
+  template: '{{select-box-kit filterable=true}}',
 
   test(assert) {
     expandSelectBox();
 
     andThen(() => {
-      assert.ok(selectBox().filter.icon().hasClass("d-icon-search"), "it has a the correct icon");
+      assert.ok(exists(selectBox().filter.icon), "it has a the correct icon");
     });
   }
 });
 
 componentTest('with no search icon', {
-  template: '{{select-box filterable=true filterIcon=null}}',
+  template: '{{select-box-kit filterable=true filterIcon=null}}',
 
   test(assert) {
     expandSelectBox();
@@ -114,7 +79,7 @@ componentTest('with no search icon', {
 });
 
 componentTest('custom search icon', {
-  template: '{{select-box filterable=true filterIcon="shower"}}',
+  template: '{{select-box-kit filterable=true filterIcon="shower"}}',
 
   test(assert) {
     expandSelectBox();
@@ -125,17 +90,8 @@ componentTest('custom search icon', {
   }
 });
 
-componentTest('not filterable by default', {
-  template: '{{select-box}}',
-  test(assert) {
-    expandSelectBox();
-
-    andThen(() => assert.notOk(selectBox().filter.exists()) );
-  }
-});
-
 componentTest('select-box is expandable', {
-  template: '{{select-box}}',
+  template: '{{select-box-kit}}',
   test(assert) {
     expandSelectBox();
 
@@ -147,186 +103,124 @@ componentTest('select-box is expandable', {
   }
 });
 
-componentTest('accepts custom id/text keys', {
-  template: '{{select-box value=value content=content idKey="identifier" textKey="name"}}',
+componentTest('accepts custom value/name keys', {
+  template: '{{select-box-kit value=value nameProperty="item" content=content valueAttribute="identifier"}}',
 
   beforeEach() {
     this.set("value", 1);
-    this.set("content", [{ identifier: 1, name: "robin" }]);
+    this.set("content", [{ identifier: 1, item: "robin" }]);
   },
 
   test(assert) {
     expandSelectBox();
 
     andThen(() => {
-      assert.equal(selectBox().selectedRow.text(), "robin");
+      assert.equal(selectBox().selectedRow.name(), "robin");
     });
   }
 });
 
 componentTest('doesn’t render collection content before first expand', {
-  template: '{{select-box value=1 content=content idKey="identifier" textKey="name"}}',
+  template: '{{select-box-kit value=1 content=content}}',
 
   beforeEach() {
-    this.set("content", [{ identifier: 1, name: "robin" }]);
+    this.set("content", [{ value: 1, name: "robin" }]);
   },
 
   test(assert) {
-    assert.notOk(exists(find(".collection")));
+    assert.notOk(exists(find(".select-box-kit-collection")));
 
     expandSelectBox();
 
     andThen(() => {
-      assert.ok(exists(find(".collection")));
+      assert.ok(exists(find(".select-box-kit-collection")));
     });
   }
 });
 
-componentTest('persists filter state when expandind/collapsing', {
-  template: '{{select-box value=1 content=content filterable=true}}',
-
-  beforeEach() {
-    this.set("content", [{id:1, text:"robin"}, {id:2, text:"régis"}]);
-  },
-
-  test(assert) {
-    expandSelectBox();
-
-    selectBoxFillInFilter("rob");
-
-    andThen(() => assert.equal(selectBox().rows.length, 1) );
-
-    collapseSelectBox();
-
-    andThen(() => assert.notOk(selectBox().isExpanded) );
-
-    expandSelectBox();
-
-    andThen(() => assert.equal(selectBox().rows.length, 1) );
-  }
-});
-
 componentTest('supports options to limit size', {
-  template: '{{select-box collectionHeight=20 content=content}}',
+  template: '{{select-box-kit collectionHeight=20 content=content}}',
 
   beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }]);
+    this.set("content", [{ id: 1, name: "robin" }]);
   },
 
   test(assert) {
     expandSelectBox();
 
     andThen(() => {
-      const body = find(".select-box-body");
-      assert.equal(parseInt(body.height()), 20, "it limits the height");
-    });
-  }
-});
-
-componentTest('supports custom row template', {
-  template: '{{select-box content=content templateForRow=templateForRow}}',
-
-  beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }]);
-    this.set("templateForRow", (rowComponent) => {
-      return `<b>${rowComponent.get("content.text")}</b>`;
-    });
-  },
-
-  test(assert) {
-    expandSelectBox();
-
-    andThen(() => assert.equal(selectBox().row(1).el().html().trim(), "<b>robin</b>") );
-  }
-});
-
-componentTest('supports converting select value to integer', {
-  template: '{{select-box value=value content=content castInteger=true}}',
-
-  beforeEach() {
-    this.set("value", 2);
-    this.set("content", [{ id: "1", text: "robin"}, {id: "2", text: "régis" }]);
-  },
-
-  test(assert) {
-    expandSelectBox();
-
-    andThen(() => assert.equal(selectBox().selectedRow.text(), "régis") );
-
-    andThen(() => {
-      this.set("value", 3);
-      this.set("content", [{ id: "3", text: "jeff" }]);
-    });
-
-    andThen(() => {
-      assert.equal(selectBox().selectedRow.text(), "jeff", "it works with dynamic content");
+      const height = find(".select-box-kit-collection").height();
+      assert.equal(parseInt(height, 10), 20, "it limits the height");
     });
   }
 });
 
 componentTest('dynamic headerText', {
-  template: '{{select-box value=1 content=content}}',
+  template: '{{select-box-kit value=1 content=content}}',
 
   beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }, { id: 2, text: "regis" }]);
+    this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
   },
 
   test(assert) {
     expandSelectBox();
 
-    andThen(() => assert.equal(selectBox().header.text(), "robin") );
+    andThen(() => assert.equal(selectBox().header.name(), "robin") );
 
     selectBoxSelectRow(2);
 
     andThen(() => {
-      assert.equal(selectBox().header.text(), "regis", "it changes header text");
+      assert.equal(selectBox().header.name(), "regis", "it changes header text");
     });
   }
 });
 
-componentTest('static headerText', {
-  template: '{{select-box value=1 content=content dynamicHeaderText=false headerText=headerText}}',
+componentTest('supports custom row template', {
+  template: '{{select-box-kit content=content templateForRow=templateForRow}}',
 
   beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }, { id: 2, text: "regis" }]);
-    this.set("headerText", "Choose...");
+    this.set("content", [{ id: 1, name: "robin" }]);
+    this.set("templateForRow", rowComponent => {
+      return `<b>${rowComponent.get("content.name")}</b>`;
+    });
   },
 
   test(assert) {
     expandSelectBox();
 
-    andThen(() => {
-      assert.equal(selectBox().header.text(), "Choose...");
-    });
-
-    selectBoxSelectRow(2);
-
-    andThen(() => {
-      assert.equal(selectBox().header.text(), "Choose...", "it doesn’t change header text");
-    });
+    andThen(() => assert.equal(selectBox().rowByValue(1).el.html().trim(), "<b>robin</b>") );
   }
 });
 
-componentTest('supports custom row title', {
-  template: '{{select-box content=content titleForRow=titleForRow}}',
+componentTest('supports converting select value to integer', {
+  template: '{{select-box-kit value=value content=content castInteger=true}}',
 
   beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }]);
-    this.set("titleForRow", () => "sam" );
+    this.set("value", 2);
+    this.set("content", [{ id: "1", name: "robin"}, {id: "2", name: "régis" }]);
   },
 
   test(assert) {
     expandSelectBox();
 
-    andThen(() => assert.equal(selectBox().row(1).title(), "sam") );
+    andThen(() => assert.equal(selectBox().selectedRow.name(), "régis") );
+
+    andThen(() => {
+      this.set("value", 3);
+      this.set("content", [{ id: "3", name: "jeff" }]);
+    });
+
+    andThen(() => {
+      assert.equal(selectBox().selectedRow.name(), "jeff", "it works with dynamic content");
+    });
   }
 });
 
 componentTest('supports keyboard events', {
-  template: '{{select-box content=content filterable=true}}',
+  template: '{{select-box-kit content=content filterable=true}}',
 
   beforeEach() {
-    this.set("content", [{ id: 1, text: "robin" }, { id: 2, text: "regis" }]);
+    this.set("content", [{ id: 1, name: "robin" }, { id: 2, name: "regis" }]);
   },
 
   test(assert) {
@@ -335,31 +229,25 @@ componentTest('supports keyboard events', {
     selectBox().keyboard.down();
 
     andThen(() => {
-      assert.equal(selectBox().highlightedRow.title(), "robin", "it highlights the first row");
+      assert.equal(selectBox().highlightedRow.title(), "regis", "the next row is highlighted");
     });
 
     selectBox().keyboard.down();
 
     andThen(() => {
-      assert.equal(selectBox().highlightedRow.title(), "regis", "it highlights the next row");
-    });
-
-    selectBox().keyboard.down();
-
-    andThen(() => {
-      assert.equal(selectBox().highlightedRow.title(), "regis", "it keeps highlighting the last row when reaching the end");
+      assert.equal(selectBox().highlightedRow.title(), "robin", "it returns to the first row");
     });
 
     selectBox().keyboard.up();
 
     andThen(() => {
-      assert.equal(selectBox().highlightedRow.title(), "robin", "it highlights the previous row");
+      assert.equal(selectBox().highlightedRow.title(), "regis", "it highlights the last row");
     });
 
     selectBox().keyboard.enter();
 
     andThen(() => {
-      assert.equal(selectBox().selectedRow.title(), "robin", "it selects the row when pressing enter");
+      assert.equal(selectBox().selectedRow.title(), "regis", "it selects the row when pressing enter");
       assert.notOk(selectBox().isExpanded, "it collapses the select box when selecting a row");
     });
 
@@ -375,15 +263,31 @@ componentTest('supports keyboard events', {
 
     selectBoxFillInFilter("regis");
 
-    andThen(() => {
-      assert.equal(selectBox().highlightedRow.title(), "regis", "it highlights the first result");
-    });
+    // andThen(() => {
+      // assert.equal(selectBox().highlightedRow.title(), "regis", "it highlights the first result");
+    // });
 
     selectBox().keyboard.tab();
 
     andThen(() => {
-      assert.equal(selectBox().selectedRow.title(), "regis", "it selects the row when pressing tab");
+      // assert.equal(selectBox().selectedRow.title(), "regis", "it selects the row when pressing tab");
       assert.notOk(selectBox().isExpanded, "it collapses the select box when selecting a row");
     });
   }
 });
+
+
+componentTest('supports mutating value when no value given', {
+  template: '{{select-box-kit value=value content=content}}',
+
+  beforeEach() {
+    this.set("value", "");
+    this.set("content", [{ id: "1", name: "robin"}, {id: "2", name: "régis" }]);
+  },
+
+  test(assert) {
+    andThen(() => {
+      assert.equal(this.get("value"), "1");
+    });
+  }
+});
diff --git a/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6 b/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
new file mode 100644
index 0000000000..fbd31aeafc
--- /dev/null
+++ b/test/javascripts/components/topic-footer-mobile-dropdown-test.js.es6
@@ -0,0 +1,35 @@
+import componentTest from 'helpers/component-test';
+import Topic from 'discourse/models/topic';
+
+const buildTopic = function() {
+  return Topic.create({
+    id: 1234,
+    title: 'Qunit Test Topic'
+  });
+};
+
+moduleForComponent('topic-footer-mobile-dropdown', {integration: true});
+
+componentTest('default', {
+  template: '{{topic-footer-mobile-dropdown topic=topic}}',
+  beforeEach() {
+    this.set("topic", buildTopic());
+  },
+
+  test(assert) {
+    expandSelectBox();
+
+    andThen(() => {
+      assert.equal(selectBox().header.name(), "Topic Controls");
+      assert.equal(selectBox().rowByIndex(0).name(), "Bookmark");
+      assert.equal(selectBox().rowByIndex(1).name(), "Share");
+      assert.equal(selectBox().selectedRow.el.length, 0, "it doesn’t preselect first row");
+    });
+
+    selectBoxSelectRow("share");
+
+    andThen(() => {
+      assert.equal(this.get("value"), null, "it resets the value");
+    });
+  }
+});
diff --git a/test/javascripts/components/topic-notifications-button-test.js.es6 b/test/javascripts/components/topic-notifications-button-test.js.es6
index eda38dca1f..67fd3ad70e 100644
--- a/test/javascripts/components/topic-notifications-button-test.js.es6
+++ b/test/javascripts/components/topic-notifications-button-test.js.es6
@@ -23,12 +23,12 @@ componentTest('the header has a localized title', {
 
   test(assert) {
     andThen(() => {
-      assert.equal(find(".select-box-header .btn").attr("title"), "Normal", "it has the correct title");
+      assert.equal(selectBox().header.name(), "Normal", "it has the correct title");
     });
 
     andThen(() => {
       this.set("topic.details.notification_level", 2);
-      assert.equal(find(".select-box-header .btn").attr("title"), "Tracking", "it correctly changes the title");
+      assert.equal(selectBox().header.name(), "Tracking", "it correctly changes the title");
     });
   }
 });
diff --git a/test/javascripts/helpers/component-test.js.es6 b/test/javascripts/helpers/component-test.js.es6
index 4154a46121..24c99aa63c 100644
--- a/test/javascripts/helpers/component-test.js.es6
+++ b/test/javascripts/helpers/component-test.js.es6
@@ -33,7 +33,7 @@ export default function(name, opts) {
                               { instantiate: false });
     }
 
-    this.registry.register('store:main', store, { instantiate: false });
+    this.registry.register('service:store', store, { instantiate: false });
 
     if (opts.beforeEach) {
       opts.beforeEach.call(this, store);
diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6
index a466f632cc..60c5762905 100644
--- a/test/javascripts/helpers/create-pretender.js.es6
+++ b/test/javascripts/helpers/create-pretender.js.es6
@@ -81,12 +81,20 @@ export default function() {
     this.get('/u/eviltrout/summary.json', () => {
       return response({
         user_summary: {
-          topics: [],
-          topic_ids: [],
-          replies: [],
-          links: []
+          topic_ids: [1234],
+          replies: [{ topic_id: 1234 }],
+          links: [{ topic_id: 1234, url: 'https://eviltrout.com' }],
+          most_replied_to_users: [ { id: 333 } ],
+          most_liked_by_users: [ { id: 333 } ],
+          most_liked_users: [ { id: 333 } ],
+          badges: [ { badge_id: 444 } ]
         },
-        topics: [],
+        badges: [
+          { id: 444, count: 1 }
+        ],
+        topics: [
+          { id: 1234, title: 'cool title', url: '/t/1234/cool-title' }
+        ],
       });
     });
 
diff --git a/test/javascripts/helpers/select-box-helper.js b/test/javascripts/helpers/select-box-helper.js
index e6fc96fd7d..546148531a 100644
--- a/test/javascripts/helpers/select-box-helper.js
+++ b/test/javascripts/helpers/select-box-helper.js
@@ -11,56 +11,68 @@ function checkSelectBoxIsNotCollapsed(selectBoxSelector) {
 }
 
 Ember.Test.registerAsyncHelper('expandSelectBox', function(app, selectBoxSelector) {
-  selectBoxSelector = selectBoxSelector || '.select-box';
+  selectBoxSelector = selectBoxSelector || '.select-box-kit';
 
   checkSelectBoxIsNotExpanded(selectBoxSelector);
 
-  click(selectBoxSelector + ' .select-box-header');
+  click(selectBoxSelector + ' .select-box-kit-header');
 });
 
 Ember.Test.registerAsyncHelper('collapseSelectBox', function(app, selectBoxSelector) {
-  selectBoxSelector = selectBoxSelector || '.select-box';
+  selectBoxSelector = selectBoxSelector || '.select-box-kit';
 
   checkSelectBoxIsNotCollapsed(selectBoxSelector);
 
-  click(selectBoxSelector + ' .select-box-header');
+  click(selectBoxSelector + ' .select-box-kit-header');
 });
 
-Ember.Test.registerAsyncHelper('selectBoxSelectRow', function(app, rowId, options) {
+Ember.Test.registerAsyncHelper('selectBoxSelectRow', function(app, rowValue, options) {
   options = options || {};
-  options.selector = options.selector || '.select-box';
+  options.selector = options.selector || '.select-box-kit';
 
   checkSelectBoxIsNotCollapsed(options.selector);
 
-  click(options.selector + " .select-box-row[data-id='" + rowId + "']");
+  click(options.selector + " .select-box-kit-row[data-value='" + rowValue + "']");
+});
+
+Ember.Test.registerAsyncHelper('selectBoxSelectNoneRow', function(app, options) {
+  options = options || {};
+  options.selector = options.selector || '.select-box-kit';
+
+  checkSelectBoxIsNotCollapsed(options.selector);
+
+  click(options.selector + " .select-box-kit-row.none");
 });
 
 Ember.Test.registerAsyncHelper('selectBoxFillInFilter', function(app, filter, options) {
   options = options || {};
-  options.selector = options.selector || '.select-box';
+  options.selector = options.selector || '.select-box-kit';
 
   checkSelectBoxIsNotCollapsed(options.selector);
 
-  var filterQuerySelector = options.selector + ' .filter-query';
+  var filterQuerySelector = options.selector + ' .select-box-kit-filter-input';
   fillIn(filterQuerySelector, filter);
   triggerEvent(filterQuerySelector, 'keyup');
 });
 
 function selectBox(selector) { // eslint-disable-line no-unused-vars
-  selector = selector || '.select-box';
+  selector = selector || '.select-box-kit';
 
   function rowHelper(row) {
     return {
-      text: function() { return row.find('.text').text().trim(); },
+      name: function() { return row.attr('data-name'); },
       icon: function() { return row.find('.d-icon'); },
       title: function() { return row.attr('title'); },
-      el: function() { return row; }
+      value: function() { return row.attr('data-value'); },
+      el: row
     };
   }
 
   function headerHelper(header) {
     return {
-      text: function() { return header.find('.current-selection').text().trim(); },
+      name: function() {
+        return header.attr('data-name');
+      },
       icon: function() { return header.find('.icon'); },
       title: function() { return header.attr('title'); },
       el: header
@@ -77,9 +89,8 @@ function selectBox(selector) { // eslint-disable-line no-unused-vars
 
   function keyboardHelper() {
     function createEvent(target, keyCode) {
-      if (typeof target !== 'undefined') {
-        selector = find(selector).find(target);
-      }
+      target = target || ".select-box-kit-filter-input";
+      selector = find(selector).find(target);
 
       andThen(function() {
         var event = jQuery.Event('keydown');
@@ -104,18 +115,30 @@ function selectBox(selector) { // eslint-disable-line no-unused-vars
 
     isHidden: find(selector).hasClass('is-hidden'),
 
-    header: headerHelper(find(selector).find('.select-box-header')),
+    header: headerHelper(find(selector).find('.select-box-kit-header')),
 
-    filter: filterHelper(find(selector).find('.select-box-filter')),
+    filter: filterHelper(find(selector).find('.select-box-kit-filter')),
 
-    rows: find(selector).find('.select-box-row'),
+    rows: find(selector).find('.select-box-kit-row'),
 
-    row: function(id) {
-      return rowHelper(find(selector).find('.select-box-row[data-id="' + id + '"]'));
+    rowByValue: function(value) {
+      return rowHelper(find(selector).find('.select-box-kit-row[data-value="' + value + '"]'));
     },
 
-    selectedRow: rowHelper(find(selector).find('.select-box-row.is-selected')),
+    rowByName: function(name) {
+      return rowHelper(find(selector).find('.select-box-kit-row[data-name="' + name + '"]'));
+    },
 
-    highlightedRow: rowHelper(find(selector).find('.select-box-row.is-highlighted'))
+    rowByIndex: function(index) {
+      return rowHelper(find(selector).find('.select-box-kit-row:eq(' + index + ')'));
+    },
+
+    el: find(selector),
+
+    noneRow: rowHelper(find(selector).find('.select-box-kit-row.none')),
+
+    selectedRow: rowHelper(find(selector).find('.select-box-kit-row.is-selected')),
+
+    highlightedRow: rowHelper(find(selector).find('.select-box-kit-row.is-highlighted'))
   };
 }
diff --git a/test/javascripts/lib/sanitizer-test.js.es6 b/test/javascripts/lib/sanitizer-test.js.es6
index 8650bc90ba..f316c84767 100644
--- a/test/javascripts/lib/sanitizer-test.js.es6
+++ b/test/javascripts/lib/sanitizer-test.js.es6
@@ -65,12 +65,22 @@ QUnit.test("sanitize", assert => {
 QUnit.test("ids on headings", assert => {
   const pt = new PrettyText(buildOptions({ siteSettings: {} }));
   assert.equal(pt.sanitize("<h3>Test Heading</h3>"), "<h3>Test Heading</h3>");
-  assert.equal(pt.sanitize(`<h1 id="test-heading">Test Heading</h1>`), `<h1 id="test-heading">Test Heading</h1>`);
-  assert.equal(pt.sanitize(`<h2 id="test-heading">Test Heading</h2>`), `<h2 id="test-heading">Test Heading</h2>`);
-  assert.equal(pt.sanitize(`<h3 id="test-heading">Test Heading</h3>`), `<h3 id="test-heading">Test Heading</h3>`);
-  assert.equal(pt.sanitize(`<h4 id="test-heading">Test Heading</h4>`), `<h4 id="test-heading">Test Heading</h4>`);
-  assert.equal(pt.sanitize(`<h5 id="test-heading">Test Heading</h5>`), `<h5 id="test-heading">Test Heading</h5>`);
-  assert.equal(pt.sanitize(`<h6 id="test-heading">Test Heading</h6>`), `<h6 id="test-heading">Test Heading</h6>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--test">Test Heading</h1>`), `<h1 id="heading--test">Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h2 id="heading--cool">Test Heading</h2>`), `<h2 id="heading--cool">Test Heading</h2>`);
+  assert.equal(pt.sanitize(`<h3 id="heading--dashed-name">Test Heading</h3>`), `<h3 id="heading--dashed-name">Test Heading</h3>`);
+  assert.equal(pt.sanitize(`<h4 id="heading--underscored_name">Test Heading</h4>`), `<h4 id="heading--underscored_name">Test Heading</h4>`);
+  assert.equal(pt.sanitize(`<h5 id="heading--trout">Test Heading</h5>`), `<h5 id="heading--trout">Test Heading</h5>`);
+  assert.equal(pt.sanitize(`<h6 id="heading--discourse">Test Heading</h6>`), `<h6 id="heading--discourse">Test Heading</h6>`);
+});
+
+QUnit.test("poorly formed ids on headings", assert => {
+  let pt = new PrettyText(buildOptions({ siteSettings: {} }));
+  assert.equal(pt.sanitize(`<h1 id="evil-trout">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--with space">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--with*char">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="heading--">Test Heading</h1>`), `<h1>Test Heading</h1>`);
+  assert.equal(pt.sanitize(`<h1 id="test-heading--cool">Test Heading</h1>`), `<h1>Test Heading</h1>`);
 });
 
 QUnit.test("urlAllowed", assert => {
diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6
index 6499262e8b..232055bb28 100644
--- a/test/javascripts/models/store-test.js.es6
+++ b/test/javascripts/models/store-test.js.es6
@@ -1,4 +1,4 @@
-QUnit.module('store:main');
+QUnit.module('service:store');
 
 import createStore from 'helpers/create-store';